From 874b992a0ceead87fc01533a741932cb22179c03 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Wed, 10 Apr 2024 02:15:24 +0200 Subject: [PATCH 1/7] Change to terrain and furniture. Change broken generator to storage battery. Add solar panel to palette. --- data/json/mapgen_palettes/lmoe.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json index 6f0a0e5ed538..c09da876b3a6 100644 --- a/data/json/mapgen_palettes/lmoe.json +++ b/data/json/mapgen_palettes/lmoe.json @@ -16,7 +16,6 @@ ":": "t_secretdoor_metal_c", ";": "t_secretdoor_metal_o", "~": "t_water_pump", - "G": "t_generator_broken", "t": "t_metal_floor" }, "furniture": { @@ -32,6 +31,7 @@ "E": "f_exercise", "F": "f_fridge", "f": "f_sofa", + "G": "f_battery", "h": "f_chair", "H": "f_water_heater", "K": "f_sink", @@ -39,6 +39,7 @@ "L": "f_table", "O": "f_oven", "P": "f_punching_bag", + "p": "f_solar_unit", "r": "f_rack", "R": "f_rack", "s": "f_shower", From e52170348c9c2cda4ad9f0af59885dead0af8d7e Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Wed, 10 Apr 2024 02:16:05 +0200 Subject: [PATCH 2/7] Add solar panel to shelter roof. --- data/json/mapgen/lmoe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index dec22389704b..18c99dd01a57 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -54,7 +54,7 @@ "vvvvvvvvv((((((vvvvvvvvv", "vvvvvvvvv( (vvvvvvvvv", "vvvvvvvvv( (vvvvvvvvv", - "vvvvvvvvv( (vvvvvvvvv", + "vvvvvvvvv( p (vvvvvvvvv", "vvvvvvvvv( (vvvvvvvvv", "vvvvvvvvv((v(((vvvvvvvvv", "vvvvvvvvvvvvvvvvvvvvvvvv", From 424ca931b638c356223399919fedb5c4791846c7 Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Wed, 10 Apr 2024 10:45:19 +0200 Subject: [PATCH 3/7] Tweak file Moved solar panel into bunker_ext palette Upgraded solar panel into v2. --- data/json/mapgen_palettes/lmoe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json index c09da876b3a6..262ea4ca61ce 100644 --- a/data/json/mapgen_palettes/lmoe.json +++ b/data/json/mapgen_palettes/lmoe.json @@ -39,7 +39,6 @@ "L": "f_table", "O": "f_oven", "P": "f_punching_bag", - "p": "f_solar_unit", "r": "f_rack", "R": "f_rack", "s": "f_shower", @@ -92,6 +91,7 @@ "terrain": { " ": [ [ "t_region_groundcover", 60 ], [ "t_region_shrub", 2 ], "t_region_tree" ], "_": [ "t_region_groundcover", [ "t_region_groundcover_barren", 9 ] ], + "p": [ "t_region_groundcover", [ "f_solar_unit_v2" ] ], "#": "t_rock", "$": [ "t_region_tree_fruit", "t_region_tree_nut", "t_region_shrub_fruit", "t_region_shrub" ], "S": [ From 6cb4e16bc1dd64a81724b039913bb5f7eb42eb95 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Wed, 10 Apr 2024 06:28:30 -0500 Subject: [PATCH 4/7] Fix the thing --- data/json/mapgen_palettes/lmoe.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json index 262ea4ca61ce..2a3e1a508d44 100644 --- a/data/json/mapgen_palettes/lmoe.json +++ b/data/json/mapgen_palettes/lmoe.json @@ -91,7 +91,7 @@ "terrain": { " ": [ [ "t_region_groundcover", 60 ], [ "t_region_shrub", 2 ], "t_region_tree" ], "_": [ "t_region_groundcover", [ "t_region_groundcover_barren", 9 ] ], - "p": [ "t_region_groundcover", [ "f_solar_unit_v2" ] ], + "p": "t_region_groundcover", "#": "t_rock", "$": [ "t_region_tree_fruit", "t_region_tree_nut", "t_region_shrub_fruit", "t_region_shrub" ], "S": [ @@ -110,6 +110,7 @@ "(": "t_slope_down", "T": [ "t_region_tree_fruit", "t_region_tree_nut" ] }, + "furniture": { "p": "f_solar_unit_v2" }, "items": { " ": [ { "item": "forest", "chance": 1 }, { "item": "field", "chance": 2 } ] } } ] From cb4b99f1b62bf68fd56968432fef1e3f1947330d Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:14:48 +0200 Subject: [PATCH 5/7] Add floor lamp to palette --- data/json/mapgen_palettes/lmoe.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json index 2a3e1a508d44..77b65f186abf 100644 --- a/data/json/mapgen_palettes/lmoe.json +++ b/data/json/mapgen_palettes/lmoe.json @@ -35,6 +35,7 @@ "h": "f_chair", "H": "f_water_heater", "K": "f_sink", + "I": "f_floor_lamp", "l": "f_utility_shelf", "L": "f_table", "O": "f_oven", From a69d5fe06be59e92ab3b173c49e36bd9b2c3163b Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:23:31 +0200 Subject: [PATCH 6/7] Added floor lamps to mapgen. --- data/json/mapgen/lmoe.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index 18c99dd01a57..98a21a6e872c 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -86,7 +86,7 @@ "##||||||||||||||||||||##", "##|{{{{{|UUUUUU|w__BB|##", "##|u____|U____U|d__BB|##", - "##|u___h|U_UU_U|A,,,_|##", + "##|u_I_h|U_UU_U|A,,,_|##", "##|u___D|=*==*=|_,,,}|##", "##|A____:______+_,,,}|##", "##|||||||_1,,1_|S__hD|##", @@ -97,9 +97,9 @@ "##|c_bbbbA|,,|CSCCKCC|##", "##|c______|,,|u_____C|##", "##|c_TT___|,,|u_hLh_F|##", - "##|c_TTh__+__+_______|##", + "##|c_TTh__+__+______I|##", "##|c_TT___|__|rrrr__~|##", - "##|c______|__|||||+|||##", + "##|c_____I|I_|||||+|||##", "##|c______|__*__a|__A|##", "##|ccccccc|<<=G_a|HlW|##", "##||||||||||||||||||||##", @@ -125,7 +125,7 @@ "##....*....^############", "##....=....^############", "##===###Y...^###########", - "##G.R###-+|||####||||||#", + "##GIR###-+|||####||||||#", "##a.l###A.|UUVVvv|{{{{|#", "##=*=###..|U.....:....|#", "##c..ll-..|Uuuu.u||||||#", @@ -133,10 +133,10 @@ "##c.h..-r.+......+...BB#", "##c.TTT-r.-r..h..------#", "#######--+-r.hLh.+...BB#", - "#######-F.Sr..h..-Dh..d#", + "#######-F.Sr.Ih..-Dh..d#", "#######-C.......-------#", "#######-CCKC.uu.+...hD-#", - "#######-----.--+-}....-#", + "#######-----.--+-}...I-#", "#########W.~.-s.-}.BBS-#", "#########H...-&.-w.BBr-#", "#########l..A-Kt-------#", @@ -162,10 +162,10 @@ "##|,,<|||||||###########", "##|Y,<|w,BBd|###########", "||||+||},BB,|###########", - "|A,,,E|,,,,,|###########", + "|A,I,E|,,,,,|###########", "|f,,,,|+|||||||||||#####", "|f,,,e|,,,,b|_____|#####", - "|f,,,,|,,h,,|_____|#####", + "|f,,,,|,,hI,|_____|#####", "|Dh,,P|,hLh,|_____|#####", "|,,,,,|,hLh,|_____|#####", "|,,,,,+,,h,,|_____|#####", @@ -207,7 +207,7 @@ "##||||||||||||||||||||##", "##|{{{{{|UUUUUU|w__BB|##", "##|u____|U____U|d__BB|##", - "##|u___h|U_UU_U|A,,,_|##", + "##|u_I_h|U_UU_U|A,,,_|##", "##|u___D|=*==*=|_,,,}|##", "##|A____:______+_,,,}|##", "##|||||||_1,,1_|S__hD|##", @@ -218,9 +218,9 @@ "##|c_bbbbA|,,|CSCCKCC|##", "##|c______|,,|u_____C|##", "##|c_TT___|,,|u_hLh_F|##", - "##|c_TTh__+__+_______|##", + "##|c_TTh__+__+______I|##", "##|c_TT___|__|rrrr__~|##", - "##|c______|__|||||+|||##", + "##|c_____I|I_|||||+|||##", "##|c______|__*__a|__A|##", "##|ccccccc|<<=G_a|HlW|##", "##||||||||||||||||||||##", From 118e52d90be7974cd2885be7a84c163a4cb3a31c Mon Sep 17 00:00:00 2001 From: arijust <54635208+arijust@users.noreply.github.com> Date: Wed, 10 Apr 2024 15:29:45 +0200 Subject: [PATCH 7/7] Added ovens to building variants which didn't have these. --- data/json/mapgen/lmoe.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index 98a21a6e872c..3ed82b435814 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -96,7 +96,7 @@ "##|||||||||++|||||||||##", "##|c_bbbbA|,,|CSCCKCC|##", "##|c______|,,|u_____C|##", - "##|c_TT___|,,|u_hLh_F|##", + "##|c_TT___|,,|u_hLhOF|##", "##|c_TTh__+__+______I|##", "##|c_TT___|__|rrrr__~|##", "##|c_____I|I_|||||+|||##", @@ -131,9 +131,9 @@ "##c..ll-..|Uuuu.u||||||#", "##c....+..|||||+||Dh..d#", "##c.h..-r.+......+...BB#", - "##c.TTT-r.-r..h..------#", + "##c.TTT-r.-r..hI.------#", "#######--+-r.hLh.+...BB#", - "#######-F.Sr.Ih..-Dh..d#", + "#######-F.Sr.Oh..-Dh..d#", "#######-C.......-------#", "#######-CCKC.uu.+...hD-#", "#######-----.--+-}...I-#", @@ -219,7 +219,7 @@ "##|c______|,,|u_____C|##", "##|c_TT___|,,|u_hLh_F|##", "##|c_TTh__+__+______I|##", - "##|c_TT___|__|rrrr__~|##", + "##|c_TT___|__|rrrr_O~|##", "##|c_____I|I_|||||+|||##", "##|c______|__*__a|__A|##", "##|ccccccc|<<=G_a|HlW|##",