Audit Lightstatus across all maps except Modular Habitats

CleverRaven · Jan 17, 2025 · f6b72fc · f6b72fc
1 parent 25adee5
commit f6b72fc
Show file tree

Hide file tree

Showing 18 changed files with 176 additions and 159 deletions.
diff --git a/data/mods/Aftershock/maps/mapgen/afs_power_station_large.json b/data/mods/Aftershock/maps/mapgen/afs_power_station_large.json
@@ -55,7 +55,13 @@
         "3  °°° °  3°  °°°     °°°°3°°°   °°°   °°° 3° °3",
         "333333333333333333333333333333333333333333333433"
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_habitat_life_support" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_residential_furnishing",
+        "afs_habitat_life_support",
+        "afs_light_param_palette"
+      ],
       "terrain": {
         "0": "t_thconc_floor_no_roof",
         "3": "t_chainfence",
@@ -93,8 +99,8 @@
         { "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 24, 34 ], "y": [ 41, 44 ], "pack_size": [ 1, 2 ], "chance": 30 }
       ],
       "place_nested": [
-        { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 24, "y": 24 },
-        { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 24 }
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 24, "y": 24 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 24 }
       ]
     }
   },

diff --git a/data/mods/Aftershock/maps/mapgen/afs_power_station_small.json b/data/mods/Aftershock/maps/mapgen/afs_power_station_small.json
@@ -31,7 +31,13 @@
         "3°° ä°°°°°°°°° °°°°3 °  ",
         "33333333333333333333°   "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_habitat_life_support" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_residential_furnishing",
+        "afs_habitat_life_support",
+        "afs_light_param_palette"
+      ],
       "terrain": {
         "3": "t_chainfence",
         "4": "t_chaingate_c",
@@ -61,7 +67,7 @@
         { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 50 },
         { "group": "AFS_GROUP_ROBOT_LOW_RISK", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 2 ], "chance": 30 }
       ],
-      "place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 } ]
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {

diff --git a/data/mods/Aftershock/maps/mapgen/astrobiology_lab.json b/data/mods/Aftershock/maps/mapgen/astrobiology_lab.json
@@ -8,38 +8,39 @@
       "rows": [
         "                ,,      ",
         "               /44/     ",
-        "     /     /   /../     ",
+        "     /     /   /''/     ",
         "    //QQQQ//QQQ/33//    ",
         "   //..hh../t???...//   ",
-        "   /..htt..3......../   ",
+        "   /.'htt'.3....''../   ",
         "  //..htth./...dd5d.//  ",
         "  /5...hh../...d.h..^/  ",
         "  ///////////33////3//  ",
-        "  /h..B/R...3.../&..S/  ",
-        "  /dd.B/R.bb/:==//////  ",
-        "  /hh..//////...=d..E/  ",
+        "  /h..B/R.'.3.'./&'.S/  ",
+        "  /dd'B/R.bb/:==//////  ",
+        "  /hh..//////...=d.'E/  ",
         "  /===:/FFFS/==:=dh.E/  ",
         "  /................ö./  ",
-        "  /.hccc..chccch..ch./  ",
-        "  /.Tchc..ccchcc..cc./  ",
+        "  /.hccc'.chccch.'ch./  ",
+        "  /.Tchc'.ccchcc.'cc./  ",
         "  ó..................ó  ",
         "  /S..((((((((((((..O/  ",
         "  /S..(Iii____IIi(.hc/  ",
         "  //=:(I77_iA___i(:=//  ",
-        "   /..(____iii___(../   ",
+        "   /.'(____iii___('./   ",
         "   //.3__7I___II_3.//   ",
         "    //------------//    ",
         "                        "
       ],
-      "palettes": [ "afs_generic_building" ],
+      "palettes": [ "afs_generic_building", "afs_light_param_palette" ],
       "terrain": {
         "A": "t_basaltfloor",
         "R": "t_metal_floor",
         ",": "t_sidewalk",
         "_": [ "t_deaddirt", "t_deaddirt", "t_ice" ],
         "i": [ "t_lichenyum", "t_lichen", "t_lichendirt" ],
         "I": [ "t_lichen", "t_lichendirt" ],
-        "7": [ "t_tree_worm", "t_tree_lichen" ]
+        "7": [ "t_tree_worm", "t_tree_lichen" ],
+        "'": "t_metal_floor_olight_inactive"
       },
       "furniture": {
         "A": "f_geo_vent",
@@ -70,7 +71,8 @@
         "t": [ { "item": "office_paper", "chance": 60 }, { "item": "tools_science", "chance": 10, "repeat": [ 1, 2 ] } ]
       },
       "item": { "c": { "item": "recipe_lichenlog", "chance": 6 } },
-      "monster": { "ö": { "monster": "mon_skitterbot" } }
+      "monster": { "ö": { "monster": "mon_skitterbot" } },
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {

diff --git a/data/mods/Aftershock/maps/mapgen/exosuit_garage.json b/data/mods/Aftershock/maps/mapgen/exosuit_garage.json
@@ -31,13 +31,19 @@
         "            /////)))//  ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_life_support", "afs_habitat_residential_furnishing" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_life_support",
+        "afs_habitat_residential_furnishing",
+        "afs_light_param_palette"
+      ],
       "terrain": { "1": "t_afs_security_gate_closed", "3": "t_afs_door_metal_elocked", "4": "t_reinforced_glass_shutter" },
       "furniture": { "2": "f_security_panel", "5": "f_machinery_light", "6": "f_machinery_electronic", "î": "f_rack" },
       "items": { "î": { "item": "magazines", "chance": 80, "repeat": [ 2, 5 ] } },
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } ],
       "place_nested": [
-        { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 },
         { "chunks": [ [ "afs_exosuit_garage_unlooted", 60 ], [ "afs_exosuit_garage_looted", 40 ] ], "x": 0, "y": 0 }
       ]
     }

diff --git a/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json b/data/mods/Aftershock/maps/mapgen/exosuit_garage_2.json
@@ -31,13 +31,19 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_life_support", "afs_habitat_residential_furnishing" ],
+      "palettes": [
+        "afs_habitat_structure",
+        "afs_habitat_exterior",
+        "afs_habitat_life_support",
+        "afs_habitat_residential_furnishing",
+        "afs_light_param_palette"
+      ],
       "terrain": { "2": "t_afs_security_gate_closed", "1": "t_afs_door_metal_elocked" },
       "furniture": { "4": "f_machinery_light", "5": "f_machinery_electronic" },
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } ],
       "vendingmachines": { "3": { "item_group": "afs_vending_false_meals", "reinforced": true, "powered": true } },
       "place_nested": [
-        { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 },
         {
           "chunks": [ [ "afs_exosuit_garage_2_unlooted", 60 ], [ "afs_exosuit_garage_2_looted", 40 ] ],
           "x": 0,

diff --git a/data/mods/Aftershock/maps/mapgen/freight_transport.json b/data/mods/Aftershock/maps/mapgen/freight_transport.json
@@ -14,12 +14,12 @@
         "       -)-)-  -))-   ññññññ      ñññññññ        ",
         "     ---Foj----II--- -)- --!--   -))-))-        ",
         "   ---yh...U-LL..qq---I---...-----ä.â.ä--       ",
-        "   #.#yh.,ss-E...,.....q-l...l-éé-ä.,.ä----     ",
+        "   #.#yh.'ss-E...'.....q-l...l-éé-ä.'.ä----     ",
         "   ---á.....!..f-)---..q-l...l-..---1---hc)     ",
-        "     --!--ee-,h❺)ê!.1,..!..,..-....5..!.,c)     ",
-        "   ---S.S----..f-)---7.q-l....!....,..--hc)     ",
-        "   #.#.,.-OP-E...,.....q-l....-6f4....f----     ",
-        "   ---SS.!,❸-LL..qq---I---...-----fL.fE--       ",
+        "     --!--ee-'h❺)ê!.1'..!..'..-....5..!.'c)     ",
+        "   ---S.S----..f-)---7.q-l....!....'..--hc)     ",
+        "   #.#.'.-OP-E...'.....q-l....-6f4....f----     ",
+        "   ---SS.!'❸-LL..qq---I---...-----fL.fE--       ",
         "     ---W-~----II--- -)- --!--   -))-))-        ",
         "       -)-)-  -))-   ññññññ      ñññññññ        ",
         "       ñññññññññññ                              ",
@@ -35,7 +35,8 @@
         "afs_habitat_structure",
         "afs_habitat_mech_furnishing",
         "afs_habitat_residential_furnishing",
-        "afs_habitat_life_support"
+        "afs_habitat_life_support",
+        "afs_light_param_palette"
       ],
       "terrain": { "ñ": "t_afs_broken_treads", "1": "t_door_metal_locked", "ê": "t_nuclear_reactor" },
       "furniture": {
@@ -75,7 +76,11 @@
           "options": [ { "name": "UNLOCK ARMORY DOORS", "action": "unlock" } ],
           "failures": [ { "action": "shutdown" }, { "action": "alarm" } ]
         }
-      }
+      },
+      "place_nested": [
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 },
+        { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 24, "y": 0 }
+      ]
     }
   },
   {

diff --git a/data/mods/Aftershock/maps/mapgen/general_store.json b/data/mods/Aftershock/maps/mapgen/general_store.json
@@ -31,7 +31,7 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing" ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": { "1": "t_door_metal_locked" },
       "//": "An Electronic safe would be prefered but the gunsafe furniture is hardcoded to say do you want to hack this gunsafe?",
       "furniture": {
@@ -61,7 +61,7 @@
       },
       "place_loot": [ { "group": "afs_register_random", "x": [ 3, 6 ], "y": 10, "repeat": 1 } ],
       "place_monster": [ { "group": "AFS_GROUP_RUIN_MOXIE", "x": [ 0, 23 ], "y": [ 0, 23 ], "pack_size": [ 1, 3 ], "chance": 20 } ],
-      "place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 } ]
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
@@ -101,13 +101,14 @@
         "afs_habitat_structure",
         "afs_habitat_residential_furnishing",
         "afs_habitat_life_support",
-        "afs_habitat_exterior"
+        "afs_habitat_exterior",
+        "afs_light_param_palette"
       ],
       "terrain": { " ": "t_open_air", "1": { "param": "carpet_color_type", "fallback": "t_carpet_red" } },
       "furniture": { "2": "f_dishwasher", "á": "f_bookcase" },
       "place_item": [ { "item": "television", "repeat": 1, "x": 11, "y": 15 } ],
       "items": { "á": { "item": "homebooks", "repeat": [ 2, 3 ] }, "q": { "item": "afs_old_food_storage", "chance": 60 } },
-      "place_nested": [ { "chunks": [ [ "null", 80 ], [ "afs_map_lights_on", 20 ] ], "x": 0, "y": 0 } ]
+      "place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
     }
   },
   {
@@ -144,14 +145,5 @@
       ],
       "palettes": [ "roof_palette" ]
     }
-  },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "nested_mapgen_id": "afs_map_lights_on",
-    "object": {
-      "mapgensize": [ 24, 24 ],
-      "place_ter_furn_transforms": [ { "transform": "afs_lights_on", "x": [ 0, 23 ], "y": [ 0, 23 ] } ]
-    }
   }
 ]
diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_1.json
@@ -35,7 +35,8 @@
         "afs_habitat_structure",
         "afs_habitat_exterior",
         "afs_habitat_residential_furnishing",
-        "afs_habblock_1_paramter_palette"
+        "afs_habblock_1_paramter_palette",
+        "afs_light_param_palette"
       ],
       "furniture": { "1": "f_washer", "2": "f_dryer", "3": "f_atm" },
       "vendingmachines": { "V": { "item_group": "afs_vending_false_meals", "reinforced": true, "powered": true } },
@@ -124,7 +125,8 @@
         "afs_habitat_exterior",
         "afs_habitat_residential_furnishing",
         "afs_habitat_life_support",
-        "afs_habblock_1_paramter_palette"
+        "afs_habblock_1_paramter_palette",
+        "afs_light_param_palette"
       ],
       "terrain": { " ": "t_open_air", "1": "t_afs_door_metal_elocked" },
       "place_monster": [
@@ -190,8 +192,7 @@
       "variant": {
         "type": "nested_mapgen_id",
         "default": { "distribution": [ "afs_habblock_1_slot1_cafe_a1", "afs_habblock_1_slot1_diner_a1" ] }
-      },
-      "lightstatus": { "type": "nested_mapgen_id", "default": { "distribution": [ "afs_map_lights_on", "null" ] } }
+      }
     }
   },
   {

diff --git a/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json b/data/mods/Aftershock/maps/mapgen/habitat_blocks/habitat_block_2.json
@@ -60,7 +60,7 @@
         "afs_habitat_exterior",
         "afs_habitat_residential_furnishing",
         "afs_habitat_life_support",
-        "afs_habblock_2_paramter_palette"
+        "afs_light_param_palette"
       ],
       "terrain": {
         "0": "t_elevator_control",
@@ -172,12 +172,7 @@
         " ////        ////              ////        //// ",
         "                                                "
       ],
-      "palettes": [
-        "afs_habitat_structure",
-        "afs_habitat_exterior",
-        "afs_habitat_residential_furnishing",
-        "afs_habblock_2_paramter_palette"
-      ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": {
         " ": "t_open_air",
         "0": "t_elevator_control",
@@ -294,12 +289,7 @@
         " ////        ////              ////        //// ",
         "                                                "
       ],
-      "palettes": [
-        "afs_habitat_structure",
-        "afs_habitat_exterior",
-        "afs_habitat_residential_furnishing",
-        "afs_habblock_2_paramter_palette"
-      ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": {
         " ": "t_open_air",
         "0": "t_elevator_control",
@@ -391,12 +381,7 @@
         " ////        ////              ////        //// ",
         "                                                "
       ],
-      "palettes": [
-        "afs_habitat_structure",
-        "afs_habitat_exterior",
-        "afs_habitat_residential_furnishing",
-        "afs_habblock_2_paramter_palette"
-      ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": {
         " ": "t_open_air",
         "0": "t_elevator_control",
@@ -486,12 +471,7 @@
         " ////        ////              [[[[        [[[[ ",
         "                                                "
       ],
-      "palettes": [
-        "afs_habitat_structure",
-        "afs_habitat_exterior",
-        "afs_habitat_residential_furnishing",
-        "afs_habblock_2_paramter_palette"
-      ],
+      "palettes": [ "afs_habitat_structure", "afs_habitat_exterior", "afs_habitat_residential_furnishing", "afs_light_param_palette" ],
       "terrain": {
         " ": "t_open_air",
         ".": "t_metal_floor_no_roof",
@@ -594,10 +574,5 @@
       "palettes": [ "afs_habitat_structure", "afs_habitat_exterior" ],
       "terrain": { " ": "t_open_air", ".": "t_metal_floor_no_roof" }
     }
-  },
-  {
-    "type": "palette",
-    "id": "afs_habblock_2_paramter_palette",
-    "parameters": { "lightstatus": { "type": "nested_mapgen_id", "default": { "distribution": [ "afs_map_lights_on", "null" ] } } }
   }
 ]