Merge pull request #70569 from CleverRaven/tileset-updates

Routine tileset updates on 01 January 2024
CleverRaven · Jan 1, 2024 · eaa25f5 · eaa25f5
2 parents 0e820db + c80f98f
commit eaa25f5
Show file tree

Hide file tree

Showing 47 changed files with 59,570 additions and 57,338 deletions.
diff --git a/gfx/ASCII_Overmap/ASCIITiles.png b/gfx/ASCII_Overmap/ASCIITiles.png
diff --git a/gfx/ASCII_Overmap/tile_config.json b/gfx/ASCII_Overmap/tile_config.json
@@ -15,6 +15,12 @@
       "file": "ASCIITiles.png",
       "//": "range 1 to 191",
       "tiles": [
+        { "id": [ "overmap_horde_3", "overmap_horde_4", "overmap_horde_5", "overmap_horde_6" ], "fg": 180, "rotates": false },
+        {
+          "id": [ "overmap_horde_7", "overmap_horde_8", "overmap_horde_9", "overmap_horde_10" ],
+          "fg": 179,
+          "rotates": false
+        },
         { "id": [ "cursor", "highlight", "line_target", "line_trail" ], "fg": 63 },
         { "id": "unknown_terrain", "fg": 154, "rotates": false },
         {
@@ -1677,6 +1683,9 @@
             "bungalow20",
             "bungalow21",
             "bungalow22",
+            "bungalow23",
+            "bungalow24",
+            "bungalow25",
             "duplex",
             "garden_house_1_floor_1",
             "garden_house_1_floor_2",
@@ -1752,6 +1761,13 @@
             "house_duplex7",
             "house_duplex8",
             "house_duplex9",
+            "house_fence01",
+            "house_fence02_1",
+            "house_fence02_2",
+            "house_fence03",
+            "house_fence04",
+            "house_fence05_1",
+            "house_fence05_2",
             "house_fortified",
             "house_garage",
             "house_garage2",
@@ -1974,6 +1990,9 @@
             "bungalow20_roof",
             "bungalow21_roof",
             "bungalow22_roof",
+            "bungalow23_roof",
+            "bungalow24_roof",
+            "bungalow25_roof",
             "duplex_roof",
             "garden_house_1_roof",
             "house_01_roof",
@@ -2040,6 +2059,11 @@
             "house_duplex7_roof",
             "house_duplex8_roof",
             "house_duplex9_roof",
+            "house_fence01_roof",
+            "house_fence02_roof",
+            "house_fence03_roof",
+            "house_fence04_roof",
+            "house_fence05_roof",
             "house_fortified_roof",
             "house_garage2_roof",
             "house_garage3_roof",
@@ -2319,6 +2343,7 @@
         { "id": "speedway_5_7", "fg": 113, "bg": 1, "rotates": true },
         { "id": [ "speedway_6_7_1", "speedway_6_7_2" ], "fg": 114, "bg": 1, "rotates": true },
         { "id": "road_nesw_manhole", "fg": 172, "bg": 1, "rotates": true },
+        { "id": "city_center", "fg": 76, "bg": 1, "rotates": true },
         { "id": "bridge", "fg": 49, "bg": 1, "rotates": true },
         { "id": "bridge_road", "fg": 157, "bg": 1, "rotates": true },
         { "id": "bridgehead_ground", "fg": 156, "bg": 1, "rotates": true },
@@ -2474,7 +2499,7 @@
         { "id": "prepnet_orchard", "fg": 18, "bg": 84 },
         { "id": "afs_crashed_escape_pod", "fg": 22, "bg": 140 },
         { "id": "robot_dispatch_first", "fg": 38, "bg": 136 },
-        { "id": "robot_dispatch_second", "fg": 38, "bg": 136 },
+        { "id": [ "robot_dispatch_second", "robot_dispatch_roof" ], "fg": 38, "bg": 136 },
         { "id": "afs_shelter_1", "fg": 96, "bg": 1, "rotates": true },
         { "id": "afs_shelter_1_roof", "fg": 96, "bg": 1, "rotates": true },
         {

diff --git a/gfx/Altica/giant.png b/gfx/Altica/giant.png
diff --git a/gfx/Altica/human_body.png b/gfx/Altica/human_body.png
diff --git a/gfx/Altica/large.png b/gfx/Altica/large.png
diff --git a/gfx/Altica/normal.png b/gfx/Altica/normal.png
diff --git a/gfx/Altica/small.png b/gfx/Altica/small.png
diff --git a/gfx/Altica/tile_config.json b/gfx/Altica/tile_config.json
diff --git a/gfx/Altica/ultica-tall.png b/gfx/Altica/ultica-tall.png
diff --git a/gfx/ChibiUltica/ChibiNormal.png b/gfx/ChibiUltica/ChibiNormal.png
diff --git a/gfx/ChibiUltica/ChibiWide.png b/gfx/ChibiUltica/ChibiWide.png
diff --git a/gfx/ChibiUltica/human_body.png b/gfx/ChibiUltica/human_body.png
diff --git a/gfx/ChibiUltica/large.png b/gfx/ChibiUltica/large.png
diff --git a/gfx/ChibiUltica/normal.png b/gfx/ChibiUltica/normal.png
diff --git a/gfx/ChibiUltica/small.png b/gfx/ChibiUltica/small.png
diff --git a/gfx/ChibiUltica/tall.png b/gfx/ChibiUltica/tall.png
diff --git a/gfx/ChibiUltica/tile_config.json b/gfx/ChibiUltica/tile_config.json
diff --git a/gfx/Cuteclysm/tile_config.json b/gfx/Cuteclysm/tile_config.json
@@ -6415,11 +6415,11 @@
         { "id": "overlay_mutation_eye_color_var_gray", "fg": 2583 },
         { "id": "overlay_mutation_eye_color_var_green", "fg": 2584 },
         { "id": "overlay_mutation_eye_color_var_hazel", "fg": 2585 },
-        { "id": "overlay_mutation_hair_long_var_brown", "fg": 2586 },
-        { "id": "overlay_mutation_hair_messy_var_brown", "fg": 2587 },
-        { "id": "overlay_mutation_hair_long_over_eye_var_brown", "fg": 2588 },
-        { "id": "overlay_mutation_hair_short_no_frige_var_brown", "fg": 2589 },
-        { "id": "overlay_mutation_hair_short_over_eye_var_brown", "fg": 2590 },
+        { "id": "overlay_mutation_long_var_brown", "fg": 2586 },
+        { "id": "overlay_mutation_messy_var_brown", "fg": 2587 },
+        { "id": "overlay_mutation_long_over_eye_var_brown", "fg": 2588 },
+        { "id": "overlay_mutation_short_no_frige_var_brown", "fg": 2589 },
+        { "id": "overlay_mutation_short_over_eye_var_brown", "fg": 2590 },
         { "id": "overlay_female_mutation_SKIN_DARK", "fg": 2591 },
         { "id": "overlay_female_mutation_SKIN_LIGHT", "fg": 2592 },
         { "id": "overlay_female_mutation_SKIN_MEDIUM", "fg": 2593 },

diff --git a/gfx/GiantDays/tile_config.json b/gfx/GiantDays/tile_config.json
diff --git a/gfx/Larwick_Overmap/overmap.png b/gfx/Larwick_Overmap/overmap.png