Bug Fixes + Missing Sprites + More Levels

oklemenz · Jun 2, 2021 · 35f869b · 35f869b
1 parent 174f71c
commit 35f869b
Show file tree

Hide file tree

Showing 200 changed files with 289,247 additions and 36 deletions.
diff --git a/assets/gfx/dungeon.json b/assets/gfx/dungeon.json
@@ -2176,6 +2176,38 @@
       "sourceSize": { "w": 60, "h": 79 },
       "pivot": { "x": 0.5, "y": 0.5 }
     },
+    "dungeon_5": {
+      "frame": { "x": 436, "y": 812, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_5_down": {
+      "frame": { "x": 498, "y": 812, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_5_down_fg": {
+      "frame": { "x": 560, "y": 812, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_5_fg": {
+      "frame": { "x": 622, "y": 812, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
     "dungeon_6": {
       "frame": { "x": 436, "y": 812, "w": 60, "h": 79 },
       "rotated": false,
@@ -2256,6 +2288,118 @@
       "sourceSize": { "w": 60, "h": 79 },
       "pivot": { "x": 0.5, "y": 0.5 }
     },
+    "dungeon_23": {
+      "frame": { "x": 375, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_23_fg": {
+      "frame": { "x": 437, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_24": {
+      "frame": { "x": 375, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_24_fg": {
+      "frame": { "x": 437, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_25": {
+      "frame": { "x": 375, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_25_fg": {
+      "frame": { "x": 437, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_26": {
+      "frame": { "x": 126, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_26_fg": {
+      "frame": { "x": 126, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_27": {
+      "frame": { "x": 126, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_27_fg": {
+      "frame": { "x": 126, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_28": {
+      "frame": { "x": 126, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_28_fg": {
+      "frame": { "x": 126, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_29": {
+      "frame": { "x": 126, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "dungeon_29_fg": {
+      "frame": { "x": 126, "y": 650, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
     "dungeon_chopper_1": {
       "frame": { "x": 932, "y": 812, "w": 60, "h": 79 },
       "rotated": false,

diff --git a/assets/gfx/palace.json b/assets/gfx/palace.json
@@ -608,6 +608,22 @@
       "sourceSize": { "w": 60, "h": 79 },
       "pivot": { "x": 0.5, "y": 0.5 }
     },
+    "palace_12_4": {
+      "frame": { "x": 320, "y": 213, "w": 64, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 79 },
+      "sourceSize": { "w": 64, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "palace_12_4_fg": {
+      "frame": { "x": 386, "y": 213, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
     "palace_12_fg": {
       "frame": { "x": 448, "y": 213, "w": 60, "h": 79 },
       "rotated": false,
@@ -776,6 +792,38 @@
       "sourceSize": { "w": 60, "h": 79 },
       "pivot": { "x": 0.5, "y": 0.5 }
     },
+    "palace_21": {
+      "frame": { "x": 466, "y": 132, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "palace_21_fg": {
+      "frame": { "x": 594, "y": 132, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "palace_22": {
+      "frame": { "x": 466, "y": 132, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "palace_22_fg": {
+      "frame": { "x": 594, "y": 132, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
     "palace_23": {
       "frame": { "x": 528, "y": 132, "w": 64, "h": 79 },
       "rotated": false,
@@ -1024,6 +1072,30 @@
       "sourceSize": { "w": 60, "h": 79 },
       "pivot": { "x": 0.5, "y": 0.5 }
     },
+    "palace_5": {
+      "frame": { "x": 2, "y": 456, "w": 64, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 79 },
+      "sourceSize": { "w": 64, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "palace_5_down": {
+      "frame": { "x": 68, "y": 456, "w": 64, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 64, "h": 79 },
+      "sourceSize": { "w": 64, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
+    "palace_5_fg": {
+      "frame": { "x": 134, "y": 456, "w": 60, "h": 79 },
+      "rotated": false,
+      "trimmed": false,
+      "spriteSourceSize": { "x": 0, "y": 0, "w": 60, "h": 79 },
+      "sourceSize": { "w": 60, "h": 79 },
+      "pivot": { "x": 0.5, "y": 0.5 }
+    },
     "palace_6": {
       "frame": { "x": 2, "y": 456, "w": 64, "h": 79 },
       "rotated": false,

diff --git a/assets/maps/custom/level101.json b/assets/maps/custom/level101.json
@@ -2742,6 +2742,7 @@
     "room": 22,
     "direction": 1,
     "turn": false,
-    "offset": 7
+    "offset": 7,
+    "sword": false
   }
 }
diff --git a/assets/maps/custom/level115.json b/assets/maps/custom/level115.json
@@ -1308,6 +1308,7 @@
     "room": 1,
     "direction": 1,
     "turn": false,
-    "offset": 7
+    "offset": 7,
+    "sword": false
   }
 }
diff --git a/assets/maps/custom/level121.json b/assets/maps/custom/level121.json
@@ -2587,7 +2587,6 @@
     "room": 17,
     "direction": 1,
     "turn": false,
-    "cameraRoom": 1,
-    "falling": true
+    "cameraRoom": 1
   }
 }
diff --git a/assets/maps/custom/level129.json b/assets/maps/custom/level129.json
@@ -3149,6 +3149,7 @@
     "room": 1,
     "direction": 1,
     "turn": false,
-    "offset": 7
+    "offset": 7,
+    "sword": false
   }
 }
diff --git a/assets/maps/custom/level135.json b/assets/maps/custom/level135.json
@@ -3199,7 +3199,6 @@
     "room": 17,
     "direction": -1,
     "turn": false,
-    "cameraRoom": 1,
-    "falling": true
+    "cameraRoom": 1
   }
 }
diff --git a/assets/maps/custom/level143.json b/assets/maps/custom/level143.json
@@ -3160,6 +3160,7 @@
     "room": 1,
     "direction": 1,
     "turn": false,
-    "offset": 7
+    "offset": 7,
+    "sword": false
   }
 }
diff --git a/assets/maps/custom/level149.json b/assets/maps/custom/level149.json
@@ -3142,7 +3142,6 @@
     "direction": -1,
     "turn": false,
     "cameraRoom": 1,
-    "falling": true,
     "offset": 2
   }
 }