diff --git a/assets/data/alphabet.xml b/assets/data/alphabet.xml index a1ee94b3..b8b107bc 100644 --- a/assets/data/alphabet.xml +++ b/assets/data/alphabet.xml @@ -1,6 +1,6 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/assets/images/FNF_main_menu_assets.png b/assets/images/FNF_main_menu_assets.png deleted file mode 100644 index 4399ed2d..00000000 Binary files a/assets/images/FNF_main_menu_assets.png and /dev/null differ diff --git a/assets/images/FNF_main_menu_assets.xml b/assets/images/FNF_main_menu_assets.xml deleted file mode 100644 index 01d1a5eb..00000000 --- a/assets/images/FNF_main_menu_assets.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/images/alphabet.png b/assets/images/alphabet.png deleted file mode 100644 index 7c1bddaa..00000000 Binary files a/assets/images/alphabet.png and /dev/null differ diff --git a/assets/images/alphabet.xml b/assets/images/alphabet.xml deleted file mode 100644 index a473eedc..00000000 --- a/assets/images/alphabet.xml +++ /dev/null @@ -1,505 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/images/backspace.png b/assets/images/backspace.png deleted file mode 100644 index 79a61215..00000000 Binary files a/assets/images/backspace.png and /dev/null differ diff --git a/assets/images/backspace.xml b/assets/images/backspace.xml deleted file mode 100644 index 3aba68ba..00000000 --- a/assets/images/backspace.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/assets/images/campaign_menu_UI_assets.png b/assets/images/campaign_menu_UI_assets.png deleted file mode 100644 index 87022a9e..00000000 Binary files a/assets/images/campaign_menu_UI_assets.png and /dev/null differ diff --git a/assets/images/campaign_menu_UI_assets.xml b/assets/images/campaign_menu_UI_assets.xml deleted file mode 100644 index f35ead1d..00000000 --- a/assets/images/campaign_menu_UI_assets.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/images/desktop/captionButtons.png b/assets/images/desktop/captionButtons.png deleted file mode 100644 index dd4a02dd..00000000 Binary files a/assets/images/desktop/captionButtons.png and /dev/null differ diff --git a/assets/images/desktop/windowFrame.png b/assets/images/desktop/windowFrame.png deleted file mode 100644 index c675cfcf..00000000 Binary files a/assets/images/desktop/windowFrame.png and /dev/null differ diff --git a/assets/images/speech_bubble_talking.png b/assets/images/dialogue/speech_bubble_talking.png similarity index 100% rename from assets/images/speech_bubble_talking.png rename to assets/images/dialogue/speech_bubble_talking.png diff --git a/assets/images/speech_bubble_talking.xml b/assets/images/dialogue/speech_bubble_talking.xml similarity index 100% rename from assets/images/speech_bubble_talking.xml rename to assets/images/dialogue/speech_bubble_talking.xml diff --git a/assets/images/bad.png b/assets/images/game/bad.png similarity index 100% rename from assets/images/bad.png rename to assets/images/game/bad.png diff --git a/assets/images/combo.png b/assets/images/game/combo.png similarity index 100% rename from assets/images/combo.png rename to assets/images/game/combo.png diff --git a/assets/images/go.png b/assets/images/game/go.png similarity index 100% rename from assets/images/go.png rename to assets/images/game/go.png diff --git a/assets/images/good.png b/assets/images/game/good.png similarity index 100% rename from assets/images/good.png rename to assets/images/game/good.png diff --git a/assets/images/healthBar.png b/assets/images/game/healthBar.png similarity index 100% rename from assets/images/healthBar.png rename to assets/images/game/healthBar.png diff --git a/assets/images/num0.png b/assets/images/game/num0.png similarity index 100% rename from assets/images/num0.png rename to assets/images/game/num0.png diff --git a/assets/images/num1.png b/assets/images/game/num1.png similarity index 100% rename from assets/images/num1.png rename to assets/images/game/num1.png diff --git a/assets/images/num2.png b/assets/images/game/num2.png similarity index 100% rename from assets/images/num2.png rename to assets/images/game/num2.png diff --git a/assets/images/num3.png b/assets/images/game/num3.png similarity index 100% rename from assets/images/num3.png rename to assets/images/game/num3.png diff --git a/assets/images/num4.png b/assets/images/game/num4.png similarity index 100% rename from assets/images/num4.png rename to assets/images/game/num4.png diff --git a/assets/images/num5.png b/assets/images/game/num5.png similarity index 100% rename from assets/images/num5.png rename to assets/images/game/num5.png diff --git a/assets/images/num6.png b/assets/images/game/num6.png similarity index 100% rename from assets/images/num6.png rename to assets/images/game/num6.png diff --git a/assets/images/num7.png b/assets/images/game/num7.png similarity index 100% rename from assets/images/num7.png rename to assets/images/game/num7.png diff --git a/assets/images/num8.png b/assets/images/game/num8.png similarity index 100% rename from assets/images/num8.png rename to assets/images/game/num8.png diff --git a/assets/images/num9.png b/assets/images/game/num9.png similarity index 100% rename from assets/images/num9.png rename to assets/images/game/num9.png diff --git a/assets/images/ready.png b/assets/images/game/ready.png similarity index 100% rename from assets/images/ready.png rename to assets/images/game/ready.png diff --git a/assets/images/restart.png b/assets/images/game/restart.png similarity index 100% rename from assets/images/restart.png rename to assets/images/game/restart.png diff --git a/assets/images/set.png b/assets/images/game/set.png similarity index 100% rename from assets/images/set.png rename to assets/images/game/set.png diff --git a/assets/images/shit.png b/assets/images/game/shit.png similarity index 100% rename from assets/images/shit.png rename to assets/images/game/shit.png diff --git a/assets/images/sick.png b/assets/images/game/sick.png similarity index 100% rename from assets/images/sick.png rename to assets/images/game/sick.png diff --git a/assets/images/grafix.png b/assets/images/grafix.png deleted file mode 100644 index 5250be09..00000000 Binary files a/assets/images/grafix.png and /dev/null differ diff --git a/assets/images/iconGrid.png b/assets/images/iconGrid.png deleted file mode 100644 index 9d3b1c05..00000000 Binary files a/assets/images/iconGrid.png and /dev/null differ diff --git a/assets/images/images-go-here.txt b/assets/images/images-go-here.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/assets/images/logo.png b/assets/images/logo.png deleted file mode 100644 index 3c59d140..00000000 Binary files a/assets/images/logo.png and /dev/null differ diff --git a/assets/images/menus/alphabet-bold.png b/assets/images/menus/alphabet-bold.png new file mode 100644 index 00000000..6dd43600 Binary files /dev/null and b/assets/images/menus/alphabet-bold.png differ diff --git a/assets/images/menus/alphabet-bold.xml b/assets/images/menus/alphabet-bold.xml new file mode 100644 index 00000000..481bc3a4 --- /dev/null +++ b/assets/images/menus/alphabet-bold.xml @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/menus/alphabet.png b/assets/images/menus/alphabet.png new file mode 100644 index 00000000..f2989fad Binary files /dev/null and b/assets/images/menus/alphabet.png differ diff --git a/assets/images/menus/alphabet.xml b/assets/images/menus/alphabet.xml new file mode 100644 index 00000000..1ff21df5 --- /dev/null +++ b/assets/images/menus/alphabet.xml @@ -0,0 +1,401 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/menus/mainmenu/donate.png b/assets/images/menus/mainmenu/donate.png new file mode 100644 index 00000000..7b5c373a Binary files /dev/null and b/assets/images/menus/mainmenu/donate.png differ diff --git a/assets/images/menus/mainmenu/donate.xml b/assets/images/menus/mainmenu/donate.xml new file mode 100644 index 00000000..118483ff --- /dev/null +++ b/assets/images/menus/mainmenu/donate.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/images/menus/mainmenu/freeplay.png b/assets/images/menus/mainmenu/freeplay.png new file mode 100644 index 00000000..02df94dc Binary files /dev/null and b/assets/images/menus/mainmenu/freeplay.png differ diff --git a/assets/images/menus/mainmenu/freeplay.xml b/assets/images/menus/mainmenu/freeplay.xml new file mode 100644 index 00000000..02e04160 --- /dev/null +++ b/assets/images/menus/mainmenu/freeplay.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/images/menus/mainmenu/options.png b/assets/images/menus/mainmenu/options.png new file mode 100644 index 00000000..9b3b13ad Binary files /dev/null and b/assets/images/menus/mainmenu/options.png differ diff --git a/assets/images/menus/mainmenu/options.xml b/assets/images/menus/mainmenu/options.xml new file mode 100644 index 00000000..5ca1d992 --- /dev/null +++ b/assets/images/menus/mainmenu/options.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/images/menus/mainmenu/story mode.png b/assets/images/menus/mainmenu/story mode.png new file mode 100644 index 00000000..8023bc89 Binary files /dev/null and b/assets/images/menus/mainmenu/story mode.png differ diff --git a/assets/images/menus/mainmenu/story mode.xml b/assets/images/menus/mainmenu/story mode.xml new file mode 100644 index 00000000..81fe3eeb --- /dev/null +++ b/assets/images/menus/mainmenu/story mode.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/assets/images/menuBG.png b/assets/images/menus/menuBG.png similarity index 100% rename from assets/images/menuBG.png rename to assets/images/menus/menuBG.png diff --git a/assets/images/menuBGBlue.png b/assets/images/menus/menuBGBlue.png similarity index 100% rename from assets/images/menuBGBlue.png rename to assets/images/menus/menuBGBlue.png diff --git a/assets/images/menuBGMagenta.png b/assets/images/menus/menuBGMagenta.png similarity index 100% rename from assets/images/menuBGMagenta.png rename to assets/images/menus/menuBGMagenta.png diff --git a/assets/images/menuContrast.png b/assets/images/menus/menuContrast.png similarity index 100% rename from assets/images/menuContrast.png rename to assets/images/menus/menuContrast.png diff --git a/assets/images/menuDesat.png b/assets/images/menus/menuDesat.png similarity index 100% rename from assets/images/menuDesat.png rename to assets/images/menus/menuDesat.png diff --git a/assets/images/menuTransparent.png b/assets/images/menus/menuTransparent.png similarity index 100% rename from assets/images/menuTransparent.png rename to assets/images/menus/menuTransparent.png diff --git a/assets/images/pauseAlt/bfLol.png b/assets/images/menus/pauseAlt/bfLol.png similarity index 100% rename from assets/images/pauseAlt/bfLol.png rename to assets/images/menus/pauseAlt/bfLol.png diff --git a/assets/images/pauseAlt/bfLol.xml b/assets/images/menus/pauseAlt/bfLol.xml similarity index 100% rename from assets/images/pauseAlt/bfLol.xml rename to assets/images/menus/pauseAlt/bfLol.xml diff --git a/assets/images/pauseAlt/pauseBG.png b/assets/images/menus/pauseAlt/pauseBG.png similarity index 100% rename from assets/images/pauseAlt/pauseBG.png rename to assets/images/menus/pauseAlt/pauseBG.png diff --git a/assets/images/pauseAlt/pauseUI.png b/assets/images/menus/pauseAlt/pauseUI.png similarity index 100% rename from assets/images/pauseAlt/pauseUI.png rename to assets/images/menus/pauseAlt/pauseUI.png diff --git a/assets/images/pauseAlt/pauseUI.xml b/assets/images/menus/pauseAlt/pauseUI.xml similarity index 100% rename from assets/images/pauseAlt/pauseUI.xml rename to assets/images/menus/pauseAlt/pauseUI.xml diff --git a/assets/images/menus/storymenu/assets.png b/assets/images/menus/storymenu/assets.png new file mode 100644 index 00000000..fbcfe351 Binary files /dev/null and b/assets/images/menus/storymenu/assets.png differ diff --git a/assets/images/menus/storymenu/assets.xml b/assets/images/menus/storymenu/assets.xml new file mode 100644 index 00000000..df85370c --- /dev/null +++ b/assets/images/menus/storymenu/assets.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/assets/images/campaign_menu_UI_characters.png b/assets/images/menus/storymenu/characters.png similarity index 100% rename from assets/images/campaign_menu_UI_characters.png rename to assets/images/menus/storymenu/characters.png diff --git a/assets/images/campaign_menu_UI_characters.xml b/assets/images/menus/storymenu/characters.xml similarity index 100% rename from assets/images/campaign_menu_UI_characters.xml rename to assets/images/menus/storymenu/characters.xml diff --git a/assets/images/storymenu/week0.png b/assets/images/menus/storymenu/week0.png similarity index 100% rename from assets/images/storymenu/week0.png rename to assets/images/menus/storymenu/week0.png diff --git a/assets/images/storymenu/week1.png b/assets/images/menus/storymenu/week1.png similarity index 100% rename from assets/images/storymenu/week1.png rename to assets/images/menus/storymenu/week1.png diff --git a/assets/images/storymenu/week2.png b/assets/images/menus/storymenu/week2.png similarity index 100% rename from assets/images/storymenu/week2.png rename to assets/images/menus/storymenu/week2.png diff --git a/assets/images/storymenu/week3.png b/assets/images/menus/storymenu/week3.png similarity index 100% rename from assets/images/storymenu/week3.png rename to assets/images/menus/storymenu/week3.png diff --git a/assets/images/storymenu/week4.png b/assets/images/menus/storymenu/week4.png similarity index 100% rename from assets/images/storymenu/week4.png rename to assets/images/menus/storymenu/week4.png diff --git a/assets/images/storymenu/week5.png b/assets/images/menus/storymenu/week5.png similarity index 100% rename from assets/images/storymenu/week5.png rename to assets/images/menus/storymenu/week5.png diff --git a/assets/images/storymenu/week6.png b/assets/images/menus/storymenu/week6.png similarity index 100% rename from assets/images/storymenu/week6.png rename to assets/images/menus/storymenu/week6.png diff --git a/assets/images/titlescreen/gfDanceTitle.png b/assets/images/menus/titlescreen/gf.png similarity index 100% rename from assets/images/titlescreen/gfDanceTitle.png rename to assets/images/menus/titlescreen/gf.png diff --git a/assets/images/titlescreen/gfDanceTitle.xml b/assets/images/menus/titlescreen/gf.xml similarity index 100% rename from assets/images/titlescreen/gfDanceTitle.xml rename to assets/images/menus/titlescreen/gf.xml diff --git a/assets/images/titlescreen/logoBumpin.png b/assets/images/menus/titlescreen/logo.png similarity index 100% rename from assets/images/titlescreen/logoBumpin.png rename to assets/images/menus/titlescreen/logo.png diff --git a/assets/images/titlescreen/logoBumpin.xml b/assets/images/menus/titlescreen/logo.xml similarity index 100% rename from assets/images/titlescreen/logoBumpin.xml rename to assets/images/menus/titlescreen/logo.xml diff --git a/assets/images/titlescreen/newgrounds_logo.png b/assets/images/menus/titlescreen/newgrounds_logo.png similarity index 100% rename from assets/images/titlescreen/newgrounds_logo.png rename to assets/images/menus/titlescreen/newgrounds_logo.png diff --git a/assets/images/titlescreen/titleEnter.png b/assets/images/menus/titlescreen/titleEnter.png similarity index 100% rename from assets/images/titlescreen/titleEnter.png rename to assets/images/menus/titlescreen/titleEnter.png diff --git a/assets/images/titlescreen/titleEnter.xml b/assets/images/menus/titlescreen/titleEnter.xml similarity index 100% rename from assets/images/titlescreen/titleEnter.xml rename to assets/images/menus/titlescreen/titleEnter.xml diff --git a/buildnumber.txt b/buildnumber.txt index 147d4e7f..9a943a23 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -845 \ No newline at end of file +849 \ No newline at end of file diff --git a/docs/doc.xml b/docs/doc.xml index 48d79a0b..0a052e24 100644 --- a/docs/doc.xml +++ b/docs/doc.xml @@ -18766,9 +18766,9 @@ - <__touch get="inline" set="null" expr=""1.667158547e+012"" line="22" static="1"> + <__touch get="inline" set="null" expr=""1.667217963e+012"" line="22" static="1"> - "1.667158547e+012" + "1.667217963e+012" diff --git a/source/funkin/desktop/DesktopMain.hx b/source/funkin/desktop/DesktopMain.hx index 40a0c3f7..334c04e3 100644 --- a/source/funkin/desktop/DesktopMain.hx +++ b/source/funkin/desktop/DesktopMain.hx @@ -42,7 +42,7 @@ class DesktopMain extends MusicBeatState { #if windows try { wallpaper.loadGraphic(BitmapData.fromFile('${Sys.getEnv("AppData")}\\Microsoft\\Windows\\Themes\\TranscodedWallpaper')); - } catch(e) #end wallpaper.loadGraphic(Paths.image("menuBG")); + } catch(e) #end wallpaper.loadGraphic(Paths.image("menus/menuBG")); wallpaper.scrollFactor.set(0, 0); // anchor at top left wallpaper.antialiasing = true; add(wallpaper); diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 6036cd33..d980bb6a 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -273,7 +273,7 @@ class PlayState extends MusicBeatState FlxG.worldBounds.set(0, 0, FlxG.width, FlxG.height); // TODO: cool healthbar - healthBarBG = new FlxSprite(0, FlxG.height * 0.9).loadGraphic(Paths.image('healthBar')); + healthBarBG = new FlxSprite(0, FlxG.height * 0.9).loadGraphic(Paths.image('game/healthBar')); healthBarBG.screenCenter(X); healthBarBG.scrollFactor.set(); add(healthBarBG); @@ -341,7 +341,7 @@ class PlayState extends MusicBeatState var swagCounter:Int = 0; - var introSprites:Array = [null, 'ready', "set", "go"]; + var introSprites:Array = [null, 'game/ready', "game/set", "game/go"]; var introSounds:Array = ['intro3', 'intro2', "intro1", "introGo"]; startTimer = new FlxTimer().start(Conductor.crochet / 1000, function(tmr:FlxTimer) @@ -362,7 +362,7 @@ class PlayState extends MusicBeatState if (!event.cancelled) { if (event.spritePath != null) { var spr = event.spritePath; - if (!Assets.exists(spr)) spr = Paths.image(spr); + if (!Assets.exists(spr)) spr = Paths.image('$spr'); sprite = new FlxSprite().loadGraphic(spr); sprite.scrollFactor.set(); @@ -511,7 +511,7 @@ class PlayState extends MusicBeatState { // FlxG.log.add(i); var babyArrow:Strum = new Strum((FlxG.width * 0.25) + (Note.swagWidth * (i - 2)) + ((FlxG.width / 2) * player), strumLine.y); - babyArrow.ID = i + (player * 4); + babyArrow.ID = i; var event = scripts.event("onStrumCreation", new StrumCreationEvent(babyArrow, player, i)); @@ -1061,6 +1061,7 @@ class PlayState extends MusicBeatState } public var endingSong:Bool = false; + public var comboPos:FlxPoint = FlxPoint.get(FlxG.width * 0.55, -60); private function popUpScore(strumtime:Float, score:Int = 350):Void { @@ -1068,10 +1069,6 @@ class PlayState extends MusicBeatState vocals.volume = 1; var placement:String = Std.string(combo); - - var coolText:FlxText = new FlxText(0, 0, 0, placement, 32); - coolText.screenCenter(); - coolText.x = FlxG.width * 0.55; // var rating:FlxSprite = new FlxSprite(); @@ -1104,37 +1101,38 @@ class PlayState extends MusicBeatState daRating = 'bad'; */ - var pixelShitPart1:String = ""; - var pixelShitPart2:String = ''; + var prefix:String = ""; + var suffix:String = ''; if (curStage.startsWith('school')) { - pixelShitPart1 = 'weeb/pixelUI/'; - pixelShitPart2 = '-pixel'; + prefix = 'weeb/pixelUI/'; + suffix = '-pixel'; } - rating.loadGraphic(Paths.image(pixelShitPart1 + daRating + pixelShitPart2)); + rating.loadGraphic(Paths.image('game/$prefix$daRating$suffix')); rating.screenCenter(); - rating.x = coolText.x - 40; + rating.x = comboPos.x - 40; rating.y -= 60; rating.acceleration.y = 550; rating.velocity.y -= FlxG.random.int(140, 175); rating.velocity.x -= FlxG.random.int(0, 10); - var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'combo' + pixelShitPart2)); + var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image('game/${prefix}combo$suffix')); comboSpr.screenCenter(); - comboSpr.x = coolText.x; + comboSpr.x = comboPos.x; comboSpr.acceleration.y = 600; comboSpr.velocity.y -= 150; - comboSpr.velocity.x += FlxG.random.int(1, 10); + add(rating); + add(comboSpr); if (!curStage.startsWith('school')) { - rating.setGraphicSize(Std.int(rating.width * 0.7)); + rating.scale.set(0.7, 0.7); rating.antialiasing = true; - comboSpr.setGraphicSize(Std.int(comboSpr.width * 0.7)); + comboSpr.scale.set(0.7, 0.7); comboSpr.antialiasing = true; } else @@ -1146,18 +1144,19 @@ class PlayState extends MusicBeatState comboSpr.updateHitbox(); rating.updateHitbox(); - var seperatedScore:Array = []; + var separatedScore:String = Std.string(combo).addZeros(3); - seperatedScore.push(Math.floor(combo / 100)); - seperatedScore.push(Math.floor((combo - (seperatedScore[0] * 100)) / 10)); - seperatedScore.push(combo % 10); - var daLoop:Int = 0; - for (i in seperatedScore) + for (i in 0...separatedScore.length) { - var numScore:FlxSprite = new FlxSprite().loadGraphic(Paths.image(pixelShitPart1 + 'num' + Std.int(i) + pixelShitPart2)); + if (combo < 10 && combo != 0) + break; + + var e = separatedScore.charAt(i); + + var numScore:FlxSprite = new FlxSprite().loadGraphic(Paths.image('game/${prefix}num$e$suffix')); numScore.screenCenter(); - numScore.x = coolText.x + (43 * daLoop) - 90; + numScore.x = comboPos.x + (43 * i) - 90; numScore.y += 80; if (!curStage.startsWith('school')) @@ -1175,7 +1174,6 @@ class PlayState extends MusicBeatState numScore.velocity.y -= FlxG.random.int(140, 160); numScore.velocity.x = FlxG.random.float(-5, 5); - if (combo >= 10 || combo == 0) add(numScore); FlxTween.tween(numScore, {alpha: 0}, 0.2, { @@ -1185,17 +1183,12 @@ class PlayState extends MusicBeatState }, startDelay: Conductor.crochet * 0.002 }); - - daLoop++; } /* trace(combo); - trace(seperatedScore); + trace(separatedScore); */ - coolText.text = Std.string(seperatedScore); - // add(coolText); - FlxTween.tween(rating, {alpha: 0}, 0.2, { startDelay: Conductor.crochet * 0.001 }); @@ -1203,7 +1196,6 @@ class PlayState extends MusicBeatState FlxTween.tween(comboSpr, {alpha: 0}, 0.2, { onComplete: function(tween:FlxTween) { - coolText.destroy(); comboSpr.destroy(); rating.destroy(); diff --git a/source/funkin/menus/FreeplayState.hx b/source/funkin/menus/FreeplayState.hx index 62692e5a..71503fc0 100644 --- a/source/funkin/menus/FreeplayState.hx +++ b/source/funkin/menus/FreeplayState.hx @@ -74,7 +74,7 @@ class FreeplayState extends MusicBeatState // LOAD CHARACTERS - bg = new FlxSprite(0, 0, Paths.image('menuDesat')); + bg = new FlxSprite(0, 0, Paths.image('menus/menuDesat')); if (songs.length > 0) bg.color = songs[0].color; add(bg); diff --git a/source/funkin/menus/GitarooPause.hx b/source/funkin/menus/GitarooPause.hx index 9345c41d..18a55791 100644 --- a/source/funkin/menus/GitarooPause.hx +++ b/source/funkin/menus/GitarooPause.hx @@ -21,25 +21,25 @@ class GitarooPause extends MusicBeatState if (FlxG.sound.music != null) FlxG.sound.music.stop(); - var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('pauseAlt/pauseBG')); + var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menus/pauseAlt//pauseBG')); add(bg); var bf:FlxSprite = new FlxSprite(0, 30); - bf.frames = Paths.getSparrowAtlas('pauseAlt/bfLol'); + bf.frames = Paths.getSparrowAtlas('menus/pauseAlt//bfLol'); bf.animation.addByPrefix('lol', "funnyThing", 13); bf.animation.play('lol'); add(bf); bf.screenCenter(X); replayButton = new FlxSprite(FlxG.width * 0.28, FlxG.height * 0.7); - replayButton.frames = Paths.getSparrowAtlas('pauseAlt/pauseUI'); + replayButton.frames = Paths.getSparrowAtlas('menus/pauseAlt//pauseUI'); replayButton.animation.addByPrefix('selected', 'bluereplay', 0, false); replayButton.animation.appendByPrefix('selected', 'yellowreplay'); replayButton.animation.play('selected'); add(replayButton); cancelButton = new FlxSprite(FlxG.width * 0.58, replayButton.y); - cancelButton.frames = Paths.getSparrowAtlas('pauseAlt/pauseUI'); + cancelButton.frames = Paths.getSparrowAtlas('menus/pauseAlt//pauseUI'); cancelButton.animation.addByPrefix('selected', 'bluecancel', 0, false); cancelButton.animation.appendByPrefix('selected', 'cancelyellow'); cancelButton.animation.play('selected'); diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 0d697fd9..f66ccac1 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -53,7 +53,7 @@ class MainMenuState extends MusicBeatState persistentUpdate = persistentDraw = true; - var bg:FlxSprite = new FlxSprite(-80).loadGraphic(Paths.image('menuBG')); + var bg:FlxSprite = new FlxSprite(-80).loadGraphic(Paths.image('menus/menuBG')); bg.scrollFactor.x = 0; bg.scrollFactor.y = 0.18; bg.scale.set(1.15, 1.15); @@ -65,7 +65,7 @@ class MainMenuState extends MusicBeatState camFollow = new FlxObject(0, 0, 1, 1); add(camFollow); - magenta = new FlxSprite(-80).loadGraphic(Paths.image('menuDesat')); + magenta = new FlxSprite(-80).loadGraphic(Paths.image('menus/menuDesat')); magenta.scrollFactor.x = 0; magenta.scrollFactor.y = 0.18; magenta.scale.set(1.15, 1.15); @@ -79,13 +79,11 @@ class MainMenuState extends MusicBeatState menuItems = new FlxTypedGroup(); add(menuItems); - - var tex = Paths.getSparrowAtlas('FNF_main_menu_assets'); - + for (i in 0...optionShit.length) { var menuItem:FlxSprite = new FlxSprite(0, 60 + (i * 160)); - menuItem.frames = tex; + menuItem.frames = Paths.getSparrowAtlas('menus/mainmenu/${optionShit[i]}');; menuItem.animation.addByPrefix('idle', optionShit[i] + " basic", 24); menuItem.animation.addByPrefix('selected', optionShit[i] + " white", 24); menuItem.animation.play('idle'); diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index e2cb83fc..6ab06a94 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -100,7 +100,7 @@ class StoryMenuState extends MusicBeatState rankText.size = scoreText.size; rankText.screenCenter(X); - var ui_tex = Paths.getSparrowAtlas('campaign_menu_UI_assets'); + var ui_tex = Paths.getSparrowAtlas('menus/storymenu/assets'); var yellowBG:FlxSprite = new FlxSprite(0, 56).makeGraphic(FlxG.width, 400, 0xFFF9CF51); grpWeekText = new FlxTypedGroup(); @@ -459,7 +459,7 @@ class MenuCharacter extends FlxSprite this.character = character; - var tex = Paths.getSparrowAtlas('campaign_menu_UI_characters'); + var tex = Paths.getSparrowAtlas('menus/storymenu/characters'); frames = tex; animation.addByPrefix('bf', "BF idle dance white", 24); @@ -487,7 +487,7 @@ class MenuItem extends FlxSpriteGroup public function new(x:Float, y:Float, weekNum:Int = 0) { super(x, y); - week = new FlxSprite().loadGraphic(Paths.image('storymenu/week' + weekNum)); + week = new FlxSprite().loadGraphic(Paths.image('menus/storymenu/week' + weekNum)); add(week); } diff --git a/source/funkin/options/OptionsMenu.hx b/source/funkin/options/OptionsMenu.hx index d2d5d5e6..4d7247eb 100644 --- a/source/funkin/options/OptionsMenu.hx +++ b/source/funkin/options/OptionsMenu.hx @@ -18,7 +18,7 @@ class OptionsMenu extends MusicBeatState { state: funkin.options.keybinds.KeybindsOptions }, { - name: 'Visuals', + name: 'Gameplay', desc: 'Change Gameplay options such as Downscroll, Scroll Speed...', state: null } @@ -33,7 +33,7 @@ class OptionsMenu extends MusicBeatState { if (fromPlayState != null) OptionsMenu.fromPlayState = fromPlayState; } public override function create() { - var bg:FlxSprite = new FlxSprite(-80).loadGraphic(Paths.image('menuBGBlue')); + var bg:FlxSprite = new FlxSprite(-80).loadGraphic(Paths.image('menus/menuBGBlue')); bg.scrollFactor.set(); bg.scale.set(1.15, 1.15); bg.updateHitbox(); diff --git a/source/funkin/options/OptionsScreen.hx b/source/funkin/options/OptionsScreen.hx index af859e76..1f9f91c1 100644 --- a/source/funkin/options/OptionsScreen.hx +++ b/source/funkin/options/OptionsScreen.hx @@ -15,6 +15,12 @@ class OptionsScreen extends MusicBeatState { public override function create() { super.create(); - + bg = new FlxSprite(-80).loadGraphic(Paths.image('menus/menuBG')); + bg.scrollFactor.set(); + bg.scale.set(1.15, 1.15); + bg.updateHitbox(); + bg.screenCenter(); + bg.antialiasing = true; + add(bg); } } \ No newline at end of file diff --git a/source/funkin/options/keybinds/KeybindsOptions.hx b/source/funkin/options/keybinds/KeybindsOptions.hx index 93dcdbc6..876f7720 100644 --- a/source/funkin/options/keybinds/KeybindsOptions.hx +++ b/source/funkin/options/keybinds/KeybindsOptions.hx @@ -106,8 +106,8 @@ class KeybindsOptions extends MusicBeatSubstate { isSubState = FlxG.state != this; alphabets = new FlxTypedGroup(); - bg = new FlxSprite(-80).loadGraphic(Paths.image(isSubState ? 'menuTransparent' : 'menuBGBlue')); - coloredBG = new FlxSprite(-80).loadGraphic(Paths.image('menuDesat')); + bg = new FlxSprite(-80).loadGraphic(Paths.image(isSubState ? 'menus/menuTransparent' : 'menus/menuBGBlue')); + coloredBG = new FlxSprite(-80).loadGraphic(Paths.image('menus/menuDesat')); for(bg in [bg, coloredBG]) { bg.scrollFactor.set(); bg.scale.set(1.15, 1.15); diff --git a/source/funkin/system/CoolUtil.hx b/source/funkin/system/CoolUtil.hx index 035b96ff..c5de6690 100644 --- a/source/funkin/system/CoolUtil.hx +++ b/source/funkin/system/CoolUtil.hx @@ -27,6 +27,11 @@ class CoolUtil return v == null ? defaultValue : v; } + public static function addZeros(str:String, num:Int) { + while(str.length < num) str = '0${str}'; + return str; + } + public static function getSizeString(size:UInt):String { var labels = ["B", "KB", "MB", "GB", "TB"]; var rSize:Float = size; diff --git a/source/funkin/ui/Alphabet.hx b/source/funkin/ui/Alphabet.hx index 8a61fedd..ae05f88c 100644 --- a/source/funkin/ui/Alphabet.hx +++ b/source/funkin/ui/Alphabet.hx @@ -64,10 +64,17 @@ class Alphabet extends FlxSpriteGroup var xml = new Access(Xml.parse(Assets.getText(path)).firstElement()); AlphaCharacter.boldAnims = []; AlphaCharacter.letterAnims = []; + AlphaCharacter.boldAlphabetPath = AlphaCharacter.letterAlphabetPath = 'ui/alphabet'; for(e in xml.elements) { var bold = e.name == "bold"; var list = bold ? AlphaCharacter.boldAnims : AlphaCharacter.letterAnims; + if (e.has.spritesheet) { + if (bold) + AlphaCharacter.boldAlphabetPath = e.att.spritesheet; + else + AlphaCharacter.letterAlphabetPath = e.att.spritesheet; + } for(e in e.nodes.letter) { if (!e.has.char || !e.has.anim) continue; var name = e.att.char; @@ -288,6 +295,10 @@ class Alphabet extends FlxSpriteGroup class AlphaCharacter extends FlxSprite { @:dox(hide) @:noCompletion public static var __alphaPath:String = null; + + public static var letterAlphabetPath:String; + public static var boldAlphabetPath:String; + public static var boldAnims:Map = []; public static var letterAnims:Map = []; @@ -307,8 +318,6 @@ class AlphaCharacter extends FlxSprite public function new(x:Float, y:Float) { super(x, y); - var tex = Paths.getSparrowAtlas('alphabet'); - frames = tex; antialiasing = true; } @@ -319,7 +328,8 @@ class AlphaCharacter extends FlxSprite if (boldAnims[letter] == null) { visible = false; return; - } + } + frames = Paths.getSparrowAtlas(boldAlphabetPath); animation.addByPrefix(letter, boldAnims[letter], 24); animation.play(letter); updateHitbox(); @@ -330,7 +340,8 @@ class AlphaCharacter extends FlxSprite if (letterAnims[letter] == null) { visible = false; return; - } + } + frames = Paths.getSparrowAtlas(letterAlphabetPath); animation.addByPrefix(letter, letterAnims[letter], 24); animation.play(letter); updateHitbox(); @@ -338,35 +349,4 @@ class AlphaCharacter extends FlxSprite y = (110 - height); y += row * 60; } - - public function createNumber(letter:String):Void - { - animation.addByPrefix(letter, letter, 24); - animation.play(letter); - - updateHitbox(); - } - - public function createSymbol(letter:String) - { - switch (letter) - { - case '.': - animation.addByPrefix(letter, 'period', 24); - animation.play(letter); - y += 50; - case "'": - animation.addByPrefix(letter, 'apostraphie', 24); - animation.play(letter); - y -= 0; - case "?": - animation.addByPrefix(letter, 'question mark', 24); - animation.play(letter); - case "!": - animation.addByPrefix(letter, 'exclamation point', 24); - animation.play(letter); - } - - updateHitbox(); - } }