diff --git a/data/json/mapgen/house/house08.json b/data/json/mapgen/house/house08.json index 61454e6d662fb..85fccec13dfb3 100644 --- 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 index b20066b63692d..e566d4030f30e 100644 --- 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 index 5d7aeafc3d19e..6538d468f861f 100644 --- 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 index 55222b71d6fd0..c176408e6d1f1 100644 --- 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 index d3d95884a80b3..c29e8ebf2c197 100644 --- 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 index 96d706e33bc56..563f703737c98 100644 --- 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 index f239206b490af..44ca410755742 100644 --- 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 index e480736a7a2e3..a2569bf1f9398 100644 --- 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 index 4c78812955d08..527d098a8cb1c 100644 --- 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 index 00077eef06aa9..122c1380b7047 100644 --- 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 index 28cf83019e889..23f4e455f8a85 100644 --- 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 index 0f2c2838319c8..6f48564a76308 100644 --- 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 index 8f1e3891895ea..db99dc10e05f1 100644 --- 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 index f0aaa24f059bf..ec5c00c2dbed7 100644 --- 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 index ef9851e4dc901..87d7e36f7745e 100644 --- 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 index dc83c8e72ebf2..a362ebe52a83e 100644 --- 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 index 9ac2de6d0218d..aad774fe92ce2 100644 --- 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 index f50a7d78b8d7d..5802ad9e00d41 100644 --- 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 index f97c605085559..23935041edfb3 100644 --- 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 index 4fc31e747ec28..d3beea2d2941f 100644 --- 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 index 641520d0fedf2..a8c61813ed6a9 100644 --- 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 index 8535661a9634a..d4bcd2757a5fa 100644 --- 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 index ea3738606b371..057d3be17119c 100644 --- 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 index 7e179c17986bb..a68228f7e7897 100644 --- 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 index a281e80b4f942..9558f06b41b72 100644 --- 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", diff --git a/data/json/mapgen_palettes/house_general_abandoned.json b/data/json/mapgen_palettes/house_general_abandoned.json new file mode 100644 index 0000000000000..afd645ad426fa --- /dev/null +++ b/data/json/mapgen_palettes/house_general_abandoned.json @@ -0,0 +1,231 @@ +[ + { + "type": "palette", + "id": "standard_domestic_palette_abandoned", + "//": "Intended as a palette for abandoned non-nested houses. Symbols still open for use: 0 ! $ % & _ = ~ ? / , ` and some symbols that conflict with json (like brackets).", + "parameters": { + "interior_wall_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_wall_b", 1 ], + [ "t_wall_g", 1 ], + [ "t_wall_p", 1 ], + [ "t_wall_P", 1 ], + [ "t_wall_r", 1 ], + [ "t_wall_w", 6 ], + [ "t_wall_y", 1 ] + ] + } + }, + "exterior_wall_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_brick_wall", 6 ], + [ "t_rock_wall", 3 ], + [ "t_wall_wood", 3 ], + [ "t_drystone_wall", 2 ], + [ "t_adobe_brick_wall", 4 ], + [ "t_concrete_wall", 4 ] + ] + } + }, + "window_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_window_domestic", 1 ], + [ "t_window_no_curtains", 1 ], + [ "t_window_no_curtains_open", 1 ], + [ "t_window_taped", 5 ], + [ "t_window_no_curtains_taped", 5 ], + [ "t_window_domestic_taped", 5 ], + [ "t_window_empty", 7 ], + [ "t_window_frame", 7 ], + [ "t_window_boarded", 7 ], + [ "t_window_boarded_noglass", 5 ], + [ "t_window_reinforced", 6 ], + [ "t_window_reinforced_noglass", 5 ], + [ "t_plastic_window", 7 ] + ] + } + }, + "lawn_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_region_groundcover_barren", 5 ], + [ "t_region_groundcover_forest", 3 ], + [ "t_region_groundcover", 1 ], + [ "t_region_groundcover_urban", 1 ] + ] + } + }, + "house_fence_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_splitrail_fence", 3 ], + [ "t_chainfence", 2 ], + [ "t_fence", 2 ], + [ "t_privacy_fence", 1 ], + [ "t_drystone_wall_half", 1 ] + ] + } + } + }, + "toilets": { "t": { } }, + "furniture": { + "a": "f_fireplace", + "b": "f_bigmirror_b", + "c": "f_null", + "d": "f_null", + "e": "f_null", + "f": "f_null", + "g": "f_water_heater", + "h": [ [ "f_chair", 5 ], [ "f_null", 95 ] ], + "i": "f_null", + "j": "f_null", + "k": "f_woodstove", + "l": "f_null", + "m": "f_null", + "n": [ [ "f_dishwasher", 50 ], [ "f_null", 50 ] ], + "p": "f_mailbox", + "q": "f_null", + "r": "f_null", + "s": "f_null", + "u": "f_rotary_clothesline", + "w": "f_null", + "x": "f_null", + "y": "f_null", + "z": "f_null", + "A": [ [ "f_stool", 5 ], [ "f_null", 95 ] ], + "B": "f_bathtub", + "C": "f_cupboard", + "D": "f_null", + "E": "f_null", + "F": "f_fridge", + "G": "f_null", + "H": "f_sofa", + "I": "f_null", + "J": "f_counter", + "K": "f_null", + "L": "f_null", + "M": "f_null", + "N": "f_null", + "O": "f_oven", + "P": "f_null", + "Q": "f_null", + "R": "f_null", + "S": "f_sink", + "T": "f_null", + "U": "f_null", + "V": "f_null", + "W": [ [ "f_null", 30 ], [ "f_washer", 70 ] ], + "X": [ [ "f_birdbath", 70 ], [ "f_washer", 30 ] ], + "Y": "f_null", + "Z": "f_dryer", + "1": "f_cupboard", + "2": "f_cupboard", + "3": "f_cupboard", + "4": "f_cupboard", + "5": "f_sink", + "6": "f_null", + "7": "f_cupboard", + "8": "f_cupboard", + "9": "f_shower", + "@": "f_bed", + "₸": "f_null", + "∞": "f_null", + "≠": "f_null", + "Ø": "f_null", + "Æ": "f_null", + "ʭ": "f_ladder" + }, + "terrain": { + "Ŧ": { "param": "house_fence_type", "fallback": "t_fence" }, + "ɤ": { + "switch": { "param": "house_fence_type", "fallback": "t_fence" }, + "cases": { + "t_splitrail_fence": "t_splitrail_fencegate_c", + "t_chainfence": "t_chaingate_c", + "t_fence": "t_fencegate_c", + "t_privacy_fence": "t_privacy_fencegate_c", + "t_drystone_wall_half": "t_region_groundcover_urban" + } + }, + "a": "t_thconc_floor", + "j": "t_region_groundcover_urban", + "p": "t_region_groundcover_urban", + "u": "t_region_groundcover_urban", + "X": "t_region_groundcover_urban", + ".": { "param": "lawn_type", "fallback": "t_region_groundcover_urban" }, + "+": [ + [ "t_door_c", 3 ], + [ "t_door_o", 3 ], + [ "t_door_b", 1 ], + [ "t_door_frame", 1 ], + "t_door_makeshift_c", + "t_door_curtain_c" + ], + "*": [ [ "t_door_locked_peep", 2 ], "t_door_b", "t_rdoor_c", "t_rdoor_b", [ "t_door_locked", 10 ], "t_door_c" ], + "^": "t_gutter_downspout", + "|": { "param": "interior_wall_type", "fallback": "t_wall_w" }, + "#": { "param": "exterior_wall_type", "fallback": "t_brick_wall" }, + "¶": "t_door_glass_c", + ":": "t_wall_glass", + "-": "t_sidewalk", + "o": { "param": "window_type", "fallback": "t_window_boarded" }, + "<": "t_wood_stairs_up", + ">": "t_wood_stairs_down" + }, + "liquids": { "g": { "liquid": "water", "amount": [ 0, 100 ] } }, + "items": { + "v": [ + { "item": "art", "chance": 5 }, + { "item": "home_display_case", "chance": 30 }, + { "item": "harddrugs", "chance": 10, "repeat": [ 1, 2 ] }, + { "item": "maps", "chance": 2 }, + { "item": "guns_pistol_common", "chance": 50, "ammo": 90, "magazine": 100 }, + { "item": "gemstones", "chance": 30, "repeat": [ 1, 2 ] } + ], + "O": { "item": "SUS_oven", "chance": 2 }, + " ": { "item": "trash", "chance": 7 }, + ".": { "item": "trash", "chance": 1 }, + "1": [ { "item": "SUS_dishes", "chance": 4 }, { "item": "SUS_silverware", "chance": 10 } ], + "2": { "item": "SUS_cookware", "chance": 4 }, + "3": [ { "item": "SUS_utensils", "chance": 3 }, { "item": "SUS_knife_drawer", "chance": 3 } ], + "4": { "item": "SUS_junk_drawer", "chance": 6 }, + "5": { "item": "SUS_kitchen_sink", "chance": 5 }, + "8": [ { "item": "SUS_bathroom_medicine", "chance": 1 }, { "item": "harddrugs", "chance": 5 } ], + "@": { "item": "bed", "chance": 5 }, + "Z": { "item": "laundry", "chance": 10 }, + "W": { "item": "laundry", "chance": 10 } + }, + "nested": { + "|": { "chunks": [ [ "bile_field", 1 ], [ "shelter_graffiti", 2 ], [ "general_graffiti", 10 ], [ "null", 75 ] ] }, + "#": { "chunks": [ [ "bile_field", 1 ], [ "shelter_graffiti", 2 ], [ "general_graffiti", 10 ], [ "null", 75 ] ] }, + "v": { + "chunks": [ [ "looted_gunsafe_nested", 1 ], [ "jammed_gunsafe_nested", 10 ], [ "open_gunsafe_nested", 20 ], [ "null", 75 ] ] + }, + "+": { "chunks": [ [ "destroyed_door_nested", 50 ], [ "null", 50 ] ] }, + "*": { "chunks": [ [ "destroyed_door_nested", 50 ], [ "null", 50 ] ] }, + "Ŧ": { "chunks": [ [ "1x1_bash", 10 ], [ "null", 90 ] ] }, + "^": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "H": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "@": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "C": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "J": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "B": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "S": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "5": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "9": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "F": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "O": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "X": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "ɤ": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] }, + "¶": { "chunks": [ [ "1x1_bash", 50 ], [ "null", 50 ] ] } + } + } +] diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json index 9ad4dba74a92d..cc1e092ec6e73 100644 --- a/data/json/mapgen_palettes/house_general_palette.json +++ b/data/json/mapgen_palettes/house_general_palette.json @@ -17,6 +17,31 @@ [ "t_wall_y", 1 ] ] } + }, + "exterior_wall_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_brick_wall", 6 ], + [ "t_rock_wall", 3 ], + [ "t_wall_wood", 3 ], + [ "t_drystone_wall", 2 ], + [ "t_adobe_brick_wall", 4 ], + [ "t_concrete_wall", 4 ] + ] + } + }, + "house_fence_type": { + "type": "ter_str_id", + "default": { + "distribution": [ + [ "t_splitrail_fence", 3 ], + [ "t_chainfence", 2 ], + [ "t_fence", 2 ], + [ "t_privacy_fence", 1 ], + [ "t_drystone_wall_half", 1 ] + ] + } } }, "toilets": { "t": { } }, @@ -89,6 +114,17 @@ "ʭ": "f_ladder" }, "terrain": { + "Ŧ": { "param": "house_fence_type", "fallback": "t_fence" }, + "ɤ": { + "switch": { "param": "house_fence_type", "fallback": "t_fence" }, + "cases": { + "t_splitrail_fence": "t_splitrail_fencegate_c", + "t_chainfence": "t_chaingate_c", + "t_fence": "t_fencegate_c", + "t_privacy_fence": "t_privacy_fencegate_c", + "t_drystone_wall_half": "t_region_groundcover_urban" + } + }, "a": "t_thconc_floor", "j": "t_region_groundcover_urban", "p": "t_region_groundcover_urban", @@ -99,7 +135,8 @@ "*": [ [ "t_door_locked_peep", 2 ], "t_door_locked_alarm", [ "t_door_locked", 10 ], "t_door_c" ], "^": "t_gutter_downspout", "|": { "param": "interior_wall_type", "fallback": "t_wall_w" }, - "#": "t_brick_wall", + "#": { "param": "exterior_wall_type", "fallback": "t_brick_wall" }, + "¶": "t_door_glass_c", ":": "t_wall_glass", "-": "t_sidewalk", "o": [ diff --git a/data/mods/Magiclysm/worldgen/house_technomancer.json b/data/mods/Magiclysm/worldgen/house_technomancer.json index 4991480c6172b..ffb24c32fdd3d 100644 --- a/data/mods/Magiclysm/worldgen/house_technomancer.json +++ b/data/mods/Magiclysm/worldgen/house_technomancer.json @@ -12,7 +12,7 @@ "?..[....#::::#..[...!!!.....[.....?!________&[.?", "?.....^##yffy#####..!````````````%##========##.?", "?.....!#T y|<>#%%%`!.......!!`!#'''''''''&#.?", - "?.....!: hfh | *````!..[....#o*##'ŦŦŦŦŦŦŦŦ'#.?", + "?.....!: hfh | *````!..[....#o*##'зззззззз'#.?", "?.....!: hfh *````!.......#'''+'±±±±±±±±'#??", "?.....!: hfh x|L #%%%%%....[..#'''#+#::::::###.?", "?.[...!#y y|i #######......#>'<#''''''''''o.?", @@ -85,7 +85,7 @@ "}": "t_grass", "&": "t_gates_control_brick", "?": "t_drystone_wall", - "Ŧ": "t_ramp_down_high", + "з": "t_ramp_down_high", "±": "t_ramp_down_low" }, "furniture": { "!": "f_region_flower", "0": "f_stool", "}": "f_huge_mana_crystal" }, diff --git a/data/mods/No_Hope/Mapgen/mansion.json b/data/mods/No_Hope/Mapgen/mansion.json index 2d87c59822a31..6e483729338c2 100644 --- a/data/mods/No_Hope/Mapgen/mansion.json +++ b/data/mods/No_Hope/Mapgen/mansion.json @@ -943,7 +943,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##%%%..%%", @@ -960,7 +960,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": 50 }, @@ -1705,9 +1705,9 @@ "# |+|==|+|=|| |", "# |9|??|t|=== & |", "#| |||||||||||| |", - "# :i Ŧ |", + "# :i з |", "#i `-```}```-` :i |", - "#i `-```````-` :i Ŧ |", + "#i `-```````-` :i з |", "#i `-```````-` : |", "#i `-```-```-` #:):::|", "# ``-`````-`` |", @@ -1738,7 +1738,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" ] @@ -2189,7 +2189,7 @@ ".....###xxx|++|H #", ".......#|||| |lHH cT#", ".[.....#bbb| |||||+|||#", - "....%%.#Ŧ + +", + "....%%.#з + +", "....%%.o | +", ".......o‡ ||+||| ||||#", "...[...o |===Y| |LLL#", @@ -2200,7 +2200,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"