From 9b4b483387449f2a30528cfa4042d10c3431cb8b Mon Sep 17 00:00:00 2001
From: Lil Shining Man <56778776+LilShiningMan@users.noreply.github.com>
Date: Mon, 20 Jan 2020 21:42:03 -0800
Subject: [PATCH] Novels Item Group Revamp - kid books and literature groups
 added

eliminated duplicated novel item lists and replaced by calling revamped Novels group, as well as newly created kid_books and literature item groups.
---
 data/json/itemgroups/books.json               | 123 ++++++------------
 data/json/itemgroups/item_groups.json         |  28 +---
 data/json/itemgroups/locations.json           |  63 ++-------
 .../json/itemgroups/locations_commercial.json |  36 +----
 data/json/itemgroups/mall_item_groups.json    |   8 +-
 data/json/itemgroups/mansion.json             |   8 +-
 6 files changed, 59 insertions(+), 207 deletions(-)

diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json
index 3479ce0f82021..cb164c2241ec9 100644
--- a/data/json/itemgroups/books.json
+++ b/data/json/itemgroups/books.json
@@ -30,16 +30,7 @@
     "id": "light_reading",
     "type": "item_group",
     "//": "for music store",
-    "items": [
-      [ "novel_coa", 10 ],
-      [ "child_book", 50 ],
-      [ "manual_dodge_kid", 25 ],
-      [ "tall_tales", 20 ],
-      [ "story_book", 4 ],
-      [ "novel_pulp", 16 ],
-      [ "fairy_tales", 20 ],
-      [ "mag_comic", 20 ]
-    ]
+    "items": [ { "group": "kids_books", "prob": 139 }, [ "novel_pulp", 16 ] ]
   },
   {
     "id": "boxing_books",
@@ -118,7 +109,9 @@
     "items": [
       { "group": "novels", "prob": 50 },
       { "group": "manuals_school", "prob": 40 },
-      { "group": "textbooks_school", "prob": 30 }
+      { "group": "textbooks_school", "prob": 30 },
+      { "group": "kids_books", "prob": 30 },
+      { "group": "literature", "prob": 30 }
     ]
   },
   {
@@ -178,73 +171,61 @@
       [ "novel_swash", 14 ],
       [ "novel_western", 22 ],
       [ "novel_war", 20 ],
+      [ "novel_war2", 20 ],
       [ "novel_adventure", 14 ],
       [ "novel_experimental", 1 ],
       [ "novel_road", 10 ],
       [ "novel_buddy", 12 ],
       [ "novel_scifi", 20 ],
       [ "novel_drama", 40 ],
-      [ "classic_literature", 10 ],
-      [ "cookbook_human", 1 ],
       [ "novel_mystery", 25 ],
       [ "novel_fantasy", 20 ],
       [ "novel_erotic", 4 ],
-      [ "poetry_book", 10 ],
-      [ "jewelry_book", 4 ],
-      [ "philosophy_book", 2 ],
-      [ "essay_book", 6 ],
-      [ "plays_book", 8 ],
-      [ "tall_tales", 10 ],
-      [ "story_book", 4 ],
       [ "novel_pulp", 16 ],
-      [ "fairy_tales", 10 ],
       [ "novel_thriller", 18 ],
-      [ "novel_coa", 10 ],
+      [ "novel_coa", 5 ],
+      [ "novel_coa2", 5 ],
       [ "novel_crime", 20 ],
+      [ "novel_crime2", 20 ],
       [ "novel_horror", 18 ],
       [ "novel_tragedy", 8 ],
-      { "group": "religious_books", "prob": 20 },
-      [ "ZSG", 5 ],
-      [ "dnd_handbook", 2 ],
       [ "survnote", 1 ]
     ]
   },
   {
-    "id": "homebooks",
+    "id": "literature",
     "type": "item_group",
     "items": [
-      [ "novel_romance", 30 ],
-      [ "novel_spy", 28 ],
-      [ "novel_sports", 22 ],
-      [ "novel_samurai", 22 ],
-      [ "novel_swash", 14 ],
-      [ "novel_western", 22 ],
-      [ "novel_war", 20 ],
-      [ "novel_war2", 20 ],
-      [ "novel_adventure", 14 ],
-      [ "novel_experimental", 1 ],
-      [ "novel_road", 10 ],
-      [ "novel_buddy", 12 ],
-      [ "novel_scifi", 20 ],
-      [ "novel_drama", 40 ],
       [ "classic_literature", 10 ],
-      [ "cookbook_human", 1 ],
-      [ "novel_mystery", 25 ],
-      [ "novel_fantasy", 20 ],
       [ "poetry_book", 10 ],
-      [ "jewelry_book", 4 ],
-      [ "plays_book", 8 ],
+      [ "philosophy_book", 2 ],
+      [ "essay_book", 6 ],
+      [ "plays_book", 8 ]
+    ]
+  },
+  {
+    "id": "kids_books",
+    "type": "item_group",
+    "items": [
       [ "tall_tales", 10 ],
       [ "story_book", 4 ],
-      [ "novel_pulp", 16 ],
       [ "fairy_tales", 10 ],
-      [ "novel_thriller", 18 ],
       [ "novel_coa", 10 ],
       [ "novel_coa2", 10 ],
-      [ "novel_crime", 20 ],
-      [ "novel_crime2", 20 ],
-      [ "novel_horror", 18 ],
-      [ "novel_tragedy", 8 ],
+      [ "child_book", 50 ],
+      [ "manual_dodge_kid", 20 ],
+      [ "mag_comic", 20 ]
+    ]
+  },
+  {
+    "id": "homebooks",
+    "type": "item_group",
+    "items": [
+      { "group": "novels", "prob": 424 },
+      { "group": "kids_books", "prob": 50 },
+      { "group": "literature", "prob": 30 },
+      [ "cookbook_human", 1 ],
+      [ "jewelry_book", 4 ],
       [ "phonebook", 8 ],
       { "group": "religious_books", "prob": 40 },
       [ "ZSG", 5 ],
@@ -490,26 +471,11 @@
       [ "reference_firstaid1", 2 ],
       [ "reference_firstaid2", 2 ],
       [ "dnd_handbook", 15 ],
-      [ "novel_romance", 30 ],
-      [ "novel_spy", 32 ],
-      [ "novel_sports", 12 ],
-      [ "novel_western", 12 ],
-      [ "novel_war", 24 ],
-      [ "novel_war2", 24 ],
-      [ "novel_adventure", 24 ],
-      [ "novel_road", 12 ],
-      [ "novel_buddy", 12 ],
-      [ "novel_scifi", 50 ],
-      [ "novel_drama", 40 ],
-      [ "novel_experimental", 24 ],
-      [ "novel_swash", 35 ],
-      [ "novel_samurai", 35 ],
-      [ "classic_literature", 30 ],
+      { "group": "novels", "prob": 366 },
+      { "group": "literature", "prob": 55 },
+      [ "novel_experimental", 23 ],
       [ "collector_book", 2 ],
-      [ "plays_book", 12 ],
-      [ "poetry_book", 12 ],
       { "group": "religious_books", "prob": 40 },
-      { "group": "homebooks", "prob": 3 },
       { "group": "textbooks", "prob": 1 },
       { "group": "manuals", "prob": 1 }
     ]
@@ -519,26 +485,11 @@
     "type": "item_group",
     "//": "Those rich mansion people have all sorts of weird books.",
     "items": [
-      [ "novel_romance", 30 ],
-      [ "novel_spy", 22 ],
-      [ "novel_sports", 12 ],
-      [ "novel_western", 12 ],
-      [ "novel_war", 24 ],
-      [ "novel_war2", 24 ],
-      [ "novel_adventure", 14 ],
-      [ "novel_road", 5 ],
-      [ "novel_buddy", 6 ],
-      [ "novel_scifi", 20 ],
-      [ "novel_drama", 40 ],
+      { "group": "novels", "prob": 370 },
+      { "group": "literature", "prob": 100 },
       [ "photo_album", 30 ],
       [ "textbook_robots", 2 ],
-      [ "novel_experimental", 24 ],
-      [ "novel_swash", 35 ],
-      [ "novel_samurai", 35 ],
-      [ "classic_literature", 40 ],
       [ "collector_book", 30 ],
-      [ "plays_book", 30 ],
-      [ "poetry_book", 30 ],
       [ "carpentry_book", 5 ],
       [ "jewelry_book", 5 ],
       { "group": "religious_books", "prob": 40 }
diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
index cc40129be46a8..3eab396931d56 100644
--- a/data/json/itemgroups/item_groups.json
+++ b/data/json/itemgroups/item_groups.json
@@ -33,15 +33,8 @@
       [ "wristwatch", 10 ],
       [ "umbrella", 5 ],
       [ "teleumbrella", 2 ],
-      [ "novel_coa", 10 ],
-      [ "novel_coa2", 10 ],
-      [ "child_book", 50 ],
-      [ "manual_dodge_kid", 20 ],
-      [ "tall_tales", 20 ],
-      [ "story_book", 4 ],
+      { "group": "kids_books", "prob": 155 },
       [ "novel_pulp", 16 ],
-      [ "fairy_tales", 20 ],
-      [ "mag_comic", 20 ],
       [ "radio_car_box", 1 ],
       [ "basketball", 8 ],
       [ "radiocontrol", 5 ],
@@ -115,12 +108,8 @@
       [ "many_years_old_newspaper", 2 ],
       [ "years_old_newspaper", 2 ],
       [ "one_year_old_newspaper", 3 ],
-      [ "child_book", 50 ],
-      [ "manual_dodge_kid", 20 ],
-      [ "tall_tales", 10 ],
-      [ "story_book", 4 ],
-      [ "novel_pulp", 16 ],
-      [ "fairy_tales", 10 ],
+      { "group": "kids_books", "prob": 110 },
+      { "group": "novels", "prob": 16 },
       [ "tailor_portfolio", 1 ],
       [ "trappers_companion", 1 ],
       [ "puck", 5 ],
@@ -745,21 +734,14 @@
       [ "fan", 10 ],
       { "group": "magazines", "prob": 225 },
       [ "photo_album", 5 ],
-      [ "novel_romance", 30 ],
-      [ "novel_drama", 40 ],
-      [ "novel_mystery", 25 ],
+      { "group": "novels", "prob": 95 },
       [ "ZSG", 5 ],
       [ "manual_mechanics", 35 ],
       [ "manual_fabrication", 12 ],
       [ "manual_speech", 50 ],
       [ "manual_business", 40 ],
       [ "manual_computers", 20 ],
-      [ "child_book", 20 ],
-      [ "manual_dodge_kid", 10 ],
-      [ "tall_tales", 10 ],
-      [ "story_book", 4 ],
-      [ "novel_pulp", 16 ],
-      [ "fairy_tales", 10 ],
+      { "group": "kids_books", "prob": 70 },
       [ "tailor_portfolio", 1 ],
       [ "recipe_augs", 1 ],
       [ "laptop", 10 ],
diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json
index f68305be79b35..985a29bd6827d 100644
--- a/data/json/itemgroups/locations.json
+++ b/data/json/itemgroups/locations.json
@@ -155,8 +155,7 @@
     "id": "waitingroom",
     "items": [
       { "group": "magazines", "prob": 2000 },
-      [ "child_book", 30 ],
-      [ "manual_dodge_kid", 5 ],
+      { "group": "kids_books", "prob": 35 },
       [ "recipe_augs", 20 ],
       [ "decoy_anarch", 50 ],
       [ "months_old_newspaper", 20 ],
@@ -220,18 +219,14 @@
     "items": [
       [ "corpse", 10 ],
       [ "bag_body_bag", 10 ],
-      [ "child_book", 5 ],
+      { "group": "kids_books", "prob": 40 },
       [ "stethoscope", 20 ],
-      [ "tall_tales", 10 ],
-      [ "story_book", 5 ],
       [ "novel_pulp", 16 ],
-      [ "fairy_tales", 10 ],
       [ "atomic_light", 1 ],
       [ "months_old_newspaper", 4 ],
       [ "weeks_old_newspaper", 5 ],
       [ "newest_newspaper", 6 ],
       { "group": "book_mag_gen", "prob": 99 },
-      [ "mag_comic", 10 ],
       [ "mag_porn", 5 ],
       [ "hairpin", 5 ],
       [ "purse", 30 ],
@@ -575,14 +570,10 @@
       [ "ZSG", 10 ],
       [ "glassblowing_book", 15 ],
       [ "textbook_chemistry", 15 ],
-      [ "child_book", 15 ],
-      [ "manual_dodge_kid", 5 ],
+      { "group": "novels", "prob": 75 },
+      { "group": "literature", "prob": 20 },
       { "group": "religious_books", "prob": 10 },
-      [ "novel_thriller", 15 ],
-      [ "novel_sports", 15 ],
-      [ "novel_war", 15 ],
-      [ "novel_western", 15 ],
-      [ "novel_experimental", 15 ],
+      { "group": "kids_books", "prob": 20 },
       [ "recipe_elfa", 15 ],
       [ "recipe_bows", 15 ],
       [ "manual_stabbing", 20 ],
@@ -1651,17 +1642,14 @@
       [ "file", 30 ],
       [ "photo_album", 5 ],
       { "group": "magazines", "prob": 255 },
-      [ "novel_romance", 30 ],
-      [ "novel_drama", 40 ],
-      [ "novel_mystery", 25 ],
+      { "group": "novels", "prob": 125 },
+      { "group": "literature", "prob": 20 },
       [ "ZSG", 5 ],
       [ "manual_mechanics", 35 ],
       [ "manual_fabrication", 12 ],
       [ "manual_speech", 50 ],
       [ "manual_business", 40 ],
       [ "manual_computers", 20 ],
-      [ "novel_western", 16 ],
-      [ "novel_pulp", 16 ],
       [ "tailor_portfolio", 1 ],
       [ "recipe_alpha", 1 ],
       [ "recipe_serum", 4 ],
@@ -1782,37 +1770,11 @@
       [ "101_carpentry", 10 ],
       [ "manual_driving", 20 ],
       [ "textbook_speech", 12 ],
-      [ "novel_romance", 30 ],
-      [ "novel_spy", 28 ],
-      [ "novel_satire", 15 ],
-      [ "novel_sports", 22 ],
-      [ "novel_samurai", 22 ],
-      [ "novel_swash", 14 ],
-      [ "novel_western", 22 ],
-      [ "novel_war", 18 ],
-      [ "novel_war2", 18 ],
+      { "group": "novels", "prob": 439 },
+      { "group": "kids_books", "prob": 50 },
+      { "group": "literature", "prob": 60 },
       [ "atomic_survival", 1 ],
-      [ "novel_adventure", 14 ],
-      [ "novel_experimental", 1 ],
-      [ "novel_road", 10 ],
-      [ "novel_buddy", 12 ],
-      [ "novel_thriller", 18 ],
-      [ "novel_coa", 10 ],
-      [ "novel_coa2", 10 ],
-      [ "novel_crime", 20 ],
-      [ "novel_crime2", 20 ],
-      [ "novel_scifi", 20 ],
-      [ "novel_drama", 40 ],
-      [ "novel_mystery", 25 ],
-      [ "novel_fantasy", 20 ],
-      [ "novel_erotic", 4 ],
-      [ "poetry_book", 10 ],
       [ "jewelry_book", 8 ],
-      [ "philosophy_book", 2 ],
-      [ "essay_book", 6 ],
-      [ "plays_book", 8 ],
-      [ "novel_horror", 18 ],
-      [ "novel_tragedy", 8 ],
       [ "ZSG", 2 ],
       [ "cookies", 50 ],
       [ "backpack", 38 ],
@@ -2204,8 +2166,7 @@
       [ "backpack_tactical_large", 3 ],
       [ "slingpack", 8 ],
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
-      [ "novel_scifi", 20 ],
-      [ "novel_drama", 40 ],
+      { "group": "novels", "prob": 60 },
       { "group": "magazines", "prob": 35 },
       [ "manual_dodge", 2 ],
       [ "manual_first_aid", 40 ],
@@ -2215,7 +2176,7 @@
       [ "manual_bashing", 1 ],
       [ "recipe_bows", 4 ],
       [ "recipe_arrows", 4 ],
-      [ "child_book", 1 ],
+      { "group": "kids_books", "prob": 5 },
       [ "many_years_old_newspaper", 3 ],
       [ "years_old_newspaper", 3 ],
       [ "one_year_old_newspaper", 3 ],
diff --git a/data/json/itemgroups/locations_commercial.json b/data/json/itemgroups/locations_commercial.json
index 5967e7c3bb502..f508b4b6c29c5 100644
--- a/data/json/itemgroups/locations_commercial.json
+++ b/data/json/itemgroups/locations_commercial.json
@@ -24,10 +24,7 @@
       { "group": "book_mag_tech", "prob": 30 },
       { "group": "book_mag_gen", "prob": 45 },
       { "group": "book_mag_interests", "prob": 30 },
-      [ "mag_comic", 15 ],
-      [ "child_book", 20 ],
-      [ "manual_dodge_kid", 10 ],
-      [ "fairy_tales", 20 ],
+      { "group": "kids_books", "prob": 65 },
       [ "family_cookbook", 25 ]
     ]
   },
@@ -307,28 +304,8 @@
       [ "remington_700", 14 ],
       [ "m1903", 1 ],
       [ "garand", 2 ],
-      [ "novel_romance", 30 ],
-      [ "novel_spy", 28 ],
-      [ "novel_satire", 15 ],
-      [ "novel_sports", 22 ],
-      [ "novel_samurai", 22 ],
-      [ "novel_swash", 14 ],
-      [ "novel_swash", 14 ],
-      [ "novel_western", 22 ],
-      [ "novel_war", 18 ],
-      [ "novel_war2", 18 ],
+      { "group": "novels", "prob": 378 },
       [ "atomic_survival", 1 ],
-      [ "novel_adventure", 14 ],
-      [ "novel_experimental", 1 ],
-      [ "novel_road", 10 ],
-      [ "novel_buddy", 12 ],
-      [ "novel_thriller", 18 ],
-      [ "novel_coa", 10 ],
-      [ "novel_coa2", 10 ],
-      [ "novel_crime", 20 ],
-      [ "novel_crime2", 20 ],
-      [ "novel_scifi", 20 ],
-      [ "novel_drama", 40 ],
       [ "survival_book", 10 ],
       [ "fun_survival", 10 ],
       [ "SICP", 3 ],
@@ -776,7 +753,6 @@
       [ "game_watch", 15 ],
       [ "deck_of_cards", 25 ],
       [ "atomic_light", 1 ],
-      [ "manual_dodge_kid", 5 ],
       [ "inflatable_boat", 10 ],
       [ "hand_pump", 15 ],
       [ "toastem", 45 ],
@@ -790,14 +766,8 @@
       [ "wristwatch", 15 ],
       [ "umbrella", 10 ],
       [ "teleumbrella", 4 ],
-      [ "novel_coa", 30 ],
-      [ "novel_coa2", 30 ],
-      [ "child_book", 30 ],
-      [ "tall_tales", 30 ],
-      [ "story_book", 30 ],
+      { "group": "kids_books", "prob": 215 },
       [ "novel_pulp", 30 ],
-      [ "fairy_tales", 30 ],
-      [ "mag_comic", 30 ],
       [ "folding_bicycle", 3 ],
       [ "sunglasses", 25 ],
       [ "cowboy_hat", 25 ],
diff --git a/data/json/itemgroups/mall_item_groups.json b/data/json/itemgroups/mall_item_groups.json
index f4b359e1cd303..f97131388519a 100644
--- a/data/json/itemgroups/mall_item_groups.json
+++ b/data/json/itemgroups/mall_item_groups.json
@@ -95,14 +95,8 @@
       [ "pockknife", 20 ],
       [ "wristwatch", 20 ],
       [ "teleumbrella", 5 ],
-      [ "novel_coa", 10 ],
-      [ "child_book", 50 ],
-      [ "manual_dodge_kid", 10 ],
-      [ "tall_tales", 20 ],
-      [ "story_book", 5 ],
+      { "group": "kids_books", "prob": 155 },
       [ "novel_pulp", 20 ],
-      [ "fairy_tales", 20 ],
-      [ "mag_comic", 40 ],
       [ "folding_bicycle", 5 ],
       [ "sunglasses", 25 ],
       [ "cowboy_hat", 25 ],
diff --git a/data/json/itemgroups/mansion.json b/data/json/itemgroups/mansion.json
index 3b8313de2a6ff..4d5038d446a18 100644
--- a/data/json/itemgroups/mansion.json
+++ b/data/json/itemgroups/mansion.json
@@ -664,20 +664,14 @@
       [ "talking_doll", 50 ],
       [ "basketball", 50 ],
       [ "fc_hairpin", 50 ],
-      [ "fairy_tales", 40 ],
-      [ "child_book", 40 ],
-      [ "manual_dodge_kid", 10 ],
-      [ "tall_tales", 40 ],
+      { "group": "kids_books", "prob": 170 },
       [ "backpack", 40 ],
       [ "baseball", 40 ],
       [ "football", 40 ],
       [ "orangesoda", 30 ],
       [ "hairpin", 30 ],
       [ "purple_drink", 20 ],
-      [ "mag_comic", 20 ],
       [ "candy", 20 ],
-      [ "story_book", 10 ],
-      [ "novel_coa", 10 ],
       [ "slingshot", 10 ],
       [ "rock", 10 ],
       [ "bat", 10 ],