More tool sprites (#685)

* More tool sprites * Update nodachi.json * fixes * Revert "Update nodachi.json" This reverts commit 67d4d1c. * change somethings * edit broom and mop sprites
I-am-Erk · Jun 30, 2021 · df161be · df161be
1 parent 22eb732
commit df161be
Show file tree

Hide file tree

Showing 35 changed files with 19 additions and 7 deletions.
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/duct_tape/duct_tape.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/duct_tape/duct_tape.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pitchfork/pitchfork.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pitchfork/pitchfork.png
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.json
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/dehydrator.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/dehydrator.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.json
@@ -0,0 +1,17 @@
+[
+  {
+  "id": "nodachi",
+  "fg": "nodachi",
+  "bg": ""
+  },
+  {
+  "id": "nodachi_fake",
+  "fg": "nodachi",
+  "bg": ""
+  },
+    {
+  "id": "nodachi_inferior",
+  "fg": "nodachi",
+  "bg": ""
+  }
+]
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/broom/broom.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/broom/broom.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/mop/mop.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/mop/mop.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light.png
diff --git a/...imateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light_off.png b/...imateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light_off.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/boltcutters.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/boltcutters.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chain_link.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chain_link.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chisel.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chisel.png
diff --git a/...ltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/cordless_drill.png b/...ltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/cordless_drill.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/data_card.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/data_card.png
diff --git a/...UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge.png b/...UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge.png
diff --git a/...ataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_engineer.png b/...ataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_engineer.png
diff --git a/...teCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_heavy.png b/...teCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_heavy.png
diff --git a/...teCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_short.png b/...teCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_short.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/jackhammer.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/jackhammer.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/link_sheet.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/link_sheet.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/pliers.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/pliers.png
diff --git a/...UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light.png b/...UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light.png
diff --git a/...imateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light_on.png b/...imateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light_on.png
diff --git a/...ltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_off.png b/...ltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_off.png
diff --git a/...UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_on.png b/...UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_on.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/swage.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/swage.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa_wood.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa_wood.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tongs.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tongs.png
diff --git a/...ltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/water_purifier.png b/...ltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/water_purifier.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tongs.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tongs.png
diff --git a/...UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer.json b/...UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer.json
@@ -1,12 +1,12 @@
 [
   {
     "id": "overlay_wielded_jackhammer",
-    "fg": "jackhammer",
+    "fg": "jackhammer_mf",
     "bg": ""
   },
   {
     "id": "overlay_wielded_elec_jackhammer",
-    "fg": "jackhammer",
+    "fg": "jackhammer_mf",
     "bg": ""
   }
 ]
diff --git a/...ed/tools_by_ace/jackhammer/jackhammer.png → ...tools_by_ace/jackhammer/jackhammer_mf.png b/...ed/tools_by_ace/jackhammer/jackhammer.png → ...tools_by_ace/jackhammer/jackhammer_mf.png