Skip to content

Commit

Permalink
Reference books (CleverRaven#33730)
Browse files Browse the repository at this point in the history
* Reference books and spawns
  • Loading branch information
tenmillimaster authored and misterprimus committed Sep 21, 2019
1 parent 566c4e2 commit 3d23353
Show file tree
Hide file tree
Showing 10 changed files with 112 additions and 8 deletions.
20 changes: 19 additions & 1 deletion data/json/itemgroups/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,11 @@
[ "dnd_handbook", 2 ]
]
},
{
"id": "ranch_homebooks",
"type": "item_group",
"items": [ [ "reference_firstaid2", 2 ], { "group": "homebooks", "prob": 98 } ]
},
{
"type": "item_group",
"id": "manuals",
Expand Down Expand Up @@ -371,6 +376,10 @@
[ "manual_driving", 15 ],
[ "manual_survival", 20 ],
[ "dnd_handbook", 2 ],
[ "reference_cooking", 1 ],
[ "reference_fabrication1", 1 ],
[ "reference_firstaid1", 1 ],
[ "reference_firstaid2", 1 ],
[ "survnote", 3 ]
]
},
Expand Down Expand Up @@ -422,6 +431,10 @@
[ "textbook_weapeast", 3 ],
[ "textbook_armwest", 3 ],
[ "textbook_armeast", 3 ],
[ "reference_cooking", 2 ],
[ "reference_fabrication1", 6 ],
[ "reference_firstaid1", 2 ],
[ "reference_firstaid2", 1 ],
[ "survnote", 2 ]
]
},
Expand Down Expand Up @@ -493,6 +506,10 @@
[ "textbook_gaswarfare", 2 ],
[ "manual_electronics", 5 ],
[ "advanced_electronics", 6 ],
[ "reference_cooking", 2 ],
[ "reference_fabrication1", 2 ],
[ "reference_firstaid1", 2 ],
[ "reference_firstaid2", 2 ],
[ "dnd_handbook", 15 ],
[ "novel_romance", 30 ],
[ "novel_spy", 32 ],
Expand Down Expand Up @@ -655,7 +672,8 @@
[ "recipe_medicalmut", 50 ],
[ "recipe_serum", 10 ],
[ "recipe_labchem", 100 ],
[ "recipe_augs", 100 ]
[ "recipe_augs", 100 ],
[ "reference_firstaid1", 15 ]
]
},
{
Expand Down
7 changes: 7 additions & 0 deletions data/json/itemgroups/item_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -3721,6 +3721,7 @@
[ "coffee_raw", 15 ],
[ "usb_drive", 5 ],
[ "software_useless", 10 ],
[ "software_electronics_reference", 2 ],
[ "umbrella", 5 ],
[ "teleumbrella", 2 ],
[ "gum", 10 ],
Expand Down Expand Up @@ -5203,6 +5204,7 @@
[ "goggles_welding", 70 ],
[ "textbook_atomic_lab", 7 ],
[ "recipe_lab_elec", 15 ],
[ "software_electronics_reference", 2 ],
[ "recipe_lab_cvd", 8 ],
[ "recipe_mininuke_launch", 5 ],
[ "teleporter", 10 ],
Expand Down Expand Up @@ -7362,6 +7364,10 @@
[ "pocket_firearms", 2 ],
[ "SICP", 3 ],
[ "textbook_robots", 1 ],
[ "reference_cooking", 1 ],
[ "reference_fabrication1", 1 ],
[ "reference_firstaid1", 1 ],
[ "reference_firstaid2", 1 ],
[ "recipe_elfa", 1 ],
[ "recipe_maiar", 1 ],
[ "recipe_caseless", 1 ],
Expand Down Expand Up @@ -7396,6 +7402,7 @@
[ "bio_soporific", 5 ],
[ "bio_surgical_razor", 5 ],
[ "bio_syringe", 8 ],
[ "software_electronics_reference", 10 ],
[ "software_useless", 10 ],
[ "canteen", 15 ],
[ "2lcanteen", 10 ],
Expand Down
18 changes: 18 additions & 0 deletions data/json/items/book/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,24 @@
"time": "45 m",
"fun": -4
},
{
"id": "reference_cooking",
"type": "BOOK",
"name": "CRC-Merck handbook, 4th edition",
"name_plural": "copies of the 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,
"volume": "1750 ml",
"price": 9000,
"price_postapoc": 30000,
"bashing": 7,
"material": [ "paper" ],
"symbol": "?",
"color": "light_green",
"intelligence": 4,
"time": "30 m",
"fun": -2
},
{
"id": "scots_cookbook",
"type": "BOOK",
Expand Down
18 changes: 18 additions & 0 deletions data/json/items/book/fabrication.json
Original file line number Diff line number Diff line change
Expand Up @@ -458,5 +458,23 @@
"intelligence": 8,
"time": "30 m",
"fun": -1
},
{
"id": "reference_fabrication1",
"type": "BOOK",
"name": "Machinery's Handbook",
"name_plural": "copies of Machinery's Handbook",
"description": "This classic reference work contains extensive, dense chapters and tables on materials, metrology, toolmaking, gears, threading and more. This recent edition includes extensive data on what was the latest techniques in additive manufacturing. If you need to know how best complete a certain machining operation, the answer lies somewhere in these pages.",
"weight": 454,
"volume": "500 ml",
"price": 8000,
"price_postapoc": 50000,
"bashing": 7,
"material": [ "paper" ],
"symbol": "?",
"color": "blue",
"intelligence": 4,
"time": "30 m",
"fun": -2
}
]
34 changes: 34 additions & 0 deletions data/json/items/book/firstaid.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,39 @@
"max_level": 1,
"time": "8 m",
"fun": 1
},
{
"id": "reference_firstaid1",
"type": "BOOK",
"name": "Physicians' Desk Reference",
"name_plural": "copies of the Physicians' Desk Reference",
"description": "This hefty volume contains all the legally mandated information relevant to physicians for writing prescriptions, generously supported by the efforts and contributions of major pharmaceutical companies. For the most part, it provides information identical to what is available on that of medication packaging inserts, and cannot match the completeness of digital pharmaceutical references like Medisoft. At least it doesn't need power to be used.",
"weight": 2268,
"volume": "500 ml",
"price": 10000,
"bashing": 7,
"material": [ "paper" ],
"symbol": "?",
"color": "blue",
"intelligence": 4,
"time": "30 m",
"fun": -2
},
{
"id": "reference_firstaid2",
"type": "BOOK",
"name": "Merck Veterinary Manual",
"name_plural": "copies of The Merck Veterinary Manual",
"description": "This expansive text covers 'all domestic species and diseases in veterinary medicine worldwide'. Should you need information regarding zoonotic diseases, off-label use of medication for animals, common dysfunctions and diseases of animals, or any other veterinary reference info, this is your book. There are some interesting new chapters on animal cloning in this edition.",
"weight": 5790,
"volume": "500 ml",
"price": 8000,
"price_postapoc": 50000,
"bashing": 7,
"material": [ "paper" ],
"symbol": "?",
"color": "blue",
"intelligence": 4,
"time": "30 m"
}
]
9 changes: 9 additions & 0 deletions data/json/items/software.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,14 @@
"container": "data_card",
"description": "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n\nWhatever the case, the idea of perpetually keeping a part of you within a metallic pill makes you feel uncomfortable.",
"flags": [ "NO_DROP" ]
},
{
"id": "software_electronics_reference",
"copy-from": "software",
"type": "GENERIC",
"name": "integrated circuit datasheet archives",
"name_plural": "misc software",
"description": "Huge archives of numerous IC circuit datasheets from several major manufacturers. Probably valuable to the right person, as it would be hard to salvage and reuse these components without them.",
"price": 40000
}
]
6 changes: 3 additions & 3 deletions data/json/mapgen/farm_dairy.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@
{ "item": "bed", "x": 11, "y": 17, "chance": 90 },
{ "item": "bed", "x": 13, "y": 16, "chance": 60 },
{ "item": "drugs_heal_simple", "x": 7, "y": 16, "chance": 90 },
{ "item": "homebooks", "x": 8, "y": 10, "chance": 80 },
{ "item": "homebooks", "x": 10, "y": 15, "chance": 80 },
{ "item": "homebooks", "x": 11, "y": 16, "chance": 80 },
{ "item": "ranch_homebooks", "x": 8, "y": 10, "chance": 80 },
{ "item": "ranch_homebooks", "x": 10, "y": 15, "chance": 80 },
{ "item": "ranch_homebooks", "x": 11, "y": 16, "chance": 80 },
{ "item": "clothing_outdoor_set", "x": 9, "y": 16, "chance": 90 },
{ "item": "fridge", "x": 15, "y": 17, "chance": 90 },
{ "item": "fridge", "x": 15, "y": 17, "chance": 90 },
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/farm_horse.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
"k": { "item": "office", "chance": 30 },
"f": { "item": "fridge", "chance": 30 },
"o": { "item": "oven", "chance": 30 },
"8": { "item": "homebooks", "chance": 30 },
"8": { "item": "ranch_homebooks", "chance": 30 },
"r": { "item": "restaur_kitchen", "chance": 30 },
"c": { "item": "kitchen_counters", "chance": 30 },
"D": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] },
Expand Down Expand Up @@ -375,7 +375,7 @@
"D": { "item": "trash_cart", "chance": 50 },
"B": { "item": "shower", "chance": 40, "repeat": [ 2, 4 ] },
"d": { "item": "dresser", "chance": 70, "repeat": [ 2, 4 ] },
"8": { "item": "homebooks", "chance": 70, "repeat": [ 2, 4 ] },
"8": { "item": "ranch_homebooks", "chance": 70, "repeat": [ 2, 4 ] },
"k": { "item": "bedroom", "chance": 60, "repeat": [ 2, 4 ] },
"S": { "item": "softdrugs", "chance": 60, "repeat": [ 2, 4 ] }
}
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/isherwood_farms/dairy_farm_isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"items": {
"Y": { "item": "coat_rack", "chance": 35, "repeat": [ 1, 4 ] },
"d": { "item": "office", "chance": 30 },
"{": [ { "item": "homebooks", "chance": 30 }, { "item": "book_survival", "chance": 30 } ],
"{": [ { "item": "ranch_homebooks", "chance": 30 }, { "item": "book_survival", "chance": 30 } ],
"^": { "item": "bed", "chance": 30 },
"o": { "item": "oven", "chance": 30, "repeat": [ 1, 2 ] },
"T": { "item": "everyday_gear", "chance": 30, "repeat": [ 1, 2 ] },
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/isherwood_farms/farm_horse_isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
"k": { "item": "office", "chance": 30 },
"f": { "item": "fridge", "chance": 30 },
"o": { "item": "oven", "chance": 30 },
"8": { "item": "homebooks", "chance": 30 },
"8": { "item": "ranch_homebooks", "chance": 30 },
"r": { "item": "restaur_kitchen", "chance": 30 },
"c": { "item": "kitchen_counters", "chance": 30 },
"D": { "item": "trash", "chance": 20, "repeat": [ 2, 4 ] },
Expand Down

0 comments on commit 3d23353

Please sign in to comment.