diff --git a/assets/data/characterList.txt b/assets/data/characterList.txt deleted file mode 100644 index dca94b8e..00000000 --- a/assets/data/characterList.txt +++ /dev/null @@ -1,17 +0,0 @@ -bf -dad -gf -spooky -pico -mom -mom-car -bf-car -parents-christmas -monster-christmas -bf-christmas -gf-christmas -monster -bf-pixel -senpai -senpai-angry -spirit \ No newline at end of file diff --git a/assets/data/controls.txt b/assets/data/controls.txt deleted file mode 100644 index 7db8a8a8..00000000 --- a/assets/data/controls.txt +++ /dev/null @@ -1,32 +0,0 @@ -setUP -W -setUP (ALTERNATE) -FlxKey.UP -setDOWN -S -setDOWN (ALTERNATE) -FlxKey.DOWN -setLEFT -A -setLEFT (ALTERNATE) -FlxKey.LEFT -setRIGHT -D -setRIGHT (ALTERNATE) -FlxKey.RIGHT -setACCEPT -Z -setACCEPT (ALTERNATE) -ENTER -setBACK -BACKSPACE -setBACK (ALTERNATE) -ESCAPE -setPAUSE -P -setPAUSE (ALTERNATE) -ENTER -setRESET -R -setRESET (ALTERNATE) -null \ No newline at end of file diff --git a/assets/data/data-goes-here.txt b/assets/data/data-goes-here.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/assets/fonts/fonts-go-here.txt b/assets/fonts/fonts-go-here.txt deleted file mode 100644 index 247f17da..00000000 --- a/assets/fonts/fonts-go-here.txt +++ /dev/null @@ -1 +0,0 @@ -You should know what this is for by the title of what it is called. diff --git a/assets/images/NOTE_assets.png b/assets/images/game/NOTE_assets.png similarity index 100% rename from assets/images/NOTE_assets.png rename to assets/images/game/NOTE_assets.png diff --git a/assets/images/NOTE_assets.xml b/assets/images/game/NOTE_assets.xml similarity index 100% rename from assets/images/NOTE_assets.xml rename to assets/images/game/NOTE_assets.xml diff --git a/assets/images/game/bad.png b/assets/images/game/score/bad.png similarity index 100% rename from assets/images/game/bad.png rename to assets/images/game/score/bad.png diff --git a/assets/images/game/combo.png b/assets/images/game/score/combo.png similarity index 100% rename from assets/images/game/combo.png rename to assets/images/game/score/combo.png diff --git a/assets/images/game/good.png b/assets/images/game/score/good.png similarity index 100% rename from assets/images/game/good.png rename to assets/images/game/score/good.png diff --git a/assets/images/game/num0.png b/assets/images/game/score/num0.png similarity index 100% rename from assets/images/game/num0.png rename to assets/images/game/score/num0.png diff --git a/assets/images/game/num1.png b/assets/images/game/score/num1.png similarity index 100% rename from assets/images/game/num1.png rename to assets/images/game/score/num1.png diff --git a/assets/images/game/num2.png b/assets/images/game/score/num2.png similarity index 100% rename from assets/images/game/num2.png rename to assets/images/game/score/num2.png diff --git a/assets/images/game/num3.png b/assets/images/game/score/num3.png similarity index 100% rename from assets/images/game/num3.png rename to assets/images/game/score/num3.png diff --git a/assets/images/game/num4.png b/assets/images/game/score/num4.png similarity index 100% rename from assets/images/game/num4.png rename to assets/images/game/score/num4.png diff --git a/assets/images/game/num5.png b/assets/images/game/score/num5.png similarity index 100% rename from assets/images/game/num5.png rename to assets/images/game/score/num5.png diff --git a/assets/images/game/num6.png b/assets/images/game/score/num6.png similarity index 100% rename from assets/images/game/num6.png rename to assets/images/game/score/num6.png diff --git a/assets/images/game/num7.png b/assets/images/game/score/num7.png similarity index 100% rename from assets/images/game/num7.png rename to assets/images/game/score/num7.png diff --git a/assets/images/game/num8.png b/assets/images/game/score/num8.png similarity index 100% rename from assets/images/game/num8.png rename to assets/images/game/score/num8.png diff --git a/assets/images/game/num9.png b/assets/images/game/score/num9.png similarity index 100% rename from assets/images/game/num9.png rename to assets/images/game/score/num9.png diff --git a/assets/images/game/shit.png b/assets/images/game/score/shit.png similarity index 100% rename from assets/images/game/shit.png rename to assets/images/game/score/shit.png diff --git a/assets/images/game/sick.png b/assets/images/game/score/sick.png similarity index 100% rename from assets/images/game/sick.png rename to assets/images/game/score/sick.png diff --git a/assets/images/lose.png b/assets/images/lose.png deleted file mode 100644 index 0585af5c..00000000 Binary files a/assets/images/lose.png and /dev/null differ diff --git a/assets/images/lose.xml b/assets/images/lose.xml deleted file mode 100644 index 328becc4..00000000 --- a/assets/images/lose.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/funkin/game/Note.hx b/source/funkin/game/Note.hx index 8b3e2210..f02b94b1 100644 --- a/source/funkin/game/Note.hx +++ b/source/funkin/game/Note.hx @@ -67,7 +67,7 @@ class Note extends FlxSprite this.noteData = noteData; - var event = new NoteCreationEvent(this, strumID, this.noteType, noteTypeID, mustPress, "NOTE_assets", 0.7); + var event = new NoteCreationEvent(this, strumID, this.noteType, noteTypeID, mustPress, "game/NOTE_assets", 0.7); if (PlayState.instance != null) event = PlayState.instance.scripts.event("onNoteCreation", event); diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index d980bb6a..768a0d01 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -520,7 +520,7 @@ class PlayState extends MusicBeatState { // case "school": default: - babyArrow.frames = Paths.getSparrowAtlas('NOTE_assets'); + babyArrow.frames = Paths.getSparrowAtlas('game/NOTE_assets'); babyArrow.animation.addByPrefix('green', 'arrowUP'); babyArrow.animation.addByPrefix('blue', 'arrowDOWN'); babyArrow.animation.addByPrefix('purple', 'arrowLEFT'); @@ -1110,7 +1110,7 @@ class PlayState extends MusicBeatState suffix = '-pixel'; } - rating.loadGraphic(Paths.image('game/$prefix$daRating$suffix')); + rating.loadGraphic(Paths.image('game/score/$prefix$daRating$suffix')); rating.screenCenter(); rating.x = comboPos.x - 40; rating.y -= 60; @@ -1118,7 +1118,7 @@ class PlayState extends MusicBeatState rating.velocity.y -= FlxG.random.int(140, 175); rating.velocity.x -= FlxG.random.int(0, 10); - var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image('game/${prefix}combo$suffix')); + var comboSpr:FlxSprite = new FlxSprite().loadGraphic(Paths.image('game/score/${prefix}combo$suffix')); comboSpr.screenCenter(); comboSpr.x = comboPos.x; comboSpr.acceleration.y = 600; diff --git a/source/funkin/options/keybinds/KeybindsOptions.hx b/source/funkin/options/keybinds/KeybindsOptions.hx index 876f7720..b7c8c751 100644 --- a/source/funkin/options/keybinds/KeybindsOptions.hx +++ b/source/funkin/options/keybinds/KeybindsOptions.hx @@ -146,7 +146,7 @@ class KeybindsOptions extends MusicBeatSubstate { var sparrowIcon:String = null; var sparrowAnim:String = null; if (e.name.startsWith('{note')) {// is actually a note!! - sparrowIcon = "NOTE_assets"; + sparrowIcon = "game/NOTE_assets"; sparrowAnim = switch(e.name) { case '{noteLeft}': "purple0";