diff --git a/TODO.md b/TODO.md index 2f3664ab..4225b2de 100644 --- a/TODO.md +++ b/TODO.md @@ -12,6 +12,7 @@ some stuff i finna add eventually/soon lol - [ ] Unhardcode more of the intro besides `introText.txt` - [ ] Finish credits list menu - [ ] Extra key support +- [ ] WEGA NOTETYPE!!!!!!!! - [ ] Improve caching for sprites and audio - [ ] Make `LoadingState` work outside of the `html5` target - [ ] LO-FI & HI-FI mode (kinda like Mic'd Up's implementation but cooler) diff --git a/art/Funkin.bmp b/art/Funkin.bmp deleted file mode 100644 index 55beb478..00000000 Binary files a/art/Funkin.bmp and /dev/null differ diff --git a/art/FunkinAlt.bmp b/art/FunkinAlt.bmp deleted file mode 100644 index ee833a25..00000000 Binary files a/art/FunkinAlt.bmp and /dev/null differ diff --git a/art/WEGA IDEA.txt b/art/WEGA IDEA.txt new file mode 100644 index 00000000..7f02c182 --- /dev/null +++ b/art/WEGA IDEA.txt @@ -0,0 +1,5 @@ +- secret wega song, can only be found through a prompt substate like Updike +- wega difficulty??? +- the secret code will be randomized per session (WEGA00000 - WEGA99999, and it wont work unless you have beaten story mode +- hitting/missing a PATENTED wega note will blast your speakers with a wega jumpscare + - 100x worse when trying to press the charting keybind \ No newline at end of file diff --git a/art/thumbnailNewer.png b/art/thumbnailNewer.png deleted file mode 100644 index a4196738..00000000 Binary files a/art/thumbnailNewer.png and /dev/null differ diff --git a/assets/preload/data/credits.json b/assets/preload/data/credits.json index 4d5b9ecb..a7942ba7 100644 --- a/assets/preload/data/credits.json +++ b/assets/preload/data/credits.json @@ -18,7 +18,7 @@ ] }, { - "header": "Artists", + "header": "Artists & Animators", "body": [ { "line": "charlesisfeline" }, { "line": "TheAnimateMan" }, @@ -35,6 +35,10 @@ { "line": "Vencerist" } ] }, + { + "header": "Programming", + "body": [{ "line": "charlesisfeline" }, { "line": "Moxie-Coder" }] + }, { "header": "Charting", "body": [{ "line": "charlesisfeline" }, { "line": "Vencerist" }] @@ -51,7 +55,7 @@ { "line": "FreyaFennec_Foxes" }, { "line": "Ren/Kasper" }, { "line": "Isaiah Mods" }, - { "line": "DerpMage" } + { "line": "Rem_ix / DerpMage" } ] }, { @@ -65,13 +69,11 @@ { "line": "bennyk" }, { "line": "richTrash21" }, { "line": "Redar13" }, + { "line": "CATZALONG" }, + { "line": "Kenward03" }, { "line": "And the Freya/Flispy Discord servers" } ] }, - { - "header": "Programming", - "body": [{ "line": "charlesisfeline" }, { "line": "Moxie-Coder" }] - }, { "header": "Friday Night Funkin'", "body": [ @@ -90,7 +92,7 @@ }, { "header": "Direction and Art Lead", - "body": [{ "line": "PhantomArcade" }] + "body": [{ "line": "David “PhantomArcade” Brown" }] }, { "header": "Music Lead", @@ -98,7 +100,7 @@ }, { "header": "Co-Direction and Programming Lead", - "body": [{ "line": "ninjamuffin99" }] + "body": [{ "line": "Cameron “ninjamuffin99” Taylor" }] }, { "header": "Producer", diff --git a/buildNoTest.bat b/buildNoTest.bat index 3c19703b..b08cc8d0 100644 --- a/buildNoTest.bat +++ b/buildNoTest.bat @@ -1,2 +1,7 @@ @echo off lime build windows -DDAMNWTF +echo. +echo FINISHED COMPILING FREYA MOD! +pause +pwd +explorer.exe export\release\windows\bin diff --git a/buildShit.bat b/buildShit.bat index 7a4fb534..fbf76e36 100644 --- a/buildShit.bat +++ b/buildShit.bat @@ -1,2 +1,6 @@ @echo off lime test windows -DDAMNWTF +echo FREYA MOD CLOSED! +pause +pwd +explorer.exe export\release\windows\bin diff --git a/buildToCubical.bat b/buildToCubical.bat new file mode 100644 index 00000000..2b0a3517 --- /dev/null +++ b/buildToCubical.bat @@ -0,0 +1,6 @@ +@echo off +lime test windows -DSONG=cubical -DDAMNWTF +echo FREYA MOD CLOSED! +pause +pwd +explorer.exe export\release\windows\bin diff --git a/buildToFreyin.bat b/buildToFreyin.bat index 23c1af2c..117cb06a 100644 --- a/buildToFreyin.bat +++ b/buildToFreyin.bat @@ -1,2 +1,6 @@ @echo off lime test windows -DSONG=freyin -DDAMNWTF +echo FREYA MOD CLOSED! +pause +pwd +explorer.exe export\release\windows\bin diff --git a/buildToIntolerant.bat b/buildToIntolerant.bat new file mode 100644 index 00000000..2b38b16e --- /dev/null +++ b/buildToIntolerant.bat @@ -0,0 +1,6 @@ +@echo off +lime test windows -DSONG=intolerant -DDAMNWTF +echo FREYA MOD CLOSED! +pause +pwd +explorer.exe export\release\windows\bin diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 10090bdf..351d57f6 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -302,7 +302,7 @@ class PlayState extends MusicBeatSubState ["its fine bud", 0.6], // From 60% to 69% ["haha 69 funni number", 0.69], // From 69% to 70% ["git gud", 0.75], // From 70% to 80% - ["is that all you got", 0.8], // From 80% to 90% + ["HELP", 0.8], // From 80% to 90% ["SLAY", 0.9], // From 90% to 97% ["BRO IS NOT PFCING :skull:", 0.97], // From 97% to 99% ["PERFECT FC!!!!!!!", 1] @@ -668,12 +668,14 @@ class PlayState extends MusicBeatSubState * Returns true if game is compiled for mobile. * It is needed for mobile checks in HScript. */ - var isMobilePlatform:Bool = #if mobile true #else false #end; + public var isMobilePlatform:Bool = #if mobile true #else false #end; public var isFreyaSong:Bool = false; var randImage:Int = 1; + public var centerStrums:Bool = false; + /** * PROPERTIES */ @@ -755,19 +757,14 @@ class PlayState extends MusicBeatSubState super(); // Validate parameters. - if (params == null && lastParams == null) - { - throw 'PlayState constructor called with no available parameters.'; - } + if (params == null && lastParams == null) throw 'PlayState constructor called with no available parameters.'; else if (params == null) { trace('WARNING: PlayState constructor called with no parameters. Reusing previous parameters.'); params = lastParams; } else - { lastParams = params; - } // Apply parameters. currentSong = params.targetSong; @@ -793,7 +790,7 @@ class PlayState extends MusicBeatSubState */ public override function create():Void { - if (instance != null) trace('WARNING: PlayState instance already exists. This should not happen.'); // TODO: Do something in this case? IDK. + if (instance != null) trace('WARNING: THERES ALREADY AN INSTANCE OF PLAYSTATE, THIS AINT ON PURPOSE HELP'); // TODO: Do something in this case? IDK. instance = this; if (!assertChartExists()) return; @@ -1828,7 +1825,7 @@ class PlayState extends MusicBeatSubState // The score text below the health bar. if (Preferences.extraScoreText) { - scoreText = new FlxText(0, healthBarBG.y + 45, FlxG.width, '', 16); + scoreText = new FlxText(0, healthBarBG.y + 30, FlxG.width, '', 16); if (isFreyaSong) scoreText.setFormat(Paths.font('roboto/roboto.ttf'), 20, FlxColor.RED, CENTER); else scoreText.setFormat(Paths.font('vcr.ttf'), 16, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE_FAST, FlxColor.BLACK); @@ -2079,9 +2076,9 @@ class PlayState extends MusicBeatSubState // Position the player strumline on the right half of the screen if (Preferences.middlescroll) playerStrumline.x = FlxG.width / 2 - playerStrumline.width / 2; + else if (centerStrums) playerStrumline.x = FlxG.width - playerStrumline.width - Constants.STRUMLINE_X_OFFSET; // Centered style else playerStrumline.x = FlxG.width / 2 + Constants.STRUMLINE_X_OFFSET; // Classic style - // playerStrumline.x = FlxG.width - playerStrumline.width - Constants.STRUMLINE_X_OFFSET; // Centered style playerStrumline.y = Preferences.downscroll ? FlxG.height - playerStrumline.height - Constants.STRUMLINE_Y_OFFSET : Constants.STRUMLINE_Y_OFFSET; playerStrumline.zIndex = 1001; playerStrumline.cameras = [camHUD]; @@ -2425,7 +2422,7 @@ class PlayState extends MusicBeatSubState // TODO: Add an option for this maybe? var commaSeparated:Bool = true; if (Preferences.extraScoreText) - scoreText.text = '[ Score: ${FlxStringUtil.formatMoney(songScore, false, commaSeparated)} • Misses: $songMisses/$totalPlayed • Accuracy: $accuracy ]'; + scoreText.text = '[ Score: ${FlxStringUtil.formatMoney(songScore, false, commaSeparated)} • Misses: $songMisses/$totalPlayed • Accuracy: $accuracy • $ratingName]'; else scoreText.text = 'Score: ${FlxStringUtil.formatMoney(songScore, false, commaSeparated)} '; // }