Merge remote-tracking branch 'origin/pr/40523'

* origin/pr/40523: (36 commits) Obsoleted ammonia recipe Slightly changed description of Advanced Physical Chemistry book Removed ammonia from scrap metal recipe as unrealistic Require three units of water in saltpeter recipe Added ability to learn recipe of lye powder from basic chemistry book Added ability to learn aspirine recipe from basic chemistry book Lowered difficulty of aspirin recipe from 4 to 2, soap recipe from 3 to 2 Made smoke bomb recipe be learned from basic chemistry book Balanced lots of recipes to use chemistry instead of cooking Made fuse recipe use chemistry instead of cooking Balanced several medical recipes to use chemistry (and sometimes first aid) instead of cooking Made boiling salt require chemistry instead of cooking Added basic chemistry book to SUS itemgroup for libraries Removed chemistry skill from soap flakes recipe Reduced chemistry skill requirement in lye recipe from 2 to 1 Updated several recipes to use chemistry instead of cooking Fixed recipes test Poppy painkiller requires chemistry Rebalanced lots of meds and chemical recipes Rebalanced several recipes ferom recipe_others.json ...
meladath · May 30, 2020 · f048227 · f048227
2 parents f006dfa + ed14bb7
commit f048227
Show file tree

Hide file tree

Showing 30 changed files with 744 additions and 706 deletions.
diff --git a/data/json/itemgroups/SUS/library.json b/data/json/itemgroups/SUS/library.json
@@ -107,7 +107,8 @@
       { "item": "textbook_gaswarfare", "count": [ 1, 2 ], "prob": 40 },
       { "item": "textbook_chemistry", "count": [ 1, 4 ], "prob": 90 },
       { "item": "textbook_extraction", "count": [ 1, 2 ], "prob": 60 },
-      { "item": "adv_chemistry", "count": [ 1, 4 ], "prob": 70 }
+      { "item": "adv_chemistry", "count": [ 1, 4 ], "prob": 70 },
+      { "item": "basic_chemistry", "count": [ 1, 3 ], "prob": 70 }
     ]
   },
   {

diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json
@@ -232,7 +232,8 @@
       { "item": "child_book", "prob": 50 },
       { "item": "manual_dodge_kid", "prob": 20 },
       { "item": "book_nonf_soft_wedding_coolring", "prob": 1 },
-      { "item": "mag_comic", "prob": 20 }
+      { "item": "mag_comic", "prob": 20 },
+      { "item": "basic_chemistry", "prob": 10 }
     ]
   },
   {
@@ -353,6 +354,7 @@
       { "item": "reference_fabrication1", "prob": 1 },
       { "item": "reference_firstaid1", "prob": 1 },
       { "item": "reference_firstaid2", "prob": 1 },
+      { "item": "basic_chemistry", "prob": 10 },
       { "item": "survnote", "prob": 3 }
     ]
   },
@@ -421,7 +423,8 @@
       { "item": "textbook_armwest", "prob": 3 },
       { "item": "textbook_armeast", "prob": 3 },
       { "item": "survnote", "prob": 2 },
-      { "item": "book_lockpick", "prob": 2 }
+      { "item": "book_lockpick", "prob": 2 },
+      { "item": "basic_chemistry", "prob": 5 }
     ]
   },
   {

diff --git a/data/json/items/book/chemistry.json b/data/json/items/book/chemistry.json
@@ -0,0 +1,331 @@
+[
+  {
+    "id": "adv_chemistry",
+    "type": "BOOK",
+    "name": { "str": "Advanced Physical Chemistry", "str_pl": "copies of Advanced Physical Chemistry" },
+    "description": "A university-level textbook on advanced principles of physical chemistry and all its branches: thermochemistry, electrochemistry, solid-state chemistry, photochemistry, quantum chemistry et cetera.",
+    "weight": "1712 g",
+    "volume": "2 L",
+    "price": 7950,
+    "price_postapoc": 750,
+    "bashing": 5,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "blue",
+    "skill": "chemistry",
+    "required_level": 5,
+    "max_level": 7,
+    "intelligence": 12,
+    "time": "35 m",
+    "fun": -1
+  },
+  {
+    "id": "modern_tanner",
+    "type": "BOOK",
+    "name": { "str": "The Modern Tanner", "str_pl": "copies of The Modern Tanner" },
+    "description": "An in-depth and easy to read guide that details a very modern take on the ancient art of leather tanning.",
+    "weight": "568 g",
+    "volume": "750 ml",
+    "price": 2000,
+    "price_postapoc": 1250,
+    "material": [ "paper", "leather" ],
+    "symbol": "?",
+    "color": "brown",
+    "skill": "chemistry",
+    "required_level": 3,
+    "max_level": 4,
+    "intelligence": 4,
+    "time": "18 m"
+  },
+  {
+    "id": "recipe_alpha",
+    "type": "BOOK",
+    "name": { "str": "PE050 \"Alpha\": Preliminary Report", "str_pl": "copies of PE050 \"Alpha\": Preliminary Report" },
+    "description": "This sheaf of papers--dated two weeks before all this started--describes some new chemical formula, and its effects on human subjects.  It's stamped \"APPROVED\"…",
+    "weight": "50 g",
+    "volume": "500 ml",
+    "price": 125000,
+    "price_postapoc": 2000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 6,
+    "max_level": 7,
+    "intelligence": 12,
+    "time": "45 m",
+    "fun": -2
+  },
+  {
+    "id": "recipe_animal",
+    "type": "BOOK",
+    "name": { "str": "lab journal-Dionne", "str_pl": "lab journals-Dionne" },
+    "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from various Earth fauna.  The team seems quite enthusiastic--if not eager--about their results.",
+    "weight": "1700 g",
+    "volume": "500 ml",
+    "price": 50000,
+    "price_postapoc": 2000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 6,
+    "max_level": 7,
+    "intelligence": 12,
+    "time": "45 m",
+    "fun": -2
+  },
+  {
+    "id": "recipe_chimera",
+    "type": "BOOK",
+    "name": { "str": "PE065 \"Chimera\": Best Practices", "str_pl": "copies of PE065 \"Chimera\": Best Practices" },
+    "description": "This sheaf of papers describes a new chemical formula in detail and supplies instructions for its use as some sort of… crowd-control catalyst?  That can't be right…",
+    "weight": "50 g",
+    "volume": "500 ml",
+    "price": 125000,
+    "price_postapoc": 2000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 6,
+    "max_level": 7,
+    "intelligence": 12,
+    "time": "45 m",
+    "fun": -2
+  },
+  {
+    "id": "recipe_creepy",
+    "type": "BOOK",
+    "name": { "str": "lab journal-Smythe", "str_pl": "lab journals-Smythe" },
+    "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from flesh contaminated with XE037.  The results look promising but the procurement methods seem awfully vague…",
+    "weight": "1700 g",
+    "volume": "500 ml",
+    "price": 50000,
+    "price_postapoc": 2000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 6,
+    "max_level": 7,
+    "intelligence": 12,
+    "time": "45 m",
+    "fun": -4
+  },
+  {
+    "id": "recipe_elfa",
+    "type": "BOOK",
+    "name": { "str": "standpipe maintenance log" },
+    "description": "This binder details the scheduled maintenance for several plumbing systems throughout the facility.  However, some of the log sheets seem to be filled with… a chemical formula?",
+    "weight": "400 g",
+    "volume": "750 ml",
+    "price": 400,
+    "price_postapoc": 2000,
+    "material": [ "paper", "plastic" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 7,
+    "max_level": 7,
+    "intelligence": 12,
+    "time": "45 m",
+    "fun": -2
+  },
+  {
+    "id": "recipe_labchem",
+    "type": "BOOK",
+    "name": { "str": "chemical reference-CLASSIFIED", "str_pl": "chemical references-CLASSIFIED" },
+    "description": "This somewhat technical binder has several intimidating security warnings on the cover, yet guarantees unauthorized readers \"permanent employment, for life\".  It contains useful information on \"basic\" chemical projects like methamphetamine and heroin, along with briefing on things called \"XE037\" and \"PE012\".",
+    "weight": "2000 g",
+    "volume": "500 ml",
+    "price": 64000,
+    "price_postapoc": 2000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 6,
+    "max_level": 7,
+    "intelligence": 11,
+    "time": "35 m",
+    "fun": -1
+  },
+  {
+    "id": "recipe_maiar",
+    "type": "BOOK",
+    "name": { "str": "lab journal-x-|xp", "str_pl": "lab journals-x-|xp" },
+    "description": "This damaged team logbook lacks (deliberately?) any identifying information, but still contains useful information on several types of mutagen and their development.",
+    "weight": "1700 g",
+    "volume": "500 ml",
+    "price": 50000,
+    "price_postapoc": 2000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 6,
+    "max_level": 7,
+    "intelligence": 12,
+    "time": "45 m",
+    "fun": -3
+  },
+  {
+    "id": "recipe_medicalmut",
+    "type": "BOOK",
+    "name": {
+      "str": "PE023 \"Medical\": Application and Findings",
+      "str_pl": "copies of PE023 \"Medical\": Application and Findings"
+    },
+    "description": "This binder of highly technical papers describes some new chemical formula, and its effects on human subjects.  It's stamped \"APPROVED\"…",
+    "weight": "1934 g",
+    "volume": "1750 ml",
+    "price": 62000,
+    "price_postapoc": 2000,
+    "bashing": 5,
+    "material": [ "paper", "plastic" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 6,
+    "max_level": 7,
+    "intelligence": 12,
+    "time": "35 m",
+    "fun": -2
+  },
+  {
+    "id": "recipe_raptor",
+    "type": "BOOK",
+    "name": { "str": "PE070 \"Raptor\": Proposal", "str_pl": "copies of PE070 \"Raptor\": Proposal" },
+    "description": "This sheaf of papers is a highly speculative proposal for focusing \"PE065\".  Scribbled notes throughout seem to think that it might work, but that there's no time.",
+    "weight": "50 g",
+    "volume": "500 ml",
+    "price": 125000,
+    "price_postapoc": 2000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 8,
+    "max_level": 8,
+    "intelligence": 12,
+    "time": "45 m",
+    "fun": -2
+  },
+  {
+    "id": "recipe_serum",
+    "type": "BOOK",
+    "name": { "str": "Best Practices for Compound Delivery", "str_pl": "copies of Best Practices for Compound Delivery" },
+    "description": "This internal manual details several varieties of mutagenic experiments, as well as describing the protocols used to concentrate mutagens for quicker results.  The authors recommend that researchers ensure that their subjects are well-fed and in good health, as the concentrated serums draw heavily on subjects' bodies.",
+    "weight": "1700 g",
+    "volume": "500 ml",
+    "price": 50000,
+    "price_postapoc": 2000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "skill": "chemistry",
+    "required_level": 6,
+    "max_level": 8,
+    "intelligence": 12,
+    "time": "45 m",
+    "fun": -4
+  },
+  {
+    "id": "reference_cooking",
+    "type": "BOOK",
+    "name": { "str": "CRC-Merck Handbook, 4th edition", "str_pl": "copies of CRC-Merck Handbook, 4th edition" },
+    "description": "This huge hardbound book is a collection of reference data and formulae pertinent to many technical disciplines.  If poring over tables of chemical and physical data is your thing, this is the book for you.",
+    "weight": "5790 g",
+    "volume": "1750 ml",
+    "price": 9000,
+    "price_postapoc": 2000,
+    "bashing": 7,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_green",
+    "intelligence": 4,
+    "time": "30 m",
+    "fun": -2
+  },
+  {
+    "id": "textbook_chemistry",
+    "type": "BOOK",
+    "name": { "str": "chemistry textbook" },
+    "description": "A college textbook on chemistry.",
+    "weight": "1587 g",
+    "volume": "2 L",
+    "price": 7950,
+    "price_postapoc": 2000,
+    "bashing": 5,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "blue",
+    "skill": "chemistry",
+    "required_level": 4,
+    "max_level": 6,
+    "intelligence": 12,
+    "time": "35 m",
+    "fun": -1
+  },
+  {
+    "id": "textbook_extraction",
+    "type": "BOOK",
+    "name": { "str": "The Essential Oil Enthusiasts Handbook", "str_pl": "copies of The Essential Oil Enthusiasts Handbook" },
+    "description": "A heavy hardback book explaining the process of essential oil making, with schematics for the equipment to do it.  Good luck, and don't blow yourself up!",
+    "looks_like": "textbook_chemistry",
+    "weight": "1420 g",
+    "volume": "1 L",
+    "price": 6000,
+    "price_postapoc": 10000,
+    "bashing": 4,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "blue",
+    "skill": "chemistry",
+    "required_level": 4,
+    "max_level": 6,
+    "intelligence": 10,
+    "time": "60 m"
+  },
+  {
+    "id": "textbook_gaswarfare",
+    "type": "BOOK",
+    "name": { "str": "Art and Science of Chemical Warfare", "str_pl": "copies of Art and Science of Chemical Warfare" },
+    "description": "This in-depth and technical text covers the design, development, dissemination of, and defenses against various chemical weapons throughout the centuries.  The photographs the author chose make it a difficult read at times, though the information is top-notch.",
+    "weight": "854 g",
+    "volume": "1500 ml",
+    "price": 400,
+    "price_postapoc": 1000,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "blue",
+    "skill": "chemistry",
+    "required_level": 4,
+    "max_level": 6,
+    "intelligence": 9,
+    "time": "20 m",
+    "fun": -2
+  },
+  {
+    "id": "basic_chemistry",
+    "type": "BOOK",
+    "name": {
+      "str": "Chemistry for Kids: Awesome Science Experiments that Really Work",
+      "str_pl": "copies of Chemistry for Kids: Awesome Science Experiments that Really Work"
+    },
+    "description": "A book with comprehensive and accurate step-by-step illustrated instructions for many scientific experiments for young researchers and anyone else who want to delve into an amazing world of chemistry.",
+    "weight": "362 g",
+    "volume": "500 ml",
+    "price": 550,
+    "price_postapoc": 1900,
+    "material": [ "paper" ],
+    "symbol": "?",
+    "color": "light_cyan",
+    "skill": "chemistry",
+    "max_level": 3,
+    "intelligence": 6,
+    "time": "15 m",
+    "fun": 2
+  }
+]