From 200ae101c43f3a9370124794d4065ed87fe88391 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sun, 25 Apr 2021 11:10:46 -0700 Subject: [PATCH 1/4] Revert "Some fun features" --- source/ChartingState.hx | 70 ++++-------------- source/FreeplayState.hx | 84 ++++------------------ source/PlayState.hx | 151 ++++++++------------------------------- source/StoryMenuState.hx | 4 -- 4 files changed, 57 insertions(+), 252 deletions(-) diff --git a/source/ChartingState.hx b/source/ChartingState.hx index 56aa33e..1ea9650 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -90,9 +90,6 @@ class ChartingState extends MusicBeatState private var lastNote:Note; - var player1Icon:String; - var player2Icon:String; - override function create() { @@ -101,6 +98,20 @@ class ChartingState extends MusicBeatState gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); add(gridBG); + leftIcon = new HealthIcon('bf'); + rightIcon = new HealthIcon('dad'); + leftIcon.scrollFactor.set(1, 1); + rightIcon.scrollFactor.set(1, 1); + + leftIcon.setGraphicSize(0, 45); + rightIcon.setGraphicSize(0, 45); + + add(leftIcon); + add(rightIcon); + + leftIcon.setPosition(0, -100); + rightIcon.setPosition(gridBG.width / 2, -100); + gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK); add(gridBlackLine); @@ -123,23 +134,6 @@ class ChartingState extends MusicBeatState }; } - player1Icon = _song.player1; - player2Icon = _song.player2; - - leftIcon = new HealthIcon(_song.player1); - rightIcon = new HealthIcon(_song.player2); - leftIcon.scrollFactor.set(1, 1); - rightIcon.scrollFactor.set(1, 1); - - leftIcon.setGraphicSize(0, 45); - rightIcon.setGraphicSize(0, 45); - - add(leftIcon); - add(rightIcon); - - leftIcon.setPosition(0, -100); - rightIcon.setPosition(gridBG.width / 2, -100); - FlxG.mouse.visible = true; FlxG.save.bind('funkin', 'ninjamuffin99'); @@ -533,8 +527,6 @@ class ChartingState extends MusicBeatState { curStep = recalculateSteps(); - changeIcon(); - if (FlxG.keys.justPressed.ALT && UI_box.selected_tab == 0) { writingNotes = !writingNotes; @@ -1019,7 +1011,7 @@ class ChartingState extends MusicBeatState { remove(gridBG); gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * _song.notes[curSection].lengthInSteps); - add(gridBG); + add(gridBG); remove(gridBlackLine); gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK); @@ -1127,38 +1119,6 @@ class ChartingState extends MusicBeatState updateNoteUI(); } - function changeIcon():Void - { - if (_song.player1 != player1Icon) - { - remove(leftIcon); - - player1Icon = _song.player1; - leftIcon = new HealthIcon(player1Icon); - leftIcon.scrollFactor.set(1, 1); - - leftIcon.setGraphicSize(0, 45); - - add(leftIcon); - - leftIcon.setPosition(0, -100); - } - - if (_song.player2 != player2Icon) - { - remove(rightIcon); - - player2Icon = _song.player2; - rightIcon = new HealthIcon(player2Icon); - rightIcon.scrollFactor.set(1, 1); - - rightIcon.setGraphicSize(0, 45); - - add(rightIcon); - - rightIcon.setPosition(gridBG.width / 2, -100); - } - } function deleteNote(note:Note):Void { diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 4507b72..59ecc70 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -8,9 +8,6 @@ import flixel.group.FlxGroup.FlxTypedGroup; import flixel.math.FlxMath; import flixel.text.FlxText; import flixel.util.FlxColor; -import flixel.util.FlxTimer; -import flixel.tweens.FlxEase; -import flixel.tweens.FlxTween; import lime.utils.Assets; @@ -38,8 +35,6 @@ class FreeplayState extends MusicBeatState private var iconArray:Array = []; - var bg:FlxSprite; - override function create() { var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist')); @@ -73,7 +68,7 @@ class FreeplayState extends MusicBeatState // LOAD CHARACTERS - bg = new FlxSprite().loadGraphic(Paths.image('menuDesat')); + var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuBGBlue')); add(bg); grpSongs = new FlxTypedGroup(); @@ -166,8 +161,6 @@ class FreeplayState extends MusicBeatState } } - var lockedIn:Bool = false; - override function update(elapsed:Float) { super.update(elapsed); @@ -213,8 +206,6 @@ class FreeplayState extends MusicBeatState trace(poop); - lockedIn = true; - PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase()); PlayState.isStoryMode = false; PlayState.storyDifficulty = curDifficulty; @@ -259,7 +250,6 @@ class FreeplayState extends MusicBeatState curSelected += change; - if (curSelected < 0) curSelected = songs.length - 1; if (curSelected >= songs.length) @@ -267,57 +257,24 @@ class FreeplayState extends MusicBeatState // selector.y = (70 * curSelected) + 30; + #if !switch + intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty); + // lerpScore = 0; + #end + + #if PRELOAD_ALL + FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName), 0); + #end + + var bullShit:Int = 0; + for (i in 0...iconArray.length) { iconArray[i].alpha = 0.6; } - - var bullShit:Int = 0; - - iconArray[curSelected].alpha = 1; - if (curSelected >= 0) - { - if (curSelected >= 4) - { - if (curSelected >= 7) - { - if (curSelected >= 10) - { - if (curSelected >= 13) - { - if (curSelected >= 16) - { - FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(219, 101, 217)); - } - else - { - FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(161, 212, 230)); - } - } - else - { - FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(230, 129, 221)); - } - } - else - { - FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(99, 12, 22)); - } - } - else - { - FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(39, 46, 66)); - } - } - else - { - FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(96, 66, 245)); - } - } - for (item in grpSongs.members) { item.targetY = bullShit - curSelected; @@ -332,23 +289,6 @@ class FreeplayState extends MusicBeatState // item.setGraphicSize(Std.int(item.width)); } } - - var temp:Int = curSelected; - - new FlxTimer().start(FlxG.random.float(0.7), function(tmr:FlxTimer) - { - if (curSelected == temp && !lockedIn) - { - #if !switch - intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty); - // lerpScore = 0; - #end - - #if PRELOAD_ALL - FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName), 0); - #end - } - }); } } diff --git a/source/PlayState.hx b/source/PlayState.hx index d1fd308..a43bd9a 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -74,27 +74,6 @@ using StringTools; class PlayState extends MusicBeatState { - var characterCol:Array = CoolUtil.coolTextFile(Paths.txt('characterList')); - var col:Array = [ - 0xFF51d8fb, // BF - 0xFFc885e5, // DAD - 0xFFca1f6f, // GF - 0xFFf9a326, // SPOOKY - 0xFFceec75, // PICO - 0xFFec7aac, // MOM - 0xFFec7aac, // MOM-CAR - 0xFF51d8fb, // BF-CAR - 0xFFffffff, // PARENTS-CHRISTMAS - 0xFFf5ff8a, // MONSTER-CHRISTMAS - 0xFF51d8fb, // BF-CHRISTMAS - 0xFFca1f6f, // GF-CHRISTMAS - 0xFFf5ff8a, // MONSTER - 0xFF9fe6ff, // BF-PIXEL - 0xFFffaa6f, // SENPAI - 0xFFffaa6f, // SENPAI-ANGRY - 0xFFff5d87 // SPIRIT - ]; - public static var curStage:String = ''; public static var SONG:SwagSong; public static var isStoryMode:Bool = false; @@ -146,9 +125,6 @@ class PlayState extends MusicBeatState private var strumLineNotes:FlxTypedGroup; private var playerStrums:FlxTypedGroup; - private var player2Strums:FlxTypedGroup; - - private var strumming2:Array = [false, false, false, false]; private var camZooming:Bool = false; private var curSong:String = ""; @@ -1022,7 +998,6 @@ class PlayState extends MusicBeatState add(strumLineNotes); playerStrums = new FlxTypedGroup(); - player2Strums = new FlxTypedGroup(); // startCountdown(); @@ -1052,29 +1027,28 @@ class PlayState extends MusicBeatState FlxG.fixedTimestep = false; if (FlxG.save.data.songPosition) // I dont wanna talk about this code :( - { - songPosBG = new FlxSprite(0, 10).loadGraphic(Paths.image('healthBar')); - if (FlxG.save.data.downscroll) - songPosBG.y = FlxG.height * 0.9 + 45; - songPosBG.screenCenter(X); - songPosBG.scrollFactor.set(); - add(songPosBG); - - songPosBar = new FlxBar(songPosBG.x + 4, songPosBG.y + 4, LEFT_TO_RIGHT, Std.int(songPosBG.width - 8), Std.int(songPosBG.height - 8), this, - 'songPositionBar', 0, 90000); - songPosBar.scrollFactor.set(); - songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME); - add(songPosBar); - - var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - 20,songPosBG.y,0,SONG.song, 16); - if (FlxG.save.data.downscroll) - songName.y -= 3; - songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); - songName.scrollFactor.set(); - add(songName); - songName.cameras = [camHUD]; - } - + { + songPosBG = new FlxSprite(0, 10).loadGraphic(Paths.image('healthBar')); + if (FlxG.save.data.downscroll) + songPosBG.y = FlxG.height * 0.9 + 45; + songPosBG.screenCenter(X); + songPosBG.scrollFactor.set(); + add(songPosBG); + + songPosBar = new FlxBar(songPosBG.x + 4, songPosBG.y + 4, LEFT_TO_RIGHT, Std.int(songPosBG.width - 8), Std.int(songPosBG.height - 8), this, + 'songPositionBar', 0, 90000); + songPosBar.scrollFactor.set(); + songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME); + add(songPosBar); + + var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - 20,songPosBG.y,0,SONG.song, 16); + if (FlxG.save.data.downscroll) + songName.y -= 3; + songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); + songName.scrollFactor.set(); + add(songName); + songName.cameras = [camHUD]; + } healthBarBG = new FlxSprite(0, FlxG.height * 0.9).loadGraphic(Paths.image('healthBar')); if (FlxG.save.data.downscroll) @@ -1086,15 +1060,10 @@ class PlayState extends MusicBeatState healthBar = new FlxBar(healthBarBG.x + 4, healthBarBG.y + 4, RIGHT_TO_LEFT, Std.int(healthBarBG.width - 8), Std.int(healthBarBG.height - 8), this, 'health', 0, 2); healthBar.scrollFactor.set(); - var curcol:FlxColor = col[characterCol.indexOf(dad.curCharacter)]; // Dad Icon - var curcol2:FlxColor = col[characterCol.indexOf(boyfriend.curCharacter)]; // Bf Icon - healthBar.createFilledBar(curcol, curcol2); // Use those colors + healthBar.createFilledBar(0xFFFF0000, 0xFF66FF33); // healthBar add(healthBar); - - - // Add Kade Engine watermark kadeEngineWatermark = new FlxText(4,healthBarBG.y + 50,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + (Main.watermarks ? " - KE " + MainMenuState.kadeEngineVer : ""), 16); kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); @@ -2062,10 +2031,6 @@ class PlayState extends MusicBeatState { playerStrums.add(babyArrow); } - else - { - player2Strums.add(babyArrow); - } babyArrow.animation.play('static'); babyArrow.x += 50; @@ -2655,15 +2620,6 @@ class PlayState extends MusicBeatState case 0: dad.playAnim('singLEFT' + altAnim, true); } - - player2Strums.forEach(function(spr:FlxSprite) - { - if (Math.abs(daNote.noteData) == spr.ID) - { - spr.animation.play('confirm'); - sustainplayer2(spr.ID, spr, daNote); - } - }); #if cpp if (lua != null) @@ -2681,23 +2637,6 @@ class PlayState extends MusicBeatState notes.remove(daNote, true); daNote.destroy(); } - - player2Strums.forEach(function(spr:FlxSprite) - { - if (strumming2[spr.ID]) - { - spr.animation.play("confirm"); - } - - if (spr.animation.curAnim.name == 'confirm' && !curStage.startsWith('school')) - { - spr.centerOffsets(); - spr.offset.x -= 13; - spr.offset.y -= 13; - } - else - spr.centerOffsets(); - }); if (!daNote.modifiedByLua) { @@ -2771,34 +2710,6 @@ class PlayState extends MusicBeatState #end } - function sustainplayer2(strum:Int, spr:FlxSprite, note:Note):Void - { - var length:Float = note.sustainLength; - var tempo:Float = Conductor.bpm / 60; - var temp:Float = 1 / tempo; - - if (length > 0) - { - strumming2[strum] = true; - } - - if (!note.isSustainNote) - { - new FlxTimer().start(length == 0 ? 0.2 : (length / Conductor.crochet * temp) + 0.1, function(tmr:FlxTimer) - { - if (!strumming2[strum]) - { - spr.animation.play("static", true); - } - else if (length > 0) - { - strumming2[strum] = false; - spr.animation.play("static", true); - } - }); - } - } - function endSong():Void { if (!loadRep) @@ -3970,18 +3881,16 @@ class PlayState extends MusicBeatState // Conductor.changeBPM(SONG.bpm); // Dad doesnt interupt his own notes - if (dad.animation.curAnim.name.startsWith('sing')) - { - if (dad.animation.finished) - { + + // Commented out until a reason to bring this back arises in the future + /* if (SONG.notes[Math.floor(curStep / 16)].mustHitSection) + dad.dance(); */ + + if(dad.animation.curAnim.name.startsWith('sing')) + if(dad.animation.finished) dad.dance(); - } - - } else - { dad.dance(); - } } // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); wiggleShit.update(Conductor.crochet); diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 870c2aa..3d99237 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -305,10 +305,6 @@ class StoryMenuState extends MusicBeatState LoadingState.loadAndSwitchState(new PlayState(), true); }); } - else - { - FlxG.camera.shake(0.02, 0.02); - } } function changeDifficulty(change:Int = 0):Void From 216dcabe2085ef4a23ac6f3a91b16367a4e68ee6 Mon Sep 17 00:00:00 2001 From: KadeDev Date: Sun, 25 Apr 2021 15:43:17 -0700 Subject: [PATCH 2/4] fix alpha --- source/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index a43bd9a..dfc9df6 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1478,7 +1478,7 @@ class PlayState extends MusicBeatState getActorByName(id).x = x; })); - trace(Lua_helper.add_callback(lua,"setActorAlpha", function(alpha:Int,id:String) { + trace(Lua_helper.add_callback(lua,"setActorAlpha", function(alpha:Float,id:String) { getActorByName(id).alpha = alpha; })); From 9b5aa58b450c033e1c5fc2d87d4935034c49b6f2 Mon Sep 17 00:00:00 2001 From: KadeDev Date: Sun, 25 Apr 2021 15:50:40 -0700 Subject: [PATCH 3/4] maybe fix html/linux? --- Project.xml | 2 +- source/PlayState.hx | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Project.xml b/Project.xml index e50ead4..1da3e3c 100644 --- a/Project.xml +++ b/Project.xml @@ -117,7 +117,7 @@ - + diff --git a/source/PlayState.hx b/source/PlayState.hx index dfc9df6..cacd2d3 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -12,7 +12,7 @@ import flixel.system.FlxAssets; // Lua -#if cpp +#if windows import llua.Convert; import llua.Lua; import llua.State; @@ -65,7 +65,7 @@ import openfl.filters.ShaderFilter; #if windows import Discord.DiscordClient; #end -#if cpp +#if windows import Sys; import sys.FileSystem; #end @@ -213,7 +213,7 @@ class PlayState extends MusicBeatState // LUA SHIT - #if cpp + #if windows public static var lua:State = null; @@ -1277,7 +1277,7 @@ class PlayState extends MusicBeatState generateStaticArrows(1); - #if cpp + #if windows if (executeModchart) // dude I hate lua (jkjkjkjk) { trace('opening a lua state (because we are cool :))'); @@ -1841,7 +1841,7 @@ class PlayState extends MusicBeatState var playerCounter:Int = 0; // Per song offset check - #if cpp + #if windows var songPath = 'assets/data/' + PlayState.SONG.song.toLowerCase() + '/'; for(file in sys.FileSystem.readDirectory(songPath)) { @@ -2120,7 +2120,7 @@ class PlayState extends MusicBeatState perfectMode = false; #end - #if cpp + #if windows if (executeModchart && lua != null && songStarted) { setVar('songPos',Conductor.songPosition); @@ -2240,7 +2240,7 @@ class PlayState extends MusicBeatState DiscordClient.changePresence("Chart Editor", null, null, true); #end FlxG.switchState(new ChartingState()); - #if cpp + #if windows if (lua != null) { Lua.close(lua); @@ -2427,7 +2427,7 @@ class PlayState extends MusicBeatState } } - #if cpp + #if windows if (lua != null) setVar("mustHit",PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection); #end @@ -2436,7 +2436,7 @@ class PlayState extends MusicBeatState { var offsetX = 0; var offsetY = 0; - #if cpp + #if windows if (lua != null) { offsetX = getVar("followXOffset", "float"); @@ -2444,7 +2444,7 @@ class PlayState extends MusicBeatState } #end camFollow.setPosition(dad.getMidpoint().x + 150 + offsetX, dad.getMidpoint().y - 100 + offsetY); - #if cpp + #if windows if (lua != null) callLua('playerTwoTurn', []); #end @@ -2470,7 +2470,7 @@ class PlayState extends MusicBeatState { var offsetX = 0; var offsetY = 0; - #if cpp + #if windows if (lua != null) { offsetX = getVar("followXOffset", "float"); @@ -2479,7 +2479,7 @@ class PlayState extends MusicBeatState #end camFollow.setPosition(boyfriend.getMidpoint().x - 100 + offsetX, boyfriend.getMidpoint().y - 100 + offsetY); - #if cpp + #if windows if (lua != null) callLua('playerOneTurn', []); #end @@ -2621,7 +2621,7 @@ class PlayState extends MusicBeatState dad.playAnim('singLEFT' + altAnim, true); } - #if cpp + #if windows if (lua != null) callLua('playerTwoSing', [Math.abs(daNote.noteData), Conductor.songPosition]); #end @@ -2715,7 +2715,7 @@ class PlayState extends MusicBeatState if (!loadRep) rep.SaveReplay(); - #if cpp + #if windows if (executeModchart) { Lua.close(lua); @@ -2757,7 +2757,7 @@ class PlayState extends MusicBeatState FlxG.switchState(new StoryMenuState()); - #if cpp + #if windows if (lua != null) { Lua.close(lua); @@ -3551,7 +3551,7 @@ class PlayState extends MusicBeatState boyfriend.playAnim('singRIGHTmiss', true); } - #if cpp + #if windows if (lua != null) callLua('playerOneMiss', [direction, Conductor.songPosition]); #end @@ -3700,7 +3700,7 @@ class PlayState extends MusicBeatState boyfriend.playAnim('singLEFT', true); } - #if cpp + #if windows if (lua != null) callLua('playerOneSing', [note.noteData, Conductor.songPosition]); #end @@ -3823,7 +3823,7 @@ class PlayState extends MusicBeatState resyncVocals(); } - #if cpp + #if windows if (executeModchart && lua != null) { setVar('curStep',curStep); @@ -3862,7 +3862,7 @@ class PlayState extends MusicBeatState notes.sort(FlxSort.byY, FlxSort.DESCENDING); } - #if cpp + #if windows if (executeModchart && lua != null) { setVar('curBeat',curBeat); From df1327dbbc938832ae008cbbbab65780e5f876f2 Mon Sep 17 00:00:00 2001 From: Kade M Date: Sun, 25 Apr 2021 18:33:13 -0700 Subject: [PATCH 4/4] Note trail fix --- source/Note.hx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/Note.hx b/source/Note.hx index 8685ee2..002d9eb 100644 --- a/source/Note.hx +++ b/source/Note.hx @@ -174,7 +174,10 @@ class Note extends FlxSprite } - prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.8 * FlxG.save.data.scrollSpeed; + if(FlxG.save.data.scrollSpeed != 1) + prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * FlxG.save.data.scrollSpeed; + else + prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * PlayState.SONG.speed; prevNote.updateHitbox(); // prevNote.setGraphicSize(); }