Add abandoned house palette, add new variable parameters for houses (#…

…55570) * add abandoned house palette, variable parameters for houses * fix some symbol conflicts there were conflicting with fences, the magiclysm ramp caused test errors.
CleverRaven · Feb 25, 2022 · 7aae629 · 7aae629
1 parent 944d708
commit 7aae629
Show file tree

Hide file tree

Showing 29 changed files with 350 additions and 64 deletions.
diff --git a/data/json/mapgen/house/house08.json b/data/json/mapgen/house/house08.json
@@ -7,7 +7,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ".%%%.....p.-....%%%.....",
+        ".%%%.....p.`....%%%.....",
         ".%###o####o*o##########.",
         ".%#hr E | RRRR       ho.",
         ".^# r E +HHH    lll  ho.",
@@ -19,35 +19,29 @@
         ".#|||||+| hfh |  Y   4#.",
         ".#g|d                Oo.",
         ".#>+          |6 31F52#.",
-        ".#||+|##[###[###o######.",
-        ".oB8 S#%-----........^=.",
-        ".#B  t#.-----.........=.",
-        ".######...............=.",
-        ".=....................=.",
-        ".=....................=.",
-        ".=....................=.",
-        ".=....................=.",
-        ".=....................=.",
-        ".=....................=.",
-        ".======================.",
+        ".#||+|##¶###¶###o######.",
+        ".oB8 S#%``````.......^Ŧ.",
+        ".#B  t#.``````........Ŧ.",
+        ".######...............Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ.",
         "........................"
       ],
-      "palettes": [ "standard_domestic_palette" ],
+      "palettes": [
+        { "distribution": [ [ "standard_domestic_palette", 10 ], [ "standard_domestic_palette_abandoned", 2 ] ] },
+        "standard_domestic_landscaping_palette"
+      ],
       "set": [
         { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": [ 0, 0 ], "repeat": [ 1, 2 ] },
         { "point": "terrain", "id": "t_tree", "x": [ 2, 11 ], "y": [ 16, 21 ], "repeat": [ 2, 6 ] },
         { "point": "terrain", "id": "t_tree_young", "x": [ 2, 11 ], "y": [ 16, 21 ], "repeat": [ 3, 5 ] }
       ],
-      "terrain": {
-        "#": "t_rock_wall",
-        "[": "t_door_glass_c",
-        "=": "t_fence",
-        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ]
-      },
-      "place_loot": [
-        { "group": "livingroom", "x": [ 9, 21 ], "y": [ 2, 7 ], "chance": 90, "repeat": [ 1, 4 ] },
-        { "group": "guns_pistol_common", "x": 4, "y": 10, "chance": 10, "ammo": 90, "magazine": 100 }
-      ],
+      "place_loot": [ { "group": "guns_pistol_common", "x": 4, "y": 10, "chance": 10, "ammo": 90, "magazine": 100 } ],
       "place_nested": [
         {
           "chunks": [

diff --git a/data/json/mapgen/house/house11.json b/data/json/mapgen/house/house11.json
@@ -39,6 +39,7 @@
         "!": "t_wall_glass",
         "_": "t_pavement",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "$": "t_fence",
         "G": "t_sidewalk",
         "K": "t_sidewalk",

diff --git a/data/json/mapgen/house/house14.json b/data/json/mapgen/house/house14.json
@@ -38,6 +38,7 @@
         "=": "t_door_metal_locked",
         "_": "t_pavement",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "$": "t_fence",
         "~": "t_thconc_floor",
         "q": "t_thconc_floor",

diff --git a/data/json/mapgen/house/house31.json b/data/json/mapgen/house/house31.json
@@ -52,6 +52,7 @@
         "t": "t_linoleum_white",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "U": "t_thconc_floor",
         "q": "t_thconc_floor",
         "N": "t_thconc_floor",

diff --git a/data/json/mapgen/house/house32.json b/data/json/mapgen/house/house32.json
@@ -52,6 +52,7 @@
         "t": "t_linoleum_white",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "U": "t_thconc_floor",
         "q": "t_thconc_floor",
         "N": "t_thconc_floor",

diff --git a/data/json/mapgen/house/house_detatched1.json b/data/json/mapgen/house/house_detatched1.json
@@ -56,6 +56,7 @@
         ";": "t_privacy_fencegate_c",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "~": "t_thconc_floor",
         "A": "t_thconc_floor",
         "N": "t_thconc_floor",

diff --git a/data/json/mapgen/house/house_dogs.json b/data/json/mapgen/house/house_dogs.json
@@ -5,7 +5,7 @@
     "monsters": [
       { "monster": "mon_null", "weight": 730 },
       { "monster": "mon_zombie_dog", "weight": 135, "cost_multiplier": 0, "pack_size": [ 5, 8 ] },
-      { "monster": "mon_dog_zombie_rot", "weight": 135, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }
+      { "monster": "mon_dog_zombie_rot", "weight": 135, "cost_multiplier": 1, "pack_size": [ 1, 4 ] }
     ]
   },
   {
@@ -30,7 +30,7 @@
     "object": {
       "fill_ter": "t_floor",
       "rows": [
-        ".!%%....p.---...........",
+        ".[%%....p.```...........",
         ".%###o####o*o##########.",
         ".%#EI  y| RRRR   sHHHHo.",
         ".%# I E +            Ho.",
@@ -42,27 +42,23 @@
         ".#|||||+| hfh |  Y    #.",
         ".#U|d     hfh |6     Oo.",
         ".#>+          |7432F51#.",
-        ".###+###&###&###o######.",
-        ".oB  S#^~~~~~~........$.",
-        ".#B8 t#%~~~~~~........$.",
-        ".######%~~~~~~........$.",
-        ".$....................$.",
-        ".$....................$.",
-        ".$....................$.",
-        ".$....................$.",
-        ".$....................$.",
-        ".$....................$.",
-        ".$$$$$$$$$$$$$$$$$$$$$$.",
+        ".###+###¶###¶###o######.",
+        ".oB  S#^``````........Ŧ.",
+        ".#B8 t#%``````........Ŧ.",
+        ".######%``````........Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".ɤ....................ɤ.",
+        ".Ŧ....................Ŧ.",
+        ".Ŧ....................Ŧ.",
+        ".ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ.",
         "........................"
       ],
-      "palettes": [ "standard_domestic_palette" ],
-      "terrain": {
-        "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
-        "$": "t_fence",
-        "~": "t_concrete",
-        "&": "t_door_glass_c",
-        "!": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ]
-      },
+      "palettes": [
+        { "distribution": [ [ "standard_domestic_palette", 10 ], [ "standard_domestic_palette_abandoned", 2 ] ] },
+        "standard_domestic_landscaping_palette"
+      ],
       "set": [
         { "point": "terrain", "id": "t_tree_apple", "x": [ 0, 14 ], "y": 0, "repeat": [ 1, 2 ] },
         { "point": "terrain", "id": "t_tree_young", "x": [ 2, 14 ], "y": [ 17, 21 ], "repeat": [ 3, 5 ] }

diff --git a/data/json/mapgen/house/house_duplex10.json b/data/json/mapgen/house/house_duplex10.json
@@ -42,6 +42,7 @@
         "9": "t_linoleum_gray",
         "-": "t_linoleum_gray",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "~": "t_thconc_floor",
         "N": "t_thconc_floor",
         "q": "t_thconc_floor",

diff --git a/data/json/mapgen/house/house_duplex9.json b/data/json/mapgen/house/house_duplex9.json
@@ -45,6 +45,7 @@
         "9": "t_linoleum_gray",
         "-": "t_linoleum_gray",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "~": "t_thconc_floor",
         "N": "t_thconc_floor",
         "q": "t_thconc_floor"

diff --git a/data/json/mapgen/house/house_garage.json b/data/json/mapgen/house/house_garage.json
@@ -39,6 +39,7 @@
         "=": "t_door_metal_locked",
         "_": "t_pavement",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "G": "t_sidewalk",
         "K": "t_sidewalk",
         "~": "t_thconc_floor",

diff --git a/data/json/mapgen/house/house_garage2.json b/data/json/mapgen/house/house_garage2.json
@@ -40,6 +40,7 @@
         "=": "t_door_metal_locked",
         "_": "t_pavement",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "G": "t_sidewalk",
         "K": "t_sidewalk",
         "~": "t_thconc_floor",

diff --git a/data/json/mapgen/house/house_garage6.json b/data/json/mapgen/house/house_garage6.json
@@ -41,6 +41,7 @@
         "M": "t_region_groundcover_urban",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "~": "t_thconc_floor",
         "q": "t_thconc_floor",
         "W": "t_thconc_floor",

diff --git a/data/json/mapgen/house/house_garage_prepper.json b/data/json/mapgen/house/house_garage_prepper.json
@@ -40,6 +40,7 @@
         "M": "t_region_groundcover_urban",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "~": "t_thconc_floor",
         " ": "t_carpet_concrete_red",
         "`": "t_concrete",

diff --git a/data/json/mapgen/house/urban_11_house_brick.json b/data/json/mapgen/house/urban_11_house_brick.json
@@ -46,6 +46,7 @@
         "g": "t_thconc_floor",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "q": "t_thconc_floor",
         "N": "t_thconc_floor",
         "Y": "t_linoleum_gray"

diff --git a/data/json/mapgen/house/urban_12_house.json b/data/json/mapgen/house/urban_12_house.json
@@ -53,6 +53,7 @@
         "q": "t_thconc_floor",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "ƃ": "t_screen_door_c",
         "$": "t_screened_porch_wall",
         "Y": "t_linoleum_gray"

diff --git a/data/json/mapgen/house/urban_15_house.json b/data/json/mapgen/house/urban_15_house.json
@@ -45,6 +45,7 @@
         "q": "t_thconc_floor",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "ƃ": "t_privacy_fencegate_c",
         "$": "t_privacy_fence",
         "Y": "t_linoleum_gray",

diff --git a/data/json/mapgen/house/urban_16_house_ranch.json b/data/json/mapgen/house/urban_16_house_ranch.json
@@ -50,6 +50,7 @@
         "q": "t_thconc_floor",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "ƃ": "t_screen_door_c",
         "$": "t_screened_porch_wall",
         "Y": "t_linoleum_gray"

diff --git a/data/json/mapgen/house/urban_17_house_ranch.json b/data/json/mapgen/house/urban_17_house_ranch.json
@@ -53,6 +53,7 @@
         "q": "t_thconc_floor",
         "=": "t_door_metal_locked",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "ƃ": "t_screen_door_c",
         ";": "t_door_glass_c",
         "$": "t_screened_porch_wall",

diff --git a/data/json/mapgen/house/urban_1_house.json b/data/json/mapgen/house/urban_1_house.json
@@ -40,6 +40,7 @@
         "=": "t_door_metal_locked",
         "_": "t_pavement",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "~": "t_thconc_floor",
         "q": "t_thconc_floor",
         "A": "t_thconc_floor",

diff --git a/data/json/mapgen/house/urban_2_house.json b/data/json/mapgen/house/urban_2_house.json
@@ -40,6 +40,7 @@
         "=": "t_door_metal_locked",
         "_": "t_pavement",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "'": "t_thconc_floor",
         "q": "t_thconc_floor",
         "A": "t_thconc_floor",
@@ -113,6 +114,7 @@
       "palettes": [ "standard_domestic_palette" ],
       "terrain": {
         "~": "t_open_air",
+        "#": "t_brick_wall",
         "=": "t_shingle_flat_roof",
         "&": "t_shingle_flat_roof",
         "%": "t_gutter_drop",

diff --git a/data/json/mapgen/house/urban_3_house.json b/data/json/mapgen/house/urban_3_house.json
@@ -40,6 +40,7 @@
         "=": "t_door_metal_locked",
         "_": "t_pavement",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "'": "t_thconc_floor",
         "q": "t_thconc_floor",
         "A": "t_thconc_floor",

diff --git a/data/json/mapgen/house/urban_4_house_basement.json b/data/json/mapgen/house/urban_4_house_basement.json
@@ -87,10 +87,10 @@
         "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ],
         "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ],
         "!": "t_region_groundcover_urban",
-        "#": "t_adobe_brick_wall",
         "=": "t_door_metal_locked",
         "_": "t_pavement",
         "&": "t_gates_control_brick",
+        "#": "t_brick_wall",
         "'": "t_thconc_floor",
         "q": "t_thconc_floor",
         "Q": "t_thconc_floor",
@@ -159,7 +159,7 @@
       "palettes": [ "standard_domestic_palette" ],
       "terrain": {
         "~": "t_open_air",
-        "#": "t_adobe_brick_wall",
+        "#": "t_brick_wall",
         "=": "t_shingle_flat_roof",
         "&": "t_shingle_flat_roof",
         "%": "t_gutter_drop",

diff --git a/data/json/mapgen/house/urban_9_house_garage_loft.json b/data/json/mapgen/house/urban_9_house_garage_loft.json
@@ -69,7 +69,8 @@
         "9": "t_linoleum_gray",
         "t": "t_linoleum_gray",
         "=": "t_door_metal_locked",
-        "&": "t_gates_control_brick"
+        "&": "t_gates_control_brick",
+        "#": "t_brick_wall"
       },
       "furniture": { "!": "f_region_flower", "0": "f_stool" },
       "place_loot": [

diff --git a/data/json/mapgen/mansion.json b/data/json/mapgen/mansion.json
@@ -1008,7 +1008,7 @@
         "         -h&&h-         ",
         "|||||  | -h&&-- |  |||||",
         "<  |R  R -h&&h- R  R|  >",
-        "<  ŦR  R -h&&h- R  RŦ  >",
+        "<  зR  R -h&&h- R  Rз  >",
         "####R  R ------ R  R####",
         "%%%#####yT    Ty#####%%%",
         "%%..%%%##oooooo##%%%..%%",
@@ -1025,7 +1025,7 @@
         "........................"
       ],
       "palettes": [ "standard_domestic_palette", "standard_domestic_landscaping_palette" ],
-      "terrain": { "-": "t_carpet_green", "?": "t_carpet_green", "&": "t_carpet_green", "h": "t_carpet_green", "Ŧ": "t_door_locked" },
+      "terrain": { "-": "t_carpet_green", "?": "t_carpet_green", "&": "t_carpet_green", "h": "t_carpet_green", "з": "t_door_locked" },
       "furniture": { "&": "f_table" },
       "place_loot": [
         { "item": "laptop", "x": 19, "y": 0, "chance": 100 },
@@ -1795,9 +1795,9 @@
         "#      |+|==|+|=||     |",
         "#      |9|??|t|===   & |",
         "#|    ||||||||||||     |",
-        "#                :i  Ŧ |",
+        "#                :i  з |",
         "#i  `-```}```-`  :i    |",
-        "#i  `-```````-`  :i  Ŧ |",
+        "#i  `-```````-`  :i  з |",
         "#i  `-```````-`  :     |",
         "#i  `-```-```-`  #:):::|",
         "#   ``-`````-``        |",
@@ -1828,7 +1828,7 @@
         ")": "t_door_glass_c"
       },
       "furniture": {
-        "Ŧ": [ "f_treadmill", "f_treadmill_mechanical" ],
+        "з": [ "f_treadmill", "f_treadmill_mechanical" ],
         "&": "f_exercise",
         "?": "f_locker",
         "‡": [ "f_ergometer", "f_ergometer_mechanical" ]
@@ -2284,7 +2284,7 @@
         ".....###xxx|++|H       #",
         ".......#||||  |lHH   cT#",
         ".[.....#bbb|  |||||+|||#",
-        "....%%.#Ŧ  +           +",
+        "....%%.#з  +           +",
         "....%%.o   |           +",
         ".......o‡  ||+|||  ||||#",
         "...[...o   |===Y|  |LLL#",
@@ -2295,7 +2295,7 @@
       "palettes": [ "standard_domestic_palette", "standard_domestic_lino_bathroom", "standard_domestic_landscaping_palette" ],
       "terrain": { "-": "t_carpet_red", "e": "t_carpet_red", "=": "t_linoleum_gray", "Y": "t_linoleum_gray" },
       "furniture": {
-        "Ŧ": [ "f_treadmill", "f_treadmill_mechanical" ],
+        "з": [ "f_treadmill", "f_treadmill_mechanical" ],
         "&": "f_exercise",
         "‡": [ "f_ergometer", "f_ergometer_mechanical" ],
         ")": "f_speaker_cabinet"

diff --git a/data/json/mapgen/nested/aux_nested.json b/data/json/mapgen/nested/aux_nested.json
@@ -174,6 +174,13 @@
       ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "//": "A nested map bash damage.",
+    "nested_mapgen_id": "1x1_bash",
+    "object": { "mapgensize": [ 1, 1 ], "set": [ { "point": "bash", "x": 0, "y": 0 } ] }
+  },
   {
     "type": "mapgen",
     "method": "json",