Sample fixes, adds human samples to purifier (CleverRaven#53279)

Maleclypse · Dec 14, 2021 · 0f74ac7 · 0f74ac7
1 parent 3ddb9ab
commit 0f74ac7
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 33 deletions.
diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -404,6 +404,24 @@
       { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
   },
+  {
+    "id": "mammal_small_fur_lupine",
+    "//": "does not drop stomach or other small organs",
+    "type": "harvest",
+    "entries": [
+      { "drop": "lupine_sample", "type": "mutagen_group" },
+      { "drop": "meat", "type": "flesh", "mass_ratio": 0.28 },
+      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
+      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  },
   {
     "id": "mammal_small_fur_rabbit",
     "//": "does not drop stomach or other small organs",
@@ -1399,6 +1417,7 @@
     "//": "a monstrous horror, probably the most destructive entity you will ever see",
     "type": "harvest",
     "entries": [
+      { "drop": "human_sample", "type": "mutagen_group" },
       { "drop": "skull_human", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
       { "drop": "human_flesh", "type": "flesh", "mass_ratio": 0.2 },
       { "drop": "hstomach", "scale_num": [ 1, 1 ], "max": 1, "type": "offal" },

diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/harvest_dissection.json b/data/json/itemgroups/Monsters_Animals_Lairs/harvest_dissection.json
@@ -3,60 +3,66 @@
     "id": "snail_sample",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "snail_sample", "prob": 30 } ]
+    "entries": [ { "item": "snail_sample" } ]
   },
   {
     "id": "rabbit_foot",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "rabbit_foot", "prob": 30 } ]
+    "entries": [ { "item": "rabbit_foot" } ]
   },
   {
     "id": "frog_sample",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "frog_sample", "prob": 30 } ]
+    "entries": [ { "item": "frog_sample", "count-min": 1, "count-max": 3 } ]
   },
   {
     "id": "insect_sample",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "insect_sample", "prob": 30 } ]
+    "entries": [ { "item": "insect_sample" } ]
   },
   {
     "id": "bovine_sample",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "bovine_sample", "prob": 30 } ]
+    "entries": [ { "item": "bovine_sample", "count-min": 2, "count-max": 5 } ]
   },
   {
     "id": "spider_sample",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "spider_sample", "prob": 30 } ]
+    "entries": [ { "item": "spider_sample" } ]
   },
   {
     "id": "molerat_sample",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "molerat_sample", "prob": 30 } ]
+    "entries": [ { "item": "molerat_sample", "count-min": 2, "count-max": 6 } ]
   },
   {
     "id": "reptile_sample",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "reptile_sample", "prob": 30 } ]
+    "entries": [ { "item": "reptile_sample", "count-min": 1, "count-max": 4 } ]
   },
   {
     "id": "lupine_sample",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "lupine_sample", "prob": 30 } ]
+    "entries": [ { "item": "lupine_sample" } ]
   },
   {
     "id": "feline_sample",
     "type": "item_group",
     "subtype": "collection",
-    "entries": [ { "item": "feline_sample", "prob": 30 } ]
+    "entries": [ { "item": "feline_sample" } ]
+  },
+  {
+    "id": "human_sample",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [ { "item": "human_sample" } ]
   }
 ]
diff --git a/data/json/items/mutagen_ingredients.json b/data/json/items/mutagen_ingredients.json
@@ -148,5 +148,20 @@
     "weight": "114 g",
     "volume": "250 ml",
     "category": "spare_parts"
+  },
+  {
+    "type": "GENERIC",
+    "id": "human_sample",
+    "symbol": "q",
+    "color": "black_red",
+    "name": { "str": "human sample" },
+    "description": "A sample of things that make up key parts of being a human.  There are significantly less of these every day.",
+    "price": 1000,
+    "price_postapoc": 10,
+    "material": [ "flesh" ],
+    "flags": [ "NO_SALVAGE" ],
+    "weight": "114 g",
+    "volume": "250 ml",
+    "category": "spare_parts"
   }
 ]
diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -838,7 +838,7 @@
     "species": [ "MAMMAL" ],
     "volume": "30000 ml",
     "weight": "30 kg",
-    "harvest": "mammal_small_fur",
+    "harvest": "mammal_small_fur_lupine",
     "hp": 30,
     "speed": 150,
     "material": [ "flesh" ],

diff --git a/data/json/recipes/chem/mutagens.json b/data/json/recipes/chem/mutagens.json
@@ -115,7 +115,7 @@
     "using": [ [ "mutagen_production_standard", 25 ] ],
     "components": [
       [ [ "mutagen", 1 ] ],
-      [ [ "insect_sample", 3 ] ],
+      [ [ "insect_sample", 1 ] ],
       [ [ "bee_sting", 3 ], [ "wasp_sting", 3 ] ],
       [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ]
     ],
@@ -134,7 +134,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_maiar", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_insect", 2 ] ] ],
+    "components": [ [ [ "mutagen_insect", 2 ] ], [ [ "insect_sample", 3 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -153,7 +153,7 @@
     "components": [
       [ [ "mutagen", 1 ] ],
       [ [ "spider_egg", 1 ], [ "chitin_piece", 4 ] ],
-      [ [ "spider_sample", 3 ] ],
+      [ [ "spider_sample", 1 ] ],
       [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ]
     ],
     "flags": [ "SECRET" ]
@@ -171,7 +171,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_maiar", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_spider", 2 ] ] ],
+    "components": [ [ [ "mutagen_spider", 2 ] ], [ [ "spider_sample", 3 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -187,7 +187,7 @@
     "batch_time_factors": [ 80, 20 ],
     "book_learn": [ [ "recipe_creepy", 6 ] ],
     "using": [ [ "mutagen_production_standard", 25 ] ],
-    "components": [ [ [ "mutagen", 1 ] ], [ [ "snail_sample", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ],
+    "components": [ [ [ "mutagen", 1 ] ], [ [ "snail_sample", 1 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -203,7 +203,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_creepy", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_snail", 2 ] ] ],
+    "components": [ [ [ "mutagen_snail", 2 ] ], [ [ "snail_sample", 3 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -428,7 +428,7 @@
     "using": [ [ "mutagen_production_standard", 25 ] ],
     "components": [
       [ [ "mutagen", 1 ] ],
-      [ [ "feline_sample", 3 ] ],
+      [ [ "feline_sample", 1 ] ],
       [ [ "meat", 3 ], [ "meat_scrap", 30 ] ],
       [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ]
     ],
@@ -447,7 +447,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_feline", 2 ] ] ],
+    "components": [ [ [ "mutagen_feline", 2 ] ], [ [ "feline_sample", 3 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -465,7 +465,7 @@
     "using": [ [ "mutagen_production_standard", 25 ] ],
     "components": [
       [ [ "mutagen", 1 ] ],
-      [ [ "lupine_sample", 3 ] ],
+      [ [ "lupine_sample", 1 ] ],
       [ [ "meat", 3 ], [ "meat_scrap", 30 ] ],
       [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ]
     ],
@@ -484,7 +484,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_lupine", 2 ] ] ],
+    "components": [ [ [ "mutagen_lupine", 2 ] ], [ [ "lupine_sample", 3 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -502,7 +502,7 @@
     "using": [ [ "mutagen_production_standard", 25 ] ],
     "components": [
       [ [ "mutagen", 1 ] ],
-      [ [ "bovine_sample", 3 ] ],
+      [ [ "bovine_sample", 1 ] ],
       [ [ "meat", 3 ], [ "meat_scrap", 30 ] ],
       [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ]
     ],
@@ -521,7 +521,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_cattle", 2 ] ] ],
+    "components": [ [ [ "mutagen_cattle", 2 ] ], [ [ "bovine_sample", 3 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -608,7 +608,7 @@
     "components": [
       [ [ "mutagen", 1 ] ],
       [ [ "egg_reptile", 1 ] ],
-      [ [ "reptile_sample", 3 ] ],
+      [ [ "reptile_sample", 1 ] ],
       [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ]
     ],
     "flags": [ "SECRET" ]
@@ -626,7 +626,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_lizard", 2 ] ] ],
+    "components": [ [ [ "mutagen_lizard", 2 ] ], [ [ "reptile_sample", 3 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -642,7 +642,7 @@
     "batch_time_factors": [ 80, 20 ],
     "book_learn": [ [ "recipe_animal", 6 ] ],
     "using": [ [ "mutagen_production_standard", 25 ] ],
-    "components": [ [ [ "mutagen", 1 ] ], [ [ "frog_sample", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ],
+    "components": [ [ [ "mutagen", 1 ] ], [ [ "frog_sample", 1 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -658,7 +658,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_batrachian", 2 ] ] ],
+    "components": [ [ [ "mutagen_batrachian", 2 ] ], [ [ "frog_sample", 3 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -674,7 +674,7 @@
     "batch_time_factors": [ 80, 20 ],
     "book_learn": [ [ "recipe_maiar", 6 ] ],
     "using": [ [ "mutagen_production_standard", 25 ] ],
-    "components": [ [ [ "mutagen", 1 ] ], [ [ "molerat_sample", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ],
+    "components": [ [ [ "mutagen", 1 ] ], [ [ "molerat_sample", 1 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -690,7 +690,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_maiar", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_troglobite", 2 ] ] ],
+    "components": [ [ [ "mutagen_troglobite", 2 ] ], [ [ "molerat_sample", 3 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -758,7 +758,13 @@
     "batch_time_factors": [ 80, 20 ],
     "book_learn": [ [ "record_patient", 7 ], [ "recipe_maiar", 6 ], [ "recipe_labchem", 5 ] ],
     "using": [ [ "mutagen_production_standard", 25 ] ],
-    "components": [ [ [ "mutagen", 2 ] ], [ [ "bleach", 3 ], [ "oxy_powder", 300 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ] ],
+    "//": "requires more human samples than comparable mutagen as you are trying to identify specific differences from your mutated anatomy than from baseline humans.",
+    "components": [
+      [ [ "mutagen", 2 ] ],
+      [ [ "bleach", 3 ], [ "oxy_powder", 300 ] ],
+      [ [ "human_sample", 2 ] ],
+      [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ]
+    ],
     "flags": [ "SECRET" ]
   },
   {
@@ -774,7 +780,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 7 ], [ "recipe_labchem", 7 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "purifier", 2 ] ] ],
+    "components": [ [ [ "purifier", 2 ] ], [ [ "human_sample", 4 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -919,7 +925,7 @@
     "time": "12 m",
     "book_learn": [ [ "recipe_animal", 6 ] ],
     "using": [ [ "mutagen_production_standard", 25 ] ],
-    "components": [ [ [ "mutagen", 1 ] ], [ [ "rabbit_foot", 2 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ],
+    "components": [ [ [ "mutagen", 1 ] ], [ [ "rabbit_foot", 1 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ],
     "flags": [ "SECRET" ]
   },
   {
@@ -935,7 +941,7 @@
     "batch_time_factors": [ 20, 5 ],
     "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ],
     "using": [ [ "serum_production_standard", 37 ] ],
-    "components": [ [ [ "mutagen_rabbit", 2 ] ] ],
+    "components": [ [ [ "mutagen_rabbit", 2 ] ], [ [ "rabbit_foot", 2 ] ] ],
     "flags": [ "SECRET" ]
   }
 ]