Merge pull request #40675 from Jerimee/sportsbooks

m books about sports

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 }
     ]
   },

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,27 @@
     "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 },
+      { "group": "SUS_book_nonf_zine_sport", "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 +272,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 +301,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 +393,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 +438,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,11 +451,13 @@
     "entries": [
       { "group": "SUS_book_nonf_soft_occult", "prob": 2 },
       { "group": "SUS_book_nonf_soft_psych", "prob": 6 },
-      { "item": "book_nonf_soft_wedding_coolring", "prob": 2 },
-      { "item": "book_nonf_soft_parent_howtogen", "prob": 2 },
+      { "group": "SUS_book_nonf_soft_sports", "prob": 3 },
+      { "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 }
     ]
   },
   {
@@ -452,21 +511,22 @@
       { "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 }
     ]
   },
   {
     "id": "SUS_book_nonf_zine_sport",
     "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 }
     ]
   },
   {
@@ -505,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_nonf_hard_sports_ergo", "prob": 1 },
       { "item": "book_nonf_hard_phil_phinfo", "prob": 1 }
     ]
   },
@@ -568,6 +629,31 @@
       { "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_ergo", "prob": 1 },
+      { "item": "book_nonf_hard_sports_morg", "prob": 1 }
+    ]
+  },
   {
     "id": "SUS_book_nonf_hard_arch",
     "type": "item_group",

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": 1,
+    "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": 1,
+    "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_fict_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_fict_soft_tpl"
+  },
   {
     "abstract": "paperback_occult",
     "type": "BOOK",

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",