Msx toughtools (#1537)

* Create folder for boneseer's armor * Add sprites for boneseer armor * Misc 32x32 item sprites hammocks, steel flail, and lit charcoal kiln. * Misc 20x20 tool sprites * Delete dummy file from folder creation * Add wield sprite for 2h flail * Create folder for boneseer overlays * Add overlay sprites for boneseer armor * Delete dummy file from folder creation * Oh boy, here we go deleting again * Delete mon_zombie_tough_14.png * Delete mon_zombie_tough_13.png * Delete mon_zombie_tough_12.png * Delete mon_zombie_tough_11.png * Delete mon_zombie_tough_10.png * Delete mon_zombie_tough_9.png * Delete mon_zombie_tough_8.png * Delete 2766_mon_zombie_tough_3_0.png * Delete 2765_mon_zombie_tough_2_0.png * Delete 2764_mon_zombie_tough_0.png * Add new sprites for tough zombies * Update tough zombie json to use new variants * Delete tough zombie corpse JSON * Add new tough zombie corpse
I-am-Erk · Sep 4, 2022 · e3cef83 · e3cef83
1 parent 3479520
commit e3cef83
Show file tree

Hide file tree

Showing 59 changed files with 5 additions and 18 deletions.
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/atomic_lamp.png b/gfx/MShockXotto+/pngs_small_20x20/items/atomic_lamp.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/atomic_lamp_off.png b/gfx/MShockXotto+/pngs_small_20x20/items/atomic_lamp_off.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/atomic_light.png b/gfx/MShockXotto+/pngs_small_20x20/items/atomic_light.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/atomic_light_off.png b/gfx/MShockXotto+/pngs_small_20x20/items/atomic_light_off.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/billet_bone.png b/gfx/MShockXotto+/pngs_small_20x20/items/billet_bone.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/billet_wood.png b/gfx/MShockXotto+/pngs_small_20x20/items/billet_wood.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/can_sealer.png b/gfx/MShockXotto+/pngs_small_20x20/items/can_sealer.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/carding_paddles.png b/gfx/MShockXotto+/pngs_small_20x20/items/carding_paddles.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/char_kiln.png b/gfx/MShockXotto+/pngs_small_20x20/items/char_kiln.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/digging_stick.png b/gfx/MShockXotto+/pngs_small_20x20/items/digging_stick.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/drill_rock_primitive.png b/gfx/MShockXotto+/pngs_small_20x20/items/drill_rock_primitive.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/dutch_oven.png b/gfx/MShockXotto+/pngs_small_20x20/items/dutch_oven.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/iron_pot.png b/gfx/MShockXotto+/pngs_small_20x20/items/iron_pot.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/knitting_needles.png b/gfx/MShockXotto+/pngs_small_20x20/items/knitting_needles.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/loom_frame.png b/gfx/MShockXotto+/pngs_small_20x20/items/loom_frame.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/pot_aluminum.png b/gfx/MShockXotto+/pngs_small_20x20/items/pot_aluminum.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/punch_bone.png b/gfx/MShockXotto+/pngs_small_20x20/items/punch_bone.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/punch_nail.png b/gfx/MShockXotto+/pngs_small_20x20/items/punch_nail.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/shed_stick.png b/gfx/MShockXotto+/pngs_small_20x20/items/shed_stick.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/sieve_primitive.png b/gfx/MShockXotto+/pngs_small_20x20/items/sieve_primitive.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/sieve_steel.png b/gfx/MShockXotto+/pngs_small_20x20/items/sieve_steel.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/tree_spile.png b/gfx/MShockXotto+/pngs_small_20x20/items/tree_spile.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/vacutainer.png b/gfx/MShockXotto+/pngs_small_20x20/items/vacutainer.png
diff --git a/...+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_2h_flail_steel.png b/...+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_2h_flail_steel.png
diff --git a/...x32/character/overlay/worn/boneseer_overlays/overlay_female_worn_boots_bone.png b/...x32/character/overlay/worn/boneseer_overlays/overlay_female_worn_boots_bone.png
diff --git a/...2/character/overlay/worn/boneseer_overlays/overlay_female_worn_helmet_skull.png b/...2/character/overlay/worn/boneseer_overlays/overlay_female_worn_helmet_skull.png
diff --git a/...cter/overlay/worn/boneseer_overlays/overlay_female_worn_jacket_leather_bone.png b/...cter/overlay/worn/boneseer_overlays/overlay_female_worn_jacket_leather_bone.png
diff --git a/...32x32/character/overlay/worn/boneseer_overlays/overlay_male_worn_boots_bone.png b/...32x32/character/overlay/worn/boneseer_overlays/overlay_male_worn_boots_bone.png
diff --git a/...x32/character/overlay/worn/boneseer_overlays/overlay_male_worn_helmet_skull.png b/...x32/character/overlay/worn/boneseer_overlays/overlay_male_worn_helmet_skull.png
diff --git a/...racter/overlay/worn/boneseer_overlays/overlay_male_worn_jacket_leather_bone.png b/...racter/overlay/worn/boneseer_overlays/overlay_male_worn_jacket_leather_bone.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/2h_flail_steel.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/2h_flail_steel.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Boneseer_armor/boots_bone.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Boneseer_armor/boots_bone.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Boneseer_armor/helmet_skull.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Boneseer_armor/helmet_skull.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Boneseer_armor/jacket_leather_bone.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Boneseer_armor/jacket_leather_bone.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/hammock.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/hammock.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/hammock_net.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/hammock_net.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/kiln_lit.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/kiln_lit.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/corpses/corpse_mon_zombie_tough.json b/gfx/MShockXotto+/pngs_tiles_32x32/monster/corpses/corpse_mon_zombie_tough.json
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/corpses/corpse_mon_zombie_tough.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/corpses/corpse_mon_zombie_tough.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/2764_mon_zombie_tough_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/2764_mon_zombie_tough_0.png
diff --git a/...ShockXotto+/pngs_tiles_32x32/monster/zombie_tough/2765_mon_zombie_tough_2_0.png b/...ShockXotto+/pngs_tiles_32x32/monster/zombie_tough/2765_mon_zombie_tough_2_0.png
diff --git a/...ShockXotto+/pngs_tiles_32x32/monster/zombie_tough/2766_mon_zombie_tough_3_0.png b/...ShockXotto+/pngs_tiles_32x32/monster/zombie_tough/2766_mon_zombie_tough_3_0.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough.json b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough.json
@@ -1,21 +1,14 @@
 {
   "id": "mon_zombie_tough",
   "fg": [
-    { "weight": 1, "sprite": "2764_mon_zombie_tough_0" },
-    { "weight": 1, "sprite": "2765_mon_zombie_tough_2_0" },
-    { "weight": 1, "sprite": "2766_mon_zombie_tough_3_0" },
+    { "weight": 1, "sprite": "mon_zombie_tough" },
+    { "weight": 1, "sprite": "mon_zombie_tough_1" },
+    { "weight": 1, "sprite": "mon_zombie_tough_2" },
+    { "weight": 1, "sprite": "mon_zombie_tough_3" },
     { "weight": 1, "sprite": "mon_zombie_tough_4" },
     { "weight": 1, "sprite": "mon_zombie_tough_5" },
     { "weight": 1, "sprite": "mon_zombie_tough_6" },
-    { "weight": 1, "sprite": "mon_zombie_tough_7" },
-    { "weight": 1, "sprite": "mon_zombie_tough_8" },
-    { "weight": 1, "sprite": "mon_zombie_tough_9" },
-    { "weight": 1, "sprite": "mon_zombie_tough_10" },
-    { "weight": 1, "sprite": "mon_zombie_tough_11" },
-    { "weight": 1, "sprite": "mon_zombie_tough_12" },
-    { "weight": 1, "sprite": "mon_zombie_tough_13" },
-    { "weight": 1, "sprite": "mon_zombie_tough_14" },
-    { "weight": 1, "sprite": "mon_zombie_tough_15" }
+    { "weight": 1, "sprite": "mon_zombie_tough_7" }
   ],
   "bg": ["shadow_32x32_normal"],
   "rotates": false

diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_1.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_1.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_10.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_10.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_11.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_11.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_12.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_12.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_13.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_13.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_14.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_14.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_15.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_15.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_2.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_2.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_3.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_3.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_4.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_4.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_5.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_5.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_6.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_6.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_7.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_7.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_8.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_8.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_9.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/zombie_tough/mon_zombie_tough_9.png