Add mutagen crafting components to underground lab (#34384)

* Add tools_science item group to a few racks * Change loot spawns to be on benches * Remove science tools from cleaning rack
CleverRaven · Oct 21, 2019 · 7787bc0 · 7787bc0
1 parent 330984b
commit 7787bc0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/data/json/mapgen/lab/lab_common.json b/data/json/mapgen/lab/lab_common.json
@@ -40,7 +40,12 @@
     "id": "lab_loot_research",
     "mapping": {
       "c": {
-        "items": [ { "item": "dissection", "chance": 10 }, { "item": "chem_lab", "chance": 10 }, { "item": "mut_lab", "chance": 2 } ]
+        "items": [
+          { "item": "tools_science", "chance": 10 },
+          { "item": "dissection", "chance": 10 },
+          { "item": "chem_lab", "chance": 10 },
+          { "item": "mut_lab", "chance": 2 }
+        ]
       },
       "S": { "items": [ { "item": "drugs_heal_simple", "chance": 10 }, { "item": "harddrugs", "chance": 5 } ] },
       "X": {

diff --git a/data/json/mapgen/lab/lab_floorplans.json b/data/json/mapgen/lab/lab_floorplans.json
@@ -209,7 +209,7 @@
         "=": "t_conveyor",
         "%": "t_machinery_heavy"
       },
-      "mapping": { "c": { "items": [ { "item": "chem_lab", "chance": 20 } ] } },
+      "mapping": { "c": { "items": [ { "item": "chem_lab", "chance": 20 }, { "item": "tools_science", "chance": 20 } ] } },
       "place_nested": [
         { "chunks": [ "lab_spawn_9x9_wall_sw" ], "x": 13, "y": 1 },
         { "chunks": [ "sub_t_concrete_wall" ], "x": 13, "y": 10 },
@@ -261,7 +261,7 @@
         "C": "t_centrifuge"
       },
       "mapping": {
-        "c": { "items": [ { "item": "chem_lab", "chance": 10 } ] },
+        "c": { "items": [ { "item": "chem_lab", "chance": 10 }, { "item": "tools_science", "chance": 10 } ] },
         "r": { "items": [ { "item": "cleaning", "chance": 30 } ] }
       },
       "place_nested": [
@@ -486,7 +486,7 @@
           ]
         },
         "r": { "items": [ { "item": "mine_equipment", "chance": 30 } ] },
-        "c": { "items": [ { "item": "chem_lab", "chance": 30 } ] }
+        "c": { "items": [ { "item": "chem_lab", "chance": 30 }, { "item": "tools_science", "chance": 30 } ] }
       },
       "place_monster": [ { "monster": "mon_turret_rifle", "x": 11, "y": 9, "chance": 20 } ],
       "place_nested": [
@@ -547,6 +547,7 @@
         "r": {
           "items": [
             { "item": "dissection", "chance": 60 },
+            { "item": "tools_science", "chance": 20 },
             { "item": "bionics_common", "chance": 10 },
             { "item": "mut_lab", "chance": 5 }
           ]
@@ -683,7 +684,10 @@
       ],
       "palettes": [ "lab_palette" ],
       "terrain": { "C": "t_centrifuge", "7": "t_console", ",": "t_floor_blue" },
-      "mapping": { "c": { "items": [ { "item": "office", "chance": 30 } ] }, "l": { "items": [ { "item": "science", "chance": 60 } ] } },
+      "mapping": {
+        "c": { "items": [ { "item": "office", "chance": 30 }, { "item": "tools_science", "chance": 15 } ] },
+        "l": { "items": [ { "item": "science", "chance": 60 } ] }
+      },
       "computers": {
         "6": {
           "name": "Containment Control",