Merge branch 'master' into EnforceNewToHit

CleverRaven · Jun 16, 2024 · bf31ac2 · bf31ac2
2 parents c0fdfd4 + a9d18c8
commit bf31ac2
Show file tree

Hide file tree

Showing 204 changed files with 244,799 additions and 214,244 deletions.
diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
@@ -170,11 +170,6 @@
     "type": "ammo_effect",
     "//": "Applies sensor-stunning effect to robots. Hardcoded"
   },
-  {
-    "id": "RECOVER_X",
-    "type": "ammo_effect",
-    "//": " Has a [(X-1)/X] probability to create a single charge of the used ammo at the point of impact. Change the X with any number, like 'RECOVER_2' means [(2-1)/2]=50% chance. Hardcoded"
-  },
   {
     "id": "RECYCLED",
     "type": "ammo_effect",

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -2342,6 +2342,18 @@
     "info": "A medium-sized gasmask filter.",
     "name": "gas mask cartridge"
   },
+  {
+    "id": "PANORAMIC_OUTSERT",
+    "type": "json_flag",
+    "info": "This item is meant to be externally attached to the eyepiece of a single-lens gas mask.",
+    "restriction": "Item must be designed to clip onto the external Lenz brackets of a panoramic-view gas mask."
+  },
+  {
+    "id": "PANORAMIC_INSERT",
+    "type": "json_flag",
+    "info": "This item is intended to be inserted behind the visor of a single-lens gas mask.",
+    "restriction": "Item must be able to clip into place within a gas mask that has a single, panoramic eyepiece."
+  },
   {
     "id": "REBREATHER_CART",
     "type": "json_flag",
@@ -2479,5 +2491,10 @@
     "id": "PREFIX_XS",
     "type": "json_flag",
     "item_prefix": "XS "
+  },
+  {
+    "id": "DECAYS_IN_AIR",
+    "type": "json_flag",
+    "info": "This will eventually <bad>go bad</bad> if left in the open air too long."
   }
 ]
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -607,7 +607,7 @@
   {
     "type": "item_action",
     "id": "GASMASK_ACTIVATE",
-    "name": { "str": "Prepare to use" }
+    "name": { "str": "Pressurise and suction test" }
   },
   {
     "type": "item_action",

diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -788,6 +788,10 @@
       [ "attachable_ear_muffs", 5 ],
       [ "mask_dust", 30 ],
       { "item": "mask_filter", "prob": 30, "charges": [ 0, 100 ] },
+      {
+        "distribution": [ { "item": "mask_gas", "charges": [ 0, -1 ], "prob": 50 }, { "group": "gasmask_bag_full", "prob": 50 } ],
+        "prob": 15
+      },
       { "item": "mask_gas_half", "prob": 30, "charges": [ 0, 100 ] },
       [ "glasses_safety", 30 ],
       [ "ear_plugs", 35 ],
@@ -890,7 +894,15 @@
     "//": "Full face protection worn with hazmat suits",
     "items": [
       { "collection": [ { "item": "glasses_safety" }, { "item": "mask_filter", "charges": [ 0, -1 ] } ], "prob": 40 },
-      { "item": "mask_gas", "prob": 60, "charges": [ 0, -1 ] },
+      {
+        "distribution": [
+          { "item": "mask_gas", "charges": [ 0, -1 ], "prob": 50 },
+          { "item": "mask_gas", "charges": [ 0, -1 ], "contents-group": "gasmask_inserts_in_use", "prob": 25 },
+          { "group": "gasmask_bag_full", "prob": 25 },
+          { "group": "gasmask_bag_used", "prob": 60 }
+        ],
+        "prob": 60
+      },
       { "item": "mask_gas_half", "prob": 60, "charges": [ 0, -1 ] }
     ]
   },
@@ -1435,7 +1447,7 @@
   {
     "id": "dress_shoes",
     "type": "item_group",
-    "items": [ [ "dress_shoes", 50 ], [ "heels", 50 ], [ "leathersandals", 20 ] ]
+    "items": [ [ "dress_shoes", 50 ], [ "heels", 50 ], [ "espadrilles", 20 ] ]
   },
   {
     "id": "wedding_dresses",
@@ -1769,6 +1781,7 @@
       [ "boots_western", 10 ],
       [ "clogs", 1 ],
       [ "leathersandals", 10 ],
+      [ "espadrilles", 5 ],
       [ "rollerskates", 1 ],
       [ "roller_blades", 5 ],
       [ "roller_shoes_off", 1 ],
@@ -2072,6 +2085,7 @@
       [ "boots_western", 60 ],
       [ "clogs", 60 ],
       [ "leathersandals", 100 ],
+      [ "espadrilles", 50 ],
       [ "rollerskates", 10 ],
       [ "roller_blades", 20 ],
       [ "roller_shoes_off", 10 ],
@@ -2674,7 +2688,7 @@
       [ "wetsuit_booties_thick", 5 ],
       [ "bastsandals", 5 ],
       [ "straw_sandals", 5 ],
-      [ "leathersandals", 5 ]
+      [ "espadrilles", 5 ]
     ]
   },
   {
@@ -2934,7 +2948,7 @@
       [ "kevlar", 10 ],
       { "group": "military_ballistic_vest", "prob": 30 },
       [ "vest", 15 ],
-      { "item": "mask_gas", "prob": 10, "charges": [ 0, -1 ] },
+      { "group": "gasmask_bag_full", "prob": 10 },
       { "item": "goggles_nv", "prob": 1, "charges": [ 0, 100 ] },
       { "item": "goggles_ir", "prob": 1, "charges": [ 0, 100 ] },
       [ "backpack", 38 ],
@@ -2966,7 +2980,7 @@
     "type": "item_group",
     "id": "mil_accessories",
     "items": [
-      { "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
+      { "group": "gasmask_bag_full", "prob": 10 },
       [ "duffelbag", 15 ],
       { "item": "goggles_nv", "prob": 1, "charges": [ 0, 100 ] },
       { "item": "goggles_ir", "prob": 1, "charges": [ 0, 100 ] },
@@ -3105,7 +3119,14 @@
     "items": [
       { "item": "mask_bunker", "prob": 70, "charges": [ 0, -1 ] },
       [ "mask_dust", 30 ],
-      { "item": "mask_gas", "prob": 20, "charges": [ 0, -1 ] },
+      {
+        "distribution": [
+          { "item": "mask_gas", "charges": [ 0, -1 ], "prob": 50 },
+          { "item": "mask_gas", "charges": [ 0, -1 ], "contents-group": "gasmask_inserts_in_use", "prob": 25 },
+          { "group": "gasmask_bag_full", "prob": 50 }
+        ],
+        "prob": 20
+      },
       { "item": "mask_gas_half", "prob": 20, "charges": [ 0, -1 ] },
       { "item": "mask_filter", "prob": 10, "charges": [ 0, -1 ] },
       { "item": "goggles_nv", "prob": 2, "charges": [ 0, 100 ] },
@@ -3138,7 +3159,14 @@
     "items": [
       [ "mask_dust", 80 ],
       { "item": "mask_filter", "prob": 20, "charges": [ 0, -1 ] },
-      { "item": "mask_gas", "prob": 10, "charges": [ 0, -1 ] }
+      {
+        "distribution": [
+          { "item": "mask_gas", "charges": [ 0, -1 ], "prob": 25 },
+          { "item": "mask_gas", "charges": [ 0, -1 ], "contents-group": "gasmask_inserts_in_use", "prob": 25 },
+          { "group": "gasmask_bag_full", "prob": 50 }
+        ],
+        "prob": 10
+      }
     ]
   },
   {
@@ -3341,7 +3369,7 @@
       [ "mask_h20survivor", 1 ],
       [ "mask_bal", 14 ],
       [ "mask_hockey", 26 ],
-      { "item": "mask_gas", "prob": 24, "charges": [ 0, 100 ] },
+      { "group": "gasmask_bag_full", "prob": 24 },
       { "item": "mask_gas_half", "prob": 24, "charges": [ 0, 100 ] },
       { "item": "mask_filter", "prob": 12, "charges": [ 0, 100 ] },
       [ "mask_bunker", 2 ],
@@ -3382,7 +3410,6 @@
       [ "balclava", 12 ],
       [ "mask_survivorxl", 2 ],
       [ "combatsaw_off", 1 ],
-      [ "bigun", 2 ],
       [ "ashot", 4 ],
       [ "pickaxe", 1 ],
       [ "makeshift_machete", 4 ],
@@ -4333,7 +4360,8 @@
           { "item": "straw_sandals", "prob": 20 },
           { "item": "flip_flops", "prob": 40 },
           { "item": "flip_flops_exp", "prob": 5 },
-          { "item": "leathersandals", "prob": 35 }
+          { "item": "leathersandals", "prob": 35 },
+          { "item": "espadrilles", "prob": 20 }
         ],
         "prob": 60
       },

diff --git a/data/json/itemgroups/Clothing_Gear/gear.json b/data/json/itemgroups/Clothing_Gear/gear.json
@@ -1,4 +1,77 @@
 [
+  {
+    "id": "wrapped_gasmask_filter",
+    "type": "item_group",
+    "subtype": "collection",
+    "ammo": 100,
+    "container-item": "wrapping_vacuumed",
+    "on_overflow": "spill",
+    "items": [ { "item": "gasfilter_med" } ]
+  },
+  {
+    "id": "gasmask_inserts_stowed",
+    "type": "item_group",
+    "//": "These are accessories grouped together for use in stashed-away or unused gas mask bags.",
+    "//2": "Vision correction assemblies have been omitted for handling within the gas mask bag item group itself.",
+    "subtype": "distribution",
+    "items": [
+      { "item": "outsert_clear", "prob": 100 },
+      { "item": "outsert_sunlight", "prob": 50 },
+      { "item": "outsert_breach", "prob": 25 }
+    ]
+  },
+  {
+    "id": "gasmask_inserts_in_use",
+    "type": "item_group",
+    "//": "Accessories grouped together for use as pre-installed spawnes within gas masks.",
+    "subtype": "distribution",
+    "items": [
+      {
+        "distribution": [
+          { "item": "outsert_clear", "prob": 100 },
+          { "item": "outsert_sunlight", "prob": 50 },
+          { "item": "outsert_breach", "prob": 25 }
+        ]
+      },
+      { "item": "insert_vision_correction", "prob": 30 }
+    ]
+  },
+  {
+    "id": "gasmask_bag_full",
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "This is a stowed-away gas mask in its carrier, packed with all its equipment but unused and unassembled. Groups together a gas mask, a spare filter, and loose accessories.",
+    "//2": "The gas mask doesn't have its own filter installed, so a second one is sitting ready in the pouch for the user to assemble.",
+    "ammo": 100,
+    "magazine": 0,
+    "container-item": "gas_mask_pouch",
+    "on_overflow": "spill",
+    "items": [
+      { "item": "mask_gas" },
+      { "group": "wrapped_gasmask_filter", "count": 2 },
+      { "group": "gasmask_inserts_stowed", "prob": 90 },
+      { "item": "insert_vision_correction", "prob": 30 }
+    ]
+  },
+  {
+    "id": "gasmask_bag_used",
+    "type": "item_group",
+    "subtype": "collection",
+    "//": "A gas mask left in its carrier, but that was in use prior to being found: assumed that the former user had required it or anticipated needing it and assembled it in readiness. The spare filter may be absent, a canister's already been loaded into the gas mask, and there's a greater chance that the loose attachments have already been added to the mask.",
+    "ammo": 100,
+    "container-item": "gas_mask_pouch",
+    "on_overflow": "spill",
+    "items": [
+      {
+        "distribution": [
+          { "item": "mask_gas", "charges": [ 0, 100 ], "prob": 40 },
+          { "item": "mask_gas", "charges": [ 0, 100 ], "contents-group": "gasmask_inserts_in_use", "prob": 60 }
+        ]
+      },
+      { "group": "wrapped_gasmask_filter", "prob": 50 },
+      { "group": "gasmask_inserts_stowed", "prob": 55 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "swat_gear",
@@ -26,7 +99,7 @@
       [ "pockknife", 10 ],
       [ "legpouch_large", 5 ],
       [ "mask_bal", 10 ],
-      { "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
+      { "group": "gasmask_bag_full", "prob": 10 },
       { "group": "swat_ballistic_vest", "prob": 15 },
       [ "smokebomb", 5 ],
       [ "suppressor", 25 ],

diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -219,7 +219,7 @@
       { "item": "flip_flops", "prob": 35 },
       { "item": "flip_flops_exp", "prob": 5 },
       { "item": "leathersandals", "prob": 40 },
-      { "item": "straw_sandals", "prob": 20 },
+      { "item": "espadrilles", "prob": 20 },
       { "item": "bastsandals", "prob": 20 },
       { "item": "sneakers_steel", "prob": 20 },
       { "item": "knee_high_boots", "prob": 20 },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1303,7 +1303,7 @@
       [ "technician_coveralls_h", 10 ],
       [ "gloves_leather", 45 ],
       { "item": "mask_filter", "prob": 30, "charges": [ 0, 100 ] },
-      { "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
+      { "group": "gasmask_bag_full", "prob": 10 },
       [ "glasses_safety", 40 ],
       { "group": "SUS_welding_gear", "prob": 70 },
       { "item": "goggles_nv", "prob": 1, "charges": [ 0, 100 ] },
@@ -1492,7 +1492,7 @@
     "id": "prison_armor",
     "items": [
       [ "helmet_riot", 25 ],
-      { "item": "mask_gas", "prob": 25, "charges": [ 0, 100 ] },
+      { "group": "gasmask_bag_full", "prob": 10 },
       [ "armor_riot", 25 ],
       [ "armor_riot_arm", 15 ],
       [ "armor_riot_leg", 15 ],
@@ -1828,7 +1828,7 @@
       [ "sneakers_steel", 35 ],
       [ "wrapped_rad_badge", 15 ],
       [ "cleansuit", 10 ],
-      { "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
+      { "group": "gasmask_bag_full", "prob": 10 },
       [ "hat_hard", 50 ],
       [ "ear_plugs", 50 ],
       [ "textbook_carpentry", 6 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -320,7 +320,10 @@
       [ "cigar_cutter", 3 ],
       [ "cigar_punch", 3 ],
       [ "collarpin", 3 ],
-      { "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
+      {
+        "distribution": [ { "item": "mask_gas", "charges": [ 0, -1 ], "prob": 50 }, { "group": "gasmask_bag_full", "prob": 50 } ],
+        "prob": 10
+      },
       [ "goggles_welding", 70 ],
       [ "glasses_monocle", 2 ],
       [ "fancy_sunglasses", 15 ],
@@ -546,6 +549,7 @@
       [ "alarmclock", 5 ],
       [ "bagh_nakha", 2 ],
       [ "leathersandals", 10 ],
+      [ "espadrilles", 5 ],
       [ "maid_dress", 3 ],
       [ "maid_dress_short", 3 ],
       [ "maid_hat", 3 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -933,6 +933,7 @@
       [ "shark_plushie", 10 ],
       [ "bottle_plastic", 30 ],
       [ "leathersandals", 30 ],
+      [ "espadrilles", 15 ],
       [ "leather_belt", 30 ],
       [ "bag_plastic", 30 ],
       [ "shot_hull", 30 ],

diff --git a/data/json/itemgroups/SUS/evac_shelter.json b/data/json/itemgroups/SUS/evac_shelter.json
@@ -9,7 +9,7 @@
       { "item": "evac_pamphlet", "prob": 99 },
       { "item": "jacket_evac", "prob": 75 },
       { "item": "emer_blanket", "prob": 75 },
-      { "item": "mask_gas", "prob": 2 },
+      { "group": "gasmask_bag_full", "prob": 2 },
       { "item": "flashlight", "prob": 50 },
       { "item": "light_disposable_cell", "prob": 10 },
       { "item": "lighter", "prob": 20, "charges": [ 60, 100 ] },
@@ -37,7 +37,7 @@
       { "item": "evac_pamphlet", "prob": 95 },
       { "item": "jacket_evac", "prob": 15 },
       { "item": "emer_blanket", "prob": 45 },
-      { "item": "mask_gas", "prob": 1 },
+      { "group": "gasmask_bag_full", "prob": 1 },
       { "item": "flashlight", "prob": 10 },
       { "item": "wrapper", "prob": 50 },
       { "item": "wrapper_foil", "prob": 2 },

diff --git a/data/json/itemgroups/SUS/gunstore.json b/data/json/itemgroups/SUS/gunstore.json
@@ -128,7 +128,10 @@
       { "item": "shoulder_holster", "prob": 5 },
       { "item": "boots_combat", "prob": 10 },
       { "item": "helmet_liner", "prob": 30 },
-      { "item": "mask_gas", "prob": 10, "charges": [ 0, 100 ] },
+      {
+        "distribution": [ { "item": "mask_gas", "charges": [ 0, -1 ], "prob": 50 }, { "group": "gasmask_bag_full", "prob": 50 } ],
+        "prob": 10
+      },
       { "item": "knife_combat", "container-item": "sheath", "prob": 3 },
       { "item": "knife_combat_marine", "container-item": "sheath", "prob": 1 },
       { "item": "knife_combat_army", "container-item": "sheath", "prob": 1 },