Backport tiles from experimental to 0.H (#76453)

* Pull tiles from experimental to 0.H * Back out BLB changes * Back out SmashButton_iso changes * Back out rural/dirt road changes * Eggs and knives are right out
CleverRaven · Sep 17, 2024 · 293c761 · 293c761
1 parent 1198995
commit 293c761
Show file tree

Hide file tree

Showing 107 changed files with 618,154 additions and 129,023 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
diff --git a/gfx/Altica/character.png b/gfx/Altica/character.png
diff --git a/gfx/Altica/fillerhoder.png b/gfx/Altica/fillerhoder.png
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/human_body_plus.png b/gfx/Altica/human_body_plus.png
diff --git a/gfx/Altica/human_body_wielded.png b/gfx/Altica/human_body_wielded.png
diff --git a/gfx/Altica/incomplete.png b/gfx/Altica/incomplete.png
diff --git a/gfx/Altica/incomplete_large.png b/gfx/Altica/incomplete_large.png
diff --git a/gfx/Altica/large.png b/gfx/Altica/large.png
diff --git a/gfx/Altica/monsters_plus.png b/gfx/Altica/monsters_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/tall_furniture.png b/gfx/Altica/tall_furniture.png
diff --git a/gfx/Altica/tall_magiclysm.png b/gfx/Altica/tall_magiclysm.png
diff --git a/gfx/Altica/tall_overmap.png b/gfx/Altica/tall_overmap.png
diff --git a/gfx/Altica/tall_terrain.png b/gfx/Altica/tall_terrain.png
diff --git a/gfx/Altica/tall_vehicle.png b/gfx/Altica/tall_vehicle.png
diff --git a/gfx/Altica/tall_wielded.png b/gfx/Altica/tall_wielded.png
diff --git a/gfx/Altica/tile_config.json b/gfx/Altica/tile_config.json
diff --git a/gfx/Altica/traps_plus.png b/gfx/Altica/traps_plus.png
diff --git a/gfx/Altica/ultica-tall.png b/gfx/Altica/ultica-tall.png
diff --git a/gfx/Altica/vehicle_plus.png b/gfx/Altica/vehicle_plus.png
diff --git a/gfx/ChibiUltica/ChibiHuge.png b/gfx/ChibiUltica/ChibiHuge.png
diff --git a/gfx/ChibiUltica/ChibiLarge.png b/gfx/ChibiUltica/ChibiLarge.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/ChibiTall.png b/gfx/ChibiUltica/ChibiTall.png
diff --git a/gfx/ChibiUltica/ChibiTaller.png b/gfx/ChibiUltica/ChibiTaller.png
diff --git a/gfx/ChibiUltica/ChibiWide.png b/gfx/ChibiUltica/ChibiWide.png
diff --git a/gfx/ChibiUltica/filler.png b/gfx/ChibiUltica/filler.png
diff --git a/gfx/ChibiUltica/fillerhoder.png b/gfx/ChibiUltica/fillerhoder.png
diff --git a/gfx/ChibiUltica/giant.png b/gfx/ChibiUltica/giant.png
diff --git a/gfx/ChibiUltica/huge.png b/gfx/ChibiUltica/huge.png
diff --git a/gfx/ChibiUltica/human_body.png b/gfx/ChibiUltica/human_body.png
diff --git a/gfx/ChibiUltica/human_body_plus.png b/gfx/ChibiUltica/human_body_plus.png
diff --git a/gfx/ChibiUltica/incomplete.png b/gfx/ChibiUltica/incomplete.png
diff --git a/gfx/ChibiUltica/incomplete_large.png b/gfx/ChibiUltica/incomplete_large.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/GiantDays/layering.json b/gfx/GiantDays/layering.json
@@ -1,42 +1,44 @@
 {
-  "variants": [
-    {
-      "context": "f_flagpole",
-      "item_variants": [
-        {
-          "item": "american_flag",
-          "sprite": [ { "id": "american_flag", "weight": 1 } ],
-          "layer": 90,
-          "offset_x": 6,
-          "offset_y": -21
-        },
-        {
-          "item": "pride_flag",
-          "sprite": [ { "id": "pride_flag", "weight": 1 } ],
-          "layer": 90,
-          "offset_x": 6,
-          "offset_y": -21
-        }
-      ]
-    },
-    {
-      "context": "f_wooden_flagpole",
-      "item_variants": [
-        {
-          "item": "american_flag",
-          "sprite": [ { "id": "american_flag", "weight": 1 } ],
-          "layer": 90,
-          "offset_x": 6,
-          "offset_y": -21
-        },
-        {
-          "item": "pride_flag",
-          "sprite": [ { "id": "pride_flag", "weight": 1 } ],
-          "layer": 90,
-          "offset_x": 6,
-          "offset_y": -21
-        }
-      ]
-    }
-  ]
+"variants": [
+  {
+    "context": "f_flagpole",
+    "item_variants": [
+      {
+        "item": "american_flag",
+        "sprite": [{"id": "american_flag", "weight": 1}],
+        "layer": 90,
+        "offset_x": 6,
+        "offset_y": -21
+      },
+      {
+        "item": "pride_flag",
+        "sprite": [{"id": "pride_flag", "weight": 1}],
+        "layer": 90,
+        "offset_x": 6,
+        "offset_y": -21
+      }
+    ]
+  },
+
+
+  {
+    "context": "f_wooden_flagpole",
+    "item_variants": [
+      {
+        "item": "american_flag",
+        "sprite": [{"id": "american_flag", "weight": 1}],
+        "layer": 90,
+        "offset_x": 6,
+        "offset_y": -21
+      },
+      {
+        "item": "pride_flag",
+        "sprite": [{"id": "pride_flag", "weight": 1}],
+        "layer": 90,
+        "offset_x": 6,
+        "offset_y": -21
+      }
+    ]
+  }
+]
 }