Merge pull request I-am-Erk#2470 from Fris0uman/idk_msx

[MSX] Duct tape sprite for cardboard roll and bird food
hoasd1 · Aug 6, 2024 · e08c8b8 · e08c8b8
2 parents 8fb7c85 + 7169780
commit e08c8b8
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 16 deletions.
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/birdfood.png b/gfx/MShockXotto+/pngs_small_20x20/items/birdfood.png
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/duct_tape/duct_tape.json b/gfx/MShockXotto+/pngs_small_20x20/items/duct_tape/duct_tape.json
@@ -0,0 +1,7 @@
+{
+  "id": [
+    "duct_tape",
+    "cardboard_roll"
+  ],
+  "fg": "duct_tape"
+}
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/stick.png b/gfx/MShockXotto+/pngs_small_20x20/items/stick.png
diff --git a/...+/pngs_tiles_32x32/character/overlay/wielded/1842_overlay_wielded_cu_pipe_0.png b/...+/pngs_tiles_32x32/character/overlay/wielded/1842_overlay_wielded_cu_pipe_0.png
diff --git a/...hockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_stick.png b/...hockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_stick.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_stick_0.json b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/overlay_wielded_stick_0.json
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/stick/heavy_stick.json b/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/stick/heavy_stick.json
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/stick/heavy_stick.png b/gfx/MShockXotto+/pngs_tiles_32x32/item/Ultica_items/stick/heavy_stick.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/2373_mon_chicken_0.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/2373_mon_chicken_0.png
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/corpses/corpse_mon_chicken.json b/gfx/MShockXotto+/pngs_tiles_32x32/monster/corpses/corpse_mon_chicken.json
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/monster/corpses/corpse_mon_chicken.png b/gfx/MShockXotto+/pngs_tiles_32x32/monster/corpses/corpse_mon_chicken.png