Skip to content

Commit

Permalink
Merge pull request #38390 from snipercup/Book-name-to-object
Browse files Browse the repository at this point in the history
Book name to object, time to string, volume to string
  • Loading branch information
ZhilkinSerg authored Feb 27, 2020
2 parents b486748 + a0edc22 commit a96911f
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion data/json/items/book/barter.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "mag_barter",
"type": "BOOK",
"name": "car buyer's guide",
"name": { "str": "car buyer's guide" },
"description": "Normally this glossy, ad-filled magazine about cars would be pointless, but it has a series of articles on haggling techniques.",
"weight": "90 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/bashing.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{
"id": "manual_bashing",
"type": "BOOK",
"name": "tactical baton defense manual",
"name": { "str": "tactical baton defense manual" },
"description": "An informative guide to self-defense using clubs and batons. Aimed at the law enforcement and military market, it is packed with time tested, no-nonsense information and written to be understandable for beginners.",
"weight": "454 g",
"volume": "250 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/book/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
{
"id": "family_cookbook",
"type": "BOOK",
"name": "family cookbook",
"name": { "str": "family cookbook" },
"description": "A big binder full of somebody's family recipes. The well-turned pages and creased corners speak volumes of the culinary knowledge contained within. You could probably learn a lot about cooking from studying this domestic artifact.",
"weight": "1887 g",
"volume": "1250 ml",
Expand Down Expand Up @@ -266,7 +266,7 @@
{
"id": "recipe_elfa",
"type": "BOOK",
"name": "standpipe maintenance log",
"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",
Expand Down Expand Up @@ -425,7 +425,7 @@
{
"id": "textbook_chemistry",
"type": "BOOK",
"name": "chemistry textbook",
"name": { "str": "chemistry textbook" },
"description": "A college textbook on chemistry.",
"weight": "1587 g",
"volume": "2 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/driving.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{
"id": "mag_cars",
"type": "BOOK",
"name": "Top Gear magazine",
"name": { "str": "Top Gear magazine" },
"description": "Lots of articles about cars and driving techniques.",
"weight": "60 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/book/electronics.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
{
"id": "recipe_atomic_battery",
"type": "BOOK",
"name": "computer printout",
"name": { "str": "computer printout" },
"description": "One side of this sheet is printed with a meaningless jumble of characters, but the other side shows a complicated, hand-drawn circuit diagram.",
"weight": "10 g",
"volume": 0,
"volume": "2 ml",
"price": 40000,
"price_postapoc": 100000,
"material": [ "paper" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/fabrication.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
{
"id": "recipe_caseless",
"type": "BOOK",
"name": "Rivtech design binder",
"name": { "str": "Rivtech design binder" },
"description": "This Rivtech binder warns that \"Unauthorized readers are our best test subjects.\" With good reason: it contains complete design specs and technical drawings for their entire line of products.",
"weight": "1409 g",
"volume": "500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/mechanics.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"id": "mag_fieldrepair",
"copy-from": "book_magazine",
"type": "BOOK",
"name": "army improvised field repairs manual",
"name": { "str": "army improvised field repairs manual" },
"description": "A compact manual with faded print detailing a number of improvised field repairs that can be made to vehicles.",
"skill": "mechanics"
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/rifle.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{
"id": "manual_rifle",
"type": "BOOK",
"name": "FM 23-16 Army marksmanship manual",
"name": { "str": "FM 23-16 Army marksmanship manual" },
"description": "A hefty military field manual about automatic rifle usage and techniques which improve marksmanship and proper weapons-handling.",
"weight": "454 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/book/stabbing.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "mag_stabbing",
"type": "BOOK",
"name": "Duelist's Annual",
"name": { "str": "Duelist's Annual" },
"description": "An annual publication about fencing and dueling. There are many good illustrations which describe proper technique and form.",
"weight": "80 g",
"volume": "250 ml",
Expand All @@ -20,7 +20,7 @@
{
"id": "manual_stabbing",
"type": "BOOK",
"name": "FM 23-25 Army bayonet manual",
"name": { "str": "FM 23-25 Army bayonet manual" },
"description": "A hefty military field manual about bayonet usage and combat theory.",
"weight": "454 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/book/tailor.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{
"id": "mag_beauty",
"type": "BOOK",
"name": "Beauty Magazine",
"name": { "str": "Beauty Magazine" },
"description": "This is a full-size glossy women's magazine. There are a few simple patterns and basic sewing tips somewhere in between the fashion photos and the makeup advertisements.",
"weight": "180 g",
"volume": "500 ml",
Expand Down Expand Up @@ -62,7 +62,7 @@
{
"id": "tailor_portfolio",
"type": "BOOK",
"name": "clothing designer's portfolio",
"name": { "str": "clothing designer's portfolio" },
"description": "A leather bound portfolio that once belonged to a clothing designer. Filled with sketches and notes, a skilled tailor could learn a lot from this volume.",
"weight": "2063 g",
"volume": "2 L",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/classes/book.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
{
"abstract": "book_magazine",
"type": "BOOK",
"name": "readable magazine",
"name": { "str": "readable magazine" },
"weight": "70 g",
"volume": "250 ml",
"material": "paper",
"symbol": "?",
"color": "pink",
"max_level": 1,
"intelligence": 5,
"time": 8,
"time": "8 m",
"fun": 1
},
{
Expand Down

0 comments on commit a96911f

Please sign in to comment.