diff --git a/Project.xml b/Project.xml
index 80f5bc764..9215a2185 100644
--- a/Project.xml
+++ b/Project.xml
@@ -40,42 +40,56 @@
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
-
+
@@ -101,7 +115,7 @@
-
+
diff --git a/assets/exclude/Monster.mp3 b/assets/exclude/music/Monster.mp3
similarity index 100%
rename from assets/exclude/Monster.mp3
rename to assets/exclude/music/Monster.mp3
diff --git a/assets/exclude/Monster.ogg b/assets/exclude/music/Monster.ogg
similarity index 100%
rename from assets/exclude/Monster.ogg
rename to assets/exclude/music/Monster.ogg
diff --git a/assets/exclude/Spookeez.mp3 b/assets/exclude/music/Spookeez.mp3
similarity index 100%
rename from assets/exclude/Spookeez.mp3
rename to assets/exclude/music/Spookeez.mp3
diff --git a/assets/exclude/Spookeez.ogg b/assets/exclude/music/Spookeez.ogg
similarity index 100%
rename from assets/exclude/Spookeez.ogg
rename to assets/exclude/music/Spookeez.ogg
diff --git a/assets/preload/music/title.mp3 b/assets/exclude/music/title.mp3
similarity index 100%
rename from assets/preload/music/title.mp3
rename to assets/exclude/music/title.mp3
diff --git a/assets/preload/music/title.ogg b/assets/exclude/music/title.ogg
similarity index 100%
rename from assets/preload/music/title.ogg
rename to assets/exclude/music/title.ogg
diff --git a/assets/preload/music/titleShoot.mp3 b/assets/exclude/music/titleShoot.mp3
similarity index 100%
rename from assets/preload/music/titleShoot.mp3
rename to assets/exclude/music/titleShoot.mp3
diff --git a/assets/preload/music/titleShoot.ogg b/assets/exclude/music/titleShoot.ogg
similarity index 100%
rename from assets/preload/music/titleShoot.ogg
rename to assets/exclude/music/titleShoot.ogg
diff --git a/assets/preload/sounds/freshIntro.mp3 b/assets/exclude/sounds/freshIntro.mp3
similarity index 100%
rename from assets/preload/sounds/freshIntro.mp3
rename to assets/exclude/sounds/freshIntro.mp3
diff --git a/assets/preload/sounds/freshIntro.ogg b/assets/exclude/sounds/freshIntro.ogg
similarity index 100%
rename from assets/preload/sounds/freshIntro.ogg
rename to assets/exclude/sounds/freshIntro.ogg
diff --git a/assets/preload/images/BOYFRIEND.png b/assets/shared/images/BOYFRIEND.png
similarity index 100%
rename from assets/preload/images/BOYFRIEND.png
rename to assets/shared/images/BOYFRIEND.png
diff --git a/assets/preload/images/BOYFRIEND.xml b/assets/shared/images/BOYFRIEND.xml
similarity index 100%
rename from assets/preload/images/BOYFRIEND.xml
rename to assets/shared/images/BOYFRIEND.xml
diff --git a/assets/preload/images/DADDY_DEAREST.png b/assets/shared/images/DADDY_DEAREST.png
similarity index 100%
rename from assets/preload/images/DADDY_DEAREST.png
rename to assets/shared/images/DADDY_DEAREST.png
diff --git a/assets/preload/images/DADDY_DEAREST.xml b/assets/shared/images/DADDY_DEAREST.xml
similarity index 100%
rename from assets/preload/images/DADDY_DEAREST.xml
rename to assets/shared/images/DADDY_DEAREST.xml
diff --git a/assets/preload/images/GF_assets.png b/assets/shared/images/GF_assets.png
similarity index 100%
rename from assets/preload/images/GF_assets.png
rename to assets/shared/images/GF_assets.png
diff --git a/assets/preload/images/GF_assets.xml b/assets/shared/images/GF_assets.xml
similarity index 100%
rename from assets/preload/images/GF_assets.xml
rename to assets/shared/images/GF_assets.xml
diff --git a/assets/preload/images/NOTE_assets.png b/assets/shared/images/NOTE_assets.png
similarity index 100%
rename from assets/preload/images/NOTE_assets.png
rename to assets/shared/images/NOTE_assets.png
diff --git a/assets/preload/images/NOTE_assets.xml b/assets/shared/images/NOTE_assets.xml
similarity index 100%
rename from assets/preload/images/NOTE_assets.xml
rename to assets/shared/images/NOTE_assets.xml
diff --git a/assets/preload/images/backspace.png b/assets/shared/images/backspace.png
similarity index 100%
rename from assets/preload/images/backspace.png
rename to assets/shared/images/backspace.png
diff --git a/assets/preload/images/backspace.xml b/assets/shared/images/backspace.xml
similarity index 100%
rename from assets/preload/images/backspace.xml
rename to assets/shared/images/backspace.xml
diff --git a/assets/preload/images/bad.png b/assets/shared/images/bad.png
similarity index 100%
rename from assets/preload/images/bad.png
rename to assets/shared/images/bad.png
diff --git a/assets/preload/images/bfCar.png b/assets/shared/images/bfCar.png
similarity index 100%
rename from assets/preload/images/bfCar.png
rename to assets/shared/images/bfCar.png
diff --git a/assets/preload/images/bfCar.xml b/assets/shared/images/bfCar.xml
similarity index 100%
rename from assets/preload/images/bfCar.xml
rename to assets/shared/images/bfCar.xml
diff --git a/assets/preload/images/combo.png b/assets/shared/images/combo.png
similarity index 100%
rename from assets/preload/images/combo.png
rename to assets/shared/images/combo.png
diff --git a/assets/preload/images/gfCar.png b/assets/shared/images/gfCar.png
similarity index 100%
rename from assets/preload/images/gfCar.png
rename to assets/shared/images/gfCar.png
diff --git a/assets/preload/images/gfCar.xml b/assets/shared/images/gfCar.xml
similarity index 100%
rename from assets/preload/images/gfCar.xml
rename to assets/shared/images/gfCar.xml
diff --git a/assets/preload/images/go.png b/assets/shared/images/go.png
similarity index 100%
rename from assets/preload/images/go.png
rename to assets/shared/images/go.png
diff --git a/assets/preload/images/good.png b/assets/shared/images/good.png
similarity index 100%
rename from assets/preload/images/good.png
rename to assets/shared/images/good.png
diff --git a/assets/preload/images/grafix.png b/assets/shared/images/grafix.png
similarity index 100%
rename from assets/preload/images/grafix.png
rename to assets/shared/images/grafix.png
diff --git a/assets/preload/images/healthBar.png b/assets/shared/images/healthBar.png
similarity index 100%
rename from assets/preload/images/healthBar.png
rename to assets/shared/images/healthBar.png
diff --git a/assets/preload/images/iconGrid.png b/assets/shared/images/iconGrid.png
similarity index 100%
rename from assets/preload/images/iconGrid.png
rename to assets/shared/images/iconGrid.png
diff --git a/assets/preload/images/images-go-here.txt b/assets/shared/images/images-go-here.txt
similarity index 100%
rename from assets/preload/images/images-go-here.txt
rename to assets/shared/images/images-go-here.txt
diff --git a/assets/preload/images/lol.png b/assets/shared/images/lol.png
similarity index 100%
rename from assets/preload/images/lol.png
rename to assets/shared/images/lol.png
diff --git a/assets/preload/images/lose.png b/assets/shared/images/lose.png
similarity index 100%
rename from assets/preload/images/lose.png
rename to assets/shared/images/lose.png
diff --git a/assets/preload/images/lose.xml b/assets/shared/images/lose.xml
similarity index 100%
rename from assets/preload/images/lose.xml
rename to assets/shared/images/lose.xml
diff --git a/assets/preload/images/momCar.png b/assets/shared/images/momCar.png
similarity index 100%
rename from assets/preload/images/momCar.png
rename to assets/shared/images/momCar.png
diff --git a/assets/preload/images/momCar.xml b/assets/shared/images/momCar.xml
similarity index 100%
rename from assets/preload/images/momCar.xml
rename to assets/shared/images/momCar.xml
diff --git a/assets/preload/images/ready.png b/assets/shared/images/ready.png
similarity index 100%
rename from assets/preload/images/ready.png
rename to assets/shared/images/ready.png
diff --git a/assets/preload/images/restart.png b/assets/shared/images/restart.png
similarity index 100%
rename from assets/preload/images/restart.png
rename to assets/shared/images/restart.png
diff --git a/assets/preload/images/screencapTierImage.png b/assets/shared/images/screencapTierImage.png
similarity index 100%
rename from assets/preload/images/screencapTierImage.png
rename to assets/shared/images/screencapTierImage.png
diff --git a/assets/preload/images/set.png b/assets/shared/images/set.png
similarity index 100%
rename from assets/preload/images/set.png
rename to assets/shared/images/set.png
diff --git a/assets/preload/images/shit.png b/assets/shared/images/shit.png
similarity index 100%
rename from assets/preload/images/shit.png
rename to assets/shared/images/shit.png
diff --git a/assets/preload/images/sick.png b/assets/shared/images/sick.png
similarity index 100%
rename from assets/preload/images/sick.png
rename to assets/shared/images/sick.png
diff --git a/assets/preload/images/speech_bubble_talking.png b/assets/shared/images/speech_bubble_talking.png
similarity index 100%
rename from assets/preload/images/speech_bubble_talking.png
rename to assets/shared/images/speech_bubble_talking.png
diff --git a/assets/preload/images/speech_bubble_talking.xml b/assets/shared/images/speech_bubble_talking.xml
similarity index 100%
rename from assets/preload/images/speech_bubble_talking.xml
rename to assets/shared/images/speech_bubble_talking.xml
diff --git a/assets/preload/images/stage_light.png b/assets/shared/images/stage_light.png
similarity index 100%
rename from assets/preload/images/stage_light.png
rename to assets/shared/images/stage_light.png
diff --git a/assets/preload/images/stageback.png b/assets/shared/images/stageback.png
similarity index 100%
rename from assets/preload/images/stageback.png
rename to assets/shared/images/stageback.png
diff --git a/assets/preload/images/stagecurtains.png b/assets/shared/images/stagecurtains.png
similarity index 100%
rename from assets/preload/images/stagecurtains.png
rename to assets/shared/images/stagecurtains.png
diff --git a/assets/preload/images/stagefront.png b/assets/shared/images/stagefront.png
similarity index 100%
rename from assets/preload/images/stagefront.png
rename to assets/shared/images/stagefront.png
diff --git a/assets/preload/images/zzzzzzzz.png b/assets/shared/images/zzzzzzzz.png
similarity index 100%
rename from assets/preload/images/zzzzzzzz.png
rename to assets/shared/images/zzzzzzzz.png
diff --git a/assets/preload/sounds/ANGRY.mp3 b/assets/shared/sounds/ANGRY.mp3
similarity index 100%
rename from assets/preload/sounds/ANGRY.mp3
rename to assets/shared/sounds/ANGRY.mp3
diff --git a/assets/preload/sounds/ANGRY.ogg b/assets/shared/sounds/ANGRY.ogg
similarity index 100%
rename from assets/preload/sounds/ANGRY.ogg
rename to assets/shared/sounds/ANGRY.ogg
diff --git a/assets/preload/sounds/ANGRY_TEXT_BOX.mp3 b/assets/shared/sounds/ANGRY_TEXT_BOX.mp3
similarity index 100%
rename from assets/preload/sounds/ANGRY_TEXT_BOX.mp3
rename to assets/shared/sounds/ANGRY_TEXT_BOX.mp3
diff --git a/assets/preload/sounds/ANGRY_TEXT_BOX.ogg b/assets/shared/sounds/ANGRY_TEXT_BOX.ogg
similarity index 100%
rename from assets/preload/sounds/ANGRY_TEXT_BOX.ogg
rename to assets/shared/sounds/ANGRY_TEXT_BOX.ogg
diff --git a/assets/preload/sounds/GF_1.mp3 b/assets/shared/sounds/GF_1.mp3
similarity index 100%
rename from assets/preload/sounds/GF_1.mp3
rename to assets/shared/sounds/GF_1.mp3
diff --git a/assets/preload/sounds/GF_1.ogg b/assets/shared/sounds/GF_1.ogg
similarity index 100%
rename from assets/preload/sounds/GF_1.ogg
rename to assets/shared/sounds/GF_1.ogg
diff --git a/assets/preload/sounds/GF_2.mp3 b/assets/shared/sounds/GF_2.mp3
similarity index 100%
rename from assets/preload/sounds/GF_2.mp3
rename to assets/shared/sounds/GF_2.mp3
diff --git a/assets/preload/sounds/GF_2.ogg b/assets/shared/sounds/GF_2.ogg
similarity index 100%
rename from assets/preload/sounds/GF_2.ogg
rename to assets/shared/sounds/GF_2.ogg
diff --git a/assets/preload/sounds/GF_3.mp3 b/assets/shared/sounds/GF_3.mp3
similarity index 100%
rename from assets/preload/sounds/GF_3.mp3
rename to assets/shared/sounds/GF_3.mp3
diff --git a/assets/preload/sounds/GF_3.ogg b/assets/shared/sounds/GF_3.ogg
similarity index 100%
rename from assets/preload/sounds/GF_3.ogg
rename to assets/shared/sounds/GF_3.ogg
diff --git a/assets/preload/sounds/GF_4.mp3 b/assets/shared/sounds/GF_4.mp3
similarity index 100%
rename from assets/preload/sounds/GF_4.mp3
rename to assets/shared/sounds/GF_4.mp3
diff --git a/assets/preload/sounds/GF_4.ogg b/assets/shared/sounds/GF_4.ogg
similarity index 100%
rename from assets/preload/sounds/GF_4.ogg
rename to assets/shared/sounds/GF_4.ogg
diff --git a/assets/preload/sounds/Lights_Shut_off.mp3 b/assets/shared/sounds/Lights_Shut_off.mp3
similarity index 100%
rename from assets/preload/sounds/Lights_Shut_off.mp3
rename to assets/shared/sounds/Lights_Shut_off.mp3
diff --git a/assets/preload/sounds/Lights_Shut_off.ogg b/assets/shared/sounds/Lights_Shut_off.ogg
similarity index 100%
rename from assets/preload/sounds/Lights_Shut_off.ogg
rename to assets/shared/sounds/Lights_Shut_off.ogg
diff --git a/assets/preload/sounds/Lights_Turn_On.mp3 b/assets/shared/sounds/Lights_Turn_On.mp3
similarity index 100%
rename from assets/preload/sounds/Lights_Turn_On.mp3
rename to assets/shared/sounds/Lights_Turn_On.mp3
diff --git a/assets/preload/sounds/Lights_Turn_On.ogg b/assets/shared/sounds/Lights_Turn_On.ogg
similarity index 100%
rename from assets/preload/sounds/Lights_Turn_On.ogg
rename to assets/shared/sounds/Lights_Turn_On.ogg
diff --git a/assets/preload/sounds/Senpai_Dies.mp3 b/assets/shared/sounds/Senpai_Dies.mp3
similarity index 100%
rename from assets/preload/sounds/Senpai_Dies.mp3
rename to assets/shared/sounds/Senpai_Dies.mp3
diff --git a/assets/preload/sounds/Senpai_Dies.ogg b/assets/shared/sounds/Senpai_Dies.ogg
similarity index 100%
rename from assets/preload/sounds/Senpai_Dies.ogg
rename to assets/shared/sounds/Senpai_Dies.ogg
diff --git a/assets/preload/sounds/badnoise1.mp3 b/assets/shared/sounds/badnoise1.mp3
similarity index 100%
rename from assets/preload/sounds/badnoise1.mp3
rename to assets/shared/sounds/badnoise1.mp3
diff --git a/assets/preload/sounds/badnoise1.ogg b/assets/shared/sounds/badnoise1.ogg
similarity index 100%
rename from assets/preload/sounds/badnoise1.ogg
rename to assets/shared/sounds/badnoise1.ogg
diff --git a/assets/preload/sounds/badnoise2.mp3 b/assets/shared/sounds/badnoise2.mp3
similarity index 100%
rename from assets/preload/sounds/badnoise2.mp3
rename to assets/shared/sounds/badnoise2.mp3
diff --git a/assets/preload/sounds/badnoise2.ogg b/assets/shared/sounds/badnoise2.ogg
similarity index 100%
rename from assets/preload/sounds/badnoise2.ogg
rename to assets/shared/sounds/badnoise2.ogg
diff --git a/assets/preload/sounds/badnoise3.mp3 b/assets/shared/sounds/badnoise3.mp3
similarity index 100%
rename from assets/preload/sounds/badnoise3.mp3
rename to assets/shared/sounds/badnoise3.mp3
diff --git a/assets/preload/sounds/badnoise3.ogg b/assets/shared/sounds/badnoise3.ogg
similarity index 100%
rename from assets/preload/sounds/badnoise3.ogg
rename to assets/shared/sounds/badnoise3.ogg
diff --git a/assets/preload/sounds/cancelMenu.mp3 b/assets/shared/sounds/cancelMenu.mp3
similarity index 100%
rename from assets/preload/sounds/cancelMenu.mp3
rename to assets/shared/sounds/cancelMenu.mp3
diff --git a/assets/preload/sounds/cancelMenu.ogg b/assets/shared/sounds/cancelMenu.ogg
similarity index 100%
rename from assets/preload/sounds/cancelMenu.ogg
rename to assets/shared/sounds/cancelMenu.ogg
diff --git a/assets/preload/sounds/carPass0.mp3 b/assets/shared/sounds/carPass0.mp3
similarity index 100%
rename from assets/preload/sounds/carPass0.mp3
rename to assets/shared/sounds/carPass0.mp3
diff --git a/assets/preload/sounds/carPass0.ogg b/assets/shared/sounds/carPass0.ogg
similarity index 100%
rename from assets/preload/sounds/carPass0.ogg
rename to assets/shared/sounds/carPass0.ogg
diff --git a/assets/preload/sounds/carPass1.mp3 b/assets/shared/sounds/carPass1.mp3
similarity index 100%
rename from assets/preload/sounds/carPass1.mp3
rename to assets/shared/sounds/carPass1.mp3
diff --git a/assets/preload/sounds/carPass1.ogg b/assets/shared/sounds/carPass1.ogg
similarity index 100%
rename from assets/preload/sounds/carPass1.ogg
rename to assets/shared/sounds/carPass1.ogg
diff --git a/assets/preload/sounds/clickText.mp3 b/assets/shared/sounds/clickText.mp3
similarity index 100%
rename from assets/preload/sounds/clickText.mp3
rename to assets/shared/sounds/clickText.mp3
diff --git a/assets/preload/sounds/clickText.ogg b/assets/shared/sounds/clickText.ogg
similarity index 100%
rename from assets/preload/sounds/clickText.ogg
rename to assets/shared/sounds/clickText.ogg
diff --git a/assets/preload/sounds/fnf_loss_sfx-pixel.mp3 b/assets/shared/sounds/fnf_loss_sfx-pixel.mp3
similarity index 100%
rename from assets/preload/sounds/fnf_loss_sfx-pixel.mp3
rename to assets/shared/sounds/fnf_loss_sfx-pixel.mp3
diff --git a/assets/preload/sounds/fnf_loss_sfx-pixel.ogg b/assets/shared/sounds/fnf_loss_sfx-pixel.ogg
similarity index 100%
rename from assets/preload/sounds/fnf_loss_sfx-pixel.ogg
rename to assets/shared/sounds/fnf_loss_sfx-pixel.ogg
diff --git a/assets/preload/sounds/fnf_loss_sfx.mp3 b/assets/shared/sounds/fnf_loss_sfx.mp3
similarity index 100%
rename from assets/preload/sounds/fnf_loss_sfx.mp3
rename to assets/shared/sounds/fnf_loss_sfx.mp3
diff --git a/assets/preload/sounds/fnf_loss_sfx.ogg b/assets/shared/sounds/fnf_loss_sfx.ogg
similarity index 100%
rename from assets/preload/sounds/fnf_loss_sfx.ogg
rename to assets/shared/sounds/fnf_loss_sfx.ogg
diff --git a/assets/preload/sounds/intro1-pixel.mp3 b/assets/shared/sounds/intro1-pixel.mp3
similarity index 100%
rename from assets/preload/sounds/intro1-pixel.mp3
rename to assets/shared/sounds/intro1-pixel.mp3
diff --git a/assets/preload/sounds/intro1-pixel.ogg b/assets/shared/sounds/intro1-pixel.ogg
similarity index 100%
rename from assets/preload/sounds/intro1-pixel.ogg
rename to assets/shared/sounds/intro1-pixel.ogg
diff --git a/assets/preload/sounds/intro1.mp3 b/assets/shared/sounds/intro1.mp3
similarity index 100%
rename from assets/preload/sounds/intro1.mp3
rename to assets/shared/sounds/intro1.mp3
diff --git a/assets/preload/sounds/intro1.ogg b/assets/shared/sounds/intro1.ogg
similarity index 100%
rename from assets/preload/sounds/intro1.ogg
rename to assets/shared/sounds/intro1.ogg
diff --git a/assets/preload/sounds/intro2-pixel.mp3 b/assets/shared/sounds/intro2-pixel.mp3
similarity index 100%
rename from assets/preload/sounds/intro2-pixel.mp3
rename to assets/shared/sounds/intro2-pixel.mp3
diff --git a/assets/preload/sounds/intro2-pixel.ogg b/assets/shared/sounds/intro2-pixel.ogg
similarity index 100%
rename from assets/preload/sounds/intro2-pixel.ogg
rename to assets/shared/sounds/intro2-pixel.ogg
diff --git a/assets/preload/sounds/intro2.mp3 b/assets/shared/sounds/intro2.mp3
similarity index 100%
rename from assets/preload/sounds/intro2.mp3
rename to assets/shared/sounds/intro2.mp3
diff --git a/assets/preload/sounds/intro2.ogg b/assets/shared/sounds/intro2.ogg
similarity index 100%
rename from assets/preload/sounds/intro2.ogg
rename to assets/shared/sounds/intro2.ogg
diff --git a/assets/preload/sounds/intro3-pixel.mp3 b/assets/shared/sounds/intro3-pixel.mp3
similarity index 100%
rename from assets/preload/sounds/intro3-pixel.mp3
rename to assets/shared/sounds/intro3-pixel.mp3
diff --git a/assets/preload/sounds/intro3-pixel.ogg b/assets/shared/sounds/intro3-pixel.ogg
similarity index 100%
rename from assets/preload/sounds/intro3-pixel.ogg
rename to assets/shared/sounds/intro3-pixel.ogg
diff --git a/assets/preload/sounds/intro3.mp3 b/assets/shared/sounds/intro3.mp3
similarity index 100%
rename from assets/preload/sounds/intro3.mp3
rename to assets/shared/sounds/intro3.mp3
diff --git a/assets/preload/sounds/intro3.ogg b/assets/shared/sounds/intro3.ogg
similarity index 100%
rename from assets/preload/sounds/intro3.ogg
rename to assets/shared/sounds/intro3.ogg
diff --git a/assets/preload/sounds/introGo-pixel.mp3 b/assets/shared/sounds/introGo-pixel.mp3
similarity index 100%
rename from assets/preload/sounds/introGo-pixel.mp3
rename to assets/shared/sounds/introGo-pixel.mp3
diff --git a/assets/preload/sounds/introGo-pixel.ogg b/assets/shared/sounds/introGo-pixel.ogg
similarity index 100%
rename from assets/preload/sounds/introGo-pixel.ogg
rename to assets/shared/sounds/introGo-pixel.ogg
diff --git a/assets/preload/sounds/introGo.mp3 b/assets/shared/sounds/introGo.mp3
similarity index 100%
rename from assets/preload/sounds/introGo.mp3
rename to assets/shared/sounds/introGo.mp3
diff --git a/assets/preload/sounds/introGo.ogg b/assets/shared/sounds/introGo.ogg
similarity index 100%
rename from assets/preload/sounds/introGo.ogg
rename to assets/shared/sounds/introGo.ogg
diff --git a/assets/preload/sounds/missnote1.mp3 b/assets/shared/sounds/missnote1.mp3
similarity index 100%
rename from assets/preload/sounds/missnote1.mp3
rename to assets/shared/sounds/missnote1.mp3
diff --git a/assets/preload/sounds/missnote1.ogg b/assets/shared/sounds/missnote1.ogg
similarity index 100%
rename from assets/preload/sounds/missnote1.ogg
rename to assets/shared/sounds/missnote1.ogg
diff --git a/assets/preload/sounds/missnote2.mp3 b/assets/shared/sounds/missnote2.mp3
similarity index 100%
rename from assets/preload/sounds/missnote2.mp3
rename to assets/shared/sounds/missnote2.mp3
diff --git a/assets/preload/sounds/missnote2.ogg b/assets/shared/sounds/missnote2.ogg
similarity index 100%
rename from assets/preload/sounds/missnote2.ogg
rename to assets/shared/sounds/missnote2.ogg
diff --git a/assets/preload/sounds/missnote3.mp3 b/assets/shared/sounds/missnote3.mp3
similarity index 100%
rename from assets/preload/sounds/missnote3.mp3
rename to assets/shared/sounds/missnote3.mp3
diff --git a/assets/preload/sounds/missnote3.ogg b/assets/shared/sounds/missnote3.ogg
similarity index 100%
rename from assets/preload/sounds/missnote3.ogg
rename to assets/shared/sounds/missnote3.ogg
diff --git a/assets/preload/sounds/pixelText.mp3 b/assets/shared/sounds/pixelText.mp3
similarity index 100%
rename from assets/preload/sounds/pixelText.mp3
rename to assets/shared/sounds/pixelText.mp3
diff --git a/assets/preload/sounds/pixelText.ogg b/assets/shared/sounds/pixelText.ogg
similarity index 100%
rename from assets/preload/sounds/pixelText.ogg
rename to assets/shared/sounds/pixelText.ogg
diff --git a/assets/preload/sounds/soundTest.mp3 b/assets/shared/sounds/soundTest.mp3
similarity index 100%
rename from assets/preload/sounds/soundTest.mp3
rename to assets/shared/sounds/soundTest.mp3
diff --git a/assets/preload/sounds/soundTest.ogg b/assets/shared/sounds/soundTest.ogg
similarity index 100%
rename from assets/preload/sounds/soundTest.ogg
rename to assets/shared/sounds/soundTest.ogg
diff --git a/assets/preload/sounds/sounds-go-here.txt b/assets/shared/sounds/sounds-go-here.txt
similarity index 100%
rename from assets/preload/sounds/sounds-go-here.txt
rename to assets/shared/sounds/sounds-go-here.txt
diff --git a/assets/preload/sounds/thunder_1.mp3 b/assets/shared/sounds/thunder_1.mp3
similarity index 100%
rename from assets/preload/sounds/thunder_1.mp3
rename to assets/shared/sounds/thunder_1.mp3
diff --git a/assets/preload/sounds/thunder_1.ogg b/assets/shared/sounds/thunder_1.ogg
similarity index 100%
rename from assets/preload/sounds/thunder_1.ogg
rename to assets/shared/sounds/thunder_1.ogg
diff --git a/assets/preload/sounds/thunder_2.mp3 b/assets/shared/sounds/thunder_2.mp3
similarity index 100%
rename from assets/preload/sounds/thunder_2.mp3
rename to assets/shared/sounds/thunder_2.mp3
diff --git a/assets/preload/sounds/thunder_2.ogg b/assets/shared/sounds/thunder_2.ogg
similarity index 100%
rename from assets/preload/sounds/thunder_2.ogg
rename to assets/shared/sounds/thunder_2.ogg
diff --git a/assets/preload/sounds/train_passes.mp3 b/assets/shared/sounds/train_passes.mp3
similarity index 100%
rename from assets/preload/sounds/train_passes.mp3
rename to assets/shared/sounds/train_passes.mp3
diff --git a/assets/preload/sounds/train_passes.ogg b/assets/shared/sounds/train_passes.ogg
similarity index 100%
rename from assets/preload/sounds/train_passes.ogg
rename to assets/shared/sounds/train_passes.ogg
diff --git a/assets/tutorial/tutorial_stuff_here.txt b/assets/tutorial/tutorial_stuff_here.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/assets/week1/week1_stuff_here.txt b/assets/week1/week1_stuff_here.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/assets/preload/images/Monster_Assets.png b/assets/week2/images/Monster_Assets.png
similarity index 100%
rename from assets/preload/images/Monster_Assets.png
rename to assets/week2/images/Monster_Assets.png
diff --git a/assets/preload/images/Monster_Assets.xml b/assets/week2/images/Monster_Assets.xml
similarity index 100%
rename from assets/preload/images/Monster_Assets.xml
rename to assets/week2/images/Monster_Assets.xml
diff --git a/assets/preload/images/halloween_bg.png b/assets/week2/images/halloween_bg.png
similarity index 100%
rename from assets/preload/images/halloween_bg.png
rename to assets/week2/images/halloween_bg.png
diff --git a/assets/preload/images/halloween_bg.xml b/assets/week2/images/halloween_bg.xml
similarity index 100%
rename from assets/preload/images/halloween_bg.xml
rename to assets/week2/images/halloween_bg.xml
diff --git a/assets/preload/images/spooky_kids_assets.png b/assets/week2/images/spooky_kids_assets.png
similarity index 100%
rename from assets/preload/images/spooky_kids_assets.png
rename to assets/week2/images/spooky_kids_assets.png
diff --git a/assets/preload/images/spooky_kids_assets.xml b/assets/week2/images/spooky_kids_assets.xml
similarity index 100%
rename from assets/preload/images/spooky_kids_assets.xml
rename to assets/week2/images/spooky_kids_assets.xml
diff --git a/assets/week2/week2_stuff_here.txt b/assets/week2/week2_stuff_here.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/assets/preload/images/Pico_FNF_assetss.png b/assets/week3/images/Pico_FNF_assetss.png
similarity index 100%
rename from assets/preload/images/Pico_FNF_assetss.png
rename to assets/week3/images/Pico_FNF_assetss.png
diff --git a/assets/preload/images/Pico_FNF_assetss.xml b/assets/week3/images/Pico_FNF_assetss.xml
similarity index 100%
rename from assets/preload/images/Pico_FNF_assetss.xml
rename to assets/week3/images/Pico_FNF_assetss.xml
diff --git a/assets/preload/images/philly/behindTrain.png b/assets/week3/images/philly/behindTrain.png
similarity index 100%
rename from assets/preload/images/philly/behindTrain.png
rename to assets/week3/images/philly/behindTrain.png
diff --git a/assets/preload/images/philly/city.png b/assets/week3/images/philly/city.png
similarity index 100%
rename from assets/preload/images/philly/city.png
rename to assets/week3/images/philly/city.png
diff --git a/assets/preload/images/philly/sky.png b/assets/week3/images/philly/sky.png
similarity index 100%
rename from assets/preload/images/philly/sky.png
rename to assets/week3/images/philly/sky.png
diff --git a/assets/preload/images/philly/street.png b/assets/week3/images/philly/street.png
similarity index 100%
rename from assets/preload/images/philly/street.png
rename to assets/week3/images/philly/street.png
diff --git a/assets/preload/images/philly/train.png b/assets/week3/images/philly/train.png
similarity index 100%
rename from assets/preload/images/philly/train.png
rename to assets/week3/images/philly/train.png
diff --git a/assets/preload/images/philly/win0.png b/assets/week3/images/philly/win0.png
similarity index 100%
rename from assets/preload/images/philly/win0.png
rename to assets/week3/images/philly/win0.png
diff --git a/assets/preload/images/philly/win1.png b/assets/week3/images/philly/win1.png
similarity index 100%
rename from assets/preload/images/philly/win1.png
rename to assets/week3/images/philly/win1.png
diff --git a/assets/preload/images/philly/win2.png b/assets/week3/images/philly/win2.png
similarity index 100%
rename from assets/preload/images/philly/win2.png
rename to assets/week3/images/philly/win2.png
diff --git a/assets/preload/images/philly/win3.png b/assets/week3/images/philly/win3.png
similarity index 100%
rename from assets/preload/images/philly/win3.png
rename to assets/week3/images/philly/win3.png
diff --git a/assets/preload/images/philly/win4.png b/assets/week3/images/philly/win4.png
similarity index 100%
rename from assets/preload/images/philly/win4.png
rename to assets/week3/images/philly/win4.png
diff --git a/assets/week3/week3_stuff_here.txt b/assets/week3/week3_stuff_here.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/assets/preload/images/Mom_Assets.png b/assets/week4/images/Mom_Assets.png
similarity index 100%
rename from assets/preload/images/Mom_Assets.png
rename to assets/week4/images/Mom_Assets.png
diff --git a/assets/preload/images/Mom_Assets.xml b/assets/week4/images/Mom_Assets.xml
similarity index 100%
rename from assets/preload/images/Mom_Assets.xml
rename to assets/week4/images/Mom_Assets.xml
diff --git a/assets/preload/images/limo/bgLimo.png b/assets/week4/images/limo/bgLimo.png
similarity index 100%
rename from assets/preload/images/limo/bgLimo.png
rename to assets/week4/images/limo/bgLimo.png
diff --git a/assets/preload/images/limo/bgLimo.xml b/assets/week4/images/limo/bgLimo.xml
similarity index 100%
rename from assets/preload/images/limo/bgLimo.xml
rename to assets/week4/images/limo/bgLimo.xml
diff --git a/assets/preload/images/limo/dumb.png b/assets/week4/images/limo/dumb.png
similarity index 100%
rename from assets/preload/images/limo/dumb.png
rename to assets/week4/images/limo/dumb.png
diff --git a/assets/preload/images/limo/fastCarLol.png b/assets/week4/images/limo/fastCarLol.png
similarity index 100%
rename from assets/preload/images/limo/fastCarLol.png
rename to assets/week4/images/limo/fastCarLol.png
diff --git a/assets/preload/images/limo/limoDancer.png b/assets/week4/images/limo/limoDancer.png
similarity index 100%
rename from assets/preload/images/limo/limoDancer.png
rename to assets/week4/images/limo/limoDancer.png
diff --git a/assets/preload/images/limo/limoDancer.xml b/assets/week4/images/limo/limoDancer.xml
similarity index 100%
rename from assets/preload/images/limo/limoDancer.xml
rename to assets/week4/images/limo/limoDancer.xml
diff --git a/assets/preload/images/limo/limoDrive.png b/assets/week4/images/limo/limoDrive.png
similarity index 100%
rename from assets/preload/images/limo/limoDrive.png
rename to assets/week4/images/limo/limoDrive.png
diff --git a/assets/preload/images/limo/limoDrive.xml b/assets/week4/images/limo/limoDrive.xml
similarity index 100%
rename from assets/preload/images/limo/limoDrive.xml
rename to assets/week4/images/limo/limoDrive.xml
diff --git a/assets/preload/images/limo/limoOverlay.png b/assets/week4/images/limo/limoOverlay.png
similarity index 100%
rename from assets/preload/images/limo/limoOverlay.png
rename to assets/week4/images/limo/limoOverlay.png
diff --git a/assets/preload/images/limo/limoSunset.png b/assets/week4/images/limo/limoSunset.png
similarity index 100%
rename from assets/preload/images/limo/limoSunset.png
rename to assets/week4/images/limo/limoSunset.png
diff --git a/assets/week4/week4_stuff_here.txt b/assets/week4/week4_stuff_here.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/assets/preload/images/christmas/bfChristmas.png b/assets/week5/images/christmas/bfChristmas.png
similarity index 100%
rename from assets/preload/images/christmas/bfChristmas.png
rename to assets/week5/images/christmas/bfChristmas.png
diff --git a/assets/preload/images/christmas/bfChristmas.xml b/assets/week5/images/christmas/bfChristmas.xml
similarity index 100%
rename from assets/preload/images/christmas/bfChristmas.xml
rename to assets/week5/images/christmas/bfChristmas.xml
diff --git a/assets/preload/images/christmas/bgEscalator.png b/assets/week5/images/christmas/bgEscalator.png
similarity index 100%
rename from assets/preload/images/christmas/bgEscalator.png
rename to assets/week5/images/christmas/bgEscalator.png
diff --git a/assets/preload/images/christmas/bgWalls.png b/assets/week5/images/christmas/bgWalls.png
similarity index 100%
rename from assets/preload/images/christmas/bgWalls.png
rename to assets/week5/images/christmas/bgWalls.png
diff --git a/assets/preload/images/christmas/bottomBop.png b/assets/week5/images/christmas/bottomBop.png
similarity index 100%
rename from assets/preload/images/christmas/bottomBop.png
rename to assets/week5/images/christmas/bottomBop.png
diff --git a/assets/preload/images/christmas/bottomBop.xml b/assets/week5/images/christmas/bottomBop.xml
similarity index 100%
rename from assets/preload/images/christmas/bottomBop.xml
rename to assets/week5/images/christmas/bottomBop.xml
diff --git a/assets/preload/images/christmas/christmasTree.png b/assets/week5/images/christmas/christmasTree.png
similarity index 100%
rename from assets/preload/images/christmas/christmasTree.png
rename to assets/week5/images/christmas/christmasTree.png
diff --git a/assets/preload/images/christmas/christmasWall.png b/assets/week5/images/christmas/christmasWall.png
similarity index 100%
rename from assets/preload/images/christmas/christmasWall.png
rename to assets/week5/images/christmas/christmasWall.png
diff --git a/assets/preload/images/christmas/evilBG.png b/assets/week5/images/christmas/evilBG.png
similarity index 100%
rename from assets/preload/images/christmas/evilBG.png
rename to assets/week5/images/christmas/evilBG.png
diff --git a/assets/preload/images/christmas/evilSnow.png b/assets/week5/images/christmas/evilSnow.png
similarity index 100%
rename from assets/preload/images/christmas/evilSnow.png
rename to assets/week5/images/christmas/evilSnow.png
diff --git a/assets/preload/images/christmas/evilTree.png b/assets/week5/images/christmas/evilTree.png
similarity index 100%
rename from assets/preload/images/christmas/evilTree.png
rename to assets/week5/images/christmas/evilTree.png
diff --git a/assets/preload/images/christmas/fgSnow.png b/assets/week5/images/christmas/fgSnow.png
similarity index 100%
rename from assets/preload/images/christmas/fgSnow.png
rename to assets/week5/images/christmas/fgSnow.png
diff --git a/assets/preload/images/christmas/gfChristmas.png b/assets/week5/images/christmas/gfChristmas.png
similarity index 100%
rename from assets/preload/images/christmas/gfChristmas.png
rename to assets/week5/images/christmas/gfChristmas.png
diff --git a/assets/preload/images/christmas/gfChristmas.xml b/assets/week5/images/christmas/gfChristmas.xml
similarity index 100%
rename from assets/preload/images/christmas/gfChristmas.xml
rename to assets/week5/images/christmas/gfChristmas.xml
diff --git a/assets/preload/images/christmas/mom_dad_christmas_assets.png b/assets/week5/images/christmas/mom_dad_christmas_assets.png
similarity index 100%
rename from assets/preload/images/christmas/mom_dad_christmas_assets.png
rename to assets/week5/images/christmas/mom_dad_christmas_assets.png
diff --git a/assets/preload/images/christmas/mom_dad_christmas_assets.xml b/assets/week5/images/christmas/mom_dad_christmas_assets.xml
similarity index 100%
rename from assets/preload/images/christmas/mom_dad_christmas_assets.xml
rename to assets/week5/images/christmas/mom_dad_christmas_assets.xml
diff --git a/assets/preload/images/christmas/monsterChristmas.png b/assets/week5/images/christmas/monsterChristmas.png
similarity index 100%
rename from assets/preload/images/christmas/monsterChristmas.png
rename to assets/week5/images/christmas/monsterChristmas.png
diff --git a/assets/preload/images/christmas/monsterChristmas.xml b/assets/week5/images/christmas/monsterChristmas.xml
similarity index 100%
rename from assets/preload/images/christmas/monsterChristmas.xml
rename to assets/week5/images/christmas/monsterChristmas.xml
diff --git a/assets/preload/images/christmas/santa.png b/assets/week5/images/christmas/santa.png
similarity index 100%
rename from assets/preload/images/christmas/santa.png
rename to assets/week5/images/christmas/santa.png
diff --git a/assets/preload/images/christmas/santa.xml b/assets/week5/images/christmas/santa.xml
similarity index 100%
rename from assets/preload/images/christmas/santa.xml
rename to assets/week5/images/christmas/santa.xml
diff --git a/assets/preload/images/christmas/upperBop.png b/assets/week5/images/christmas/upperBop.png
similarity index 100%
rename from assets/preload/images/christmas/upperBop.png
rename to assets/week5/images/christmas/upperBop.png
diff --git a/assets/preload/images/christmas/upperBop.xml b/assets/week5/images/christmas/upperBop.xml
similarity index 100%
rename from assets/preload/images/christmas/upperBop.xml
rename to assets/week5/images/christmas/upperBop.xml
diff --git a/assets/week5/week5_stuff_here.txt b/assets/week5/week5_stuff_here.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/assets/preload/images/weeb/animatedEvilSchool.png b/assets/week6/images/weeb/animatedEvilSchool.png
similarity index 100%
rename from assets/preload/images/weeb/animatedEvilSchool.png
rename to assets/week6/images/weeb/animatedEvilSchool.png
diff --git a/assets/preload/images/weeb/animatedEvilSchool.xml b/assets/week6/images/weeb/animatedEvilSchool.xml
similarity index 100%
rename from assets/preload/images/weeb/animatedEvilSchool.xml
rename to assets/week6/images/weeb/animatedEvilSchool.xml
diff --git a/assets/preload/images/weeb/bfPixel.png b/assets/week6/images/weeb/bfPixel.png
similarity index 100%
rename from assets/preload/images/weeb/bfPixel.png
rename to assets/week6/images/weeb/bfPixel.png
diff --git a/assets/preload/images/weeb/bfPixel.xml b/assets/week6/images/weeb/bfPixel.xml
similarity index 100%
rename from assets/preload/images/weeb/bfPixel.xml
rename to assets/week6/images/weeb/bfPixel.xml
diff --git a/assets/preload/images/weeb/bfPixelsDEAD.png b/assets/week6/images/weeb/bfPixelsDEAD.png
similarity index 100%
rename from assets/preload/images/weeb/bfPixelsDEAD.png
rename to assets/week6/images/weeb/bfPixelsDEAD.png
diff --git a/assets/preload/images/weeb/bfPixelsDEAD.xml b/assets/week6/images/weeb/bfPixelsDEAD.xml
similarity index 100%
rename from assets/preload/images/weeb/bfPixelsDEAD.xml
rename to assets/week6/images/weeb/bfPixelsDEAD.xml
diff --git a/assets/preload/images/weeb/bfPortrait.png b/assets/week6/images/weeb/bfPortrait.png
similarity index 100%
rename from assets/preload/images/weeb/bfPortrait.png
rename to assets/week6/images/weeb/bfPortrait.png
diff --git a/assets/preload/images/weeb/bfPortrait.xml b/assets/week6/images/weeb/bfPortrait.xml
similarity index 100%
rename from assets/preload/images/weeb/bfPortrait.xml
rename to assets/week6/images/weeb/bfPortrait.xml
diff --git a/assets/preload/images/weeb/bgFreaks.png b/assets/week6/images/weeb/bgFreaks.png
similarity index 100%
rename from assets/preload/images/weeb/bgFreaks.png
rename to assets/week6/images/weeb/bgFreaks.png
diff --git a/assets/preload/images/weeb/bgFreaks.xml b/assets/week6/images/weeb/bgFreaks.xml
similarity index 100%
rename from assets/preload/images/weeb/bgFreaks.xml
rename to assets/week6/images/weeb/bgFreaks.xml
diff --git a/assets/preload/images/weeb/evilSchoolBG.png b/assets/week6/images/weeb/evilSchoolBG.png
similarity index 100%
rename from assets/preload/images/weeb/evilSchoolBG.png
rename to assets/week6/images/weeb/evilSchoolBG.png
diff --git a/assets/preload/images/weeb/evilSchoolFG.png b/assets/week6/images/weeb/evilSchoolFG.png
similarity index 100%
rename from assets/preload/images/weeb/evilSchoolFG.png
rename to assets/week6/images/weeb/evilSchoolFG.png
diff --git a/assets/preload/images/weeb/gfPixel.png b/assets/week6/images/weeb/gfPixel.png
similarity index 100%
rename from assets/preload/images/weeb/gfPixel.png
rename to assets/week6/images/weeb/gfPixel.png
diff --git a/assets/preload/images/weeb/gfPixel.xml b/assets/week6/images/weeb/gfPixel.xml
similarity index 100%
rename from assets/preload/images/weeb/gfPixel.xml
rename to assets/week6/images/weeb/gfPixel.xml
diff --git a/assets/preload/images/weeb/petals.png b/assets/week6/images/weeb/petals.png
similarity index 100%
rename from assets/preload/images/weeb/petals.png
rename to assets/week6/images/weeb/petals.png
diff --git a/assets/preload/images/weeb/petals.xml b/assets/week6/images/weeb/petals.xml
similarity index 100%
rename from assets/preload/images/weeb/petals.xml
rename to assets/week6/images/weeb/petals.xml
diff --git a/assets/preload/images/weeb/pixelUI/arrowEnds.png b/assets/week6/images/weeb/pixelUI/arrowEnds.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/arrowEnds.png
rename to assets/week6/images/weeb/pixelUI/arrowEnds.png
diff --git a/assets/preload/images/weeb/pixelUI/arrows-pixels.png b/assets/week6/images/weeb/pixelUI/arrows-pixels.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/arrows-pixels.png
rename to assets/week6/images/weeb/pixelUI/arrows-pixels.png
diff --git a/assets/preload/images/weeb/pixelUI/bad-pixel.png b/assets/week6/images/weeb/pixelUI/bad-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/bad-pixel.png
rename to assets/week6/images/weeb/pixelUI/bad-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/combo-pixel.png b/assets/week6/images/weeb/pixelUI/combo-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/combo-pixel.png
rename to assets/week6/images/weeb/pixelUI/combo-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/date-pixel.png b/assets/week6/images/weeb/pixelUI/date-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/date-pixel.png
rename to assets/week6/images/weeb/pixelUI/date-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/dialogueBox-evil.png b/assets/week6/images/weeb/pixelUI/dialogueBox-evil.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/dialogueBox-evil.png
rename to assets/week6/images/weeb/pixelUI/dialogueBox-evil.png
diff --git a/assets/preload/images/weeb/pixelUI/dialogueBox-evil.xml b/assets/week6/images/weeb/pixelUI/dialogueBox-evil.xml
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/dialogueBox-evil.xml
rename to assets/week6/images/weeb/pixelUI/dialogueBox-evil.xml
diff --git a/assets/preload/images/weeb/pixelUI/dialogueBox-pixel.png b/assets/week6/images/weeb/pixelUI/dialogueBox-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/dialogueBox-pixel.png
rename to assets/week6/images/weeb/pixelUI/dialogueBox-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/dialogueBox-pixel.xml b/assets/week6/images/weeb/pixelUI/dialogueBox-pixel.xml
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/dialogueBox-pixel.xml
rename to assets/week6/images/weeb/pixelUI/dialogueBox-pixel.xml
diff --git a/assets/preload/images/weeb/pixelUI/dialogueBox-senpaiMad.png b/assets/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/dialogueBox-senpaiMad.png
rename to assets/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.png
diff --git a/assets/preload/images/weeb/pixelUI/dialogueBox-senpaiMad.xml b/assets/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.xml
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/dialogueBox-senpaiMad.xml
rename to assets/week6/images/weeb/pixelUI/dialogueBox-senpaiMad.xml
diff --git a/assets/preload/images/weeb/pixelUI/good-pixel.png b/assets/week6/images/weeb/pixelUI/good-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/good-pixel.png
rename to assets/week6/images/weeb/pixelUI/good-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/hand_textbox.png b/assets/week6/images/weeb/pixelUI/hand_textbox.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/hand_textbox.png
rename to assets/week6/images/weeb/pixelUI/hand_textbox.png
diff --git a/assets/preload/images/weeb/pixelUI/num0-pixel.png b/assets/week6/images/weeb/pixelUI/num0-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num0-pixel.png
rename to assets/week6/images/weeb/pixelUI/num0-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/num1-pixel.png b/assets/week6/images/weeb/pixelUI/num1-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num1-pixel.png
rename to assets/week6/images/weeb/pixelUI/num1-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/num2-pixel.png b/assets/week6/images/weeb/pixelUI/num2-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num2-pixel.png
rename to assets/week6/images/weeb/pixelUI/num2-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/num3-pixel.png b/assets/week6/images/weeb/pixelUI/num3-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num3-pixel.png
rename to assets/week6/images/weeb/pixelUI/num3-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/num4-pixel.png b/assets/week6/images/weeb/pixelUI/num4-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num4-pixel.png
rename to assets/week6/images/weeb/pixelUI/num4-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/num5-pixel.png b/assets/week6/images/weeb/pixelUI/num5-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num5-pixel.png
rename to assets/week6/images/weeb/pixelUI/num5-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/num6-pixel.png b/assets/week6/images/weeb/pixelUI/num6-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num6-pixel.png
rename to assets/week6/images/weeb/pixelUI/num6-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/num7-pixel.png b/assets/week6/images/weeb/pixelUI/num7-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num7-pixel.png
rename to assets/week6/images/weeb/pixelUI/num7-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/num8-pixel.png b/assets/week6/images/weeb/pixelUI/num8-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num8-pixel.png
rename to assets/week6/images/weeb/pixelUI/num8-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/num9-pixel.png b/assets/week6/images/weeb/pixelUI/num9-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/num9-pixel.png
rename to assets/week6/images/weeb/pixelUI/num9-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/ready-pixel.png b/assets/week6/images/weeb/pixelUI/ready-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/ready-pixel.png
rename to assets/week6/images/weeb/pixelUI/ready-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/set-pixel.png b/assets/week6/images/weeb/pixelUI/set-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/set-pixel.png
rename to assets/week6/images/weeb/pixelUI/set-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/shit-pixel.png b/assets/week6/images/weeb/pixelUI/shit-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/shit-pixel.png
rename to assets/week6/images/weeb/pixelUI/shit-pixel.png
diff --git a/assets/preload/images/weeb/pixelUI/sick-pixel.png b/assets/week6/images/weeb/pixelUI/sick-pixel.png
similarity index 100%
rename from assets/preload/images/weeb/pixelUI/sick-pixel.png
rename to assets/week6/images/weeb/pixelUI/sick-pixel.png
diff --git a/assets/preload/images/weeb/senpai.png b/assets/week6/images/weeb/senpai.png
similarity index 100%
rename from assets/preload/images/weeb/senpai.png
rename to assets/week6/images/weeb/senpai.png
diff --git a/assets/preload/images/weeb/senpai.xml b/assets/week6/images/weeb/senpai.xml
similarity index 100%
rename from assets/preload/images/weeb/senpai.xml
rename to assets/week6/images/weeb/senpai.xml
diff --git a/assets/preload/images/weeb/senpaiCrazy.png b/assets/week6/images/weeb/senpaiCrazy.png
similarity index 100%
rename from assets/preload/images/weeb/senpaiCrazy.png
rename to assets/week6/images/weeb/senpaiCrazy.png
diff --git a/assets/preload/images/weeb/senpaiCrazy.xml b/assets/week6/images/weeb/senpaiCrazy.xml
similarity index 100%
rename from assets/preload/images/weeb/senpaiCrazy.xml
rename to assets/week6/images/weeb/senpaiCrazy.xml
diff --git a/assets/preload/images/weeb/senpaiPortrait.png b/assets/week6/images/weeb/senpaiPortrait.png
similarity index 100%
rename from assets/preload/images/weeb/senpaiPortrait.png
rename to assets/week6/images/weeb/senpaiPortrait.png
diff --git a/assets/preload/images/weeb/senpaiPortrait.xml b/assets/week6/images/weeb/senpaiPortrait.xml
similarity index 100%
rename from assets/preload/images/weeb/senpaiPortrait.xml
rename to assets/week6/images/weeb/senpaiPortrait.xml
diff --git a/assets/preload/images/weeb/spirit.png b/assets/week6/images/weeb/spirit.png
similarity index 100%
rename from assets/preload/images/weeb/spirit.png
rename to assets/week6/images/weeb/spirit.png
diff --git a/assets/preload/images/weeb/spirit.txt b/assets/week6/images/weeb/spirit.txt
similarity index 100%
rename from assets/preload/images/weeb/spirit.txt
rename to assets/week6/images/weeb/spirit.txt
diff --git a/assets/preload/images/weeb/spiritFaceForward.png b/assets/week6/images/weeb/spiritFaceForward.png
similarity index 100%
rename from assets/preload/images/weeb/spiritFaceForward.png
rename to assets/week6/images/weeb/spiritFaceForward.png
diff --git a/assets/preload/images/weeb/weebSchool.png b/assets/week6/images/weeb/weebSchool.png
similarity index 100%
rename from assets/preload/images/weeb/weebSchool.png
rename to assets/week6/images/weeb/weebSchool.png
diff --git a/assets/preload/images/weeb/weebSky.png b/assets/week6/images/weeb/weebSky.png
similarity index 100%
rename from assets/preload/images/weeb/weebSky.png
rename to assets/week6/images/weeb/weebSky.png
diff --git a/assets/preload/images/weeb/weebStreet.png b/assets/week6/images/weeb/weebStreet.png
similarity index 100%
rename from assets/preload/images/weeb/weebStreet.png
rename to assets/week6/images/weeb/weebStreet.png
diff --git a/assets/preload/images/weeb/weebTrees.png b/assets/week6/images/weeb/weebTrees.png
similarity index 100%
rename from assets/preload/images/weeb/weebTrees.png
rename to assets/week6/images/weeb/weebTrees.png
diff --git a/assets/preload/images/weeb/weebTrees.txt b/assets/week6/images/weeb/weebTrees.txt
similarity index 100%
rename from assets/preload/images/weeb/weebTrees.txt
rename to assets/week6/images/weeb/weebTrees.txt
diff --git a/assets/preload/images/weeb/weebTreesBack.png b/assets/week6/images/weeb/weebTreesBack.png
similarity index 100%
rename from assets/preload/images/weeb/weebTreesBack.png
rename to assets/week6/images/weeb/weebTreesBack.png
diff --git a/assets/preload/music/Lunchbox.mp3 b/assets/week6/music/Lunchbox.mp3
similarity index 100%
rename from assets/preload/music/Lunchbox.mp3
rename to assets/week6/music/Lunchbox.mp3
diff --git a/assets/preload/music/Lunchbox.ogg b/assets/week6/music/Lunchbox.ogg
similarity index 100%
rename from assets/preload/music/Lunchbox.ogg
rename to assets/week6/music/Lunchbox.ogg
diff --git a/assets/preload/music/LunchboxScary.mp3 b/assets/week6/music/LunchboxScary.mp3
similarity index 100%
rename from assets/preload/music/LunchboxScary.mp3
rename to assets/week6/music/LunchboxScary.mp3
diff --git a/assets/preload/music/LunchboxScary.ogg b/assets/week6/music/LunchboxScary.ogg
similarity index 100%
rename from assets/preload/music/LunchboxScary.ogg
rename to assets/week6/music/LunchboxScary.ogg
diff --git a/assets/week6/week6_stuff_here.txt b/assets/week6/week6_stuff_here.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/source/ChartParser.hx b/source/ChartParser.hx
index cba97ce80..3884c0e54 100644
--- a/source/ChartParser.hx
+++ b/source/ChartParser.hx
@@ -11,7 +11,7 @@ class ChartParser
var IMG_WIDTH:Int = 8;
var regex:EReg = new EReg("[ \t]*((\r\n)|\r|\n)[ \t]*", "g");
- var csvData = FlxStringUtil.imageToCSV('assets/data/' + songName + '/' + songName + '_section' + section + '.png');
+ var csvData = FlxStringUtil.imageToCSV(Paths.file('data/' + songName + '/' + songName + '_section' + section + '.png'));
var lines:Array = regex.split(csvData);
var rows:Array = lines.filter(function(line) return line != "");
diff --git a/source/ChartingState.hx b/source/ChartingState.hx
index 0e7afa2a2..cc7d91846 100644
--- a/source/ChartingState.hx
+++ b/source/ChartingState.hx
@@ -225,7 +225,7 @@ class ChartingState extends MusicBeatState
stepperBPM.value = Conductor.bpm;
stepperBPM.name = 'song_bpm';
- var characters:Array = CoolUtil.coolTextFile('assets/data/characterList.txt');
+ var characters:Array = CoolUtil.coolTextFile(Paths.txt('characterList'));
var player1DropDown = new FlxUIDropDownMenu(10, 100, FlxUIDropDownMenu.makeStrIdLabelArray(characters, true), function(character:String)
{
@@ -351,7 +351,7 @@ class ChartingState extends MusicBeatState
// vocals.stop();
}
- FlxG.sound.playMusic('assets/music/' + daSong + "_Inst" + TitleState.soundExt, 0.6);
+ FlxG.sound.playMusic(Paths.inst(daSong), 0.6);
// WONT WORK FOR TUTORIAL OR TEST SONG!!! REDO LATER
vocals = new FlxSound().loadEmbedded(Paths.music(daSong + "_Voices"));
diff --git a/source/DialogueBox.hx b/source/DialogueBox.hx
index 868c780f2..4b4252506 100644
--- a/source/DialogueBox.hx
+++ b/source/DialogueBox.hx
@@ -60,24 +60,6 @@ class DialogueBox extends FlxSpriteGroup
bgFade.alpha = 0.7;
}, 5);
- portraitLeft = new FlxSprite(-20, 40);
- portraitLeft.frames = Paths.getSparrowAtlas('weeb/senpaiPortrait');
- portraitLeft.animation.addByPrefix('enter', 'Senpai Portrait Enter', 24, false);
- portraitLeft.setGraphicSize(Std.int(portraitLeft.width * PlayState.daPixelZoom * 0.9));
- portraitLeft.updateHitbox();
- portraitLeft.scrollFactor.set();
- add(portraitLeft);
- portraitLeft.visible = false;
-
- portraitRight = new FlxSprite(0, 40);
- portraitRight.frames = Paths.getSparrowAtlas('weeb/bfPortrait');
- portraitRight.animation.addByPrefix('enter', 'Boyfriend portrait enter', 24, false);
- portraitRight.setGraphicSize(Std.int(portraitRight.width * PlayState.daPixelZoom * 0.9));
- portraitRight.updateHitbox();
- portraitRight.scrollFactor.set();
- add(portraitRight);
- portraitRight.visible = false;
-
box = new FlxSprite(-20, 45);
var hasDialog = false;
@@ -107,19 +89,40 @@ class DialogueBox extends FlxSpriteGroup
add(face);
}
- if (hasDialog)
- {
- box.animation.play('normalOpen');
- box.setGraphicSize(Std.int(box.width * PlayState.daPixelZoom * 0.9));
- box.updateHitbox();
- add(box);
- }
+ this.dialogueList = dialogueList;
+
+ if (!hasDialog)
+ return;
+
+ portraitLeft = new FlxSprite(-20, 40);
+ portraitLeft.frames = Paths.getSparrowAtlas('weeb/senpaiPortrait');
+ portraitLeft.animation.addByPrefix('enter', 'Senpai Portrait Enter', 24, false);
+ portraitLeft.setGraphicSize(Std.int(portraitLeft.width * PlayState.daPixelZoom * 0.9));
+ portraitLeft.updateHitbox();
+ portraitLeft.scrollFactor.set();
+ add(portraitLeft);
+ portraitLeft.visible = false;
+
+ portraitRight = new FlxSprite(0, 40);
+ portraitRight.frames = Paths.getSparrowAtlas('weeb/bfPortrait');
+ portraitRight.animation.addByPrefix('enter', 'Boyfriend portrait enter', 24, false);
+ portraitRight.setGraphicSize(Std.int(portraitRight.width * PlayState.daPixelZoom * 0.9));
+ portraitRight.updateHitbox();
+ portraitRight.scrollFactor.set();
+ add(portraitRight);
+ portraitRight.visible = false;
+
+ box.animation.play('normalOpen');
+ box.setGraphicSize(Std.int(box.width * PlayState.daPixelZoom * 0.9));
+ box.updateHitbox();
+ add(box);
+
+ box.screenCenter(X);
+ portraitLeft.screenCenter(X);
handSelect = new FlxSprite(FlxG.width * 0.9, FlxG.height * 0.9).loadGraphic(Paths.image('weeb/pixelUI/hand_textbox'));
add(handSelect);
- box.screenCenter(X);
- portraitLeft.screenCenter(X);
if (!talkingRight)
{
@@ -140,8 +143,6 @@ class DialogueBox extends FlxSpriteGroup
dialogue = new Alphabet(0, 80, "", false, true);
// dialogue.x = 90;
// add(dialogue);
-
- this.dialogueList = dialogueList;
}
var dialogueOpened:Bool = false;
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
index c1f02ce07..b39ebc973 100644
--- a/source/FreeplayState.hx
+++ b/source/FreeplayState.hx
@@ -30,7 +30,7 @@ class FreeplayState extends MusicBeatState
override function create()
{
- songs = CoolUtil.coolTextFile('assets/data/freeplaySonglist.txt');
+ songs = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist'));
/*
if (FlxG.sound.music != null)
@@ -104,7 +104,7 @@ class FreeplayState extends MusicBeatState
scoreText = new FlxText(FlxG.width * 0.7, 5, 0, "", 32);
// scoreText.autoSize = false;
- scoreText.setFormat("assets/fonts/vcr.ttf", 32, FlxColor.WHITE, RIGHT);
+ scoreText.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, RIGHT);
// scoreText.alignment = RIGHT;
var scoreBG:FlxSprite = new FlxSprite(scoreText.x - 6, 0).makeGraphic(Std.int(FlxG.width * 0.35), 66, 0xFF000000);
@@ -249,7 +249,9 @@ class FreeplayState extends MusicBeatState
// lerpScore = 0;
#end
- FlxG.sound.playMusic('assets/music/' + songs[curSelected] + "_Inst" + TitleState.soundExt, 0);
+ #if PRELOAD_ALL
+ FlxG.sound.playMusic(Paths.inst(songs[curSelected]), 0);
+ #end
var bullShit:Int = 0;
diff --git a/source/LoadingState.hx b/source/LoadingState.hx
index 64fb3c87f..8e3676ec0 100644
--- a/source/LoadingState.hx
+++ b/source/LoadingState.hx
@@ -1,5 +1,7 @@
package;
+import lime.app.Promise;
+import lime.app.Future;
import flixel.FlxG;
import flixel.FlxState;
import flixel.FlxSprite;
@@ -8,11 +10,8 @@ import flixel.util.FlxTimer;
import openfl.utils.Assets;
import lime.utils.Assets as LimeAssets;
-import lime.utils.AssetBundle;
import lime.utils.AssetLibrary;
import lime.utils.AssetManifest;
-import lime.app.Future;
-import lime.app.Promise;
import haxe.io.Path;
@@ -38,7 +37,7 @@ class LoadingState extends MusicBeatState
override function create()
{
logo = new FlxSprite(-150, -100);
- logo.frames = FlxAtlasFrames.fromSparrow('assets/images/logoBumpin.png', 'assets/images/logoBumpin.xml');
+ logo.frames = Paths.getSparrowAtlas('logoBumpin');
logo.antialiasing = true;
logo.animation.addByPrefix('bump', 'logo bumpin', 24);
logo.animation.play('bump');
@@ -47,31 +46,33 @@ class LoadingState extends MusicBeatState
// logoBl.color = FlxColor.BLACK;
gfDance = new FlxSprite(FlxG.width * 0.4, FlxG.height * 0.07);
- gfDance.frames = FlxAtlasFrames.fromSparrow('assets/images/gfDanceTitle.png', 'assets/images/gfDanceTitle.xml');
+ gfDance.frames = Paths.getSparrowAtlas('gfDanceTitle');
gfDance.animation.addByIndices('danceLeft', 'gfDance', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false);
gfDance.animation.addByIndices('danceRight', 'gfDance', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
gfDance.antialiasing = true;
add(gfDance);
add(logo);
- // function onSongsManifestInit()
- // {
- callbacks = new MultiCallback(onLoad);
- var introComplete = callbacks.add("introComplete");
- checkLoadSong(getSongPath());
- checkLoadSong(getVocalPath());
- checkLibrary("shared");
- if (PlayState.storyWeek > 0)
- checkLibrary("week" + PlayState.storyWeek);
- else
- checkLibrary("tutorial");
-
- var fadeTime = 0.5;
- FlxG.camera.fade(FlxG.camera.bgColor, fadeTime, true);
- new FlxTimer().start(fadeTime + MIN_TIME, function(_) introComplete());
- // }
-
- // initSongsManifest(onSongsManifestInit);
+ initSongsManifest().onComplete
+ (
+ function (lib)
+ {
+ callbacks = new MultiCallback(onLoad);
+ var introComplete = callbacks.add("introComplete");
+ checkLoadSong(getSongPath());
+ if (PlayState.SONG.needsVoices)
+ checkLoadSong(getVocalPath());
+ checkLibrary("shared");
+ if (PlayState.storyWeek > 0)
+ checkLibrary("week" + PlayState.storyWeek);
+ else
+ checkLibrary("tutorial");
+
+ var fadeTime = 0.5;
+ FlxG.camera.fade(FlxG.camera.bgColor, fadeTime, true);
+ new FlxTimer().start(fadeTime + MIN_TIME, function(_) introComplete());
+ }
+ );
}
function checkLoadSong(path:String)
@@ -80,10 +81,10 @@ class LoadingState extends MusicBeatState
{
var library = Assets.getLibrary("songs");
final symbolPath = path.split(":").pop();
- @:privateAccess
- library.types.set(symbolPath, SOUND);
- @:privateAccess
- library.pathGroups.set(symbolPath, [library.__cacheBreak(symbolPath)]);
+ // @:privateAccess
+ // library.types.set(symbolPath, SOUND);
+ // @:privateAccess
+ // library.pathGroups.set(symbolPath, [library.__cacheBreak(symbolPath)]);
var callback = callbacks.add("song:" + path);
Assets.loadSound(path).onComplete(function (_) { callback(); });
}
@@ -91,8 +92,13 @@ class LoadingState extends MusicBeatState
function checkLibrary(library:String)
{
+ trace(Assets.hasLibrary(library));
if (Assets.getLibrary(library) == null)
{
+ @:privateAccess
+ if (!LimeAssets.libraryPaths.exists(library))
+ throw "Missing library: " + library;
+
var callback = callbacks.add("library:" + library);
Assets.loadLibrary(library).onComplete(function (_) { callback(); });
}
@@ -114,6 +120,10 @@ class LoadingState extends MusicBeatState
override function update(elapsed:Float)
{
super.update(elapsed);
+ #if debug
+ if (FlxG.keys.justPressed.SPACE)
+ trace('fired: ' + callbacks.getFired() + " unfired:" + callbacks.getUnfired());
+ #end
}
function onLoad()
@@ -141,6 +151,7 @@ class LoadingState extends MusicBeatState
static function getNextState(target:FlxState, stopMusic = false):FlxState
{
+ Paths.setCurrentLevel("week" + PlayState.storyWeek);
#if js
var loaded = isSoundLoaded(getSongPath())
&& (!PlayState.SONG.needsVoices || isSoundLoaded(getVocalPath()))
@@ -174,110 +185,68 @@ class LoadingState extends MusicBeatState
callbacks = null;
}
-
- /**
- * creates the song manifest without loading all the songs so we can load them individually
- * @param onComplete called on load
- * @return Future
- */
- static function initSongsManifest(onComplete:Void->Void):Future
+ static function initSongsManifest()
{
- final id = "songs";
+ var id = "songs";
var promise = new Promise();
- // #if (tools && !display && !macro)
var library = LimeAssets.getLibrary(id);
if (library != null)
{
- onComplete();
return Future.withValue(library);
}
-
+
var path = id;
var rootPath = null;
-
- // @:privateAccess
- // if (LimeAssets.bundlePaths.exists(id))
- // {
- // AssetBundle.loadFromFile(bundlePaths.get(id)).onComplete(function(bundle)
- // {
- // if (bundle == null)
- // {
- // promise.error("Cannot load bundle for library \"" + id + "\"");
- // return;
- // }
- // var library = AssetLibrary.fromBundle(bundle);
-
- // if (library == null)
- // {
- // promise.error("Cannot open library \"" + id + "\"");
- // }
- // else
- // {
- // libraries.set(id, library);
- // library.onChange.add(LimeAssets.onChange.dispatch);
- // promise.completeWith(Future.withValue(library));
- // onComplete();
- // }
- // }).onError(function(_)
- // {
- // promise.error("There is no asset library with an ID of \"" + id + "\"");
- // });
- // }
- // else
- // {
- @:privateAccess
- final libraryPaths = LimeAssets.libraryPaths;
- if (libraryPaths.exists(id))
+ @:privateAccess
+ var libraryPaths = LimeAssets.libraryPaths;
+ if (libraryPaths.exists(id))
+ {
+ path = libraryPaths[id];
+ rootPath = Path.directory(path);
+ }
+ else
+ {
+ if (StringTools.endsWith(path, ".bundle"))
{
- path = libraryPaths[id];
- rootPath = Path.directory(path);
+ rootPath = path;
+ path += "/library.json";
}
else
{
- if (StringTools.endsWith(path, ".bundle"))
- {
- rootPath = path;
- path += "/library.json";
- }
- else
- {
- rootPath = Path.directory(path);
- }
- @:privateAccess
- path = LimeAssets.__cacheBreak(path);
+ rootPath = Path.directory(path);
+ }
+ @:privateAccess
+ path = LimeAssets.__cacheBreak(path);
+ }
+
+ AssetManifest.loadFromFile(path, rootPath).onComplete(function(manifest)
+ {
+ if (manifest == null)
+ {
+ promise.error("Cannot parse asset manifest for library \"" + id + "\"");
+ return;
}
- AssetManifest.loadFromFile(path, rootPath).onComplete(function(manifest)
- {
- if (manifest == null)
- {
- promise.error("Cannot parse asset manifest for library \"" + id + "\"");
- return;
- }
+ var library = AssetLibrary.fromManifest(manifest);
- var library = AssetLibrary.fromManifest(manifest);
-
- if (library == null)
- {
- promise.error("Cannot open library \"" + id + "\"");
- }
- else
- {
- @:privateAccess
- LimeAssets.libraries.set(id, library);
- library.onChange.add(LimeAssets.onChange.dispatch);
- promise.completeWith(Future.withValue(library));
- onComplete();
- }
- }).onError(function(_)
+ if (library == null)
{
- promise.error("There is no asset library with an ID of \"" + id + "\"");
- });
- // }
- // #end
+ promise.error("Cannot open library \"" + id + "\"");
+ }
+ else
+ {
+ @:privateAccess
+ LimeAssets.libraries.set(id, library);
+ library.onChange.add(LimeAssets.onChange.dispatch);
+ promise.completeWith(Future.withValue(library));
+ }
+ }).onError(function(_)
+ {
+ promise.error("There is no asset library with an ID of \"" + id + "\"");
+ });
return promise.future;
}
@@ -337,5 +306,5 @@ class MultiCallback
}
public function getFired() return fired.copy();
- public function getUnfired() return [for (id in unfired) id];
+ public function getUnfired() return [for (id in unfired.keys()) id];
}
\ No newline at end of file
diff --git a/source/Note.hx b/source/Note.hx
index 781206b3f..d0560636c 100644
--- a/source/Note.hx
+++ b/source/Note.hx
@@ -4,7 +4,9 @@ import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.math.FlxMath;
import flixel.util.FlxColor;
+#if polymod
import polymod.format.ParseRules.TargetSignatureElement;
+#end
using StringTools;
diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx
index 76a175890..bf36c83d5 100644
--- a/source/OptionsMenu.hx
+++ b/source/OptionsMenu.hx
@@ -24,7 +24,7 @@ class OptionsMenu extends MusicBeatState
override function create()
{
var menuBG:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
- controlsStrings = CoolUtil.coolTextFile('assets/data/controls.txt');
+ controlsStrings = CoolUtil.coolTextFile(Paths.txt('controls'));
menuBG.color = 0xFFea71fd;
menuBG.setGraphicSize(Std.int(menuBG.width * 1.1));
menuBG.updateHitbox();
diff --git a/source/Paths.hx b/source/Paths.hx
index 4e2094c42..73214c00c 100644
--- a/source/Paths.hx
+++ b/source/Paths.hx
@@ -30,7 +30,7 @@ class Paths
return levelPath;
}
- return 'assets/$file';
+ return 'assets/preload/$file';
}
inline static function getLibraryPath(library:String, file:String)
@@ -43,14 +43,29 @@ class Paths
return getPath(file, type);
}
- inline static public function sound(key:String)
+ inline static public function txt(key:String)
+ {
+ return getPath('data/$key.txt', TEXT);
+ }
+
+ inline static public function xml(key:String)
+ {
+ return getPath('data/$key.xml', TEXT);
+ }
+
+ inline static public function json(key:String)
+ {
+ return getPath('data/$key.json', TEXT);
+ }
+
+ static public function sound(key:String)
{
return getPath('sounds/$key.$SOUND_EXT', SOUND);
}
inline static public function soundRandom(key:String, min:Int, max:Int)
{
- return getPath('sounds/$key${FlxG.random.int(min, max)}.$SOUND_EXT', SOUND);
+ return sound(key + FlxG.random.int(min, max));
}
inline static public function music(key:String)
@@ -60,12 +75,12 @@ class Paths
inline static public function voices(song:String)
{
- return "songs:" + getPath('songs/${song.toLowerCase()}/Voices.$SOUND_EXT', MUSIC);
+ return 'songs:assets/songs/${song.toLowerCase()}/Voices.$SOUND_EXT';
}
inline static public function inst(song:String)
{
- return "songs:" + getPath('songs/${song.toLowerCase()}/Inst.$SOUND_EXT', MUSIC);
+ return 'songs:assets/songs/${song.toLowerCase()}/Inst.$SOUND_EXT';
}
inline static public function image(key:String)
@@ -73,6 +88,11 @@ class Paths
return getPath('images/$key.png', IMAGE);
}
+ inline static public function font(key:String)
+ {
+ return 'assets/fonts/$key';
+ }
+
inline static public function getSparrowAtlas(key:String)
{
return FlxAtlasFrames.fromSparrow(image(key), file('images/$key.xml'));
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 45149110e..225f3e44e 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -139,7 +139,6 @@ class PlayState extends MusicBeatState
if (SONG == null)
SONG = Song.loadFromJson('tutorial');
- Paths.setCurrentLevel(SONG.song);
Conductor.changeBPM(SONG.bpm);
@@ -163,11 +162,11 @@ class PlayState extends MusicBeatState
"Only then I will even CONSIDER letting you\ndate my daughter!"
];
case 'senpai':
- dialogue = CoolUtil.coolTextFile('assets/data/senpai/senpaiDialogue.txt');
+ dialogue = CoolUtil.coolTextFile(Paths.txt('senpai/senpaiDialogue'));
case 'roses':
- dialogue = CoolUtil.coolTextFile('assets/data/roses/rosesDialogue.txt');
+ dialogue = CoolUtil.coolTextFile(Paths.txt('roses/rosesDialogue'));
case 'thorns':
- dialogue = CoolUtil.coolTextFile('assets/data/thorns/thornsDialogue.txt');
+ dialogue = CoolUtil.coolTextFile(Paths.txt('thorns/thornsDialogue'));
}
if (SONG.song.toLowerCase() == 'spookeez' || SONG.song.toLowerCase() == 'monster' || SONG.song.toLowerCase() == 'south')
@@ -676,7 +675,7 @@ class PlayState extends MusicBeatState
add(healthBar);
scoreTxt = new FlxText(healthBarBG.x + healthBarBG.width - 190, healthBarBG.y + 30, 0, "", 20);
- scoreTxt.setFormat("assets/fonts/vcr.ttf", 16, FlxColor.WHITE, RIGHT);
+ scoreTxt.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT);
scoreTxt.scrollFactor.set();
add(scoreTxt);
@@ -866,16 +865,16 @@ class PlayState extends MusicBeatState
boyfriend.playAnim('idle');
var introAssets:Map> = new Map>();
- introAssets.set('default', ['ready.png', "set.png", "go.png"]);
+ introAssets.set('default', ['ready', "set", "go"]);
introAssets.set('school', [
- 'weeb/pixelUI/ready-pixel.png',
- 'weeb/pixelUI/set-pixel.png',
- 'weeb/pixelUI/date-pixel.png'
+ 'weeb/pixelUI/ready-pixel',
+ 'weeb/pixelUI/set-pixel',
+ 'weeb/pixelUI/date-pixel'
]);
introAssets.set('schoolEvil', [
- 'weeb/pixelUI/ready-pixel.png',
- 'weeb/pixelUI/set-pixel.png',
- 'weeb/pixelUI/date-pixel.png'
+ 'weeb/pixelUI/ready-pixel',
+ 'weeb/pixelUI/set-pixel',
+ 'weeb/pixelUI/date-pixel'
]);
var introAlts:Array = introAssets.get('default');
@@ -896,7 +895,7 @@ class PlayState extends MusicBeatState
case 0:
FlxG.sound.play(Paths.sound('intro3'), 0.6);
case 1:
- var ready:FlxSprite = new FlxSprite().loadGraphic('assets/images/' + introAlts[0]);
+ var ready:FlxSprite = new FlxSprite().loadGraphic(Paths.image(introAlts[0]));
ready.scrollFactor.set();
ready.updateHitbox();
@@ -914,7 +913,7 @@ class PlayState extends MusicBeatState
});
FlxG.sound.play(Paths.sound('intro2'), 0.6);
case 2:
- var set:FlxSprite = new FlxSprite().loadGraphic('assets/images/' + introAlts[1]);
+ var set:FlxSprite = new FlxSprite().loadGraphic(Paths.image(introAlts[1]));
set.scrollFactor.set();
if (curStage.startsWith('school'))
@@ -931,7 +930,7 @@ class PlayState extends MusicBeatState
});
FlxG.sound.play(Paths.sound('intro1'), 0.6);
case 3:
- var go:FlxSprite = new FlxSprite().loadGraphic('assets/images/' + introAlts[2]);
+ var go:FlxSprite = new FlxSprite().loadGraphic(Paths.image(introAlts[2]));
go.scrollFactor.set();
if (curStage.startsWith('school'))
@@ -1743,7 +1742,7 @@ class PlayState extends MusicBeatState
pixelShitPart2 = '-pixel';
}
- rating.loadGraphic('assets/images/' + pixelShitPart1 + daRating + pixelShitPart2 + ".png");
+ rating.loadGraphic(Paths.image(pixelShitPart1 + daRating + pixelShitPart2));
rating.screenCenter();
rating.x = coolText.x - 40;
rating.y -= 60;
@@ -2041,7 +2040,7 @@ class PlayState extends MusicBeatState
if (!boyfriend.stunned)
{
health -= 0.04;
- if (combo > 5)
+ if (combo > 5 && gf.animOffsets.exists('sad'))
{
gf.playAnim('sad');
}
diff --git a/source/Song.hx b/source/Song.hx
index 55827e79b..51d0f3191 100644
--- a/source/Song.hx
+++ b/source/Song.hx
@@ -50,7 +50,7 @@ class Song
public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong
{
- var rawJson = Assets.getText('assets/data/' + folder.toLowerCase() + '/' + jsonInput.toLowerCase() + '.json').trim();
+ var rawJson = Assets.getText(Paths.json(folder.toLowerCase() + '/' + jsonInput.toLowerCase())).trim();
while (!rawJson.endsWith("}"))
{
diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx
index bd5f13e51..27c63e7b6 100644
--- a/source/StoryMenuState.hx
+++ b/source/StoryMenuState.hx
@@ -86,7 +86,7 @@ class StoryMenuState extends MusicBeatState
var rankText:FlxText = new FlxText(0, 10);
rankText.text = 'RANK: GREAT';
- rankText.setFormat("assets/fonts/vcr.ttf", 32);
+ rankText.setFormat(Paths.font("vcr.ttf"), 32);
rankText.size = scoreText.size;
rankText.screenCenter(X);
diff --git a/source/TitleState.hx b/source/TitleState.hx
index cfdaea54c..afd7bd5bb 100644
--- a/source/TitleState.hx
+++ b/source/TitleState.hx
@@ -23,7 +23,6 @@ import flixel.util.FlxTimer;
import io.newgrounds.NG;
import lime.app.Application;
import openfl.Assets;
-import polymod.Polymod;
using StringTools;
@@ -44,8 +43,10 @@ class TitleState extends MusicBeatState
override public function create():Void
{
- Polymod.init({modRoot: "mods", dirs: ['introMod']});
-
+ #if polymod
+ polymod.Polymod.init({modRoot: "mods", dirs: ['introMod']});
+ #end
+
#if (!web)
TitleState.soundExt = '.ogg';
#end
@@ -206,7 +207,7 @@ class TitleState extends MusicBeatState
function getIntroTextShit():Array>
{
- var fullText:String = Assets.getText('assets/data/introText.txt');
+ var fullText:String = Assets.getText(Paths.txt('introText'));
var firstArray:Array = fullText.split('\n');
var swagGoodArray:Array> = [];