Merge branch 'master' into modernize-volume-weight

CleverRaven · Jun 30, 2020 · 67213f2 · 67213f2
2 parents f2735fb + 537b773
commit 67213f2
Show file tree

Hide file tree

Showing 221 changed files with 7,547 additions and 3,356 deletions.
diff --git a/data/json/achievements.json b/data/json/achievements.json
diff --git a/data/json/emit.json b/data/json/emit.json
@@ -331,5 +331,12 @@
     "field": "fd_fog",
     "intensity": 2,
     "qty": 200
+  },
+  {
+    "id": "emit_extinguisher_burst",
+    "type": "emit",
+    "field": "fd_extinguisher",
+    "intensity": 1,
+    "qty": 10
   }
 ]
diff --git a/data/json/field_type.json b/data/json/field_type.json
@@ -76,9 +76,32 @@
     "id": "fd_web",
     "type": "field_type",
     "legacy_enum_id": 5,
-    "intensity_levels": [ { "name": "cobwebs", "sym": "}" }, { "name": "webs" }, { "name": "thick webs", "transparent": false } ],
+    "intensity_levels": [
+      {
+        "name": "cobwebs",
+        "sym": "}",
+        "effects": [
+          { "effect_id": "webbed", "intensity": 1, "min_duration": "1 m", "immune_in_vehicle": true, "is_environmental": false }
+        ]
+      },
+      {
+        "name": "webs",
+        "effects": [
+          { "effect_id": "webbed", "intensity": 2, "min_duration": "1 m", "immune_in_vehicle": true, "is_environmental": false }
+        ]
+      },
+      {
+        "name": "thick webs",
+        "transparent": false,
+        "effects": [
+          { "effect_id": "webbed", "intensity": 3, "min_duration": "1 m", "immune_in_vehicle": true, "is_environmental": false }
+        ]
+      }
+    ],
     "description_affix": "covered_in",
     "immunity_data": { "traits": [ "WEB_WALKER" ] },
+    "immune_mtypes": [ "mon_spider_web", "mon_spider_web_s" ],
+    "decrease_intensity_on_contact": true,
     "priority": 2,
     "phase": "solid",
     "display_items": false,
@@ -239,6 +262,93 @@
     "display_items": false,
     "display_field": true
   },
+  {
+    "id": "fd_extinguisher",
+    "type": "field_type",
+    "intensity_levels": [
+      {
+        "name": "extinguisher mist",
+        "sym": "%",
+        "color": "white",
+        "dangerous": true,
+        "translucency": 0.1,
+        "convection_temperature_mod": -10,
+        "effects": [
+          {
+            "effect_id": "poison",
+            "body_part": "MOUTH",
+            "intensity": 2,
+            "min_duration": "2 minutes",
+            "max_duration": "2 minutes",
+            "immune_inside_vehicle": true,
+            "message": "You feel sick from inhaling the extinguisher mist",
+            "message_type": "bad"
+          }
+        ]
+      },
+      {
+        "name": "extinguisher cloud",
+        "color": "white",
+        "convection_temperature_mod": -20,
+        "translucency": 0.4,
+        "effects": [
+          {
+            "effect_id": "poison",
+            "body_part": "MOUTH",
+            "intensity": 2,
+            "min_duration": "2 minutes",
+            "max_duration": "2 minutes",
+            "immune_inside_vehicle": true,
+            "message": "You feel sick from inhaling the extinguisher cloud",
+            "message_type": "bad"
+          }
+        ]
+      },
+      {
+        "name": "thick extinguisher cloud",
+        "color": "white",
+        "convection_temperature_mod": -30,
+        "translucency": 0.7,
+        "effects": [
+          {
+            "effect_id": "poison",
+            "body_part": "MOUTH",
+            "intensity": 5,
+            "min_duration": "3 minutes",
+            "max_duration": "3 minutes",
+            "//": "won't be applied outside of vehicles, so it could apply harsher effect",
+            "immune_outside_vehicle": true,
+            "message": "You feel sick from inhaling the thick extinguisher cloud",
+            "message_type": "bad"
+          },
+          {
+            "effect_id": "badpoison",
+            "body_part": "MOUTH",
+            "intensity": 5,
+            "min_duration": "3 minutes",
+            "max_duration": "3 minutes",
+            "//": "won't be applied inside of vehicles, so it could apply lesser effect",
+            "immune_inside_vehicle": true,
+            "message": "You feel sick from inhaling the thick extinguisher cloud",
+            "message_type": "bad"
+          }
+        ]
+      }
+    ],
+    "description_affix": "on",
+    "decay_amount_factor": 3,
+    "priority": 4,
+    "half_life": "10 seconds",
+    "phase": "gas",
+    "display_items": false,
+    "display_field": true,
+    "looks_like": "fd_fog",
+    "gas_absorption_factor": 15,
+    "has_fume": true,
+    "percent_spread": 90,
+    "dirty_transparency_cache": true,
+    "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] }
+  },
   {
     "id": "fd_rubble",
     "type": "field_type",

diff --git a/data/json/harvest.json b/data/json/harvest.json
@@ -88,6 +88,39 @@
       { "drop": "scrap", "base_num": [ 1, 5 ], "scale_num": [ 0.3, 0.7 ], "max": 12, "type": "bone" }
     ]
   },
+  {
+    "id": "mon_zomborg",
+    "type": "harvest",
+    "message": "You search for any salvageable hardware in what's left of this flesh and metal monster",
+    "entries": [
+      {
+        "drop": "bio_power_storage",
+        "type": "bionic",
+        "flags": [ "FILTHY", "NO_STERILE", "NO_PACKED" ],
+        "faults": [ "fault_bionic_salvaged" ]
+      },
+      {
+        "drop": "bionics_common",
+        "type": "bionic_group",
+        "flags": [ "FILTHY", "NO_STERILE", "NO_PACKED" ],
+        "faults": [ "fault_bionic_salvaged" ]
+      },
+      {
+        "drop": "bionics",
+        "type": "bionic_group",
+        "flags": [ "FILTHY", "NO_STERILE", "NO_PACKED" ],
+        "faults": [ "fault_bionic_salvaged" ],
+        "base_num": [ 0, 1 ]
+      },
+      { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.04 },
+      { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.05 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.001 },
+      { "drop": "cable", "base_num": [ 1, 3 ], "scale_num": [ 0.2, 0.6 ], "max": 8, "type": "flesh" },
+      { "drop": "e_scrap", "base_num": [ 1, 5 ], "scale_num": [ 0.3, 0.7 ], "max": 12, "type": "bone" },
+      { "drop": "scrap", "base_num": [ 1, 5 ], "scale_num": [ 0.3, 0.7 ], "max": 12, "type": "bone" }
+    ]
+  },
   {
     "id": "mammal_tiny",
     "//": "animals so tiny they don't drop chunks of meat",

diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -894,11 +894,6 @@
     "id": "THORAZINE",
     "name": { "str": "Take" }
   },
-  {
-    "type": "item_action",
-    "id": "THROWABLE_EXTINGUISHER_ACT",
-    "name": { "str": "Extinguish a fire" }
-  },
   {
     "type": "item_action",
     "id": "TOWEL",

diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
@@ -1127,6 +1127,23 @@
     "phase": "gas",
     "ammo_type": "nitrox"
   },
+  {
+    "type": "AMMO",
+    "id": "extinguishing_agent",
+    "category": "chems",
+    "price": 500,
+    "price_postapoc": 250,
+    "name": { "str_sp": "extinguishing agent" },
+    "symbol": "%",
+    "color": "white",
+    "container": "bottle_plastic",
+    "description": "Dry chemical solution effective in extinguishing fires.",
+    "volume": "250 ml",
+    "weight": "1 g",
+    "phase": "gas",
+    "ammo_type": "extinguishing_agent",
+    "count": 10
+  },
   {
     "id": "tinder",
     "type": "AMMO",

diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json
@@ -0,0 +1,10 @@
+[
+  {
+    "id": "123ln",
+    "type": "AMMO",
+    "copy-from": "3006",
+    "name": { "str": "12.3ln round" },
+    "description": "The 12.3ln cartridge was introduced in Romania in the wake of the second Carpathian conflict.  The PA md. 71 rifle using this ammunition rapidly gained popularity in the Eastern Union, and from there, the world.  Due to this, the 12.3ln rapidly became the standard combat round in the Eurasian sphere.  It was easily scavenged and stockpiled by the Exodii.  To you, it looks and feels quite similar to a .30-06 Springfield cartridge, but with a slightly sharper taper.",
+    "ammo_type": "123ln"
+  }
+]
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
@@ -629,6 +629,12 @@
     "name": "compressed air",
     "default": "nitrox"
   },
+  {
+    "type": "ammunition_type",
+    "id": "extinguishing_agent",
+    "name": "extinguishing agent",
+    "default": "extinguishing_agent"
+  },
   {
     "id": "tinder",
     "name": "tinder",
@@ -652,5 +658,11 @@
     "id": "300blk",
     "name": ".300 AAC Blackout",
     "default": "300blk"
+  },
+  {
+    "type": "ammunition_type",
+    "id": "123ln",
+    "name": "12.3ln cartridge",
+    "default": "123ln"
   }
 ]
diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json
@@ -115,9 +115,9 @@
         "pocket_type": "CONTAINER",
         "holster": true,
         "min_item_volume": "300 ml",
-        "max_contains_volume": "800 ml",
+        "max_contains_volume": "1000 ml",
         "max_contains_weight": "2 kg",
-        "max_item_length": "25 cm",
+        "max_item_length": "30 cm",
         "moves": 50
       }
     ],
@@ -227,9 +227,9 @@
         "pocket_type": "CONTAINER",
         "holster": true,
         "min_item_volume": "750 ml",
-        "max_contains_volume": "1250 ml",
+        "max_contains_volume": "1500 ml",
         "max_contains_weight": "5 kg",
-        "max_item_length": "30 cm",
+        "max_item_length": "45 cm",
         "moves": 50
       }
     ],