From 8e0005f09f33395f1513e150fe59ec45235c261b Mon Sep 17 00:00:00 2001 From: Jerimee Date: Mon, 18 May 2020 14:48:26 -0400 Subject: [PATCH 1/9] sports books --- data/json/items/book/abstract.json | 89 +++++++++++++++++++++------ data/json/items/book/misc.json | 11 ---- data/json/items/book/misc_sports.json | 11 ++++ 3 files changed, 82 insertions(+), 29 deletions(-) create mode 100644 data/json/items/book/misc_sports.json diff --git a/data/json/items/book/abstract.json b/data/json/items/book/abstract.json index 0a30706b9496c..bda751152b04f 100644 --- a/data/json/items/book/abstract.json +++ b/data/json/items/book/abstract.json @@ -1,33 +1,54 @@ [ { - "abstract": "book_fict_soft_tpl", + "abstract": "book_nonf_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" ], + "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_fict_tpl", + "type": "BOOK", + "name": "Generic Fiction Book", + "description": "template for a work of fiction", + "intelligence": 5, "symbol": "?", "looks_like": "story_book", "color": "light_cyan", - "flags": [ "TINDER", "FLAMMABLE" ], - "intelligence": 4, "time": "15 m", "chapters": 16, "fun": 2 }, { - "abstract": "book_nonf_tpl", + "abstract": "book_fict_hard_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" + "name": "Generic Hard Bound Fiction Book", + "description": "Template for hard bound book of fiction", + "weight": "1000 g", + "volume": "1100 ml", + "price": 1999, + "price_postapoc": 1500, + "material": [ "paper", "cardboard" ], + "bashing": 2, + "copy-from": "book_fict_tpl" + }, + { + "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": 799, + "price_postapoc": 1500, + "material": [ "paper" ], + "bashing": 1, + "flags": [ "FLAMMABLE" ], + "copy-from": "book_fict_tpl" }, { "abstract": "book_nonf_hard_tpl", @@ -119,6 +140,38 @@ "copy-from": "book_nonf_soft_tpl", "relative": { "price": 400, "price_post": -2600, "intelligence": 3 } }, + { + "abstract": "book_nonf_hard_sports_tpl", + "type": "BOOK", + "name": "Hardcover Nonfiction Sports Book", + "description": "This is a template.", + "fun": 2, + "copy-from": "book_nonf_hard_tpl" + }, + { + "abstract": "book_nonf_soft_sports_tpl", + "type": "BOOK", + "name": "Softcover Nonfiction Sports Book.", + "description": "This is a template.", + "fun": 2, + "copy-from": "book_nonf_soft_tpl" + }, + { + "abstract": "book_fict_hard_sports_tpl", + "type": "BOOK", + "name": "Hardcover Fictional Sports Book", + "description": "This is a template.", + "fun": 2, + "copy-from": "book_nonf_hard_tpl" + }, + { + "abstract": "book_fict_soft_sports_tpl", + "type": "BOOK", + "name": "Softcover Fictional Sports Book.", + "description": "This is a template.", + "fun": 2, + "copy-from": "book_nonf_soft_tpl" + }, { "abstract": "paperback_occult", "type": "BOOK", diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json index eb422adaacc99..d7bf7e7846149 100644 --- a/data/json/items/book/misc.json +++ b/data/json/items/book/misc.json @@ -707,17 +707,6 @@ } ] }, - { - "id": "novel_sports", - "type": "BOOK", - "name": { "str": "sports novel" }, - "description": "The dramatic tale of a small-time boxer who gets a rare chance to fight the heavy-weight champion, and seize his one chance to make a better life for himself while impressing the cute girl who works in the pet store.", - "copy-from": "book_fict_soft_tpl", - "intelligence": 7, - "time": "20 m", - "chapters": 28, - "fun": 3 - }, { "id": "novel_spy", "type": "BOOK", diff --git a/data/json/items/book/misc_sports.json b/data/json/items/book/misc_sports.json new file mode 100644 index 0000000000000..bb31c3b8276b2 --- /dev/null +++ b/data/json/items/book/misc_sports.json @@ -0,0 +1,11 @@ +[ + { + "id": "novel_sports", + "type": "BOOK", + "name": { "str": "sports novel" }, + "description": "The dramatic tale of a small-time boxer who gets a rare chance to fight the heavy-weight champion, and seize his one chance to make a better life for himself while impressing the cute girl who works in the pet store.", + "time": "20 m", + "copy-from": "book_fict_soft_tpl", + "relative": { "chapters": 12, "fun": 1, "intelligence": 1 } + } +] From cb6ab88171df56dd0fd7caedf671db8448de8659 Mon Sep 17 00:00:00 2001 From: Jerimee Date: Mon, 18 May 2020 19:33:34 -0400 Subject: [PATCH 2/9] m unrelated change to foodstuff --- data/json/items/book/abstract.json | 8 +- data/json/items/book/misc_sports.json | 139 ++++++++++++++++++++++++++ data/json/materials.json | 2 +- 3 files changed, 144 insertions(+), 5 deletions(-) diff --git a/data/json/items/book/abstract.json b/data/json/items/book/abstract.json index bda751152b04f..9d879d5a82ca3 100644 --- a/data/json/items/book/abstract.json +++ b/data/json/items/book/abstract.json @@ -145,7 +145,7 @@ "type": "BOOK", "name": "Hardcover Nonfiction Sports Book", "description": "This is a template.", - "fun": 2, + "fun": 1, "copy-from": "book_nonf_hard_tpl" }, { @@ -153,7 +153,7 @@ "type": "BOOK", "name": "Softcover Nonfiction Sports Book.", "description": "This is a template.", - "fun": 2, + "fun": 1, "copy-from": "book_nonf_soft_tpl" }, { @@ -162,7 +162,7 @@ "name": "Hardcover Fictional Sports Book", "description": "This is a template.", "fun": 2, - "copy-from": "book_nonf_hard_tpl" + "copy-from": "book_fict_hard_tpl" }, { "abstract": "book_fict_soft_sports_tpl", @@ -170,7 +170,7 @@ "name": "Softcover Fictional Sports Book.", "description": "This is a template.", "fun": 2, - "copy-from": "book_nonf_soft_tpl" + "copy-from": "book_fict_soft_tpl" }, { "abstract": "paperback_occult", diff --git a/data/json/items/book/misc_sports.json b/data/json/items/book/misc_sports.json index bb31c3b8276b2..0c1c3b78a3719 100644 --- a/data/json/items/book/misc_sports.json +++ b/data/json/items/book/misc_sports.json @@ -8,4 +8,143 @@ "copy-from": "book_fict_soft_tpl", "relative": { "chapters": 12, "fun": 1, "intelligence": 1 } } + { + "id": "book_fict_soft_sports_bunt", + "type": "BOOK", + "name": { "str": "The Art of Bunting", "str_pl": "copies of The Art of Bunting" }, + "description": "While you might be forgiven for expecting instructions for party decorating, it is in fact a novel about baseball. In the final climactic game a young star proves to himself that he is ready for the big leagues.", + "//isbn13": 9780316126670, + "weight": "472 g", + "volume": "1074 ml", + "longest_side": "20 cm", + "copy-from": "book_fict_soft_tpl" + }, + { + "id": "book_fict_soft_sports_tdsp", + "type": "BOOK", + "name": { "str": "The Touchdown Special", "str_pl": "copies of The Touchdown Special" }, + "description": "In this absorbing novel of football fandom, a pizza delivery driver makes a desperate gamble on the monday night game.", + "//isbn13": 9780393353785, + "weight": "184 g", + "volume": "450 ml", + "longest_side": "21 cm", + "copy-from": "book_fict_soft_tpl" + }, + { + "id": "book_fict_soft_sports_envy", + "type": "BOOK", + "name": { "str": "Trophy Envy", "str_pl": "copies of Trophy Envy" }, + "description": "This paperback tells the story of a tennis prodigy who begins to regret her own success.", + "//isbn13": 9781250183170, + "weight": "227 g", + "volume": "535 ml", + "longest_side": "20 cm", + "price": 1799, + "copy-from": "book_fict_soft_tpl" + }, + { + "id": "book_fict_hard_sports_semi", + "type": "BOOK", + "name": { "str": "Semi-Rough", "str_pl": "copies of Semi-Rough" }, + "description": "This novel follows the humorous adventures of a professional athlete turned amateur reporter.", + "//isbn13": 9780689105180, + "copy-from": "book_fict_hard_tpl", + "relative": { "fun": 1 } + }, + { + "id": "book_fict_hard_sports_omni", + "type": "BOOK", + "name": { "str": "The Golf Omnivore", "str_pl": "copies of The Golf Omnivore" }, + "description": "This hardback book is a collection of short stories in which love and golf are the only two constants.", + "//isbn13": 9780091439606, + "weight": "648 g", + "volume": "720 ml", + "longest_side": "21 cm", + "copy-from": "book_fict_hard_tpl" + }, + { + "id": "book_fict_hard_sports_uni", + "type": "BOOK", + "name": { "str": "Uniform Boy", "str_pl": "copies of Uniform Boy" }, + "description": "This hardback book about an equipment manager for a minor league team explores themes of loyalty and resentment.", + "//isbn13": 9780606153522, + "//dual genre": "sports and ya", + "weight": "363 g", + "volume": "640 ml", + "longest_side": "20 cm", + "price": 1899, + "copy-from": "book_fict_hard_tpl" + }, + { + "id": "book_nonf_soft_sports_bdgt", + "type": "BOOK", + "name": { "str": "Budgetball: Winning a Rigged Game", "str_pl": "copies of Budgetball" }, + "description": "Budgetball tells the true story of the curious case of Benny Bobbin and his quixotic quest to defeat the deep-pocketed Orlando O's.", + "//isbn13": 9780393324815, + "weight": "245 g", + "volume": "679 ml", + "longest_side": "21 cm", + "price": 1299, + "copy-from": "book_nonf_soft_tpl", + "relative": { "fun": 1, "intelligence": 1 } + }, + { + "id": "book_nonf_soft_sports_lads", + "type": "BOOK", + "name": { "str": "The Lads of Summer", "str_pl": "copies of The Lads of Summer" }, + "description": "This well worn paperback details the early baseball careers of one of the greatest teams professional sports has ever known.", + "//isbn13": 9780060883966, + "weight": "408 g", + "volume": "654 ml", + "longest_side": "20 cm", + "price": 1399, + "copy-from": "book_nonf_soft_tpl", + "relative": { "fun": 1 } + }, + { + "id": "book_nonf_soft_sports_vlly", + "type": "BOOK", + "name": { "str": "Volleyball: Get Ready to Get Ready", "str_pl": "copies of Volleyball" }, + "description": "\"Volleyball: Get Ready to Get Ready\" is YOUR illustrated guide to level up your game. With full-color photos and diagrams, you will learn the drills and techniques you need to dominate the competition.", + "//isbn13": 9781450468824, + "weight": "703 g", + "volume": "920 ml", + "longest_side": "28 cm", + "chapters": 12, + "copy-from": "book_nonf_soft_tpl", + "relative": { "fun": -1, "intelligence": -1 } + }, + { + "id": "book_nonf_hard_sports_1", + "type": "BOOK", + "name": { "str": "", "str_pl": "copies of " }, + "description": "xxx.", + "//isbn13": 9780000000000, + "weight": "472 g", + "volume": "1074 ml", + "longest_side": "20 cm", + "copy-from": "book_nonf_hard_tpl" + }, + { + "id": "book_nonf_hard_sports_xx2xx", + "type": "BOOK", + "name": { "str": "", "str_pl": "copies of " }, + "description": "xxx.", + "//isbn13": 9780000000000, + "weight": "472 g", + "volume": "1074 ml", + "longest_side": "20 cm", + "copy-from": "book_nonf_hard_tpl" + }, + { + "id": "book_nonf_hard_sports_xx3xx", + "type": "BOOK", + "name": { "str": "", "str_pl": "copies of " }, + "description": "xxx.", + "//isbn13": 9780000000000, + "weight": "472 g", + "volume": "1074 ml", + "longest_side": "20 cm", + "copy-from": "book_nonf_hard_tpl" + } ] diff --git a/data/json/materials.json b/data/json/materials.json index df95f30dd600b..d079695e7ac1e 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -763,7 +763,7 @@ { "type": "material", "ident": "foodplace_foodstuff", - "name": "Foodplace'delicious foodstuff", + "name": "Foodplace's delicious foodstuff", "copy-from": "junk" }, { From 416bc11bb424d33d0effc5c61a69d789240d83fa Mon Sep 17 00:00:00 2001 From: Jerimee Date: Mon, 18 May 2020 21:15:30 -0400 Subject: [PATCH 3/9] itemgroups --- data/json/itemgroups/SUS/library.json | 87 ++++++++++++++++++++++++++- data/json/items/book/misc_sports.json | 56 +++++++++-------- 2 files changed, 116 insertions(+), 27 deletions(-) diff --git a/data/json/itemgroups/SUS/library.json b/data/json/itemgroups/SUS/library.json index cc70729dafbb4..7d8a8562b7200 100644 --- a/data/json/itemgroups/SUS/library.json +++ b/data/json/itemgroups/SUS/library.json @@ -189,8 +189,7 @@ "//2": "This group is for a set of novels.", "subtype": "collection", "entries": [ - { "group": "SUS_book_fict", "count": [ 3, 10 ], "prob": 100 }, - { "item": "novel_sports", "count": [ 1, 5 ], "prob": 80 }, + { "group": "SUS_book_fict", "count": [ 3, 12 ], "prob": 160 }, { "item": "novel_samurai", "count": [ 1, 5 ], "prob": 80 }, { "item": "novel_war", "count": [ 1, 5 ], "prob": 80 }, { "item": "novel_adventure", "count": [ 1, 5 ], "prob": 80 }, @@ -239,13 +238,26 @@ "subtype": "distribution", "entries": [ { "group": "SUS_book_fict", "prob": 1 }, { "group": "SUS_book_nonf", "prob": 1 } ] }, + { + "id": "SUS_book_sports", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "Returns one book about sports. It may be hard or soft cover, fiction or nonfiction", + "subtype": "distribution", + "entries": [ + { "group": "SUS_book_fict_soft_sports", "prob": 1 }, + { "group": "SUS_book_fict_hard_sports", "prob": 1 }, + { "group": "SUS_book_nonf_soft_sports", "prob": 1 }, + { "group": "SUS_book_nonf_hard_sports", "prob": 1 } + ] + }, { "id": "SUS_book_fict", "type": "item_group", "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", "//2": "This group is for a single book of any fiction.", "subtype": "distribution", - "entries": [ { "group": "SUS_book_fict_soft", "prob": 1 } ] + "entries": [ { "group": "SUS_book_fict_soft", "prob": 10 }, { "group": "SUS_book_fict_hard", "prob": 1 } ] }, { "id": "SUS_book_fict_soft", @@ -259,9 +271,18 @@ { "group": "SUS_book_fict_soft_west", "prob": 1 }, { "group": "SUS_book_fict_soft_satire", "prob": 1 }, { "group": "SUS_book_fict_soft_swash", "prob": 1 }, + { "group": "SUS_book_fict_soft_sports", "prob": 1 }, { "group": "SUS_book_fict_soft_spy", "prob": 1 } ] }, + { + "id": "SUS_book_fict_hard", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "This group is for a single hardback novel.", + "subtype": "distribution", + "entries": [ { "group": "SUS_book_fict_hard_sports", "prob": 3 }, { "group": "SUS_book_fict_hard_ya", "prob": 1 } ] + }, { "id": "SUS_book_fict_soft_west", "type": "item_group", @@ -279,6 +300,19 @@ { "item": "book_fict_soft_west_vride", "prob": 1 } ] }, + { + "id": "SUS_book_fict_soft_sports", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "This returns a single paperback fictional sports book.", + "subtype": "distribution", + "entries": [ + { "item": "novel_sports", "prob": 1 }, + { "item": "book_fict_soft_sports_bunt", "prob": 1 }, + { "item": "book_fict_soft_sports_tdsp", "prob": 1 }, + { "item": "book_fict_soft_sports_envy", "prob": 1 } + ] + }, { "id": "SUS_book_fict_soft_swash", "type": "item_group", @@ -358,6 +392,27 @@ { "item": "novel_spy_rocketsci", "prob": 1 } ] }, + { + "id": "SUS_book_fict_hard_sports", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "This returns a single hardback fictional sports book.", + "subtype": "distribution", + "entries": [ + { "item": "book_fict_hard_sports_semi", "prob": 1 }, + { "item": "book_fict_hard_sports_omni", "prob": 1 }, + { "item": "book_fict_hard_sports_uni", "prob": 1 } + ] + }, + { + "id": "SUS_book_fict_hard_ya", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "This group returns a single hardback book for young adults and teens.", + "//3": "This group is a WIP. Please don't delete.", + "subtype": "distribution", + "entries": [ { "item": "book_fict_hard_sports_uni", "prob": 1 } ] + }, { "id": "SUS_book_nonf", "type": "item_group", @@ -382,6 +437,7 @@ { "group": "SUS_book_nonf_hard_homemk", "prob": 10 }, { "group": "SUS_book_nonf_hard_psych", "prob": 10 }, { "group": "SUS_book_nonf_hard_phil", "prob": 7 }, + { "group": "SUS_book_nonf_hard_sports", "prob": 3 }, { "group": "SUS_book_nonf_hard_arch", "prob": 10 } ] }, @@ -394,6 +450,7 @@ "entries": [ { "group": "SUS_book_nonf_soft_occult", "prob": 2 }, { "group": "SUS_book_nonf_soft_psych", "prob": 6 }, + { "group": "SUS_book_nonf_soft_sports", "prob": 3 }, { "item": "book_nonf_soft_wedding_coolring", "prob": 2 }, { "item": "book_nonf_soft_parent_howtogen", "prob": 2 }, { "item": "book_nonf_soft_safety_radiaea", "prob": 1 }, @@ -568,6 +625,30 @@ { "item": "book_nonf_soft_psych_cggamers", "prob": 1 } ] }, + { + "id": "SUS_book_nonf_soft_sports", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "returns one nonfiction paperback about sports", + "subtype": "distribution", + "entries": [ + { "item": "book_nonf_soft_sports_bdgt", "prob": 1 }, + { "item": "book_nonf_soft_sports_lads", "prob": 1 }, + { "item": "book_nonf_soft_sports_vlly", "prob": 1 } + ] + }, + { + "id": "SUS_book_nonf_hard_sports", + "type": "item_group", + "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", + "//2": "returns a single hardback book of nonfiction sports", + "subtype": "distribution", + "entries": [ + { "item": "book_nonf_hard_sports_hoop", "prob": 1 }, + { "item": "book_nonf_hard_sports_bike", "prob": 1 }, + { "item": "book_nonf_hard_sports_morg", "prob": 1 } + ] + }, { "id": "SUS_book_nonf_hard_arch", "type": "item_group", diff --git a/data/json/items/book/misc_sports.json b/data/json/items/book/misc_sports.json index 0c1c3b78a3719..31350db576e0d 100644 --- a/data/json/items/book/misc_sports.json +++ b/data/json/items/book/misc_sports.json @@ -115,36 +115,44 @@ "relative": { "fun": -1, "intelligence": -1 } }, { - "id": "book_nonf_hard_sports_1", + "id": "book_nonf_hard_sports_morg", "type": "BOOK", - "name": { "str": "", "str_pl": "copies of " }, - "description": "xxx.", - "//isbn13": 9780000000000, - "weight": "472 g", - "volume": "1074 ml", - "longest_side": "20 cm", - "copy-from": "book_nonf_hard_tpl" + "name": { "str": "William G. Morgan, the Godfather of Volleyball", "str_pl": "copies of The Godfather of Volleyball" }, + "description": "This odd little hardbound book is only 98 pages long, and a dozen of those are comprised of grainy black and white photos. If you read this book, you learn that volleyball was originally called \"Mintonette\" and also some biographic details about its inventor.", + "//isbn13": 9781595941893, + "weight": "272 g", + "volume": "400 ml", + "longest_side": "22 cm", + "price": 3999, + "copy-from": "book_nonf_hard_tpl", + "relative": { "fun": -1, "intelligence": 1 } }, { - "id": "book_nonf_hard_sports_xx2xx", + "id": "book_nonf_hard_sports_bike", "type": "BOOK", - "name": { "str": "", "str_pl": "copies of " }, - "description": "xxx.", - "//isbn13": 9780000000000, - "weight": "472 g", - "volume": "1074 ml", - "longest_side": "20 cm", - "copy-from": "book_nonf_hard_tpl" + "name": { "str": "Legendary Bike Rides", "str_pl": "copies of Bike Rides" }, + "description": "This unweildy coffeetable book is titled \"LEGENDARY Bike Rides Around the WORLD.\" It provides a wealth of detail about paved bike trails in every part of the globe except New England. But if you make it to Patagonia on bike, you're all set.", + "//isbn13": 9781760340834, + "weight": "1589 g", + "volume": "1660 ml", + "longest_side": "27 cm", + "price": 2999, + "chapters": 40, + "time": "8 m", + "copy-from": "book_nonf_hard_tpl", + "relative": { "intelligence": -1 } }, { - "id": "book_nonf_hard_sports_xx3xx", + "id": "book_nonf_hard_sports_hoop", "type": "BOOK", - "name": { "str": "", "str_pl": "copies of " }, - "description": "xxx.", - "//isbn13": 9780000000000, - "weight": "472 g", - "volume": "1074 ml", - "longest_side": "20 cm", - "copy-from": "book_nonf_hard_tpl" + "name": { "str": "Stratosphere: The Rise of Hoops", "str_pl": "copies of Stratosphere" }, + "description": "\"Stratosphere: The Rise of Hoops\" chronicles four decades of professional basketball against a backdrop of sustained social change.", + "//isbn13": 9781629376509, + "weight": "818 g", + "volume": "1114 ml", + "longest_side": "23 cm", + "price": 2699, + "copy-from": "book_nonf_hard_tpl", + "relative": { "chapters": 8 } } ] From da7fa06d655cbd092829ab44c2e7006b2a37817d Mon Sep 17 00:00:00 2001 From: Jerimee Date: Mon, 18 May 2020 23:18:48 -0400 Subject: [PATCH 4/9] college kids --- .../Locations_MapExtras/map_extras.json | 3 +++ data/json/itemgroups/SUS/library.json | 17 ++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/map_extras.json b/data/json/itemgroups/Locations_MapExtras/map_extras.json index f0d6fa2f00a5d..cb0abda1164e4 100644 --- a/data/json/itemgroups/Locations_MapExtras/map_extras.json +++ b/data/json/itemgroups/Locations_MapExtras/map_extras.json @@ -27,6 +27,7 @@ { "group": "hatstore_hats", "damage-min": 1, "damage-max": 4, "prob": 40 }, { "group": "college_camping", "prob": 50 }, { "group": "college_camping", "prob": 80 }, + { "group": "SUS_book_nonf_soft", "prob": 20 }, { "item": "corpse", "damage": 3 } ] }, @@ -43,6 +44,7 @@ { "group": "hatstore_hats", "damage-min": 1, "damage-max": 4, "prob": 40 }, { "group": "college_sports", "prob": 50 }, { "group": "college_sports", "prob": 90 }, + { "group": "SUS_book_sports", "prob": 30 }, { "item": "corpse", "damage": 3 } ] }, @@ -59,6 +61,7 @@ { "group": "hatstore_hats", "damage-min": 1, "damage-max": 4, "prob": 40 }, { "group": "college_lake", "prob": 50 }, { "group": "college_lake", "prob": 70 }, + { "group": "SUS_book_nonf_soft", "prob": 25 }, { "item": "corpse", "damage": 3 } ] }, diff --git a/data/json/itemgroups/SUS/library.json b/data/json/itemgroups/SUS/library.json index 7d8a8562b7200..703cab9c60aab 100644 --- a/data/json/itemgroups/SUS/library.json +++ b/data/json/itemgroups/SUS/library.json @@ -248,7 +248,8 @@ { "group": "SUS_book_fict_soft_sports", "prob": 1 }, { "group": "SUS_book_fict_hard_sports", "prob": 1 }, { "group": "SUS_book_nonf_soft_sports", "prob": 1 }, - { "group": "SUS_book_nonf_hard_sports", "prob": 1 } + { "group": "SUS_book_nonf_hard_sports", "prob": 1 }, + { "group": "SUS_book_nonf_zine_sport", "prob": 1 } ] }, { @@ -451,11 +452,12 @@ { "group": "SUS_book_nonf_soft_occult", "prob": 2 }, { "group": "SUS_book_nonf_soft_psych", "prob": 6 }, { "group": "SUS_book_nonf_soft_sports", "prob": 3 }, - { "item": "book_nonf_soft_wedding_coolring", "prob": 2 }, - { "item": "book_nonf_soft_parent_howtogen", "prob": 2 }, + { "item": "book_nonf_soft_wedding_coolring", "prob": 1 }, + { "item": "book_nonf_soft_parent_howtogen", "prob": 1 }, { "item": "book_nonf_soft_safety_radiaea", "prob": 1 }, { "item": "book_nonf_soft_mechnic_hotrod", "prob": 1 }, - { "item": "book_nonf_soft_speech_naillaw", "prob": 1 } + { "item": "book_nonf_soft_speech_naillaw", "prob": 1 }, + { "item": "book_nonf_soft_phil_benoth", "prob": 1 } ] }, { @@ -509,7 +511,8 @@ { "item": "mag_cutting", "prob": 6 }, { "item": "mag_cars", "prob": 10 }, { "item": "mag_guns", "prob": 10 }, - { "item": "mag_glam", "prob": 10 } + { "item": "mag_glam", "prob": 10 }, + { "item": "mag_gaming", "prob": 10 } ] }, { @@ -517,13 +520,13 @@ "type": "item_group", "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", "//2": "Returns a single sports or games magazine.", + "//TODO": "rename this SUS_book_nonf_zine_sports", "subtype": "distribution", "entries": [ { "item": "mag_unarmed", "prob": 1 }, { "item": "mag_throwing", "prob": 1 }, { "item": "mag_archery", "prob": 1 }, - { "item": "mag_bashing", "prob": 1 }, - { "item": "mag_gaming", "prob": 2 } + { "item": "mag_bashing", "prob": 1 } ] }, { From 2aa9bacec29ed1044796916747c07bc46328b153 Mon Sep 17 00:00:00 2001 From: Jerimee Date: Tue, 19 May 2020 13:18:50 -0400 Subject: [PATCH 5/9] m typo --- data/json/items/book/misc_sports.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/book/misc_sports.json b/data/json/items/book/misc_sports.json index 31350db576e0d..b2d49b25f0a03 100644 --- a/data/json/items/book/misc_sports.json +++ b/data/json/items/book/misc_sports.json @@ -7,7 +7,7 @@ "time": "20 m", "copy-from": "book_fict_soft_tpl", "relative": { "chapters": 12, "fun": 1, "intelligence": 1 } - } + }, { "id": "book_fict_soft_sports_bunt", "type": "BOOK", From d5701489b0ba7e675799251c5626da8d5376914d Mon Sep 17 00:00:00 2001 From: Jerimee Date: Tue, 19 May 2020 13:28:07 -0400 Subject: [PATCH 6/9] m --- data/json/items/book/misc_sports.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/book/misc_sports.json b/data/json/items/book/misc_sports.json index b2d49b25f0a03..f58508f581509 100644 --- a/data/json/items/book/misc_sports.json +++ b/data/json/items/book/misc_sports.json @@ -147,7 +147,7 @@ "type": "BOOK", "name": { "str": "Stratosphere: The Rise of Hoops", "str_pl": "copies of Stratosphere" }, "description": "\"Stratosphere: The Rise of Hoops\" chronicles four decades of professional basketball against a backdrop of sustained social change.", - "//isbn13": 9781629376509, + "//isbn13": 9781629376509, "weight": "818 g", "volume": "1114 ml", "longest_side": "23 cm", From 0adcc83b011e82b0544da4e0210254e0ef1809ea Mon Sep 17 00:00:00 2001 From: Jerimee Date: Tue, 19 May 2020 16:33:37 -0400 Subject: [PATCH 7/9] add ergo book to sports and phil --- data/json/itemgroups/SUS/library.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/SUS/library.json b/data/json/itemgroups/SUS/library.json index 703cab9c60aab..c4817cbe5042f 100644 --- a/data/json/itemgroups/SUS/library.json +++ b/data/json/itemgroups/SUS/library.json @@ -565,11 +565,12 @@ "id": "SUS_book_nonf_hard_phil", "type": "item_group", "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", - "//2": "Returns a book about philosophy.", + "//2": "Returns one hardback book about philosophy.", "subtype": "distribution", "entries": [ { "item": "book_nonf_hard_phil_mdlogic", "prob": 1 }, { "item": "book_nonf_hard_phil_aesth", "prob": 1 }, + { "item": "book_noft_hard_sports_ergo", "prob": 1 }, { "item": "book_nonf_hard_phil_phinfo", "prob": 1 } ] }, @@ -649,6 +650,7 @@ "entries": [ { "item": "book_nonf_hard_sports_hoop", "prob": 1 }, { "item": "book_nonf_hard_sports_bike", "prob": 1 }, + { "item": "book_noft_hard_sports_ergo", "prob": 1 }, { "item": "book_nonf_hard_sports_morg", "prob": 1 } ] }, From 319651486b60a48c8945d01c558f98561ef14cf5 Mon Sep 17 00:00:00 2001 From: Jerimee Date: Wed, 20 May 2020 13:38:39 -0400 Subject: [PATCH 8/9] typo --- data/json/itemgroups/SUS/library.json | 4 ++-- data/json/items/book/misc_sports.json | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/data/json/itemgroups/SUS/library.json b/data/json/itemgroups/SUS/library.json index c4817cbe5042f..1010f28122b25 100644 --- a/data/json/itemgroups/SUS/library.json +++ b/data/json/itemgroups/SUS/library.json @@ -570,7 +570,7 @@ "entries": [ { "item": "book_nonf_hard_phil_mdlogic", "prob": 1 }, { "item": "book_nonf_hard_phil_aesth", "prob": 1 }, - { "item": "book_noft_hard_sports_ergo", "prob": 1 }, + { "item": "book_nonf_hard_sports_ergo", "prob": 1 }, { "item": "book_nonf_hard_phil_phinfo", "prob": 1 } ] }, @@ -650,7 +650,7 @@ "entries": [ { "item": "book_nonf_hard_sports_hoop", "prob": 1 }, { "item": "book_nonf_hard_sports_bike", "prob": 1 }, - { "item": "book_noft_hard_sports_ergo", "prob": 1 }, + { "item": "book_nonf_hard_sports_ergo", "prob": 1 }, { "item": "book_nonf_hard_sports_morg", "prob": 1 } ] }, diff --git a/data/json/items/book/misc_sports.json b/data/json/items/book/misc_sports.json index f58508f581509..861687d478a28 100644 --- a/data/json/items/book/misc_sports.json +++ b/data/json/items/book/misc_sports.json @@ -142,6 +142,20 @@ "copy-from": "book_nonf_hard_tpl", "relative": { "intelligence": -1 } }, + { + "id": "book_noft_hard_sports_ergo", + "type": "BOOK", + "name": { "str": "Natare Ergo Sum", "str_pl": "copies of Natare Ergo Sum" }, + "description": "The poorly translated title is supposed to be Latin for \"I Swim, Therefore I Am.\" This short hardback presents \"A Philosophy of Swimming\" and then playfully attributes a variety of famous philosophical expressions into edorsements for the sport of swimming. It's not a bad book, just a bit odd.", + "//isbn13": 9781587313776, + "//dual genre": "sports and phil", + "weight": "167 g", + "volume": "289 ml", + "longest_side": "18 cm", + "price": 1299, + "copy-from": "book_fict_hard_tpl", + "relative": { "fun": 1, "intelligence": 2,"chapters": -10 } + }, { "id": "book_nonf_hard_sports_hoop", "type": "BOOK", From b4966fc25fa78b14b98fb0caf64be68d4f55cf17 Mon Sep 17 00:00:00 2001 From: Jerimee Date: Wed, 20 May 2020 15:16:30 -0400 Subject: [PATCH 9/9] m --- data/json/items/book/misc_sports.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/book/misc_sports.json b/data/json/items/book/misc_sports.json index 861687d478a28..fe5699a8b95fa 100644 --- a/data/json/items/book/misc_sports.json +++ b/data/json/items/book/misc_sports.json @@ -143,7 +143,7 @@ "relative": { "intelligence": -1 } }, { - "id": "book_noft_hard_sports_ergo", + "id": "book_nonf_hard_sports_ergo", "type": "BOOK", "name": { "str": "Natare Ergo Sum", "str_pl": "copies of Natare Ergo Sum" }, "description": "The poorly translated title is supposed to be Latin for \"I Swim, Therefore I Am.\" This short hardback presents \"A Philosophy of Swimming\" and then playfully attributes a variety of famous philosophical expressions into edorsements for the sport of swimming. It's not a bad book, just a bit odd.", @@ -154,7 +154,7 @@ "longest_side": "18 cm", "price": 1299, "copy-from": "book_fict_hard_tpl", - "relative": { "fun": 1, "intelligence": 2,"chapters": -10 } + "relative": { "fun": 1, "intelligence": 2, "chapters": -10 } }, { "id": "book_nonf_hard_sports_hoop",