[Ultica] Bunch of random terrain , pear tree and small tweaks by hoas…

…d1 (#2190) * [Ultica] Bunch of random terrain with pear tree by hoasd1 * [Ultica] Bunch of random terrain with pear tree and rebar cage fix by hoasd1
I-am-Erk · Nov 10, 2023 · ae74887 · ae74887
1 parent 6430297
commit ae74887
Show file tree

Hide file tree

Showing 73 changed files with 562 additions and 65 deletions.
diff --git a/gfx/UltimateCataclysm/pngs_fillergiant_96x96/aioe_filler_trees/fillertree.json b/gfx/UltimateCataclysm/pngs_fillergiant_96x96/aioe_filler_trees/fillertree.json
@@ -3,7 +3,6 @@
     "id": [
       "t_tree_apricot_season_spring",
       "t_tree_mulberry_season_spring",
-      "t_tree_pear_season_spring",
       "t_tree_plum_season_spring"
     ],
     "fg": "t_tree_season_spring",
@@ -24,11 +23,6 @@
     "fg": "t_tree_mulberry",
     "bg": "t_grass_summer_giant"
   },
-  {
-    "id": "t_tree_pear_season_autumn",
-    "fg": "t_tree_pear",
-    "bg": "t_grass_summer_giant"
-  },
   {
     "id": "t_tree_plum_season_summer",
     "fg": "t_tree_plum",
@@ -38,8 +32,7 @@
     "id": [
       "t_tree_apricot_harvested",
       "t_tree_mulberry_harvested",
-      "t_tree_plum_harvested",
-      "t_tree_pear_season_summer"
+      "t_tree_plum_harvested"
     ],
     "fg": "t_tree",
     "bg": "t_grass_summer_giant"
@@ -48,8 +41,7 @@
     "id": [
       "t_tree_apricot_season_autumn",
       "t_tree_mulberry_season_autumn",
-      "t_tree_plum_season_autumn",
-      "t_tree_pear_harvested"
+      "t_tree_plum_season_autumn"
     ],
     "fg": [
       { "weight": 100, "sprite": "t_tree_season_autumn" },
@@ -63,7 +55,6 @@
     "id": [
       "t_tree_apricot_season_winter",
       "t_tree_mulberry_season_winter",
-      "t_tree_pear_season_winter",
       "t_tree_plum_season_winter"
     ],
     "fg": "t_tree_dead",

diff --git a/gfx/UltimateCataclysm/pngs_fillergiant_96x96/aioe_filler_trees/t_tree_pear.png b/gfx/UltimateCataclysm/pngs_fillergiant_96x96/aioe_filler_trees/t_tree_pear.png
diff --git a/gfx/UltimateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear.json b/gfx/UltimateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear.json
@@ -0,0 +1,27 @@
+[
+  {
+    "id": "t_tree_pear",
+    "fg": "t_tree_pear",
+    "bg": "t_grass_giant"
+  },
+  {
+    "id": "t_tree_pear_season_summer",
+    "fg": "t_tree_pear_season_summer",
+    "bg": "t_grass_summer_giant"
+  },
+  {
+    "id": "t_tree_pear_season_autumn",
+    "fg": "t_tree_pear_season_autumn",
+    "bg": "t_grass_autumn_giant"
+  },
+  {
+    "id": "t_tree_pear_season_winter",
+    "fg": "t_tree_pear_season_winter",
+    "bg": "snow_shallow_giant"
+  },
+  {
+    "id": "t_tree_pear_harvested",
+    "fg": "t_tree_pear_harvested",
+    "bg": "t_grass_autumn_giant"
+  }
+]
diff --git a/gfx/UltimateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear.png b/gfx/UltimateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear.png
diff --git a/...ltimateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear_harvested.png b/...ltimateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear_harvested.png
diff --git a/...ateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear_season_autumn.png b/...ateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear_season_autumn.png
diff --git a/...ateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear_season_summer.png b/...ateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear_season_summer.png
diff --git a/...ateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear_season_winter.png b/...ateCataclysm/pngs_giant_96x96/terrain/t_tree_pear/t_tree_pear_season_winter.png
diff --git a/...ataclysm/pngs_human_body_plus_32x48/furniture/f_dancing_pole/f_dancing_pole.png b/...ataclysm/pngs_human_body_plus_32x48/furniture/f_dancing_pole/f_dancing_pole.png
diff --git a/...s_human_body_plus_32x48/furniture/f_electrical_conduit/f_electrical_conduit.png b/...s_human_body_plus_32x48/furniture/f_electrical_conduit/f_electrical_conduit.png
diff --git a/.../pngs_human_body_plus_32x48/furniture/f_hanging_meathook/f_hanging_meathook.png b/.../pngs_human_body_plus_32x48/furniture/f_hanging_meathook/f_hanging_meathook.png
diff --git a/...eCataclysm/pngs_human_body_plus_32x48/furniture/f_hoist_chain/f_hoist_chain.png b/...eCataclysm/pngs_human_body_plus_32x48/furniture/f_hoist_chain/f_hoist_chain.png
diff --git a/...ataclysm/pngs_human_body_plus_32x48/furniture/f_hoist_pulley/f_hoist_pulley.png b/...ataclysm/pngs_human_body_plus_32x48/furniture/f_hoist_pulley/f_hoist_pulley.png
diff --git a/...ateCataclysm/pngs_human_body_plus_32x48/furniture/f_hoist_rope/f_hoist_rope.png b/...ateCataclysm/pngs_human_body_plus_32x48/furniture/f_hoist_rope/f_hoist_rope.png
diff --git a/gfx/UltimateCataclysm/pngs_human_body_plus_32x48/furniture/f_rope_up/f_rope_up.png b/gfx/UltimateCataclysm/pngs_human_body_plus_32x48/furniture/f_rope_up/f_rope_up.png
diff --git a/gfx/UltimateCataclysm/pngs_large_64x64/terrain/common/t_concrete_large.png b/gfx/UltimateCataclysm/pngs_large_64x64/terrain/common/t_concrete_large.png
diff --git a/gfx/UltimateCataclysm/pngs_large_64x64/terrain/t_oil_circ_brkr_l/t_oil_circ_brkr_l.json b/gfx/UltimateCataclysm/pngs_large_64x64/terrain/t_oil_circ_brkr_l/t_oil_circ_brkr_l.json
@@ -0,0 +1,5 @@
+{
+  "id": "t_oil_circ_brkr_l",
+  "fg": "t_oil_circ_brkr_l",
+  "bg": "t_concrete_large"
+}
diff --git a/...imateCataclysm/pngs_large_64x64/terrain/t_oil_circ_brkr_l/t_oil_circ_brkr_l.png b/...imateCataclysm/pngs_large_64x64/terrain/t_oil_circ_brkr_l/t_oil_circ_brkr_l.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/by_int_ua/t_reb_cage.json b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/by_int_ua/t_reb_cage.json
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/by_int_ua/t_reb_cage.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/by_int_ua/t_reb_cage.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_reb_cage/t_reb_cage.json b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_reb_cage/t_reb_cage.json
@@ -0,0 +1,56 @@
+{
+  "id": "t_reb_cage",
+  "fg": "t_reb_cage_unconnected",
+  "bg": "t_thconc_floor_center",
+  "multitile": true,
+  "additional_tiles": [
+    {
+      "id": "center",
+      "fg": "t_reb_cage_center",
+      "bg": "t_thconc_floor_center"
+    },
+    {
+      "id": "corner",
+      "fg": [
+        "t_reb_cage_corner_nw",
+        "t_reb_cage_corner_sw",
+        "t_reb_cage_corner_se",
+        "t_reb_cage_corner_ne"
+      ],
+      "bg": "t_thconc_floor_center"
+    },
+    {
+      "id": "t_connection",
+      "fg": [
+        "t_reb_cage_t_connection_n",
+        "t_reb_cage_t_connection_w",
+        "t_reb_cage_t_connection_s",
+        "t_reb_cage_t_connection_e"
+      ],
+      "bg": "t_thconc_floor_center"
+    },
+    {
+      "id": "edge",
+      "fg": [
+        "t_reb_cage_edge_ns",
+        "t_reb_cage_edge_ew"
+      ],
+      "bg": "t_thconc_floor_center"
+    },
+    {
+      "id": "end_piece",
+      "fg": [
+        "t_reb_cage_end_piece_n",
+        "t_reb_cage_end_piece_w",
+        "t_reb_cage_end_piece_s",
+        "t_reb_cage_end_piece_e"
+      ],
+      "bg": "t_thconc_floor_center"
+    },
+    {
+      "id": "unconnected",
+      "fg": "t_reb_cage_unconnected",
+      "bg": "t_thconc_floor_center"
+    }
+  ]
+}
diff --git a/...rain/t_rebar_cage/t_rebar_cage_center.png → .../terrain/t_reb_cage/t_reb_cage_center.png b/...rain/t_rebar_cage/t_rebar_cage_center.png → .../terrain/t_reb_cage/t_reb_cage_center.png
diff --git a/...n/t_rebar_cage/t_rebar_cage_corner_ne.png → ...rrain/t_reb_cage/t_reb_cage_corner_ne.png b/...n/t_rebar_cage/t_rebar_cage_corner_ne.png → ...rrain/t_reb_cage/t_reb_cage_corner_ne.png
diff --git a/...n/t_rebar_cage/t_rebar_cage_corner_nw.png → ...rrain/t_reb_cage/t_reb_cage_corner_nw.png b/...n/t_rebar_cage/t_rebar_cage_corner_nw.png → ...rrain/t_reb_cage/t_reb_cage_corner_nw.png
diff --git a/...n/t_rebar_cage/t_rebar_cage_corner_se.png → ...rrain/t_reb_cage/t_reb_cage_corner_se.png b/...n/t_rebar_cage/t_rebar_cage_corner_se.png → ...rrain/t_reb_cage/t_reb_cage_corner_se.png
diff --git a/...n/t_rebar_cage/t_rebar_cage_corner_sw.png → ...rrain/t_reb_cage/t_reb_cage_corner_sw.png b/...n/t_rebar_cage/t_rebar_cage_corner_sw.png → ...rrain/t_reb_cage/t_reb_cage_corner_sw.png
diff --git a/...ain/t_rebar_cage/t_rebar_cage_edge_ew.png → ...terrain/t_reb_cage/t_reb_cage_edge_ew.png b/...ain/t_rebar_cage/t_rebar_cage_edge_ew.png → ...terrain/t_reb_cage/t_reb_cage_edge_ew.png
diff --git a/...ain/t_rebar_cage/t_rebar_cage_edge_ns.png → ...terrain/t_reb_cage/t_reb_cage_edge_ns.png b/...ain/t_rebar_cage/t_rebar_cage_edge_ns.png → ...terrain/t_reb_cage/t_reb_cage_edge_ns.png
diff --git a/...t_rebar_cage/t_rebar_cage_end_piece_e.png → ...ain/t_reb_cage/t_reb_cage_end_piece_e.png b/...t_rebar_cage/t_rebar_cage_end_piece_e.png → ...ain/t_reb_cage/t_reb_cage_end_piece_e.png
diff --git a/...t_rebar_cage/t_rebar_cage_end_piece_n.png → ...ain/t_reb_cage/t_reb_cage_end_piece_n.png b/...t_rebar_cage/t_rebar_cage_end_piece_n.png → ...ain/t_reb_cage/t_reb_cage_end_piece_n.png
diff --git a/...t_rebar_cage/t_rebar_cage_end_piece_s.png → ...ain/t_reb_cage/t_reb_cage_end_piece_s.png b/...t_rebar_cage/t_rebar_cage_end_piece_s.png → ...ain/t_reb_cage/t_reb_cage_end_piece_s.png
diff --git a/...t_rebar_cage/t_rebar_cage_end_piece_w.png → ...ain/t_reb_cage/t_reb_cage_end_piece_w.png b/...t_rebar_cage/t_rebar_cage_end_piece_w.png → ...ain/t_reb_cage/t_reb_cage_end_piece_w.png
diff --git a/...ebar_cage/t_rebar_cage_t_connection_e.png → .../t_reb_cage/t_reb_cage_t_connection_e.png b/...ebar_cage/t_rebar_cage_t_connection_e.png → .../t_reb_cage/t_reb_cage_t_connection_e.png
diff --git a/...ebar_cage/t_rebar_cage_t_connection_n.png → .../t_reb_cage/t_reb_cage_t_connection_n.png b/...ebar_cage/t_rebar_cage_t_connection_n.png → .../t_reb_cage/t_reb_cage_t_connection_n.png
diff --git a/...ebar_cage/t_rebar_cage_t_connection_s.png → .../t_reb_cage/t_reb_cage_t_connection_s.png b/...ebar_cage/t_rebar_cage_t_connection_s.png → .../t_reb_cage/t_reb_cage_t_connection_s.png
diff --git a/...ebar_cage/t_rebar_cage_t_connection_w.png → .../t_reb_cage/t_reb_cage_t_connection_w.png b/...ebar_cage/t_rebar_cage_t_connection_w.png → .../t_reb_cage/t_reb_cage_t_connection_w.png
diff --git a/...t_rebar_cage/t_rebar_cage_unconnected.png → ...ain/t_reb_cage/t_reb_cage_unconnected.png b/...t_rebar_cage/t_rebar_cage_unconnected.png → ...ain/t_reb_cage/t_reb_cage_unconnected.png
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_rebar_cage/t_rebar_cage.json b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_rebar_cage/t_rebar_cage.json
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_rubber_mulch/t_rubber_mulch.png b/gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_rubber_mulch/t_rubber_mulch.png