From 775639e76ee46c35d3e383e8efa88ad708c41a19 Mon Sep 17 00:00:00 2001 From: fireredfan7 <87201149+fireredfan7@users.noreply.github.com> Date: Fri, 17 Sep 2021 11:45:39 -0500 Subject: [PATCH 1/8] Update build.yml --- .github/workflows/build.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8cdcfe62..3177a5d96 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,20 +128,6 @@ jobs: with: name: windowsWeek7Build path: export/release/windows/bin - - name: Compile 32 bit - run: haxelib run lime build windows -D32bit -32 - - name: Publish 32bit - uses: actions/upload-artifact@v2 - with: - name: windows32Build - path: export/32bit/windows/bin - - name: Copy Week 7 Files - run: Copy-Item -Force -Recurse ./Week7Assets/* -Destination ./export/32bit/windows/bin/assets - - name: Publish Artifact - uses: actions/upload-artifact@v2 - with: - name: windowsWeek732bitBuild - path: export/32bit/windows/bin buildMac: runs-on: macos-latest From 4920defca86ac5041b679d8e186c872134b87e52 Mon Sep 17 00:00:00 2001 From: fireredfan7 <87201149+fireredfan7@users.noreply.github.com> Date: Fri, 17 Sep 2021 11:47:42 -0500 Subject: [PATCH 2/8] Update and rename win64.yml to win32.yml --- .github/workflows/{win64.yml => win32.yml} | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) rename .github/workflows/{win64.yml => win32.yml} (79%) diff --git a/.github/workflows/win64.yml b/.github/workflows/win32.yml similarity index 79% rename from .github/workflows/win64.yml rename to .github/workflows/win32.yml index 74a80354f..61ae8dd20 100644 --- a/.github/workflows/win64.yml +++ b/.github/workflows/win32.yml @@ -1,6 +1,6 @@ # This is a basic workflow to help you get started with Actions -name: Win64 +name: Win32 # Controls when the action will run. on: @@ -50,10 +50,17 @@ jobs: shell: cmd - name: Create Version Tag run: echo "${{github.run_id}}" > VERSION - - name: Compile - run: haxelib run lime build windows --app-version="4.0.0-${{ github.run_id}}" + - name: Compile 32 bit + run: haxelib run lime build windows -D32bit -32 + - name: Publish 32bit + uses: actions/upload-artifact@v2 + with: + name: windows32Build + path: export/32bit/windows/bin + - name: Copy Week 7 Files + run: Copy-Item -Force -Recurse ./Week7Assets/* -Destination ./export/32bit/windows/bin/assets - name: Publish Artifact uses: actions/upload-artifact@v2 with: - name: windows64Build - path: export/release/windows/bin + name: windowsWeek732bitBuild + path: export/32bit/windows/bin From 326e2ac39e1647db56306b57e52472a2f8f7fff5 Mon Sep 17 00:00:00 2001 From: fireredfan7 <87201149+fireredfan7@users.noreply.github.com> Date: Fri, 17 Sep 2021 11:55:08 -0500 Subject: [PATCH 3/8] Update win32.yml --- .github/workflows/win32.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/win32.yml b/.github/workflows/win32.yml index 61ae8dd20..274401700 100644 --- a/.github/workflows/win32.yml +++ b/.github/workflows/win32.yml @@ -16,7 +16,7 @@ on: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: # This workflow contains a single job called "build" - buildWindows64x: + buildWindows32x: runs-on: windows-latest steps: From 78c6245439ccd992b288382d9bf6f37bb71c10d4 Mon Sep 17 00:00:00 2001 From: fireredfan7 <87201149+fireredfan7@users.noreply.github.com> Date: Mon, 20 Sep 2021 09:51:15 -0500 Subject: [PATCH 4/8] Update CategoryState.hx --- source/CategoryState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/CategoryState.hx b/source/CategoryState.hx index 524a15002..9780ab860 100644 --- a/source/CategoryState.hx +++ b/source/CategoryState.hx @@ -39,7 +39,7 @@ class CategoryState extends MusicBeatState override function create() { // it's a js file to make syntax highlighting acceptable - #if windows + #if cpp // Updating Discord Rich Presence Discord.DiscordClient.changePresence("In the Freeplay Menu", null); #end From 338364d85b977f3e62b7b60e937a58390abbe18f Mon Sep 17 00:00:00 2001 From: fireredfan7 <87201149+fireredfan7@users.noreply.github.com> Date: Mon, 20 Sep 2021 09:53:06 -0500 Subject: [PATCH 5/8] Update FreeplayState.hx --- source/FreeplayState.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 0cb4253d3..5dd5f0cee 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -144,7 +144,7 @@ class FreeplayState extends MusicBeatState + '/freakyMenu' + TitleState.soundExt)); } - #if windows + #if cpp // Updating Discord Rich Presence var customPrecence = TitleState.discordStuff.freeplay; Discord.DiscordClient.changePresence(customPrecence, null); @@ -574,4 +574,4 @@ typedef JsonMetadata = { var week:Int; var character:String; var ?flags:Array; -} \ No newline at end of file +} From d432d141486fbab8d3615c9fbed275d1d3e70286 Mon Sep 17 00:00:00 2001 From: fireredfan7 <87201149+fireredfan7@users.noreply.github.com> Date: Mon, 20 Sep 2021 09:55:48 -0500 Subject: [PATCH 6/8] Update MainMenuState.hx --- source/MainMenuState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index 3ff4e4031..71200b020 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -55,7 +55,7 @@ class MainMenuState extends MusicBeatState public static var version:String = ""; override function create() { - #if windows + #if cpp // Updating Discord Rich Presence var customPrecence = TitleState.discordStuff.mainmenu; Discord.DiscordClient.changePresence(customPrecence, null); From a2208ca187346966b7a761d75bf3940d4f942808 Mon Sep 17 00:00:00 2001 From: fireredfan7 <87201149+fireredfan7@users.noreply.github.com> Date: Mon, 20 Sep 2021 10:26:39 -0500 Subject: [PATCH 7/8] Update PlayState.hx --- source/PlayState.hx | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 332d33dfc..82a81f405 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -92,7 +92,7 @@ enum abstract DisplayLayer(Int) from Int to Int { } class PlayState extends MusicBeatState { - #if windows + #if cpp public static var customPrecence = FNFAssets.getText("assets/discord/presence/play.txt"); #end public static var curStage:String = ''; @@ -166,7 +166,7 @@ class PlayState extends MusicBeatState // private var bfColor:FlxColor = 0xFF149DFF; private var barShowingPoison:Bool = false; private var pixelUI:Bool = false; - #if (windows && cpp) + #if cpp // Discord RPC variables var storyDifficultyText:String = ""; var iconRPC:String = ""; @@ -569,7 +569,7 @@ class PlayState extends MusicBeatState if (Reflect.hasField(Judgement.uiJson, preferredJudgement) && Reflect.field(Judgement.uiJson, preferredJudgement).uses != preferredJudgement) preferredJudgement = Reflect.field(Judgement.uiJson, preferredJudgement).uses; } - #if windows + #if cpp // Making difficulty text for Discord Rich Presence. // I JUST REALIZED THIS IS NOT VERY COMPATIBILE /* @@ -2006,7 +2006,7 @@ class PlayState extends MusicBeatState vocals.pause(); } controls.setKeyboardScheme(Solo(false)); - #if windows + #if cpp var ae = FNFAssets.getText("assets/discord/presence/playpause.txt"); DiscordClient.changePresence(ae + SONG.song @@ -2077,7 +2077,7 @@ class PlayState extends MusicBeatState currentIconState = "Being Posioned"; } } - #if windows + #if cpp if (startTimer.finished) { DiscordClient.changePresence(customPrecence @@ -2120,7 +2120,7 @@ class PlayState extends MusicBeatState vocals.time = Conductor.songPosition; vocals.play(); - #if windows + #if cpp DiscordClient.changePresence(detailsText + " " + SONG.song @@ -2251,7 +2251,7 @@ class PlayState extends MusicBeatState if (FlxG.keys.justPressed.SEVEN && !OptionsHandler.options.danceMode) { - #if windows + #if cpp DiscordClient.changePresence("Chart Editor", null, null, true); #end LoadingState.loadAndSwitchState(new ChartingState()); @@ -2324,21 +2324,21 @@ class PlayState extends MusicBeatState { iconP1.iconState = Dying; iconP2.iconState = Winning; - #if windows + #if cpp iconRPC = player1Icon + "-dead"; #end } else { iconP1.iconState = Normal; - #if windows + #if cpp iconRPC = player1Icon; #end } if (!opponentPlayer && poisonTimes != 0) { iconP1.iconState = Poisoned; - #if windows + #if cpp iconRPC = player1Icon + "-dazed"; #end } @@ -2379,14 +2379,14 @@ class PlayState extends MusicBeatState if (iconP1.iconState != Poisoned) { iconP1.iconState = Winning; } - #if windows + #if cpp if (opponentPlayer) iconRPC = player2Icon + "-dead"; #end } else { iconP2.iconState = Normal; - #if windows + #if cpp if (opponentPlayer) iconRPC = player2Icon; #end @@ -2396,7 +2396,7 @@ class PlayState extends MusicBeatState } if (poisonTimes != 0 && opponentPlayer) { iconP2.iconState = Poisoned; - #if windows + #if cpp if (opponentPlayer) iconRPC = player2Icon + "-dazed"; #end @@ -2607,7 +2607,7 @@ class PlayState extends MusicBeatState } else openSubState(new GameOverSubstate(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); - #if windows + #if cpp // Game Over doesn't get his own variable because it's only used here DiscordClient.changePresence("GAME OVER -- " + SONG.song @@ -3098,7 +3098,7 @@ class PlayState extends MusicBeatState campaignAccuracy = campaignAccuracy / defaultPlaylistLength; if (useVictoryScreen) { - #if windows + #if cpp DiscordClient.changePresence("Reviewing Score -- " + SONG.song + " (" @@ -3165,7 +3165,7 @@ class PlayState extends MusicBeatState trace('WENT BACK TO FREEPLAY??'); if (useVictoryScreen) { - #if windows + #if cpp DiscordClient.changePresence("Reviewing Score -- " + SONG.song + " (" @@ -4038,7 +4038,7 @@ class PlayState extends MusicBeatState songName.cameras = [camHUD]; } - #if windows + #if cpp // Song duration in a float, useful for the time left feature @@ -4133,7 +4133,7 @@ class PlayState extends MusicBeatState callAllHScript('beatHit', [curBeat]); } function updatePrecence() { - #if windows + #if cpp // Updating Discord Rich Presence. DiscordClient.changePresence(customPrecence + " " From 01d9338532ebc6231963e0ef5c8f582ec1ed15fd Mon Sep 17 00:00:00 2001 From: fireredfan7 <87201149+fireredfan7@users.noreply.github.com> Date: Mon, 20 Sep 2021 10:28:41 -0500 Subject: [PATCH 8/8] Update TitleState.hx --- source/TitleState.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/TitleState.hx b/source/TitleState.hx index b78383ca9..725db367e 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -1,6 +1,6 @@ package; -#if windows +#if cpp import Discord.DiscordClient; #end import flixel.FlxG; @@ -85,7 +85,7 @@ class TitleState extends MusicBeatState override public function create():Void { - #if windows + #if cpp DiscordClient.initialize(); Application.current.onExit.add(function(exitCode)