better week 7 positions

and made the json stage system more consistent
TheRealJake12 · Jan 18, 2024 · 0edd6fd · 0edd6fd
1 parent 6ad28d2
commit 0edd6fd
Show file tree

Hide file tree

Showing 14 changed files with 401 additions and 108 deletions.
diff --git a/assets/preload/data/characters/pico-speaker.json b/assets/preload/data/characters/pico-speaker.json
@@ -1,64 +1,105 @@
 {
   "name": "Pico (Speaker)",
-  "asset": ["characters/picoSpeaker"],
+  "asset": [
+    "characters/picoSpeaker"
+  ],
   "barColor": "#A5004D",
-  "charPos":[0, -100],
   "startingAnim": "shoot1",
   "animations": [
     {
       "name": "shoot1",
       "prefix": "Pico shoot 1",
       "looped": false,
       "nextAnim": "shoot1Loop",
-      "offsets": [0, 0]
+      "offsets": [
+        0,
+        0
+      ]
     },
     {
       "name": "shoot2",
       "prefix": "Pico shoot 2",
       "looped": false,
       "nextAnim": "shoot2Loop",
-      "offsets": [-1,  -128]
+      "offsets": [
+        -1,
+        -128
+      ]
     },
     {
       "name": "shoot3",
       "prefix": "Pico shoot 3",
       "looped": false,
       "nextAnim": "shoot3Loop",
-      "offsets": [412, -64]
+      "offsets": [
+        412,
+        -64
+      ]
     },
     {
       "name": "shoot4",
       "prefix": "Pico shoot 4",
       "looped": false,
       "nextAnim": "shoot4Loop",
-      "offsets": [439, -19]
+      "offsets": [
+        439,
+        -19
+      ]
     },
     {
       "name": "shoot3Loop",
       "prefix": "Pico shoot 3",
-      "offsets": [412, -64],
-      "frameIndices": [50,51,52],
+      "offsets": [
+        412,
+        -64
+      ],
+      "frameIndices": [
+        50,
+        51,
+        52
+      ],
       "looped": true
     },
     {
       "name": "shoot1Loop",
       "prefix": "Pico shoot 1",
-      "offsets": [0, 0],
-      "frameIndices": [23,24,25],
+      "offsets": [
+        0,
+        0
+      ],
+      "frameIndices": [
+        23,
+        24,
+        25
+      ],
       "looped": true
     },
     {
       "name": "shoot2Loop",
       "prefix": "Pico shoot 2",
-      "offsets": [-1, -128],
-	    "frameIndices": [57,58,59],
+      "offsets": [
+        -1,
+        -128
+      ],
+      "frameIndices": [
+        57,
+        58,
+        59
+      ],
       "looped": true
     },
     {
       "name": "shoot4Loop",
       "prefix": "Pico shoot 4",
-      "offsets": [439, -19],
-      "frameIndices": [50,51,52],
+      "offsets": [
+        439,
+        -19
+      ],
+      "frameIndices": [
+        50,
+        51,
+        52
+      ],
       "looped": true
     }
   ]

diff --git a/assets/preload/data/stages/halloween.json b/assets/preload/data/stages/halloween.json
@@ -0,0 +1,27 @@
+{
+    "staticCam": false,
+    "positions": {
+        "bf": [
+            770,
+            450
+        ],
+        "gf": [
+            400,
+            130
+        ],
+        "spooky": [
+            100,
+            300
+        ],
+        "monster": [
+            100,
+            200
+        ]
+    },
+    "camZoom": 1.05,
+    "hasGF": true,
+    "camPosition": [
+        751.5,
+        454
+    ]
+}
diff --git a/assets/preload/data/stages/limo.json b/assets/preload/data/stages/limo.json
@@ -0,0 +1,23 @@
+{
+    "staticCam": false,
+    "positions": {
+        "gf-car": [
+            400,
+            130
+        ],
+        "mom-car": [
+            100,
+            100
+        ],
+        "bf-car": [
+            1030,
+            230
+        ]
+    },
+    "camZoom": 0.9,
+    "hasGF": true,
+    "camPosition": [
+        787,
+        454.5
+    ]
+}
diff --git a/assets/preload/data/stages/mall.json b/assets/preload/data/stages/mall.json
@@ -0,0 +1,23 @@
+{
+ "staticCam": false,
+ "positions": {
+  "gf-christmas": [
+   400,
+   130
+  ],
+  "parents-christmas": [
+   -400,
+   100
+  ],
+  "bf-christmas": [
+   970,
+   450
+  ]
+ },
+ "camZoom": 0.8,
+ "hasGF": true,
+ "camPosition": [
+  808.5,
+  487.5
+ ]
+}
diff --git a/assets/preload/data/stages/mallEvil.json b/assets/preload/data/stages/mallEvil.json
@@ -0,0 +1,23 @@
+{
+ "staticCam": false,
+ "positions": {
+  "gf-christmas": [
+   400,
+   130
+  ],
+  "bf-christmas": [
+   1090,
+   450
+  ],
+  "monster-christmas": [
+   100,
+   150
+  ]
+ },
+ "camZoom": 1.05,
+ "hasGF": true,
+ "camPosition": [
+  808.5,
+  487.5
+ ]
+}
diff --git a/assets/preload/data/stages/philly.json b/assets/preload/data/stages/philly.json
@@ -0,0 +1,23 @@
+{
+    "staticCam": false,
+    "positions": {
+        "bf": [
+            770,
+            450
+        ],
+        "gftrain": [
+            400,
+            130
+        ],
+        "pico": [
+            100,
+            400
+        ]
+    },
+    "camZoom": 1.05,
+    "hasGF": true,
+    "camPosition": [
+        751.5,
+        454
+    ]
+}
diff --git a/assets/preload/data/stages/school.json b/assets/preload/data/stages/school.json
@@ -0,0 +1,23 @@
+{
+ "staticCam": false,
+ "positions": {
+  "gf-pixel": [
+   580,
+   430
+  ],
+  "senpai": [
+   250,
+   460
+  ],
+  "bf-pixel": [
+   970,
+   670
+  ]
+ },
+ "camZoom": 1.05,
+ "hasGF": true,
+ "camPosition": [
+  600,
+  500
+ ]
+}
diff --git a/assets/preload/data/stages/schoolEvil.json b/assets/preload/data/stages/schoolEvil.json
@@ -0,0 +1,23 @@
+{
+ "staticCam": false,
+ "positions": {
+  "gf-pixel": [
+   580,
+   430
+  ],
+  "bf-pixel": [
+   970,
+   670
+  ],
+  "spirit": [
+   -50,
+   200
+  ]
+ },
+ "camZoom": 1.05,
+ "hasGF": true,
+ "camPosition": [
+  600,
+  500
+ ]
+}
diff --git a/assets/preload/data/stages/stage.json b/assets/preload/data/stages/stage.json
@@ -0,0 +1,23 @@
+{
+    "staticCam": false,
+    "positions": {
+        "bf": [
+            770,
+            450
+        ],
+        "gf": [
+            400,
+            130
+        ],
+        "dad": [
+            100,
+            100
+        ]
+    },
+    "camZoom": 0.9,
+    "hasGF": true,
+    "camPosition": [
+        639,
+        359
+    ]
+}
diff --git a/assets/preload/data/stages/tank.json b/assets/preload/data/stages/tank.json
@@ -0,0 +1,27 @@
+{
+    "staticCam": false,
+    "positions": {
+        "bf": [
+            810,
+            450
+        ],
+        "tankman": [
+            20,
+            340
+        ],
+        "gftank": [
+            200,
+            65
+        ],
+        "pico-speaker": [
+            320,
+            -60
+        ],
+        "camZoom": 0.9,
+        "hasGF": true,
+        "camPosition": [
+            666.5,
+            472.5
+        ]
+    }
+}
diff --git a/source/Debug.hx b/source/Debug.hx
@@ -21,8 +21,8 @@ using StringTools;
 class Debug
 {
 	static final LOG_STYLE_ERROR:LogStyle = new LogStyle('[ERROR] ', 'FF8888', 12, true, false, false, 'flixel/sounds/beep', true);
-	static final LOG_STYLE_WARN:LogStyle = new LogStyle('[WARN ] ', 'D9F85C', 12, true, false, false, 'flixel/sounds/beep', true);
-	static final LOG_STYLE_INFO:LogStyle = new LogStyle('[INFO ] ', '5CF878', 12, false);
+	static final LOG_STYLE_WARN:LogStyle = new LogStyle('[WARN] ', 'D9F85C', 12, true, false, false, 'flixel/sounds/beep', true);
+	static final LOG_STYLE_INFO:LogStyle = new LogStyle('[INFO] ', '5CF878', 12, false);
 	static final LOG_STYLE_TRACE:LogStyle = new LogStyle('[TRACE] ', '5CF878', 12, false);
 
 	static var logFileWriter:DebugLogWriter = null;