From 6b886768d52e886c3d48e6c07fe7074df6a216a9 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 7 Nov 2024 00:21:26 -0600 Subject: [PATCH 1/8] Only remove airtight from containers that don't hold gases well --- data/json/items/containers/containers.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index 0b84ebc23f80f..a1d2b7321a914 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -566,7 +566,6 @@ "pocket_data": [ { "pocket_type": "CONTAINER", - "airtight": true, "watertight": true, "rigid": true, "transparent": true, @@ -798,7 +797,6 @@ "pocket_data": [ { "pocket_type": "CONTAINER", - "airtight": true, "watertight": true, "rigid": true, "transparent": true, @@ -860,7 +858,6 @@ "pocket_data": [ { "pocket_type": "CONTAINER", - "airtight": true, "watertight": true, "rigid": true, "transparent": true, @@ -900,7 +897,6 @@ "pocket_data": [ { "pocket_type": "CONTAINER", - "airtight": true, "watertight": true, "rigid": true, "transparent": true, @@ -4237,7 +4233,6 @@ "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1500 g", - "airtight": true, "moves": 50, "sealed_data": { "spoil_multiplier": 0.0 }, "watertight": true @@ -4264,7 +4259,6 @@ "pocket_type": "CONTAINER", "max_contains_volume": "510 ml", "max_contains_weight": "3 kg", - "airtight": true, "moves": 50, "sealed_data": { "spoil_multiplier": 0.0 }, "watertight": true @@ -4291,7 +4285,6 @@ "pocket_type": "CONTAINER", "max_contains_volume": "1625 ml", "max_contains_weight": "4 kg", - "airtight": true, "moves": 50, "sealed_data": { "spoil_multiplier": 0.0 }, "watertight": true @@ -4319,7 +4312,6 @@ "pocket_type": "CONTAINER", "max_contains_volume": "125 ml", "max_contains_weight": "750 g", - "airtight": true, "moves": 50, "sealed_data": { "spoil_multiplier": 0.0 }, "watertight": true @@ -4346,7 +4338,6 @@ "pocket_type": "CONTAINER", "max_contains_volume": "31 ml", "max_contains_weight": "180 g", - "airtight": true, "moves": 50, "sealed_data": { "spoil_multiplier": 0.0 }, "watertight": true @@ -4373,7 +4364,6 @@ "pocket_type": "CONTAINER", "max_contains_volume": "32 ml", "max_contains_weight": "180 g", - "airtight": true, "moves": 50, "sealed_data": { "spoil_multiplier": 0.0 }, "watertight": true @@ -4401,7 +4391,6 @@ "pocket_type": "CONTAINER", "max_contains_volume": "2000 ml", "max_contains_weight": "1500 g", - "airtight": true, "transparent": true, "moves": 50, "sealed_data": { "spoil_multiplier": 0.0 }, From 87c910b24c65689e65321e0646ad095f9bfc2f33 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 8 Nov 2024 22:04:23 -0600 Subject: [PATCH 2/8] Fix nitrox --- data/json/items/ammo.json | 2 +- data/json/items/containers/containers.json | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 54d97d83b3464..4c91fc6c40fb6 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1384,7 +1384,7 @@ "name": { "str_sp": "nitrox" }, "symbol": "=", "color": "white", - "container": "bottle_plastic", + "container": "nitrox_canister", "sealed": false, "description": "A mixture of oxygen and nitrogen in proportions suitable for sustaining divers.", "volume": "250 ml", diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index a1d2b7321a914..d8c868fee2a2c 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -4607,6 +4607,33 @@ }, "melee_damage": { "bash": 20 } }, + { + "id": "nitrox_canister", + "type": "TOOL", + "category": "tool_magazine", + "name": { "str": "nitrox container" }, + "description": "A small tank of nitrox, a mixture of nitrogen and oxygen used for diving.", + "weight": "25 g", + "volume": "755 ml", + "longest_side": "12 cm", + "price": "20 USD", + "price_postapoc": "5 USD", + "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "uneven" }, + "material": [ "steel", "plastic" ], + "symbol": ";", + "color": "green", + "pocket_data": [ + { + "pocket_type": "MAGAZINE", + "airtight": true, + "watertight": true, + "rigid": true, + "ammo_restriction": { "nitrox": 3 } + } + ], + "flags": [ "COLLAPSE_CONTENTS", "NO_SALVAGE" ], + "melee_damage": { "bash": 1 } + }, { "id": "small_propane_tank", "type": "TOOL", From e651cc9b401ed6e6485a33519d94dd4c2c93f8ff Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 8 Nov 2024 22:06:36 -0600 Subject: [PATCH 3/8] Update data/json/items/containers/containers.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/containers/containers.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index d8c868fee2a2c..e6b394fcd2a5f 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -4623,13 +4623,7 @@ "symbol": ";", "color": "green", "pocket_data": [ - { - "pocket_type": "MAGAZINE", - "airtight": true, - "watertight": true, - "rigid": true, - "ammo_restriction": { "nitrox": 3 } - } + { "pocket_type": "MAGAZINE", "airtight": true, "watertight": true, "rigid": true, "ammo_restriction": { "nitrox": 3 } } ], "flags": [ "COLLAPSE_CONTENTS", "NO_SALVAGE" ], "melee_damage": { "bash": 1 } From 3e5b769a9a9e670d2e696edd4b45141267eb691f Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 8 Nov 2024 23:58:12 -0600 Subject: [PATCH 4/8] Fix --- data/json/items/ammo.json | 6 +++--- data/json/items/containers/containers.json | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 4c91fc6c40fb6..ceaf840f1d4cd 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -1384,7 +1384,7 @@ "name": { "str_sp": "nitrox" }, "symbol": "=", "color": "white", - "container": "nitrox_canister", + "container": "pressurized_canister", "sealed": false, "description": "A mixture of oxygen and nitrogen in proportions suitable for sustaining divers.", "volume": "250 ml", @@ -1401,7 +1401,7 @@ "name": { "str_sp": "extinguishing agent" }, "symbol": "%", "color": "white", - "container": "bottle_plastic", + "container": "pressurized_canister", "sealed": false, "description": "A dry chemical solution effective at extinguishing fires.", "volume": "250 ml", @@ -1419,7 +1419,7 @@ "name": { "str_sp": "tear gas spray" }, "symbol": "%", "color": "white", - "container": "bottle_plastic", + "container": "pressurized_canister", "sealed": false, "description": "A noxious aerosolized irritant used to fend off attackers both human and bear alike.", "volume": "250 ml", diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index d8c868fee2a2c..c4e0273cf9221 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -4608,11 +4608,11 @@ "melee_damage": { "bash": 20 } }, { - "id": "nitrox_canister", + "id": "pressurized_canister", "type": "TOOL", "category": "tool_magazine", - "name": { "str": "nitrox container" }, - "description": "A small tank of nitrox, a mixture of nitrogen and oxygen used for diving.", + "name": { "str": "pressurized canister" }, + "description": "A small tank for containing pressurized gases.", "weight": "25 g", "volume": "755 ml", "longest_side": "12 cm", @@ -4627,8 +4627,7 @@ "pocket_type": "MAGAZINE", "airtight": true, "watertight": true, - "rigid": true, - "ammo_restriction": { "nitrox": 3 } + "rigid": true } ], "flags": [ "COLLAPSE_CONTENTS", "NO_SALVAGE" ], From 6571d99bec0c14c3a0118fd57762edfb06b00bc6 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 9 Nov 2024 00:30:08 -0600 Subject: [PATCH 5/8] Update data/json/items/containers/containers.json --- data/json/items/containers/containers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index c4e0273cf9221..c27342107dcdf 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -4624,7 +4624,7 @@ "color": "green", "pocket_data": [ { - "pocket_type": "MAGAZINE", + "pocket_type": "CONTAINER", "airtight": true, "watertight": true, "rigid": true From 813bd7fd444c96f0309e3320e8db1603d4074e97 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 9 Nov 2024 00:31:48 -0600 Subject: [PATCH 6/8] Update data/json/items/containers/containers.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/containers/containers.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index c27342107dcdf..b99a6e05a9973 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -4622,14 +4622,7 @@ "material": [ "steel", "plastic" ], "symbol": ";", "color": "green", - "pocket_data": [ - { - "pocket_type": "CONTAINER", - "airtight": true, - "watertight": true, - "rigid": true - } - ], + "pocket_data": [ { "pocket_type": "CONTAINER", "airtight": true, "watertight": true, "rigid": true } ], "flags": [ "COLLAPSE_CONTENTS", "NO_SALVAGE" ], "melee_damage": { "bash": 1 } }, From cf2d4e1a081ca457f5b2ef0bf644522576ab812b Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 9 Nov 2024 01:25:31 -0600 Subject: [PATCH 7/8] Apply suggestions from code review --- data/json/items/containers/containers.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index b99a6e05a9973..ec310646d8424 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -4614,7 +4614,7 @@ "name": { "str": "pressurized canister" }, "description": "A small tank for containing pressurized gases.", "weight": "25 g", - "volume": "755 ml", + "volume": "350 ml", "longest_side": "12 cm", "price": "20 USD", "price_postapoc": "5 USD", @@ -4622,7 +4622,8 @@ "material": [ "steel", "plastic" ], "symbol": ";", "color": "green", - "pocket_data": [ { "pocket_type": "CONTAINER", "airtight": true, "watertight": true, "rigid": true } ], + "pocket_data": [ { "pocket_type": "CONTAINER", "airtight": true, "watertight": true, "rigid": true, "max_contains_volume": "250 ml", + "max_contains_weight": "50 g" } ], "flags": [ "COLLAPSE_CONTENTS", "NO_SALVAGE" ], "melee_damage": { "bash": 1 } }, From 10568ec4234c81ea46e8a57967cec8c1f56940be Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 9 Nov 2024 01:27:43 -0600 Subject: [PATCH 8/8] Update data/json/items/containers/containers.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/containers/containers.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index ec310646d8424..166b5ffe9b83e 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -4622,8 +4622,16 @@ "material": [ "steel", "plastic" ], "symbol": ";", "color": "green", - "pocket_data": [ { "pocket_type": "CONTAINER", "airtight": true, "watertight": true, "rigid": true, "max_contains_volume": "250 ml", - "max_contains_weight": "50 g" } ], + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "airtight": true, + "watertight": true, + "rigid": true, + "max_contains_volume": "250 ml", + "max_contains_weight": "50 g" + } + ], "flags": [ "COLLAPSE_CONTENTS", "NO_SALVAGE" ], "melee_damage": { "bash": 1 } },