feat(content): residential personal items (#4312)

* residential personal items add nested container for unique personal items to spawn in houses * Update residential_personal_items.json * updated palette symbol * Fix No Hope Why is there not just not one full override of `standard_domestic_palette` in No Hope but TWO of them!? --------- Co-authored-by: Chaosvolt <[email protected]>
cataclysmbnteam · Mar 9, 2024 · 59eb28f · 59eb28f
1 parent a0a694d
commit 59eb28f
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 4 deletions.
diff --git a/data/json/mapgen/house/house_fence09.json b/data/json/mapgen/house/house_fence09.json
@@ -126,7 +126,7 @@
         ".............^.,,,,,....",
         "...######oo######oo##...",
         "...#wQ|8888B|d+ IIID#...",
-        "...#z |S___B|d+     #...",
+        "...#z |S___B|ɸ+     #...",
         "...#|+|t___||||b    #...",
         "...oy |||+||!!|  @@ o...",
         "...oy         + ¤@@¤o...",

diff --git a/data/json/mapgen/nested/residential_personal_items.json b/data/json/mapgen/nested/residential_personal_items.json
@@ -0,0 +1,60 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "NC_res_personal_items_1X1",
+    "//": "NEST CONTAINER - Items of interest or use to a specific person (hobbies, job-related, uniforms, tools, etc), meant to add personality. Should be able to fit in a closet or corner of a bedroom. This should be the nested chunk called by each individual house file. Global spawn rates for all houses that call this chunk can be managed by editing values below. ",
+    "object": {
+      "mapgensize": [ 1, 1 ],
+      "rows": [ "_" ],
+      "terrain": { "_": "t_null" },
+      "place_nested": [
+        {
+          "chunks": [ [ "null", 1 ], [ "res_personal_scuba_1X1", 5 ], [ "res_personal_elecgtr_1X1", 5 ] ],
+          "x": [ 0 ],
+          "y": [ 0 ]
+        }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "res_personal_scuba_1X1",
+    "object": {
+      "mapgensize": [ 1, 1 ],
+      "rows": [ "x" ],
+      "terrain": { "x": "t_null" },
+      "furniture": { "x": "f_cardboard_box" },
+      "place_loot": [
+        { "item": "wetsuit", "x": 0, "y": 0 },
+        { "item": "small_scuba_tank", "x": 0, "y": 0 },
+        { "item": "dive_bag", "x": 0, "y": 0 },
+        { "item": "swim_fins", "x": 0, "y": 0 },
+        { "item": "diving_watch", "x": 0, "y": 0, "chance": 5 },
+        { "item": "wetsuit_hood", "x": 0, "y": 0, "chance": 5 },
+        { "item": "wetsuit_spring", "x": 0, "y": 0, "chance": 5 },
+        { "item": "wetsuit_gloves", "x": 0, "y": 0, "chance": 5 },
+        { "item": "wetsuit_booties", "x": 0, "y": 0, "chance": 5 },
+        { "item": "rebreather", "x": 0, "y": 0, "chance": 5 },
+        { "item": "rebreather_filter", "x": 0, "y": 0, "chance": 5 }
+      ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "res_personal_elecgtr_1X1",
+    "object": {
+      "mapgensize": [ 1, 1 ],
+      "rows": [ "x" ],
+      "terrain": { "x": "t_null" },
+      "furniture": { "x": "f_speaker_cabinet" },
+      "place_loot": [
+        { "item": "cable_instrument", "x": 0, "y": 0, "repeat": [ 2, 3 ] },
+        { "item": "amplifier_head", "x": 0, "y": 0 },
+        { "item": "guitar_electric", "x": 0, "y": 0 }
+      ]
+    }
+  }
+]
diff --git a/data/json/mapgen_palettes/house_general_palette.json b/data/json/mapgen_palettes/house_general_palette.json
@@ -218,7 +218,8 @@
         { "item": "stash_drugs", "chance": 1 },
         { "item": "maps", "chance": 7 }
       ]
-    }
+    },
+    "nested": { "ɸ": { "chunks": [ "NC_res_personal_items_1X1" ] } }
   },
   {
     "type": "palette",

diff --git a/data/mods/No_Hope/Mapgen/office_doctor.json b/data/mods/No_Hope/Mapgen/office_doctor.json
@@ -218,7 +218,8 @@
         { "item": "toy_store", "chance": 60, "repeat": [ 1, 2 ] },
         { "item": "allsporting", "chance": 5 }
       ]
-    }
+    },
+    "nested": { "ɸ": { "chunks": [ "NC_res_personal_items_1X1" ] } }
   },
   {
     "type": "palette",

diff --git a/data/mods/No_Hope/palettes.json b/data/mods/No_Hope/palettes.json
@@ -218,7 +218,8 @@
         { "item": "toy_store", "chance": 60, "repeat": [ 1, 2 ] },
         { "item": "allsporting", "chance": 5 }
       ]
-    }
+    },
+    "nested": { "ɸ": { "chunks": [ "NC_res_personal_items_1X1" ] } }
   },
   {
     "type": "palette",