Merge pull request CleverRaven#78628 from WhaleYogurt/small-lighthous…

…e-fix-2 Fix Small Lighthouse Tower Floor
GuardianDll · Dec 20, 2024 · 41efa55 · 41efa55
2 parents 3b696b7 + 93b0309
commit 41efa55
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json
@@ -657,6 +657,20 @@
     "symbol": ".",
     "color": "light_gray",
     "looks_like": "t_rock_floor",
+    "connect_groups": [ "INDOORFLOOR", "ROCKFLOOR" ],
+    "connects_to": "ROCKFLOOR",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FLAT", "SUPPORTS_ROOF", "INDOORS", "ROAD" ],
+    "bash": { "ter_set": "t_null", "str_min": 75, "str_max": 400, "str_min_supported": 100, "bash_below": true }
+  },
+  {
+    "type": "terrain",
+    "id": "t_stone_masonry_floor_balcony",
+    "name": "stone masonry floor",
+    "description": "A floor of carefully cut and laid stones, joined with mortar.",
+    "symbol": ".",
+    "color": "light_gray",
+    "looks_like": "t_rock_floor",
     "connect_groups": "ROCKFLOOR",
     "connects_to": "ROCKFLOOR",
     "move_cost": 2,

diff --git a/data/json/mapgen/lake_buildings/lighthouse_small.json b/data/json/mapgen/lake_buildings/lighthouse_small.json
@@ -49,6 +49,7 @@
       "ú": "t_pit",
       "¢": "t_sand",
       "d": "t_dock",
+      "+": "t_stone_masonry_floor_balcony",
       ";": "t_stone_masonry_floor",
       "¤": "t_stone_masonry_floor",
       "ɱ": "t_stone_masonry_floor",
@@ -264,15 +265,15 @@
         "                        ",
         "                        ",
         "          %%%%%%%%%     ",
-        "         %%;;;;;;;%%    ",
-        "         %;;ååååå;;%    ",
-        "         %;åå;;;åå;%    ",
-        "         %;å;@@@;å;%    ",
-        "         %;å;@*@;å;%    ",
-        "         %;å;@ö@;å;%    ",
-        "         %;åå;v;åå;%    ",
-        "         %;;åå!åå;;%    ",
-        "         %%;;<;;;;%%    ",
+        "         %%+++++++%%    ",
+        "         %++ååååå++%    ",
+        "         %+åå;;;åå+%    ",
+        "         %+å;@@@;å+%    ",
+        "         %+å;@*@;å+%    ",
+        "         %+å;@ö@;å+%    ",
+        "         %+åå;v;åå+%    ",
+        "         %++åå!åå++%    ",
+        "         %%++<++++%%    ",
         "          %%%%%%%%%     ",
         "                        "
       ],