Ultica "Firefly, heavy cable, press, crucible, tire iron" (#832)

* mon_firefly * crucible * tire_iron * jumper_cable_heavy * corrugated metal wall as a recolor * hand press * golf club * tents look like rollmats * tourist table
I-am-Erk · Aug 22, 2021 · 5ded8a9 · 5ded8a9
1 parent a1dc923
commit 5ded8a9
Show file tree

Hide file tree

Showing 29 changed files with 65 additions and 8 deletions.
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/by_int_ua/f_tourist_table.png b/gfx/UltimateCataclysm/pngs_normal_32x32/furniture/by_int_ua/f_tourist_table.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/by_int_ua/jumper_cable_heavy.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/by_int_ua/jumper_cable_heavy.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/rollmats/rollmats.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/rollmats/rollmats.json
@@ -1,12 +1,10 @@
 [
   {
-    "id": "fur_rollmat",
-    "fg": "fur_rollmat",
-    "bg": ""
+    "id": ["fur_rollmat", "broketent", "largebroketent"],
+    "fg": "fur_rollmat"
   },
   {
-    "id": "rollmat",
-    "fg": "rollmat",
-    "bg": ""
+    "id": ["rollmat", "tent_kit", "large_tent_kit"],
+    "fg": "rollmat"
   }
-]
+]
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/credits.txt b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/credits.txt
@@ -0,0 +1,2 @@
+Shape by Solomonhn https://www.blendswap.com/blend/10755
+Updated materials and rendering by int_ua
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.json b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.json
@@ -0,0 +1,5 @@
+{
+  "id": "mon_firefly",
+  "fg": "mon_firefly",
+  "bg": "shadow_32x32_small"
+}
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.png b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/firefly/mon_firefly.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/rabbit/credits.txt b/gfx/UltimateCataclysm/pngs_normal_32x32/monsters/rabbit/credits.txt
@@ -1,2 +1,2 @@
 sr_cwya (shape)
-intua (colors)
+int_ua (colors)
diff --git a/...eCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated.json b/...eCataclysm/pngs_normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated.json
@@ -0,0 +1,52 @@
+{
+  "id": "t_wall_metal_corrugated",
+  "fg": "t_wall_metal_corrugated_unconnected",
+  "multitile": true,
+  "additional_tiles": [
+    {
+      "id": "center",
+      "fg": "t_wall_metal_corrugated_center"
+    },
+    {
+      "id": "corner",
+      "fg": [
+        "t_wall_metal_corrugated_corner_nw",
+        "t_wall_metal_corrugated_corner_sw",
+        "t_wall_metal_corrugated_corner_se",
+        "t_wall_metal_corrugated_corner_ne"
+      ]
+    },
+    {
+      "id": "t_connection",
+      "fg": [
+        "t_wall_metal_corrugated_t_connection_n",
+        "t_wall_metal_corrugated_t_connection_w",
+        "t_wall_metal_corrugated_t_connection_s",
+        "t_wall_metal_corrugated_t_connection_e"
+      ]
+    },
+    {
+      "id": "edge",
+      "fg": [
+        "t_wall_metal_corrugated_edge_ns",
+        "t_wall_metal_corrugated_edge_ew"
+      ]
+    },
+    {
+      "id": "end_piece",
+      "fg": [
+        "t_wall_metal_corrugated_end_piece_n",
+        "t_wall_metal_corrugated_end_piece_w",
+        "t_wall_metal_corrugated_end_piece_s",
+        "t_wall_metal_corrugated_end_piece_e"
+      ]
+    },
+    {
+      "id": "unconnected",
+      "fg": [
+        "t_wall_metal_corrugated_unconnected",
+        "t_wall_metal_corrugated_unconnected"
+      ]
+    }
+  ]
+}
diff --git a/...normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_center.png b/...normal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_center.png
diff --git a/...mal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_ne.png b/...mal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_ne.png
diff --git a/...mal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_nw.png b/...mal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_nw.png
diff --git a/...mal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_se.png b/...mal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_se.png
diff --git a/...mal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_sw.png b/...mal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_corner_sw.png
diff --git a/...ormal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ew.png b/...ormal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ew.png
diff --git a/...ormal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ns.png b/...ormal_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_edge_ns.png
diff --git a/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_e.png b/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_e.png
diff --git a/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_n.png b/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_n.png
diff --git a/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_s.png b/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_s.png
diff --git a/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_w.png b/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_end_piece_w.png
diff --git a/...2x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_e.png b/...2x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_e.png
diff --git a/...2x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_n.png b/...2x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_n.png
diff --git a/...2x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_s.png b/...2x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_s.png
diff --git a/...2x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_w.png b/...2x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_t_connection_w.png
diff --git a/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_unconnected.png b/...l_32x32/terrain/t_wall_metal_corrugated/t_wall_metal_corrugated_unconnected.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/golf_club.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/golf_club.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/press.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/press.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/tourist_table.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/by_int_ua/tourist_table.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/crucible.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/crucible.png
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tire_iron.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tire_iron.png