diff --git a/assets/preload/images/icons/icon-dad.png b/assets/preload/images/icons/icon-dad.png index f6eda3f0e..d1b8e60bb 100644 Binary files a/assets/preload/images/icons/icon-dad.png and b/assets/preload/images/icons/icon-dad.png differ diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index d6040e87c..f1ec26019 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -30,14 +30,15 @@ class FreeplayState extends MusicBeatState var intendedScore:Int = 0; var coolColors:Array = [ - 0xff9271fd, + 0xffff038e, 0xff9271fd, 0xff223344, 0xFF941653, 0xFFfc96d7, 0xFFa0d1ff, 0xffff78bf, - 0xfff6b604 + 0xfff6b604, + 0xff309bff ]; private var grpSongs:FlxTypedGroup; @@ -58,14 +59,13 @@ class FreeplayState extends MusicBeatState #if debug isDebug = true; - addSong('Test', 1, 'bf-pixel'); #end var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist')); for (i in 0...initSonglist.length) { - songs.push(new SongMetadata(initSonglist[i], 1, 'gf')); + songs.push(new SongMetadata(initSonglist[i], 0, 'gf')); } if (FlxG.sound.music != null) @@ -95,6 +95,11 @@ class FreeplayState extends MusicBeatState if (StoryMenuState.weekUnlocked[7] || isDebug) addWeek(['Ugh', 'Guns', 'Stress'], 7, ['tankman']); + #if debug + addSong('Test', 8, 'bf-pixel'); + #end + + // LOAD MUSIC // LOAD CHARACTERS diff --git a/source/PlayState.hx b/source/PlayState.hx index c6c80bd23..de254b5ea 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -464,15 +464,14 @@ class PlayState extends MusicBeatState var posX = 400; var posY = 200; - var bg:FlxSprite = new FlxSprite(posX, posY); + /*var bg:FlxSprite = new FlxSprite(posX, posY); bg.frames = Paths.getSparrowAtlas('weeb/animatedEvilSchool'); bg.animation.addByPrefix('idle', 'background 2', 24); bg.animation.play('idle'); bg.scrollFactor.set(0.8, 0.9); bg.scale.set(6, 6); - add(bg); + add(bg);*/ - /* var bg:FlxSprite = new FlxSprite(posX, posY).loadGraphic(Paths.image('weeb/evilSchoolBG')); bg.scale.set(6, 6); // bg.setGraphicSize(Std.int(bg.width * 6)); @@ -489,12 +488,10 @@ class PlayState extends MusicBeatState wiggleShit.waveAmplitude = 0.01; wiggleShit.waveFrequency = 60; wiggleShit.waveSpeed = 0.8; - */ - // bg.shader = wiggleShit.shader; - // fg.shader = wiggleShit.shader; + bg.shader = wiggleShit.shader; + fg.shader = wiggleShit.shader; - /* var waveSprite = new FlxEffectSprite(bg, [waveEffectBG]); var waveSpriteFG = new FlxEffectSprite(fg, [waveEffectFG]); @@ -514,7 +511,12 @@ class PlayState extends MusicBeatState add(waveSprite); add(waveSpriteFG); - */ + + waveSprite.x = posX; + waveSprite.y = posY; + + waveSpriteFG.x = posX; + waveSpriteFG.y = posY; case 'guns' | 'stress' | 'ugh': defaultCamZoom = 0.90; diff --git a/vscode-project.hxml b/vscode-project.hxml index a0a171b8d..6ddf986eb 100644 --- a/vscode-project.hxml +++ b/vscode-project.hxml @@ -1,3 +1,3 @@ #automatically generated do not edit -#@date Fri Jun 02 2023 19:52:08 GMT-0700 (Pacific Daylight Time) +#@date Sat Jun 03 2023 00:09:25 GMT-0700 (Pacific Daylight Time) -cp c:\users\bamst\appdata\local\temp\2def77e625d453c59a42a972450a0ad156c9aa14 \ No newline at end of file