feat: add batteries and solar panels to LMOE shelter (cataclysmbnteam…

…#4460) * Change to terrain and furniture. Change broken generator to storage battery. Add solar panel to palette. * Add solar panel to shelter roof. * Tweak file Moved solar panel into bunker_ext palette Upgraded solar panel into v2. * Fix the thing * Add floor lamp to palette * Added floor lamps to mapgen. * Added ovens to building variants which didn't have these. --------- Co-authored-by: Chaosvolt <[email protected]>
Lamandus · Apr 10, 2024 · 5960913 · 5960913
1 parent 5de1f91
commit 5960913
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git 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",
@@ -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|##",
@@ -96,10 +96,10 @@
         "##|||||||||++|||||||||##",
         "##|c_bbbbA|,,|CSCCKCC|##",
         "##|c______|,,|u_____C|##",
-        "##|c_TT___|,,|u_hLh_F|##",
-        "##|c_TTh__+__+_______|##",
+        "##|c_TT___|,,|u_hLhOF|##",
+        "##|c_TTh__+__+______I|##",
         "##|c_TT___|__|rrrr__~|##",
-        "##|c______|__|||||+|||##",
+        "##|c_____I|I_|||||+|||##",
         "##|c______|__*__a|__A|##",
         "##|ccccccc|<<=G_a|HlW|##",
         "##||||||||||||||||||||##",
@@ -125,18 +125,18 @@
         "##....*....^############",
         "##....=....^############",
         "##===###Y...^###########",
-        "##G.R###-+|||####||||||#",
+        "##GIR###-+|||####||||||#",
         "##a.l###A.|UUVVvv|{{{{|#",
         "##=*=###..|U.....:....|#",
         "##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..h..-Dh..d#",
+        "#######-F.Sr.Oh..-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_TT___|__|rrrr__~|##",
-        "##|c______|__|||||+|||##",
+        "##|c_TTh__+__+______I|##",
+        "##|c_TT___|__|rrrr_O~|##",
+        "##|c_____I|I_|||||+|||##",
         "##|c______|__*__a|__A|##",
         "##|ccccccc|<<=G_a|HlW|##",
         "##||||||||||||||||||||##",

diff --git 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,9 +31,11 @@
       "E": "f_exercise",
       "F": "f_fridge",
       "f": "f_sofa",
+      "G": "f_battery",
       "h": "f_chair",
       "H": "f_water_heater",
       "K": "f_sink",
+      "I": "f_floor_lamp",
       "l": "f_utility_shelf",
       "L": "f_table",
       "O": "f_oven",
@@ -91,6 +92,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",
       "#": "t_rock",
       "$": [ "t_region_tree_fruit", "t_region_tree_nut", "t_region_shrub_fruit", "t_region_shrub" ],
       "S": [
@@ -109,6 +111,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 } ] }
   }
 ]