Merge pull request #33288 from curstwist/add-apartment-roofs

add roofs to 2story apartments
CleverRaven · Aug 17, 2019 · f1a14e0 · f1a14e0
2 parents d94f8b1 + 86c8ad4
commit f1a14e0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/data/json/mapgen/apartment_con.json b/data/json/mapgen/apartment_con.json
@@ -26,8 +26,8 @@
         "   Rssw..A.....F.|+-|......|-+|..........wssR   ",
         "   Rss|.....FFFF^|.Y|......|Y.|^....FFF.o|ssR   ",
         "   |------------||--|......|--||------------|   ",
-        "   |############|EEE=......=xEE|############|   ",
-        "   |############|EEx=......=EEE|############|   ",
+        "   |############|...=......=xEE|############|   ",
+        "   |############|<..=......=EEE|############|   ",
         "   |------|-|-|-|---|......|---|-|-|-|------|   ",
         "   |.dBBd.+r|u+..e32|......|23e..+u|r+.dBBd.|   ",
         "   w..BB..|-|-|....u|......|u....|-|-|..BB..w   ",

diff --git a/data/json/mapgen/apartment_mod.json b/data/json/mapgen/apartment_mod.json
@@ -15,10 +15,10 @@
         "    |--|-----+--|+|--|    |--|+|--+-----|--|    ",
         "    RsswFFFF...^|.STb|    |bTS.|...FFFF.wssR    ",
         "    Rssw........+...b|-WW-|b...+........wssR    ",
-        "    RssX........|--|-|EEEE|-|--|........XssR    ",
-        "    Rss|1.htth...oo|Y|EEEE|Y|..........1|ssR    ",
-        "    Rss|e.htth.....+.|xEEE|.+..........e|ssR    ",
-        " |-----|2.........A|-|-==-|-|..hh......u|-----| ",
+        "    RssX........|--|-|....|-|--|........XssR    ",
+        "    Rss|1.htth...oo|Y|<...|Y|..........1|ssR    ",
+        "    Rss|e.htth.....+.|....|.+..........e|ssR    ",
+        " |-----|2.........A|-|-..-|-|..hh......u|-----| ",
         " |..BBd|uO3........|........|..tt....3O2|dBB..| ",
         " w..BB.|--|+|......D........D..tt..|+|--|.BB..w ",
         " |d....+.r|u|^....t|........|..hh.^|u|r.+....d| ",

diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -851,9 +851,13 @@
     "locations": [ "land" ],
     "overmaps": [
       { "point": [ 1, 1, 0 ], "overmap": "apartments_con_tower_NW_south" },
+      { "point": [ 1, 1, 1 ], "overmap": "apartments_con_tower_114_south" },
       { "point": [ 0, 1, 0 ], "overmap": "apartments_con_tower_NE_south" },
+      { "point": [ 0, 1, 1 ], "overmap": "apartments_con_tower_014_south" },
       { "point": [ 1, 0, 0 ], "overmap": "apartments_con_tower_SW_south" },
-      { "point": [ 0, 0, 0 ], "overmap": "apartments_con_tower_SE_south" }
+      { "point": [ 1, 0, 1 ], "overmap": "apartments_con_tower_104_south" },
+      { "point": [ 0, 0, 0 ], "overmap": "apartments_con_tower_SE_south" },
+      { "point": [ 0, 0, 1 ], "overmap": "apartments_con_tower_004_south" }
     ]
   },
   {
@@ -862,9 +866,13 @@
     "locations": [ "land" ],
     "overmaps": [
       { "point": [ 1, 1, 0 ], "overmap": "apartments_mod_tower_NW_south" },
+      { "point": [ 1, 1, 1 ], "overmap": "apartments_mod_tower_113_south" },
       { "point": [ 0, 1, 0 ], "overmap": "apartments_mod_tower_NE_south" },
+      { "point": [ 0, 1, 1 ], "overmap": "apartments_mod_tower_013_south" },
       { "point": [ 1, 0, 0 ], "overmap": "apartments_mod_tower_SW_south" },
-      { "point": [ 0, 0, 0 ], "overmap": "apartments_mod_tower_SE_south" }
+      { "point": [ 1, 0, 1 ], "overmap": "apartments_mod_tower_103_south" },
+      { "point": [ 0, 0, 0 ], "overmap": "apartments_mod_tower_SE_south" },
+      { "point": [ 0, 0, 1 ], "overmap": "apartments_mod_tower_003_south" }
     ]
   },
   {