Routine tileset updates on 01 October 2024

CleverRaven · Oct 1, 2024 · 44c4eb6 · 44c4eb6
1 parent 45a93aa
commit 44c4eb6
Show file tree

Hide file tree

Showing 45 changed files with 53,020 additions and 51,237 deletions.
diff --git a/gfx/Altica/centered.png b/gfx/Altica/centered.png
diff --git a/gfx/Altica/human_body.png b/gfx/Altica/human_body.png
diff --git a/gfx/Altica/human_body_plus.png b/gfx/Altica/human_body_plus.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/BrownLikeBears/tile_config.json b/gfx/BrownLikeBears/tile_config.json
@@ -3151,7 +3151,7 @@
         { "id": "dry_rice", "fg": 394, "rotates": false, "multitile": false },
         { "id": "dry_veggy", "fg": 1371, "rotates": false, "multitile": false },
         { "id": "dry_veggy_tainted", "fg": 1366, "rotates": false, "multitile": false },
-        { "id": "egg_bird", "fg": 1486, "rotates": false, "multitile": false },
+        { "id": "egg_chicken", "fg": 1486, "rotates": false, "multitile": false },
         { "id": "egg_reptile", "fg": 1426, "rotates": false, "multitile": false },
         { "id": "fat", "fg": 1423, "rotates": false, "multitile": false },
         { "id": "fat_tainted", "fg": 1379, "rotates": false, "multitile": false },

diff --git a/gfx/ChibiUltica/ChibiNormal.png b/gfx/ChibiUltica/ChibiNormal.png
diff --git a/gfx/ChibiUltica/ChibiSmall.png b/gfx/ChibiUltica/ChibiSmall.png
diff --git a/gfx/ChibiUltica/ChibiTall.png b/gfx/ChibiUltica/ChibiTall.png
diff --git a/gfx/ChibiUltica/centered.png b/gfx/ChibiUltica/centered.png
diff --git a/gfx/ChibiUltica/human_body_plus.png b/gfx/ChibiUltica/human_body_plus.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/Larwick_Overmap/tile_config.json b/gfx/Larwick_Overmap/tile_config.json
@@ -4571,7 +4571,7 @@
           ],
           "fg": 344
         },
-        { "id": "apartments_con_tower_015", "fg": 196 },
+        { "id": [ "apartments_con_tower_015", "apartments_con_tower_115" ], "fg": 196 },
         { "id": [ "homelesscamp", "homelesscamp_npc" ], "fg": 336 },
         {
           "id": [
@@ -5111,6 +5111,7 @@
         { "id": "lake_surface", "fg": 383 },
         { "id": "lake_water_cube", "fg": 383 },
         { "id": "lake_bed", "fg": 383 },
+        { "id": [ "stream", "stream_corner", "stream_end" ], "fg": 384 },
         { "id": "backfloorchamber", "fg": 200 },
         { "id": "clear", "fg": 331 },
         { "id": [ "portal_storm", "close_portal_storm" ], "fg": 229 },

diff --git a/gfx/MshockXotto+/fillernormal.png b/gfx/MshockXotto+/fillernormal.png
diff --git a/gfx/MshockXotto+/large.png b/gfx/MshockXotto+/large.png
diff --git a/gfx/MshockXotto+/layering.json b/gfx/MshockXotto+/layering.json
@@ -33,6 +33,39 @@
         }
       ]
     },
+    {
+      "context": "f_indoor_flagpole",
+      "item_variants": [
+        {
+          "item": "state_flag",
+          "sprite": [ { "id": "state_flag", "weight": 1 } ],
+          "layer": 90,
+          "offset_x": 18,
+          "offset_y": -25
+        },
+        {
+          "item": "pride_flag",
+          "sprite": [ { "id": "pride_flag", "weight": 1 } ],
+          "layer": 90,
+          "offset_x": 18,
+          "offset_y": -25
+        },
+        {
+          "item": "american_flag",
+          "sprite": [ { "id": "american_flag", "weight": 1 } ],
+          "layer": 90,
+          "offset_x": 18,
+          "offset_y": -25
+        },
+        {
+          "item": "national_flag",
+          "sprite": [ { "id": "national_flag", "weight": 1 } ],
+          "layer": 90,
+          "offset_x": 18,
+          "offset_y": -25
+        }
+      ]
+    },
     {
       "context": "f_wooden_flagpole",
       "item_variants": [

diff --git a/gfx/MshockXotto+/small.png b/gfx/MshockXotto+/small.png
diff --git a/gfx/MshockXotto+/tall.png b/gfx/MshockXotto+/tall.png
diff --git a/gfx/MshockXotto+/tile_config.json b/gfx/MshockXotto+/tile_config.json
diff --git a/gfx/MshockXotto+/tiles.png b/gfx/MshockXotto+/tiles.png
diff --git a/gfx/MshockXotto+/wide.png b/gfx/MshockXotto+/wide.png
diff --git a/gfx/PenAndPaper/tile_config.json b/gfx/PenAndPaper/tile_config.json
@@ -6783,7 +6783,7 @@
           ]
         },
         {
-          "id": [ "apartments_con_tower_015", "apartments_mod_tower_shack_roof" ],
+          "id": [ "apartments_con_tower_015", "apartments_con_tower_115", "apartments_mod_tower_shack_roof" ],
           "fg": 1,
           "bg": [
             { "weight": 1, "sprite": 3125 },

diff --git a/gfx/RetroDaysTileset/tile_config.json b/gfx/RetroDaysTileset/tile_config.json
@@ -3216,7 +3216,7 @@
         { "id": [ "pot_xlhelmet", "pot_helmet" ], "fg": 1539, "rotates": false },
         { "id": "potato_baked", "fg": 1757, "rotates": false },
         {
-          "id": [ "potato", "irradiated_potato", "kiwi", "irradiated_kiwi", "egg_bird" ],
+          "id": [ "potato", "irradiated_potato", "kiwi", "irradiated_kiwi", "egg_chicken" ],
           "fg": 1758,
           "rotates": false
         },

diff --git a/gfx/SurveyorsMap/tile_config.json b/gfx/SurveyorsMap/tile_config.json
@@ -233,7 +233,12 @@
           "bg": 7751,
           "rotates": true
         },
-        { "id": "apartments_con_tower_015", "fg": [ 258, 256, 257, 259 ], "bg": 7751, "rotates": true },
+        {
+          "id": [ "apartments_con_tower_015", "apartments_con_tower_115" ],
+          "fg": [ 258, 256, 257, 259 ],
+          "bg": 7751,
+          "rotates": true
+        },
         { "id": "apartments_mod_tower_110", "fg": [ 302, 300, 301, 303 ], "bg": 7523, "rotates": true },
         {
           "id": [ "apartments_mod_tower_111", "apartments_mod_tower_112", "apartments_mod_tower_113" ],

diff --git a/gfx/Ultica_iso/human_body_2x.png b/gfx/Ultica_iso/human_body_2x.png
diff --git a/gfx/Ultica_iso/human_body_plus_2x.png b/gfx/Ultica_iso/human_body_plus_2x.png
diff --git a/gfx/Ultica_iso/normal.png b/gfx/Ultica_iso/normal.png
diff --git a/gfx/Ultica_iso/normal_2x.png b/gfx/Ultica_iso/normal_2x.png
diff --git a/gfx/Ultica_iso/small.png b/gfx/Ultica_iso/small.png