Merge branch 'master' into baby_struct

CleverRaven · Sep 7, 2024 · 825c03b · 825c03b
2 parents e1925b8 + e398be1
commit 825c03b
Show file tree

Hide file tree

Showing 64 changed files with 1,587 additions and 1,014 deletions.
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -737,7 +737,7 @@
   {
     "type": "item_action",
     "id": "RADIO_ON",
-    "name": { "str": "scan" }
+    "name": { "str": "Scan" }
   },
   {
     "type": "item_action",

diff --git a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
@@ -820,5 +820,29 @@
     "id": "pillbox_any_used",
     "subtype": "distribution",
     "groups": [ "pillbox_used", "pillbox_large_used" ]
+  },
+  {
+    "type": "item_group",
+    "id": "codeine_bottle_plastic_pill_painkiller_10",
+    "subtype": "collection",
+    "//": "This group was created automatically and may contain errors.",
+    "container-item": "bottle_plastic_pill_painkiller",
+    "entries": [ { "item": "codeine", "container-item": "null", "count": 10 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "oxycodone_bottle_plastic_pill_prescription_10",
+    "subtype": "collection",
+    "//": "This group was created automatically and may contain errors.",
+    "container-item": "bottle_plastic_pill_prescription",
+    "entries": [ { "item": "oxycodone", "container-item": "null", "count": 10 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "meth_bag_zipper_6",
+    "subtype": "collection",
+    "//": "This group was created automatically and may contain errors.",
+    "container-item": "bag_zipper",
+    "entries": [ { "item": "meth", "container-item": "null", "count": 6 } ]
   }
 ]
diff --git a/data/json/itemgroups/Drugs_Tobacco_Alcohol/tobacco.json b/data/json/itemgroups/Drugs_Tobacco_Alcohol/tobacco.json
@@ -84,5 +84,13 @@
     "//": "This group was created automatically and may contain errors.",
     "container-item": "wrapper",
     "entries": [ { "item": "chaw", "container-item": "null", "count": [ 1, 20 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "cig_box_cigarette_20",
+    "subtype": "collection",
+    "//": "This group was created automatically and may contain errors.",
+    "container-item": "box_cigarette",
+    "entries": [ { "item": "cig", "container-item": "null", "count": 20 } ]
   }
 ]
diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -1484,5 +1484,13 @@
     "//": "This group was created automatically and may contain errors.",
     "container-item": "bag_paper_powder",
     "entries": [ { "item": "soup_instant_vegetable_powder", "container-item": "null", "count": [ 1, 1 ] } ]
+  },
+  {
+    "type": "item_group",
+    "id": "flour_bag_paper_powder_10",
+    "subtype": "collection",
+    "//": "This group was created automatically and may contain errors.",
+    "container-item": "bag_paper_powder",
+    "entries": [ { "item": "flour", "container-item": "null", "count": 10 } ]
   }
 ]
diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -1979,19 +1979,6 @@
       { "item": "anesthetic_kit", "prob": 10, "charges": [ 0, -1 ] }
     ]
   },
-  {
-    "id": "daycare_misc",
-    "type": "item_group",
-    "items": [
-      [ "magnifying_glass", 2 ],
-      { "item": "sewing_kit", "prob": 1, "charges": [ 0, -1 ] },
-      [ "scissors", 1 ],
-      [ "phonebook", 2 ],
-      { "item": "flashlight", "prob": 2, "charges": [ 0, 300 ] },
-      [ "petpack", 1 ],
-      [ "mag_comic", 5 ]
-    ]
-  },
   {
     "id": "daycare_kitchen",
     "type": "item_group",

diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
@@ -1,10 +1,4 @@
 [
-  {
-    "type": "item_group",
-    "id": "shia_stuff",
-    "subtype": "distribution",
-    "entries": [ { "item": "knife_small", "variant": "knife_steak", "prob": 3 }, { "item": "ax", "prob": 1 } ]
-  },
   {
     "type": "item_group",
     "id": "monparts",
@@ -120,44 +114,6 @@
     "subtype": "distribution",
     "entries": [ { "item": "fighter_sting", "prob": 5 } ]
   },
-  {
-    "type": "item_group",
-    "id": "vault_wanderer",
-    "magazine": 100,
-    "ammo": 20,
-    "subtype": "distribution",
-    "entries": [
-      { "item": "jumpsuit", "prob": 90 },
-      { "item": "mask_filter", "prob": 10, "charges": [ 0, 100 ] },
-      { "group": "ammo_pocket_batteries_full", "prob": 10 },
-      { "item": "radio", "prob": 10, "charges": [ 10, 95 ] },
-      { "item": "boots_combat", "prob": 20 },
-      { "item": "bandages", "prob": 10, "count": [ 1, 3 ] },
-      { "prob": 30, "group": "cig_box_cigarette_1_20" },
-      { "item": "knife_combat_army", "variant": "m9bayonet", "prob": 10 },
-      { "item": "vest", "prob": 15 },
-      { "item": "glasses_safety", "prob": 15 },
-      { "item": "9mm", "prob": 15, "charges": [ 1, 50 ] },
-      { "item": "m9", "prob": 10, "charges": [ 0, 15 ] },
-      { "item": "water_clean", "prob": 10 },
-      { "item": "eyedrops", "prob": 10, "count": [ 1, 10 ] },
-      { "item": "steroid_eyedrops", "prob": 10, "count": [ 1, 10 ] },
-      { "item": "screwdriver", "prob": 10 },
-      { "group": "wallets_science", "prob": 5 },
-      { "item": "cleansuit", "prob": 10 },
-      { "item": "coat_lab", "prob": 20 },
-      { "item": "glasses_eye", "prob": 30 },
-      { "item": "rad_monitor", "prob": 10, "charges": [ 2, 20 ] },
-      { "item": "geiger_off", "prob": 10, "charges": [ 10, 95 ] },
-      { "item": "tool_belt", "prob": 15 },
-      { "item": "panties", "prob": 20 },
-      { "item": "boy_shorts", "prob": 20 },
-      { "item": "bra", "prob": 20 },
-      { "item": "undershirt", "prob": 40 },
-      { "item": "boxer_shorts", "prob": 30 },
-      { "item": "briefs", "prob": 30 }
-    ]
-  },
   {
     "type": "item_group",
     "id": "cow",

diff --git a/data/json/items/book/martial.json b/data/json/items/book/martial.json
@@ -43,16 +43,6 @@
     "description": "A complete guide to Capoeira.",
     "martial_art": "style_capoeira"
   },
-  {
-    "id": "manual_centipede",
-    "copy-from": "book_martial",
-    "type": "BOOK",
-    "name": { "str": "The Centipede Lu Feng", "str_pl": "copies of The Centipede Lu Feng" },
-    "//": "Could be moved to Mythical Martial Arts mod after 0.G.",
-    "price_postapoc": "20 USD",
-    "description": "A complete guide to Centipede Kung Fu.",
-    "martial_art": "style_centipede"
-  },
   {
     "id": "manual_crane",
     "copy-from": "book_martial",
@@ -143,16 +133,6 @@
     "description": "A complete guide to Leopard Kung Fu.",
     "martial_art": "style_leopard"
   },
-  {
-    "id": "manual_lizard",
-    "copy-from": "book_martial",
-    "type": "BOOK",
-    "name": { "str": "The Lizard Kuo Chui", "str_pl": "copies of The Lizard Kuo Chui" },
-    "//": "Could be moved to Mythical Martial Arts mod after 0.G.",
-    "price_postapoc": "20 USD",
-    "description": "A complete guide to Lizard Kung Fu.",
-    "martial_art": "style_lizard"
-  },
   {
     "id": "manual_muay_thai",
     "copy-from": "book_martial",
@@ -189,16 +169,6 @@
     "description": "A complete guide to Pankration.",
     "martial_art": "style_pankration"
   },
-  {
-    "id": "manual_scorpion",
-    "copy-from": "book_martial",
-    "type": "BOOK",
-    "name": { "str": "The Scorpion Sun Chien", "str_pl": "copies of The Scorpion Sun Chien" },
-    "//": "Could be moved to Mythical Martial Arts mod after 0.G.",
-    "price_postapoc": "20 USD",
-    "description": "A complete guide to Scorpion Kung Fu.",
-    "martial_art": "style_scorpion"
-  },
   {
     "id": "manual_silat",
     "copy-from": "book_martial",
@@ -244,26 +214,6 @@
     "description": "A complete guide to Tiger Kung Fu.",
     "martial_art": "style_tiger"
   },
-  {
-    "id": "manual_toad",
-    "copy-from": "book_martial",
-    "type": "BOOK",
-    "name": { "str": "The Toad Lo Mang", "str_pl": "copies of The Toad Lo Mang" },
-    "//": "Could be moved to Mythical Martial Arts mod after 0.G.",
-    "price_postapoc": "20 USD",
-    "description": "A complete guide to Toad Kung Fu.",
-    "martial_art": "style_toad"
-  },
-  {
-    "id": "manual_venom_snake",
-    "copy-from": "book_martial",
-    "type": "BOOK",
-    "name": { "str": "The Viper Wei Pai", "str_pl": "copies of The Viper Wei Pai" },
-    "//": "Could be moved to Mythical Martial Arts mod after 0.G.",
-    "price_postapoc": "20 USD",
-    "description": "A complete guide to Viper Kung Fu.",
-    "martial_art": "style_venom_snake"
-  },
   {
     "id": "manual_zui_quan",
     "copy-from": "book_martial",

diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json
@@ -172,23 +172,6 @@
     "chapters": 4,
     "fun": 1
   },
-  {
-    "id": "necropolis_freq",
-    "type": "BOOK",
-    "name": { "str": "frequency list" },
-    "description": "A notepad with a number of frequencies scribbled on it.",
-    "weight": "1 g",
-    "volume": "250 ml",
-    "price": "30 USD",
-    "price_postapoc": "50 cent",
-    "material": [ "paper" ],
-    "symbol": "?",
-    "looks_like": "pocket_firstaid",
-    "color": "light_cyan",
-    "intelligence": 2,
-    "time": "10 m",
-    "melee_damage": { "bash": 1 }
-  },
   {
     "id": "news_regional",
     "type": "BOOK",