week 3 songs

UNSTOP4BLE · Jul 6, 2024 · 190ae33 · 190ae33
1 parent 8a488fd
commit 190ae33
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 2 deletions.
diff --git a/assets/songs/unfinishedshit/blammed/Inst.ogg → assets/songs/blammed/Inst.ogg b/assets/songs/unfinishedshit/blammed/Inst.ogg → assets/songs/blammed/Inst.ogg
diff --git a/...s/songs/unfinishedshit/blammed/Voices.ogg → assets/songs/blammed/Voices.ogg b/...s/songs/unfinishedshit/blammed/Voices.ogg → assets/songs/blammed/Voices.ogg
diff --git a/.../unfinishedshit/blammed/blammed-easy.json → assets/songs/blammed/blammed-easy.json b/.../unfinishedshit/blammed/blammed-easy.json → assets/songs/blammed/blammed-easy.json
diff --git a/.../unfinishedshit/blammed/blammed-hard.json → assets/songs/blammed/blammed-hard.json b/.../unfinishedshit/blammed/blammed-hard.json → assets/songs/blammed/blammed-hard.json
diff --git a/...songs/unfinishedshit/blammed/blammed.json → assets/songs/blammed/blammed.json b/...songs/unfinishedshit/blammed/blammed.json → assets/songs/blammed/blammed.json
diff --git a/assets/songs/blammed/config.json b/assets/songs/blammed/config.json
@@ -0,0 +1,15 @@
+{   
+    "player": "bf",
+    "playerpos": [260, 195,
+                  -50, -20, 1.2],
+    "opponent": "pico",
+    "opponentpos": [130, 195,
+                 -70, -20, 1.2],
+    "gf": "gf",
+    "gfpos": [215, 95],
+
+    "back": "philly",
+
+    "next": "null"
+
+}
diff --git a/...songs/unfinishedshit/philly-nice/Inst.ogg → assets/songs/philly/Inst.ogg b/...songs/unfinishedshit/philly-nice/Inst.ogg → assets/songs/philly/Inst.ogg
diff --git a/...ngs/unfinishedshit/philly-nice/Voices.ogg → assets/songs/philly/Voices.ogg b/...ngs/unfinishedshit/philly-nice/Voices.ogg → assets/songs/philly/Voices.ogg
diff --git a/assets/songs/philly/config.json b/assets/songs/philly/config.json
@@ -0,0 +1,15 @@
+{   
+    "player": "bf",
+    "playerpos": [260, 195,
+                  -50, -20, 1.2],
+    "opponent": "pico",
+    "opponentpos": [130, 195,
+                 -70, -20, 1.2],
+    "gf": "gf",
+    "gfpos": [215, 95],
+
+    "back": "philly",
+
+    "next": "blammed"
+
+}
diff --git a/...hedshit/philly-nice/philly-nice-easy.json → assets/songs/philly/philly-easy.json b/...hedshit/philly-nice/philly-nice-easy.json → assets/songs/philly/philly-easy.json
diff --git a/...hedshit/philly-nice/philly-nice-hard.json → assets/songs/philly/philly-hard.json b/...hedshit/philly-nice/philly-nice-hard.json → assets/songs/philly/philly-hard.json
diff --git a/...finishedshit/philly-nice/philly-nice.json → assets/songs/philly/philly.json b/...finishedshit/philly-nice/philly-nice.json → assets/songs/philly/philly.json
diff --git a/assets/songs/unfinishedshit/pico/Inst.ogg → assets/songs/pico/Inst.ogg b/assets/songs/unfinishedshit/pico/Inst.ogg → assets/songs/pico/Inst.ogg
diff --git a/assets/songs/unfinishedshit/pico/Voices.ogg → assets/songs/pico/Voices.ogg b/assets/songs/unfinishedshit/pico/Voices.ogg → assets/songs/pico/Voices.ogg
diff --git a/assets/songs/pico/config.json b/assets/songs/pico/config.json
@@ -0,0 +1,15 @@
+{   
+    "player": "bf",
+    "playerpos": [260, 195,
+                  -50, -20, 1.2],
+    "opponent": "pico",
+    "opponentpos": [130, 195,
+                 -70, -20, 1.2],
+    "gf": "gf",
+    "gfpos": [215, 95],
+
+    "back": "philly",
+
+    "next": "philly"
+
+}
diff --git a/.../songs/unfinishedshit/pico/pico-easy.json → assets/songs/pico/pico-easy.json b/.../songs/unfinishedshit/pico/pico-easy.json → assets/songs/pico/pico-easy.json
diff --git a/.../songs/unfinishedshit/pico/pico-hard.json → assets/songs/pico/pico-hard.json b/.../songs/unfinishedshit/pico/pico-hard.json → assets/songs/pico/pico-hard.json
diff --git a/assets/songs/unfinishedshit/pico/pico.json → assets/songs/pico/pico.json b/assets/songs/unfinishedshit/pico/pico.json → assets/songs/pico/pico.json
diff --git a/assets/stages/philly/philly.json b/assets/stages/philly/philly.json
@@ -13,8 +13,8 @@
         "foreground":[],
         "middleground":[],
         "background":[
-            {"def": "back",  "img": [  1, 359, 381, 131], "disp": [ 18,  4, 381, 131], "scrollfactor": [0.1, 0.1], "angle":   0, "alpha": 255}, //sky
-            {"def": "back",  "img": [  1, 145, 391, 213], "disp": [  8, 13, 391, 213], "scrollfactor": [0.3, 0.3], "angle":   0, "alpha": 255}, //city
+            {"def": "back",  "img": [  1, 359, 381, 131], "disp": [ 68, 34, 381, 131], "scrollfactor": [0.1, 0.1], "angle":   0, "alpha": 255}, //sky
+            {"def": "back",  "img": [  1, 145, 391, 213], "disp": [ 38, 33, 391, 213], "scrollfactor": [0.3, 0.3], "angle":   0, "alpha": 255}, //city
             {"def": "back",  "img": [  1,   1,  70, 142], "disp": [ 54, 24,  70, 142], "scrollfactor": [1, 1], "angle":   0, "alpha": 255}, //behindtrainL
             {"def": "back",  "img": [ 72,   1,  70, 143], "disp": [276, 24,  70, 143], "scrollfactor": [1, 1], "angle":   0, "alpha": 255}, //behindtrainR