From 7d2bd7bed082e6b23deff0e0957181d30d077f46 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 22 Feb 2023 14:39:41 -0500 Subject: [PATCH 1/6] revert haxe setup to hmm --- .github/actions/setup-haxeshit/action.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/actions/setup-haxeshit/action.yml b/.github/actions/setup-haxeshit/action.yml index 3931e62a7..5844499b7 100644 --- a/.github/actions/setup-haxeshit/action.yml +++ b/.github/actions/setup-haxeshit/action.yml @@ -1,10 +1,20 @@ name: setup-haxeshit -description: "sets up haxe shit, using lix!" +description: "sets up haxe shit, using HMM!" runs: using: "composite" steps: - - uses: lix-pm/setup-lix@1.0.0 + - uses: krdlab/setup-haxe@v1.4.0 with: - lix-version: 15.8.9 # optional - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' + haxe-version: 4.2.5 + - name: Config haxelib + run: | + haxelib config + shell: bash + - name: Installing Haxe lol + run: | + haxe -version + haxelib git haxelib https://github.com/HaxeFoundation/haxelib.git + haxelib version + haxelib --global install hmm + haxelib --global run hmm install --quiet + shell: bash From 25d91f396422a8eb52f73d20ddb3b12ca8399c79 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 22 Feb 2023 14:41:04 -0500 Subject: [PATCH 2/6] revert to hmm stuff for windows build --- .github/workflows/build-shit.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml index 182ee2af6..574f1c3ef 100644 --- a/.github/workflows/build-shit.yml +++ b/.github/workflows/build-shit.yml @@ -55,15 +55,10 @@ jobs: export/debug/windows/haxe/ export/debug/windows/obj/ - - name: lix stuff - run: | - npm i -g lix - lix download - lix +lib lime - lix run lime setup + - uses: ./.github/actions/setup-haxeshit - name: Build game run: | - lix run lime build windows + haxelib run lime build windows dir - uses: ./.github/actions/upload-itch with: From dd73539294cd76d761abfaa2467b38c42564b16c Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 22 Feb 2023 14:46:46 -0500 Subject: [PATCH 3/6] inputSpitter for ravy --- source/funkin/play/PlayState.hx | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 0be033a64..b2e0bba12 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -1381,6 +1381,8 @@ class PlayState extends MusicBeatState startingSong = true; + inputSpitter = []; + FlxG.sound.music.pause(); vocals.pause(); @@ -1804,6 +1806,11 @@ class PlayState extends MusicBeatState { dispatchEvent(new ScriptEvent(ScriptEvent.SONG_END)); + #if sys + // spitter for ravy, teehee!! + sys.io.File.saveContent("./scores.txt", inputSpitter.join("\n")); + #end + seenCutscene = false; deathCounter = 0; mayPauseGame = false; @@ -2034,6 +2041,11 @@ class PlayState extends MusicBeatState */ // } + /** + * Spitting out the input for ravy 🙇‍♂️!! + */ + var inputSpitter:Array = []; + public function keyShit(test:Bool):Void { if (PlayState.instance == null) return; @@ -2052,6 +2064,15 @@ class PlayState extends MusicBeatState controls.NOTE_UP_R, controls.NOTE_RIGHT_R ]; + + if (pressArray.contains(true)) + { + var lol:Array = cast pressArray; + inputSpitter.push(Std.int(Conductor.songPosition) + " " + lol.join(" ")); + } + + if (FlxG.keys.justPressed.B) trace(inputSpitter.join("\n")); + // HOLDS, check for sustain notes if (holdArray.contains(true) && PlayState.instance.generatedMusic) { From 9ef5974e52d0e46cff3d258619420d3d0f1b5d83 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 22 Feb 2023 15:30:58 -0500 Subject: [PATCH 4/6] build fix? --- Project.xml | 2 +- hmm.json | 222 +++++++++--------- .../funkin/play/cutscene/VanillaCutscenes.hx | 9 +- 3 files changed, 113 insertions(+), 120 deletions(-) diff --git a/Project.xml b/Project.xml index c2f03f83b..ef58d5b53 100644 --- a/Project.xml +++ b/Project.xml @@ -129,7 +129,7 @@ - + diff --git a/hmm.json b/hmm.json index 9edc42cdd..6e8601501 100644 --- a/hmm.json +++ b/hmm.json @@ -1,116 +1,108 @@ { - "dependencies": [ - { - "name": "discord_rpc", - "type": "git", - "dir": null, - "ref": "2d83fa8", - "url": "https://github.com/Aidan63/linc_discord-rpc" - }, - { - "name": "flixel", - "type": "git", - "dir": null, - "ref": "d6100cc8", - "url": "https://github.com/EliteMasterEric/flixel" - }, - { - "name": "flixel-addons", - "type": "git", - "dir": null, - "ref": "f107166", - "url": "https://github.com/EliteMasterEric/flixel-addons" - }, - { - "name": "flixel-ui", - "type": "haxelib", - "version": "2.4.0" - }, - { - "name": "flxanimate", - "type": "git", - "dir": null, - "ref": "18b2060", - "url": "https://github.com/Dot-Stuff/flxanimate" - }, - { - "name": "format", - "type": "haxelib", - "version": "3.5.0" - }, - { - "name": "haxeui-core", - "type": "git", - "dir": null, - "ref": "e5cf78d", - "url": "https://github.com/haxeui/haxeui-core/" - }, - { - "name": "haxeui-flixel", - "type": "git", - "dir": null, - "ref": "f03bb6d", - "url": "https://github.com/haxeui/haxeui-flixel" - }, - { - "name": "hmm", - "type": "git", - "dir": null, - "ref": "3ef9522", - "url": "https://github.com/steviegt6/hmm" - }, - { - "name": "hscript", - "type": "haxelib", - "version": "2.5.0" - }, - { - "name": "hxcodec", - "type": "git", - "dir": null, - "ref": "master", - "url": "https://github.com/EliteMasterEric/hxCodec" - }, - { - "name": "hxcpp", - "type": "haxelib", - "version": "4.2.1" - }, - { - "name": "hxcpp-debug-server", - "type": "haxelib", - "version": "1.2.4" - }, - { - "name": "hxp", - "type": "haxelib", - "version": null - }, - { - "name": "lime", - "type": "git", - "dir": null, - "ref": "afadf5f", - "url": "https://github.com/openfl/lime" - }, - { - "name": "openfl", - "type": "git", - "dir": null, - "ref": "b2c18513", - "url": "https://github.com/EliteMasterEric/openfl" - }, - { - "name": "polymod", - "type": "git", - "dir": null, - "ref": "4e5b4b3", - "url": "https://github.com/larsiusprime/polymod" - }, - { - "name": "thx.semver", - "type": "haxelib", - "version": "0.2.2" - } - ] -} + "dependencies": [{ + "name": "discord_rpc", + "type": "git", + "dir": null, + "ref": "2d83fa8", + "url": "https://github.com/Aidan63/linc_discord-rpc" + }, + { + "name": "flixel", + "type": "git", + "dir": null, + "ref": "d6100cc8", + "url": "https://github.com/EliteMasterEric/flixel" + }, + { + "name": "flixel-addons", + "type": "git", + "dir": null, + "ref": "f107166", + "url": "https://github.com/EliteMasterEric/flixel-addons" + }, + { + "name": "flixel-ui", + "type": "haxelib", + "version": "2.4.0" + }, + { + "name": "flxanimate", + "type": "git", + "dir": null, + "ref": "49f5554", + "url": "https://github.com/Dot-Stuff/flxanimate" + }, + { + "name": "format", + "type": "haxelib", + "version": "3.5.0" + }, + { + "name": "haxeui-core", + "type": "git", + "dir": null, + "ref": "dd7a95d", + "url": "https://github.com/haxeui/haxeui-core/" + }, + { + "name": "haxeui-flixel", + "type": "git", + "dir": null, + "ref": "3882f1f", + "url": "https://github.com/haxeui/haxeui-flixel" + }, + { + "name": "hmm", + "type": "git", + "dir": null, + "ref": "3ef9522", + "url": "https://github.com/steviegt6/hmm" + }, + { + "name": "hscript", + "type": "haxelib", + "version": "2.5.0" + }, + { + "name": "hxcpp", + "type": "haxelib", + "version": "4.2.1" + }, + { + "name": "hxcpp-debug-server", + "type": "haxelib", + "version": "1.2.4" + }, + { + "name": "hxp", + "type": "haxelib", + "version": null + }, + { + "name": "lime", + "type": "git", + "dir": null, + "ref": "afadf5f", + "url": "https://github.com/openfl/lime" + }, + { + "name": "openfl", + "type": "git", + "dir": null, + "ref": "b2c18513", + "url": "https://github.com/EliteMasterEric/openfl" + }, + { + "name": "polymod", + "type": "git", + "dir": null, + "ref": "4e5b4b3", + "url": "https://github.com/larsiusprime/polymod" + }, + { + "name": "thx.semver", + "type": "haxelib", + "version": "0.2.2" + } + ] +} \ No newline at end of file diff --git a/source/funkin/play/cutscene/VanillaCutscenes.hx b/source/funkin/play/cutscene/VanillaCutscenes.hx index 99d0bd0d8..9f51b214c 100644 --- a/source/funkin/play/cutscene/VanillaCutscenes.hx +++ b/source/funkin/play/cutscene/VanillaCutscenes.hx @@ -1,12 +1,13 @@ package funkin.play.cutscene; -import hxcodec.flixel.FlxVideoSprite; -import hxcodec.flixel.FlxCutsceneState; +// import hxcodec.flixel.FlxVideoSprite; +// import hxcodec.flixel.FlxCutsceneState; import flixel.FlxSprite; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; import flixel.util.FlxColor; import flixel.util.FlxTimer; +import funkin.graphics.video.FlxVideo; /** * Static methods for playing cutscenes in the PlayState. @@ -62,7 +63,7 @@ class VanillaCutscenes vid.finishCallback = finishCutscene; #else // Video displays OVER the FlxState. - vid = new FlxVideoSprite(0, 0); + // vid = new FlxVideoSprite(0, 0); vid.cameras = [PlayState.instance.camCutscene]; @@ -73,7 +74,7 @@ class VanillaCutscenes #end } - static var vid:#if html5 FlxVideo #else FlxVideoSprite #end; + static var vid:#if html5 FlxVideo #else Dynamic /**FlxVideoSprite **/ #end; /** * Does the cleanup to start the countdown after the video is done. From b8e0dbbb0fdea82771e5596137f19e487c8df342 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 22 Feb 2023 15:47:55 -0500 Subject: [PATCH 5/6] debug.. doh! --- .github/workflows/build-shit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-shit.yml b/.github/workflows/build-shit.yml index 574f1c3ef..0d9ab8677 100644 --- a/.github/workflows/build-shit.yml +++ b/.github/workflows/build-shit.yml @@ -58,7 +58,7 @@ jobs: - uses: ./.github/actions/setup-haxeshit - name: Build game run: | - haxelib run lime build windows + haxelib run lime build windows -debug dir - uses: ./.github/actions/upload-itch with: From aeb0b3e8a9d8772b76e6ff0acff7e8d8236bd15f Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Wed, 22 Feb 2023 21:40:46 -0500 Subject: [PATCH 6/6] let the kids have they .vscode/ --- .gitignore | 1 - .vscode/settings.json | 84 +++++++++++++++++++++++++++++++++++++++++++ .vscode/tasks.json | 13 +++++++ 3 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json create mode 100644 .vscode/tasks.json diff --git a/.gitignore b/.gitignore index 8896597a0..d4aba58ac 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .DS_STORE .haxelib/ -.vscode/ APIStuff.hx dump/ export/ diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..d7433698d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,84 @@ +{ + "[haxe]": { + // Automatically keep Haxe files formatted. + "editor.formatOnSave": true, + "editor.formatOnPaste": true, + "editor.codeActionsOnSave": { + // Compilation server issues can cause auto-cleanup to remove valid imports. + "source.organizeImports": false + }, + "editor.defaultFormatter": "nadako.vshaxe", + "editor.tabSize": 2 + }, + + "[json]": { + // Automatically keep JSON files formatted. + "editor.formatOnSave": true, + "editor.formatOnPaste": true, + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + + "[jsonc]": { + // Automatically keep JSONC files formatted. + "editor.formatOnSave": true, + "editor.formatOnPaste": true, + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "prettier.tabWidth": 2, + + // Automatically detect indentation. + "editor.detectIndentation": true, + "editor.insertSpaces": true, + "editor.tabSize": 2, + + // Automatically enforce Linux style line endings. + "files.eol": "\n", + + "haxe.displayPort": "auto", + "haxe.enableCompilationServer": true, + "haxe.displayServer": { + "arguments": ["-v"] + }, + // Fix file associations for HScript. + "files.associations": { + "*.hxp": "haxe", + "*.hscript": "haxe", + "*.haxe": "haxe", + "*.hxs": "haxe", + "*.hxc": "haxe" + }, + "projectManager.git.baseFolders": ["./"], + + "haxecheckstyle.sourceFolders": ["src", "Source"], + "haxecheckstyle.externalSourceRoots": [], + "haxecheckstyle.configurationFile": "checkstyle.json", + "haxecheckstyle.codeSimilarityBufferSize": 100, + + "lime.targetConfigurations": [ + { + "label": "Windows / Debug", + "target": "windows", + "args": ["-debug"] + }, + { + "label": "Windows / Debug (DEBUG ASSETS)", + "target": "windows", + "args": ["-debug", "-DDEBUG_ASSETS"] + }, + { + "label": "Windows / Debug (ANIMATE)", + "target": "windows", + "args": ["-debug", "-DANIMATE"] + }, + { + "label": "HTML5 / Debug", + "target": "html5", + "args": ["-debug"] + }, + { + "label": "HTML5 / Debug (Watch)", + "target": "html5", + "args": ["-debug", "-watch"] + } + ] + } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..16a77646f --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,13 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "type": "lime", + "command": "test", + "group": { + "kind": "build", + "isDefault": true + } + } + ] +}