[Ultica] 2 overmap sprites and gold dental grill by Zaloran82

Co-Authored-By: Zaloran82 <[email protected]>

gfx/UltimateCataclysm/pngs_normal_32x32/overmap/cave/cave.json

@@ -1,8 +1,12 @@
-[{
-	"id": "cave",
-	"fg": "cave",
-	"bg": "field"
-},{
-	"id": "cave_underground",
-	"fg": "cave"
-}]
+[
+  {
+	  "id": "cave",
+  	"fg": "cave",
+	  "bg": "field"
+  },
+  {
+  	"id": "cave_underground",
+	  "fg": "cave",
+    "bg": "t_soil_center"
+  }
+]

gfx/UltimateCataclysm/pngs_normal_32x32/overmap/evac_shelters/evac_shelters.json

@@ -2,12 +2,13 @@
   {
     "id": [
 	    "shelter",
-	    "shelter_1",
 	    "shelter_2",
 	    "shelter_vandal",
-	    "shelter_1_vandal",
 	    "shelter_2_vandal",
-      "shelter_1b"
+      "shelter_infested",
+      "shelter_2_infested",
+      "shelter_survivor",
+      "shelter_2_survivor"
 	  ],
     "fg": [ "otr_evac_shelter_1_faceN", "otr_evac_shelter_1_faceW", "otr_evac_shelter_1_faceS", "otr_evac_shelter_1_faceE" ],
     "bg": "field",
@@ -16,9 +17,7 @@
   {
 	  "id": [
 	   "shelter_roof",
-		 "shelter_roof_1",
-		 "shelter_roof_2",
-     "shelter_roof_1b"
+		 "shelter_roof_2"
 		],
 	  "fg": [ "otr_evac_shelter_1_faceN", "otr_evac_shelter_1_faceW", "otr_evac_shelter_1_faceS", "otr_evac_shelter_1_faceE" ],
 	  "bg": "open_air",
@@ -27,9 +26,45 @@
   {
 	  "id": [
       "shelter_under",
-      "shelter_under_1b"
+      "shelter_under_2",
+      "shelter_under_vandal",
+      "shelter_under_2_vandal",
+      "shelter_under_infested",
+      "shelter_under_2_infested"
     ],
 	  "fg": [ "otr_evac_shelter_1_faceN", "otr_evac_shelter_1_faceW", "otr_evac_shelter_1_faceS", "otr_evac_shelter_1_faceE" ],
+    "bg": "t_soil_center",
 	  "rotates": true
+  },
+  {
+    "id": [
+      "shelter_1",
+      "shelter_1b",
+      "shelter_1_vandal",
+      "shelter_1b_vandal",
+      "shelter_1_infested",
+      "shelter_1b_infested",
+      "shelter_1_survivor",
+      "shelter_1b_survivor"
+    ],
+    "fg": "evac_shelter_1",
+    "bg": "field"
+  },
+  {
+	  "id": [ "shelter_roof_1", "shelter_roof_1b" ],
+	  "fg": "evac_shelter_1",
+	  "bg": "open_air"
+  },
+  {
+	  "id": [
+      "shelter_under_1",
+      "shelter_under_1b",
+      "shelter_under_1_vandal",
+      "shelter_under_1b_vandal",
+      "shelter_under_1_infested",
+      "shelter_under_1b_infested"
+    ],
+	  "fg": "evac_shelter_1",
+    "bg": "t_soil_center"
   }
-]
+]

gfx/UltimateCataclysm/pngs_normal_32x32/overmap/luna_park/luna_park.json

@@ -0,0 +1,134 @@
+[
+  {
+    "id": [ "luna_park_0_0_0", "miniaturerailway_0_0_0" ],
+    "fg": [
+      "luna_park_bot_left_faceN",
+      "luna_park_bot_left_faceW",
+      "luna_park_bot_left_faceS",
+      "luna_park_bot_left_faceE"
+    ],
+    "bg": "field",
+    "rotates": true
+  },
+  {
+    "id": "luna_park_1_0_0",
+    "fg": [
+      "luna_park_mid_left_faceN",
+      "luna_park_mid_left_faceW",
+      "luna_park_mid_left_faceS",
+      "luna_park_mid_left_faceE"
+    ],
+    "bg": "field",
+    "rotates": true
+  },
+  {
+    "id": [ "luna_park_2_0_0", "miniaturerailway_1_0_0" ],
+    "fg": [
+      "luna_park_top_left_faceN",
+      "luna_park_top_left_faceW",
+      "luna_park_top_left_faceS",
+      "luna_park_top_left_faceE"
+    ],
+    "bg": "field",
+    "rotates": true
+  },
+  {
+    "id": [ "luna_park_0_1_0", "miniaturerailway_0_1_0" ],
+    "fg": [
+      "luna_park_bot_right_faceN",
+      "luna_park_bot_right_faceW",
+      "luna_park_bot_right_faceS",
+      "luna_park_bot_right_faceE"
+    ],
+    "bg": "field",
+    "rotates": true
+  },
+  {
+    "id": "luna_park_1_1_0",
+    "fg": [
+      "luna_park_mid_right_faceN",
+      "luna_park_mid_right_faceW",
+      "luna_park_mid_right_faceS",
+      "luna_park_mid_right_faceE"
+    ],
+    "bg": "field",
+    "rotates": true
+  },
+  {
+    "id": [ "luna_park_2_1_0", "miniaturerailway_1_1_0" ],
+    "fg": [
+      "luna_park_top_right_faceN",
+      "luna_park_top_right_faceW",
+      "luna_park_top_right_faceS",
+      "luna_park_top_right_faceE"
+    ],
+    "bg": "field",
+    "rotates": true
+  },
+  {
+    "id": [ "luna_park_0_0_1", "miniaturerailway_0_0_1" ],
+    "fg": [
+      "luna_park_bot_left_faceN",
+      "luna_park_bot_left_faceW",
+      "luna_park_bot_left_faceS",
+      "luna_park_bot_left_faceE"
+    ],
+    "bg": "open_air",
+    "rotates": true
+  },
+  {
+    "id": "luna_park_1_0_1",
+    "fg": [
+      "luna_park_mid_left_faceN",
+      "luna_park_mid_left_faceW",
+      "luna_park_mid_left_faceS",
+      "luna_park_mid_left_faceE"
+    ],
+    "bg": "open_air",
+    "rotates": true
+  },
+  {
+    "id": [ "luna_park_2_0_1", "miniaturerailway_1_0_1" ],
+    "fg": [
+      "luna_park_top_left_faceN",
+      "luna_park_top_left_faceW",
+      "luna_park_top_left_faceS",
+      "luna_park_top_left_faceE"
+    ],
+    "bg": "open_air",
+    "rotates": true
+  },
+  {
+    "id": [ "luna_park_0_1_1", "miniaturerailway_0_1_1" ],
+    "fg": [
+      "luna_park_bot_right_faceN",
+      "luna_park_bot_right_faceW",
+      "luna_park_bot_right_faceS",
+      "luna_park_bot_right_faceE"
+    ],
+    "bg": "open_air",
+    "rotates": true
+  },
+  {
+    "id": "luna_park_1_1_1",
+    "fg": [
+      "luna_park_mid_right_faceN",
+      "luna_park_mid_right_faceW",
+      "luna_park_mid_right_faceS",
+      "luna_park_mid_right_faceE"
+    ],
+    "bg": "open_air",
+    "rotates": true
+  },
+  {
+    "id": [ "luna_park_2_1_1", "miniaturerailway_1_1_1" ],
+    "fg": [
+      "luna_park_top_right_faceN",
+      "luna_park_top_right_faceW",
+      "luna_park_top_right_faceS",
+      "luna_park_top_right_faceE"
+    ],
+    "bg": "open_air",
+    "rotates": true
+  }
+]

gfx/UltimateCataclysm/pngs_normal_32x32/overmap/underground.json

@@ -60,5 +60,54 @@
         "bg": "t_railroad_rubble_center"
       }
     ]
+  },
+  {
+    "id": "sewer",
+    "fg": "t_sewage_unconnected",
+    "multitile": true,
+    "additional_tiles": [
+      {
+        "id": "center",
+        "fg": "t_sewage_center"
+      },
+      {
+        "id": "corner",
+        "fg": [
+          "t_sewage_corner_nw",
+          "t_sewage_corner_sw",
+          "t_sewage_corner_se",
+          "t_sewage_corner_ne"
+        ]
+      },
+      {
+        "id": "t_connection",
+        "fg": [
+          "t_sewage_t_connection_n",
+          "t_sewage_t_connection_w",
+          "t_sewage_t_connection_s",
+          "t_sewage_t_connection_e"
+        ]
+      },
+      {
+        "id": "edge",
+        "fg": [
+          "t_sewage_edge_ns",
+          "t_sewage_edge_ew"
+          ]
+      },
+      {
+        "id": "end_piece",
+        "fg": [
+          "t_sewage_end_piece_n",
+          "t_sewage_end_piece_w",
+          "t_sewage_end_piece_s",
+          "t_sewage_end_piece_e"
+        ]
+      },
+      {
+        "id": "unconnected",
+        "fg": "t_sewage_unconnected"
+      }
+    ]
   }
 ]

gfx/UltimateCataclysm/pngs_normal_32x32/terrain/t_railroad_track_small/t_railroad_track_small.json

@@ -89,8 +89,8 @@
       {
         "id": "edge",
         "fg": [
-          "t_railroad_track_small_d_corner_ne",
-          "t_railroad_track_small_d_corner_sw"
+          "t_railroad_track_small_edge_ns",
+          "t_railroad_track_small_edge_ew"
         ],
         "bg": "t_railroad_rubble_center"
       },