Merge pull request #76094 from CleverRaven/tileset-updates

Routine tileset updates on 01 September 2024
CleverRaven · Sep 1, 2024 · bd98c1f · bd98c1f
2 parents 418431b + b95a7d3
commit bd98c1f
Show file tree

Hide file tree

Showing 46 changed files with 83,495 additions and 51,057 deletions.
diff --git a/gfx/ASCII_Overmap/tile_config.json b/gfx/ASCII_Overmap/tile_config.json
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/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/ChibiSmall.png b/gfx/ChibiUltica/ChibiSmall.png
diff --git a/gfx/ChibiUltica/ChibiWide.png b/gfx/ChibiUltica/ChibiWide.png
diff --git a/gfx/ChibiUltica/human_body_plus.png b/gfx/ChibiUltica/human_body_plus.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/overmap.png b/gfx/Larwick_Overmap/overmap.png
diff --git a/gfx/Larwick_Overmap/tile_config.json b/gfx/Larwick_Overmap/tile_config.json
diff --git a/gfx/MshockXotto+/overmap.png b/gfx/MshockXotto+/overmap.png
diff --git a/gfx/MshockXotto+/small.png b/gfx/MshockXotto+/small.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/MshockXotto+/widecenter.png b/gfx/MshockXotto+/widecenter.png
diff --git a/gfx/PenAndPaper/backgrounds.png b/gfx/PenAndPaper/backgrounds.png
diff --git a/gfx/PenAndPaper/cursor.png b/gfx/PenAndPaper/cursor.png
diff --git a/gfx/PenAndPaper/fallback.png b/gfx/PenAndPaper/fallback.png
diff --git a/gfx/PenAndPaper/icons-h.png b/gfx/PenAndPaper/icons-h.png
diff --git a/gfx/PenAndPaper/icons-v.png b/gfx/PenAndPaper/icons-v.png
diff --git a/gfx/PenAndPaper/icons.png b/gfx/PenAndPaper/icons.png
diff --git a/gfx/PenAndPaper/overmap.png b/gfx/PenAndPaper/overmap.png
diff --git a/gfx/PenAndPaper/tile_config.json b/gfx/PenAndPaper/tile_config.json
diff --git a/gfx/PenAndPaper/tileset.txt b/gfx/PenAndPaper/tileset.txt
@@ -0,0 +1,4 @@
+NAME: PenAndPaper
+VIEW: Pen & Paper Overmap
+JSON: tile_config.json
+TILESET: tiles.png
diff --git a/gfx/PenAndPaper/weather.png b/gfx/PenAndPaper/weather.png
diff --git a/gfx/PenAndPaper/weather_unknown.png b/gfx/PenAndPaper/weather_unknown.png
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/small.png b/gfx/Ultica_iso/small.png
diff --git a/gfx/Ultica_iso/tile_config.json b/gfx/Ultica_iso/tile_config.json
diff --git a/gfx/UltimateCataclysm/human_body.png b/gfx/UltimateCataclysm/human_body.png
diff --git a/gfx/UltimateCataclysm/human_body_plus.png b/gfx/UltimateCataclysm/human_body_plus.png
diff --git a/gfx/UltimateCataclysm/layering.json b/gfx/UltimateCataclysm/layering.json
@@ -9,6 +9,20 @@
           "layer": 90,
           "offset_x": 16,
           "offset_y": -37
+        },
+        {
+          "item": "pride_flag",
+          "sprite": [ { "id": "pride_flag_var_rainbow_pride_flag_hoisted", "weight": 1 } ],
+          "layer": 90,
+          "offset_x": 16,
+          "offset_y": -37
+        },
+        {
+          "item": "state_flag",
+          "sprite": [ { "id": "state_flag_var_massachusetts_flag_hoisted", "weight": 1 } ],
+          "layer": 90,
+          "offset_x": 16,
+          "offset_y": -37
         }
       ]
     },
@@ -21,6 +35,20 @@
           "layer": 90,
           "offset_x": 16,
           "offset_y": -37
+        },
+        {
+          "item": "pride_flag",
+          "sprite": [ { "id": "pride_flag_var_rainbow_pride_flag_hoisted", "weight": 1 } ],
+          "layer": 90,
+          "offset_x": 16,
+          "offset_y": -37
+        },
+        {
+          "item": "state_flag",
+          "sprite": [ { "id": "state_flag_var_massachusetts_flag_hoisted", "weight": 1 } ],
+          "layer": 90,
+          "offset_x": 16,
+          "offset_y": -37
         }
       ]
     },

diff --git a/gfx/UltimateCataclysm/normal.png b/gfx/UltimateCataclysm/normal.png
diff --git a/gfx/UltimateCataclysm/small.png b/gfx/UltimateCataclysm/small.png
diff --git a/gfx/UltimateCataclysm/tall.png b/gfx/UltimateCataclysm/tall.png