From 0e089b2d97dc523fac7a11dbccc961ee58373efc Mon Sep 17 00:00:00 2001 From: Eric Pierce Date: Sat, 6 Jun 2020 09:56:35 -0600 Subject: [PATCH 1/3] Make quivers MAGAZINE type so they can hold ammo --- data/json/items/armor/ammo_pouch.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index beb0ff2c00298..adbb57ecec21c 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -321,7 +321,7 @@ "coverage": 10, "encumbrance": 3, "material_thickness": 1, - "pocket_data": [ { "ammo_restriction": { "arrow": 20, "bolt": 20 }, "moves": 20 } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 20, "bolt": 20 }, "moves": 20 } ], "flags": [ "WAIST", "OVERSIZE", "WATER_FRIENDLY" ] }, { @@ -342,7 +342,7 @@ "coverage": 10, "encumbrance": 10, "material_thickness": 1, - "pocket_data": [ { "ammo_restriction": { "arrow": 20, "bolt": 20 }, "moves": 20 } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 20, "bolt": 20 }, "moves": 20 } ], "flags": [ "WAIST", "VARSIZE", "OVERSIZE", "WATER_FRIENDLY" ] }, { @@ -363,7 +363,7 @@ "coverage": 15, "encumbrance": 3, "material_thickness": 1, - "pocket_data": [ { "ammo_restriction": { "arrow": 60, "bolt": 60 }, "moves": 20 } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 60, "bolt": 60 }, "moves": 20 } ], "flags": [ "BELTED", "OVERSIZE", "WATER_FRIENDLY" ] }, { @@ -384,7 +384,7 @@ "coverage": 15, "encumbrance": 14, "material_thickness": 1, - "pocket_data": [ { "ammo_restriction": { "arrow": 60, "bolt": 60 }, "moves": 20 } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 60, "bolt": 60 }, "moves": 20 } ], "flags": [ "BELTED", "VARSIZE", "OVERSIZE", "WATER_FRIENDLY" ] }, { From d6f5ea78e02b0a587a4c33590db32cb659f3c924 Mon Sep 17 00:00:00 2001 From: Eric Pierce Date: Sat, 6 Jun 2020 10:18:55 -0600 Subject: [PATCH 2/3] Make quivers rigid "Encumbrance when full" was shown incorrectly for quivers. Since they are magazines with volume determined by their ammo restriction, their encumbrance does not actually increase when full. Setting them to explicitly be "rigid" allows the info display to accurately reflect the encumbrance of these items. --- data/json/items/armor/ammo_pouch.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index adbb57ecec21c..b5c0616cd03bf 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -321,7 +321,7 @@ "coverage": 10, "encumbrance": 3, "material_thickness": 1, - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 20, "bolt": 20 }, "moves": 20 } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "arrow": 20, "bolt": 20 }, "moves": 20 } ], "flags": [ "WAIST", "OVERSIZE", "WATER_FRIENDLY" ] }, { @@ -342,7 +342,7 @@ "coverage": 10, "encumbrance": 10, "material_thickness": 1, - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 20, "bolt": 20 }, "moves": 20 } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "arrow": 20, "bolt": 20 }, "moves": 20 } ], "flags": [ "WAIST", "VARSIZE", "OVERSIZE", "WATER_FRIENDLY" ] }, { @@ -363,7 +363,7 @@ "coverage": 15, "encumbrance": 3, "material_thickness": 1, - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 60, "bolt": 60 }, "moves": 20 } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "arrow": 60, "bolt": 60 }, "moves": 20 } ], "flags": [ "BELTED", "OVERSIZE", "WATER_FRIENDLY" ] }, { @@ -384,7 +384,7 @@ "coverage": 15, "encumbrance": 14, "material_thickness": 1, - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 60, "bolt": 60 }, "moves": 20 } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "arrow": 60, "bolt": 60 }, "moves": 20 } ], "flags": [ "BELTED", "VARSIZE", "OVERSIZE", "WATER_FRIENDLY" ] }, { From 6ad18b58e015a4b3ef044f883a81e375e16a4ac9 Mon Sep 17 00:00:00 2001 From: Eric Pierce Date: Sat, 6 Jun 2020 12:15:00 -0600 Subject: [PATCH 3/3] Change quivers to include bolts; how to reload The quiver descriptions claimed they could be "activated" to store arrows, but now they are technically "magazine" items and must be unloaded/reloaded instead. They may contain bolts as well. --- data/json/items/armor/ammo_pouch.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index b5c0616cd03bf..d272aa71008c0 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -307,7 +307,7 @@ "id": "quiver", "type": "ARMOR", "name": { "str": "quiver" }, - "description": "A leather quiver worn at the waist that can hold 20 arrows. Activate to store arrows.", + "description": "A leather quiver worn at the waist that can hold 20 arrows or bolts. It can be unloaded or reloaded.", "weight": "260 g", "volume": "500 ml", "price": 6500, @@ -328,7 +328,7 @@ "id": "quiver_birchbark", "type": "ARMOR", "name": { "str": "birchbark quiver" }, - "description": "A quiver woven from strips of birch bark, worn at the waist, that can hold 20 arrows. Activate to store arrows.", + "description": "A quiver woven from strips of birch bark, worn at the waist, that can hold 20 arrows or bolts. It can be unloaded or reloaded.", "weight": "490 g", "volume": "500 ml", "price": 6500, @@ -349,7 +349,7 @@ "id": "quiver_large", "type": "ARMOR", "name": { "str": "large quiver" }, - "description": "A large leather quiver trimmed with metal, worn on the back, that can hold 60 arrows. Historically used by horse archers, rather than foot archers, but neither of THEM had to fight zombies. Activate to store arrows.", + "description": "A large leather quiver trimmed with metal, worn on the back, that can hold 60 arrows or bolts. Historically used by horse archers, rather than foot archers, but neither of THEM had to fight zombies. It can be unloaded or reloaded.", "weight": "920 g", "volume": "1500 ml", "price": 8800, @@ -370,7 +370,7 @@ "id": "quiver_large_birchbark", "type": "ARMOR", "name": { "str": "large birchbark quiver" }, - "description": "A large quiver woven from strips of birchbark, worn on the back, that can hold 60 arrows. Activate to store arrows.", + "description": "A large quiver woven from strips of birchbark, worn on the back, that can hold 60 arrows or bolts. It can be unloaded or reloaded.", "weight": "1380 g", "volume": "1500 ml", "price": 8800,