AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change Discord stuff to only windows

Browse Source
This commit is contained in:
daniel11420 2021-04-06 01:56:20 +00:00 committed by GitHub
parent 572d1ddd01
commit 8af197ab19
9 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Project.xml
View File

@ -116,7 +116,7 @@
<haxelib name="newgrounds"/> <haxelib name="newgrounds"/>
<haxelib name="faxe" if='switch'/> <haxelib name="faxe" if='switch'/>
<haxelib name="polymod"/> <haxelib name="polymod"/>
<haxelib name="discord_rpc" if="desktop"/> <haxelib name="discord_rpc" if="windows"/>
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> --> <!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->
<!-- <haxelib name="markdown" /> --> <!-- <haxelib name="markdown" /> -->

2
source/Discord.hx
View File

@ -1,3 +1,4 @@
# if windows
package; package;
import Sys.sleep; import Sys.sleep;
@ -85,3 +86,4 @@ class DiscordClient
//trace('Discord RPC Updated. Arguments: $details, $state, $smallImageKey, $hasStartTimestamp, $endTimestamp'); //trace('Discord RPC Updated. Arguments: $details, $state, $smallImageKey, $hasStartTimestamp, $endTimestamp');
} }
} }
#end

4
source/FreeplayState.hx
View File

@ -11,7 +11,7 @@ import flixel.util.FlxColor;
import lime.utils.Assets; import lime.utils.Assets;
#if desktop #if windows
import Discord.DiscordClient; import Discord.DiscordClient;
#end #end
@ -53,7 +53,7 @@ class FreeplayState extends MusicBeatState
} }
*/ */
#if desktop #if windows
// Updating Discord Rich Presence // Updating Discord Rich Presence
DiscordClient.changePresence("In the Menus", null); DiscordClient.changePresence("In the Menus", null);
#end #end

4
source/GameplayCustomizeState.hx
View File

@ -2,7 +2,7 @@ import flixel.math.FlxMath;
import flixel.FlxCamera; import flixel.FlxCamera;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import flixel.FlxObject; import flixel.FlxObject;
#if desktop #if windows
import Discord.DiscordClient; import Discord.DiscordClient;
import sys.thread.Thread; import sys.thread.Thread;
#end #end
@ -33,7 +33,7 @@ class GameplayCustomizeState extends MusicBeatState
private var camHUD:FlxCamera; private var camHUD:FlxCamera;
public override function create() { public override function create() {
#if desktop #if windows
// Updating Discord Rich Presence // Updating Discord Rich Presence
DiscordClient.changePresence("Customizing Gameplay", null); DiscordClient.changePresence("Customizing Gameplay", null);
#end #end

4
source/MainMenuState.hx
View File

@ -14,7 +14,7 @@ import flixel.util.FlxColor;
import io.newgrounds.NG; import io.newgrounds.NG;
import lime.app.Application; import lime.app.Application;
#if desktop #if windows
import Discord.DiscordClient; import Discord.DiscordClient;
#end #end
@ -46,7 +46,7 @@ class MainMenuState extends MusicBeatState
override function create() override function create()
{ {
#if desktop #if windows
// Updating Discord Rich Presence // Updating Discord Rich Presence
DiscordClient.changePresence("In the Menus", null); DiscordClient.changePresence("In the Menus", null);
#end #end

2
source/MusicBeatState.hx
View File

@ -1,6 +1,8 @@
package; package;
#if windows
import Discord.DiscordClient; import Discord.DiscordClient;
#end
import flixel.tweens.FlxTween; import flixel.tweens.FlxTween;
import flixel.util.FlxColor; import flixel.util.FlxColor;
import openfl.Lib; import openfl.Lib;

20
source/PlayState.hx
View File

@ -40,7 +40,7 @@ import openfl.display.BlendMode;
import openfl.display.StageQuality; import openfl.display.StageQuality;
import openfl.filters.ShaderFilter; import openfl.filters.ShaderFilter;
#if desktop #if windows
import Discord.DiscordClient; import Discord.DiscordClient;
#end #end
@ -72,7 +72,7 @@ class PlayState extends MusicBeatState
var songLength:Float = 0; var songLength:Float = 0;
#if desktop #if windows
// Discord RPC variables // Discord RPC variables
var storyDifficultyText:String = ""; var storyDifficultyText:String = "";
var iconRPC:String = ""; var iconRPC:String = "";
@ -197,7 +197,7 @@ class PlayState extends MusicBeatState
repPresses = 0; repPresses = 0;
repReleases = 0; repReleases = 0;
#if desktop #if windows
// Making difficulty text for Discord Rich Presence. // Making difficulty text for Discord Rich Presence.
switch (storyDifficulty) switch (storyDifficulty)
{ {
@ -1192,7 +1192,7 @@ class PlayState extends MusicBeatState
default: allowedToHeadbang = false; default: allowedToHeadbang = false;
} }
#if desktop #if windows
// Updating Discord Rich Presence (with Time Left) // Updating Discord Rich Presence (with Time Left)
DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC); DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC);
#end #end
@ -1421,7 +1421,7 @@ class PlayState extends MusicBeatState
vocals.pause(); vocals.pause();
} }
#if desktop #if windows
DiscordClient.changePresence("PAUSED on " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "Acc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC); DiscordClient.changePresence("PAUSED on " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "Acc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC);
#end #end
if (!startTimer.finished) if (!startTimer.finished)
@ -1444,7 +1444,7 @@ class PlayState extends MusicBeatState
startTimer.active = true; startTimer.active = true;
paused = false; paused = false;
#if desktop #if windows
if (startTimer.finished) if (startTimer.finished)
{ {
DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses, iconRPC, true, songLength - Conductor.songPosition); DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses, iconRPC, true, songLength - Conductor.songPosition);
@ -1469,7 +1469,7 @@ class PlayState extends MusicBeatState
vocals.time = Conductor.songPosition; vocals.time = Conductor.songPosition;
vocals.play(); vocals.play();
#if desktop #if windows
DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC); DiscordClient.changePresence(detailsText + " " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(), "\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC);
#end #end
} }
@ -1655,7 +1655,7 @@ class PlayState extends MusicBeatState
if (FlxG.keys.justPressed.SEVEN) if (FlxG.keys.justPressed.SEVEN)
{ {
#if desktop #if windows
DiscordClient.changePresence("Chart Editor", null, null, true); DiscordClient.changePresence("Chart Editor", null, null, true);
#end #end
FlxG.switchState(new ChartingState()); FlxG.switchState(new ChartingState());
@ -1940,7 +1940,7 @@ class PlayState extends MusicBeatState
openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));
#if desktop #if windows
// Game Over doesn't get his own variable because it's only used here // Game Over doesn't get his own variable because it's only used here
DiscordClient.changePresence("GAME OVER -- " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(),"\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC); DiscordClient.changePresence("GAME OVER -- " + SONG.song + " (" + storyDifficultyText + ") " + generateRanking(),"\nAcc: " + truncateFloat(accuracy, 2) + "% | Score: " + songScore + " | Misses: " + misses , iconRPC);
#end #end
@ -3111,7 +3111,7 @@ class PlayState extends MusicBeatState
// yes this updates every step. // yes this updates every step.
// yes this is bad // yes this is bad
// but i'm doing it to update misses and accuracy // but i'm doing it to update misses and accuracy
#if desktop #if windows
// Song duration in a float, useful for the time left feature // Song duration in a float, useful for the time left feature
songLength = FlxG.sound.music.length; songLength = FlxG.sound.music.length;

4
source/StoryMenuState.hx
View File

@ -13,7 +13,7 @@ import flixel.util.FlxColor;
import flixel.util.FlxTimer; import flixel.util.FlxTimer;
import lime.net.curl.CURLCode; import lime.net.curl.CURLCode;
#if desktop #if windows
import Discord.DiscordClient; import Discord.DiscordClient;
#end #end
@ -74,7 +74,7 @@ class StoryMenuState extends MusicBeatState
override function create() override function create()
{ {
#if desktop #if windows
// Updating Discord Rich Presence // Updating Discord Rich Presence
DiscordClient.changePresence("In the Menus", null); DiscordClient.changePresence("In the Menus", null);
#end #end

7
source/TitleState.hx
View File

@ -24,8 +24,11 @@ import io.newgrounds.NG;
import lime.app.Application; import lime.app.Application;
import openfl.Assets; import openfl.Assets;
#if desktop #if windows
import Discord.DiscordClient; import Discord.DiscordClient;
#end
#if desktop
import sys.thread.Thread; import sys.thread.Thread;
#end #end
@ -59,7 +62,7 @@ class TitleState extends MusicBeatState
PlayerSettings.init(); PlayerSettings.init();
#if desktop #if windows
DiscordClient.initialize(); DiscordClient.initialize();
Application.current.onExit.add (function (exitCode) { Application.current.onExit.add (function (exitCode) {