Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lots more books #37377

Merged
merged 86 commits into from
May 7, 2020
Merged
Show file tree
Hide file tree
Changes from 84 commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
9b47c0f
Merge pull request #1 from CleverRaven/master
Jerimee Dec 18, 2019
7335969
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Jerimee Dec 20, 2019
3124e39
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Jerimee Dec 22, 2019
da27b3a
M materials sentence json_info
Jerimee Dec 25, 2019
7657c82
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Jerimee Jan 6, 2020
ab22417
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Jerimee Jan 18, 2020
167d6ad
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Jerimee Jan 24, 2020
acf09cb
Merge branch 'master' of https://github.com/Jerimee/Cataclysm-DDA
Jerimee Jan 24, 2020
85ef31a
Update misc.json
Jerimee Jan 24, 2020
9043cc6
Update misc.json
Jerimee Jan 25, 2020
0027783
Update misc.json
Jerimee Jan 25, 2020
60928d8
Update misc.json
Jerimee Jan 25, 2020
27edc1f
Update misc.json
Jerimee Jan 25, 2020
693907a
Update JSON_INFO.md
Jerimee Jan 25, 2020
b0886a9
Update JSON_INFO.md
Jerimee Jan 25, 2020
1d2abac
Update misc.json
Jerimee Feb 1, 2020
5a34757
Update misc.json
Jerimee Feb 2, 2020
056975a
Update misc.json
Jerimee Feb 2, 2020
f6b0de9
Update misc.json
Jerimee Feb 2, 2020
cb1a158
Update misc.json
Jerimee Feb 10, 2020
2210e82
Update misc.json
Jerimee Feb 15, 2020
d0d6af3
westerns
Jerimee Feb 16, 2020
5dc23d4
Update misc.json
Jerimee Feb 16, 2020
00a6f1e
spiritual.json
Jerimee Feb 16, 2020
5991612
u
Jerimee Feb 16, 2020
6fd425a
arghhh
Jerimee Feb 16, 2020
b3dad7d
wip
Jerimee Feb 16, 2020
07c541e
wip - dodge and ya
Jerimee Feb 17, 2020
252c59a
ya
Jerimee Feb 17, 2020
43fa8b9
satire
Jerimee Feb 18, 2020
0e748ab
oops
Jerimee Feb 18, 2020
b0bf926
spy
Jerimee Feb 18, 2020
ee6bf13
m
Jerimee Feb 18, 2020
d00af1e
magazines
Jerimee Feb 18, 2020
4a446e8
sports magazines
Jerimee Feb 18, 2020
191035d
m
Jerimee Feb 23, 2020
ce54c67
archery
Jerimee Feb 23, 2020
8e2e2be
hard_arch
Jerimee Feb 23, 2020
56e6d5b
change paperback_novel to book_fict_soft_tpl
Jerimee Feb 25, 2020
1d312e5
add homemaking nonfict
Jerimee Feb 26, 2020
dd88822
m
Jerimee Feb 26, 2020
fa7f0d2
Update misc.json
Jerimee Mar 17, 2020
5f29272
Update library.json
Jerimee Mar 28, 2020
0d1cd49
Update misc.json
Jerimee Mar 28, 2020
afcbef6
Update misc.json
Jerimee Mar 28, 2020
0e0bd6e
Merge branch 'master' into more-paperbacks
Jerimee Mar 28, 2020
73e44ee
Update library.json
Jerimee Mar 28, 2020
eaa4d08
Merge branch 'more-paperbacks' of https://github.com/Jerimee/Cataclys…
Jerimee Mar 28, 2020
f14cb43
Update nonfiction.json
Jerimee Mar 28, 2020
c9ab69b
Update nonfiction.json
Jerimee Mar 28, 2020
3b22ef8
Update nonfiction.json
Jerimee Mar 28, 2020
6d4f9d4
Update dodge.json
Jerimee Mar 28, 2020
e782f69
add books to book loot tables
Jerimee Mar 29, 2020
b64e010
more nonfiction paperbacks
Jerimee Mar 29, 2020
df39c5b
Merge branch 'master' into more-paperbacks
Jerimee Apr 3, 2020
4cd0c09
add a law book
Jerimee Apr 7, 2020
5ab2981
new mechanics book
Jerimee Apr 7, 2020
e31e481
Merge branch 'more-paperbacks' of https://github.com/Jerimee/Cataclys…
Jerimee Apr 7, 2020
45a4f4f
Apply suggestions from code review
ZhilkinSerg Apr 7, 2020
7581a20
Apply suggestions from code review
ZhilkinSerg Apr 7, 2020
efdcc12
fix a number of glaring errors
Jerimee Apr 9, 2020
9451172
no newline at end of file
Jerimee Apr 9, 2020
fddba8a
add three pulps
Jerimee Apr 9, 2020
f75f316
Update data/json/items/book/nonfiction.json
Jerimee Apr 10, 2020
cb6290f
Update data/json/items/book/misc.json
Jerimee Apr 10, 2020
d0c572e
Update data/json/items/book/nonfiction.json
Jerimee Apr 10, 2020
7f3fa68
Update data/json/items/book/misc.json
Jerimee Apr 10, 2020
8911c61
Update data/json/items/book/nonfiction.json
Jerimee Apr 10, 2020
e3061cc
Update data/json/items/book/nonfiction.json
Jerimee Apr 10, 2020
4d76b20
Update data/json/items/book/nonfiction.json
Jerimee Apr 10, 2020
a5fb55e
Create abstract.json
Jerimee Apr 14, 2020
c4b57d8
restore bashing.json
Jerimee Apr 14, 2020
80a4759
move abstracts to abstract.json
Jerimee Apr 14, 2020
adc676f
qa misc.json
Jerimee Apr 14, 2020
5aea4ed
Merge branch 'master' into more-paperbacks
Jerimee Apr 14, 2020
549d7fe
Update abstract.json
Jerimee Apr 15, 2020
9b075ae
Merge branch 'more-paperbacks' of https://github.com/Jerimee/Cataclys…
Jerimee Apr 15, 2020
e9d9c3e
Update nonfiction.json
Jerimee Apr 15, 2020
a837f06
Update bashing.json
Jerimee Apr 15, 2020
6783986
add abstracts to cooking
Jerimee Apr 17, 2020
c72e659
Merge branch 'master' into more-paperbacks
Jerimee Apr 21, 2020
c52443a
Update spiritual.json
Jerimee Apr 21, 2020
3cac9be
Update spiritual.json
Jerimee May 6, 2020
aa6c8eb
Apply suggestions from code review
ZhilkinSerg May 7, 2020
dc83f04
Apply suggestions from code review
ZhilkinSerg May 7, 2020
a222b44
Apply suggestions from code review
ZhilkinSerg May 7, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
374 changes: 368 additions & 6 deletions data/json/itemgroups/SUS/library.json

Large diffs are not rendered by default.

33 changes: 22 additions & 11 deletions data/json/itemgroups/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,20 @@
"subtype": "distribution",
"entries": [
{ "item": "manual_mechanics", "prob": 35 },
{ "item": "manual_carpentry", "prob": 10 },
{ "item": "carpentry_book", "prob": 5 },
{ "item": "manual_fabrication", "prob": 20 },
{ "item": "mag_mechanics", "prob": 35 },
{ "item": "mag_carpentry", "prob": 30 },
{ "item": "101_carpentry", "prob": 20 },
{ "item": "mag_mechanics", "prob": 35 },
{ "item": "manual_fabrication", "prob": 20 },
{ "item": "book_nonf_hard_homemk_outkitchn", "prob": 20 },
{ "item": "book_nonf_hard_homemk_plantshome", "prob": 20 },
{ "item": "mag_fabrication", "prob": 12 },
{ "item": "concrete_book", "prob": 12 },
{ "item": "textbook_mechanics", "prob": 12 },
{ "item": "textbook_fabrication", "prob": 12 },
{ "item": "textbook_biodiesel", "prob": 10 },
{ "item": "manual_carpentry", "prob": 10 },
{ "item": "book_icef", "prob": 8 },
{ "item": "textbook_fabrication", "prob": 12 },
{ "item": "concrete_book", "prob": 12 }
{ "item": "carpentry_book", "prob": 5 }
]
},
{
Expand Down Expand Up @@ -176,13 +178,13 @@
"type": "item_group",
"subtype": "distribution",
"entries": [
{ "item": "novel_romance", "prob": 30 },
{ "item": "novel_spy", "prob": 28 },
{ "item": "novel_satire", "prob": 15 },
{ "group": "SUS_book_fict_soft_romc", "prob": 30 },
{ "group": "SUS_book_fict_soft_spy", "prob": 28 },
{ "group": "SUS_book_fict_soft_satire", "prob": 15 },
{ "item": "novel_sports", "prob": 22 },
{ "item": "novel_samurai", "prob": 22 },
{ "item": "novel_swash", "prob": 14 },
{ "item": "novel_western", "prob": 22 },
{ "group": "SUS_book_fict_soft_west", "prob": 22 },
{ "item": "novel_war", "prob": 20 },
{ "item": "novel_war2", "prob": 20 },
{ "item": "novel_adventure", "prob": 14 },
Expand Down Expand Up @@ -224,11 +226,12 @@
"entries": [
{ "item": "tall_tales", "prob": 10 },
{ "item": "story_book", "prob": 4 },
{ "item": "fairy_tales", "prob": 10 },
{ "item": "fairy_tales", "prob": 20 },
{ "item": "novel_coa", "prob": 10 },
{ "item": "novel_coa2", "prob": 10 },
{ "item": "child_book", "prob": 50 },
{ "item": "manual_dodge_kid", "prob": 20 },
{ "item": "book_nonf_soft_wedding_coolring", "prob": 1 },
{ "item": "mag_comic", "prob": 20 }
]
},
Expand All @@ -239,7 +242,10 @@
"entries": [
{ "group": "novels", "prob": 424 },
{ "group": "kids_books", "prob": 50 },
{ "group": "SUS_book_fict_soft_ya", "prob": 50 },
{ "group": "literature", "prob": 30 },
{ "group": "SUS_book_nonf_hard_homemk", "prob": 26 },
{ "group": "SUS_book_nonf_soft", "prob": 20 },
{ "item": "cookbook_human", "prob": 1 },
{ "item": "jewelry_book", "prob": 4 },
{ "item": "phonebook", "prob": 8 },
Expand All @@ -254,6 +260,7 @@
{ "item": "manual_business", "prob": 40 },
{ "item": "manual_first_aid", "prob": 40 },
{ "item": "manual_computers", "prob": 20 },
{ "group": "SUS_book_nonf_hard_dodge", "prob": 20 },
{ "item": "textbook_computer", "prob": 4 },
{ "item": "textbook_chemistry", "prob": 4 },
{ "item": "textbook_mechanics", "prob": 4 },
Expand Down Expand Up @@ -461,11 +468,13 @@
{ "item": "preserving_juice", "prob": 16 },
{ "group": "novels", "prob": 370 },
{ "group": "literature", "prob": 100 },
{ "group": "SUS_book_nonf_hard_homemk", "prob": 40 },
{ "item": "photo_album", "prob": 30 },
{ "item": "textbook_robots", "prob": 2 },
{ "item": "collector_book", "prob": 30 },
{ "item": "carpentry_book", "prob": 5 },
{ "item": "jewelry_book", "prob": 5 },
{ "item": "book_nonf_soft_speech_naillaw", "prob": 5 },
{ "item": "book_lockpick", "prob": 2 },
{ "group": "religious_books", "prob": 40 }
]
Expand Down Expand Up @@ -571,6 +580,7 @@
"type": "item_group",
"subtype": "distribution",
"entries": [
{ "group": "SUS_book_nonf_hard_psych", "prob": 160 },
{ "item": "mag_firstaid", "prob": 50 },
{ "item": "textbook_firstaid", "prob": 200 },
{ "item": "manual_swimming", "prob": 50 },
Expand Down Expand Up @@ -656,6 +666,7 @@
{ "item": "mag_glam", "prob": 60 },
{ "item": "mag_beauty", "prob": 50 },
{ "item": "mag_news", "prob": 35 },
{ "item": "book_nonf_zine_news_anlyst", "prob": 35 },
{ "item": "news_regional", "prob": 15 }
]
},
Expand Down
238 changes: 238 additions & 0 deletions data/json/items/book/abstract.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,238 @@
[
{
"abstract": "book_fict_soft_tpl",
"type": "BOOK",
"name": { "str": "paperback novel", "str_pl": "paperbacks" },
"description": "An ordinary paperback book. Or is it? It is.",
"weight": "400 g",
"volume": "700 ml",
"price": 750,
"price_postapoc": 1900,
"material": [ "paper" ],
"symbol": "?",
"looks_like": "story_book",
"color": "light_cyan",
"flags": [ "TINDER", "FLAMMABLE" ],
"intelligence": 4,
"time": "15 m",
"chapters": 16,
"fun": 2
},
{
"abstract": "book_nonf_tpl",
"type": "BOOK",
"name": "Generic Nonfiction Book",
"description": "template for a manuscript purporting to be factual",
"intelligence": 5,
"symbol": "?",
"looks_like": "story_book",
"color": "light_blue",
"time": "20 m"
},
{
"abstract": "book_nonf_hard_tpl",
"type": "BOOK",
"name": "Nonfiction Book",
"description": "template for hard bound nonfiction book",
"weight": "1000 g",
"volume": "1100 ml",
"price": 1450,
"price_postapoc": 2900,
"material": [ "paper", "cardboard" ],
"bashing": 2,
"chapters": 18,
"copy-from": "book_nonf_tpl"
},
{
"abstract": "book_nonf_soft_tpl",
"type": "BOOK",
"name": "Nonfiction Paperback",
"description": "template for a paperback nonfiction book",
"weight": "460 g",
"volume": "500 ml",
"price": 990,
"price_postapoc": 2700,
"material": [ "paper" ],
"bashing": 1,
"chapters": 18,
"copy-from": "book_nonf_tpl"
},
{
"abstract": "book_nonf_hard_homemk_tpl",
"type": "BOOK",
"name": "Homemaking Book",
"description": "This is a template for books about homemaking, style, home decor, and home economics.",
"weight": "1100 g",
"copy-from": "book_nonf_hard_tpl",
"relative": { "intelligence": -1, "price_postapoc": -1600, "chapters": 2 }
},
{
"abstract": "book_nonf_hard_cook_tpl",
"type": "BOOK",
"name": "Hardcover Cookbook",
"description": "This is a template for books about cooking.",
"skill": "cooking",
"copy-from": "book_nonf_hard_tpl",
"relative": { "intelligence": -1 }
},
{
"abstract": "book_nonf_soft_cook_tpl",
"type": "BOOK",
"name": "Softcover Cookbook",
"description": "This is a template for books about cooking.",
"skill": "cooking",
"copy-from": "book_nonf_soft_tpl",
"relative": { "intelligence": -1 }
},
{
"abstract": "book_nonf_hard_dodge_tpl",
"type": "BOOK",
"name": "dodge skillbook abstract",
"description": "An ordinary book. Or is it? It is.",
"weight": "600 g",
"price": 1000,
"price_postapoc": 5000,
"flags": [ "TINDER", "FLAMMABLE" ],
"skill": "dodge",
"intelligence": 4,
"time": "10 m",
"fun": -1,
"copy-from": "book_nonf_hard_tpl"
},
{
"abstract": "paperback_occult",
"type": "BOOK",
"name": "template for mass produced books on esoteric subjects",
"description": "An ordinary paperback book. Or is it? Is that a glimmer of higher truth?",
"weight": "371 g",
"volume": "700 ml",
"price": 750,
"price_postapoc": 2900,
"material": [ "paper" ],
"symbol": "?",
"looks_like": "story_book",
"color": "dark_gray",
"flags": [ "TINDER", "FLAMMABLE" ],
"intelligence": 6,
"time": "35 m",
"chapters": 30,
"//": "TODO fun should be conditional for this item",
"fun": 1
},
{
"abstract": "paperback_romance_spb",
"type": "BOOK",
"name": "Sweet Providence Romance Novel",
"description": "Sweet Providence Books is a publisher of discount romance paperbacks easily recognized by their blue and yellow cover illustrations. Despite the adult nature of their subject matter, the books tend to be under 250 pages of large print written in a vocabulary consistent with a 4th grade reading level.",
"//": "these are books are tiny",
"weight": "200 g",
"volume": "400 ml",
"copy-from": "book_fict_soft_tpl",
"time": "11 m",
"relative": { "price": -351, "price_post": -800, "chapters": -8, "intelligence": -1 }
},
{
"abstract": "paperback_romance_lnl",
"type": "BOOK",
"name": "Lorn and Loan Romance Novel",
"description": "Lorn and Loan Press marketed romance paperbacks to a variety of alt demographics, especially those with a penchant for eyeliner. The books are billed as \"provocative,\" but words like \"malingering\" and \"turgid\" also come to mind.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_post": -400, "intelligence": 1, "fun": -1 }
},
{
"abstract": "paperback_romance_vanilla",
"type": "BOOK",
"name": "Vanilla Romance Novel",
"description": "Vanilla Media is a mainstream publisher providing romantic literature to everyday readers of taste. These stories contain explicit details only in the odd chapters, and invariably end with a conventionally uplifting moral.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_post": -100, "intelligence": -1 }
},
{
"abstract": "paperback_western_em",
"type": "BOOK",
"name": "The Everyman Library",
"description": "The Everyman Library is an imprint of Vanilla Media that publishes stories about private eyes, cowboys, quarterbacks, and mobsters.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_post": -100, "intelligence": -1 }
},
{
"abstract": "book_fict_soft_ya_vanilla",
"type": "BOOK",
"name": "Tween Topics",
"description": "Tween Topics is an imprint of Vanilla Media that publishes stories that appeal to the youth of today. Or, failing that, the parents of said youth.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_post": -400, "intelligence": 1, "fun": -1 }
},
{
"abstract": "book_fict_soft_ya_quiddity",
"type": "BOOK",
"name": "Quiddity Books",
"description": "Quiddity publishes books for young adults. They offer stories about self-discovery, personal identity, and contemporary trends.",
"copy-from": "book_fict_soft_tpl",
"relative": { "price_post": -400, "chapters": 9 }
},
{
"abstract": "book_fict_soft_satire_tpl",
"type": "BOOK",
"name": "Satire Template",
"description": "template for mass produced satirical fiction",
"copy-from": "book_fict_soft_tpl",
"time": "20 m",
"relative": { "intelligence": 3, "price": 249 }
},
{
"abstract": "book_nonf_zine",
"type": "BOOK",
"name": "Magazine Template",
"description": "template for magazine",
"intelligence": 4,
"weight": "60 g",
"volume": "250 ml",
"price": 400,
"price_postapoc": 100,
"material": [ "paper" ],
"symbol": "?",
"color": "pink",
"time": "8 m",
"fun": 1
},
{
"abstract": "book_nonf_zine_news_tpl",
"type": "BOOK",
"name": "News Magazine Template",
"description": "template for news magazine",
"copy-from": "book_nonf_zine",
"time": "11 m",
"relative": { "intelligence": 1 }
},
{
"abstract": "book_magazine",
"//": "this is the original version of book_nonf_zine",
"type": "BOOK",
"name": { "str": "readable magazine" },
"weight": "70 g",
"volume": "250 ml",
"material": "paper",
"symbol": "?",
"color": "pink",
"max_level": 1,
"intelligence": 5,
"time": "8 m",
"fun": 1
},
{
"abstract": "book_martial",
"type": "GENERIC",
"category": "books",
"name": { "str": "martial art manual" },
"weight": "150 g",
"volume": "250 ml",
"price": 20000,
"material": "paper",
"symbol": "?",
"color": "green",
"use_action": "MA_MANUAL",
"time": "10 m",
ZhilkinSerg marked this conversation as resolved.
Show resolved Hide resolved
"book_data": { "intelligence": 9 }
ZhilkinSerg marked this conversation as resolved.
Show resolved Hide resolved
}
]
Loading