From 232ed62bc58ee9e8f527c17934e41b10d2808e6e Mon Sep 17 00:00:00 2001 From: Kantonine <91917075+Kantonine@users.noreply.github.com> Date: Sat, 23 Nov 2024 17:53:15 +0000 Subject: [PATCH 1/2] Update custom_headgear.json Ported original changes from previous hood and cowl PR, mainly done for easier history viewability than before, as well as making mouth on both cowls plastic. --- .../armor/bespoke_armor/custom_headgear.json | 91 +++++++++++++++---- 1 file changed, 72 insertions(+), 19 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_headgear.json b/data/json/items/armor/bespoke_armor/custom_headgear.json index f7c8f8f4dd2aa..7cf6c3a1911f9 100644 --- a/data/json/items/armor/bespoke_armor/custom_headgear.json +++ b/data/json/items/armor/bespoke_armor/custom_headgear.json @@ -1,9 +1,9 @@ [ { "id": "helmet_nomad", - "type": "ARMOR", + "type": "TOOL_ARMOR", "name": { "str": "nomad cowl" }, - "description": "A cowl with protection for the eyes from rain and sun, designed for long travels. The design includes some clever shaping that allows it to offer a lot of coverage without interfering too much with vision and breathing.", + "description": "A denim cowl with additional leather padding stitched onto the head with integrated protection from a plastic visor, sun brim, and filter cartridge intake, designed for long travels. The design includes some clever shaping that allows it to offer a lot of coverage without interfering too much with vision and breathing.", "weight": "470 g", "volume": "2500 ml", "price_postapoc": "2 USD 50 cent", @@ -36,7 +36,7 @@ "encumbrance": 5 }, { - "material": [ { "type": "denim", "covered_by_mat": 100, "thickness": 2.0 } ], + "material": [ { "type": "plastic", "covered_by_mat": 100, "thickness": 2.0 } ], "covers": [ "mouth" ], "coverage": 100, "encumbrance": 5 @@ -45,7 +45,19 @@ "warmth": 15, "material_thickness": 3, "environmental_protection": 4, - "flags": [ "VARSIZE", "WATERPROOF", "SUN_GLASSES", "PADDED" ] + "environmental_protection_with_filter": 7, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "rigid": true, + "flag_restriction": [ "GASFILTER_SM" ], + "default_magazine": "gasfilter_sm" + } + ], + "ammo": "gasfilter_s", + "use_action": [ "GASMASK_ACTIVATE" ], + "tick_action": [ "GASMASK" ], + "flags": [ "VARSIZE", "SUN_GLASSES", "RAINPROOF", "PADDED" ] }, { "id": "xl_helmet_nomad", @@ -73,7 +85,8 @@ "volume": "2 L", "price": "580 USD", "price_postapoc": "40 USD", - "material": [ "kevlar_layered", "leather" ], + "to_hit": -1, + "material": [ "kevlar", "leather" ], "symbol": "[", "looks_like": "hood_rain", "color": "brown", @@ -94,7 +107,8 @@ "volume": "1500 ml", "price": "580 USD", "price_postapoc": "35 USD", - "material": [ "kevlar_layered", "fur" ], + "to_hit": -1, + "material": [ "kevlar", "fur" ], "symbol": "[", "looks_like": "hood_survivor", "color": "light_gray", @@ -146,7 +160,8 @@ "volume": "750 ml", "price": "580 USD", "price_postapoc": "30 USD", - "material": [ "kevlar_layered", "cotton" ], + "to_hit": -1, + "material": [ "kevlar", "cotton" ], "symbol": "[", "looks_like": "hood_survivor", "color": "green", @@ -178,7 +193,7 @@ "name": { "str": "winter faux fur survivor hood" }, "description": "A customized armored Kevlar hood. Warm thanks to the faux-fur lining.", "copy-from": "hood_wsurvivor", - "material": [ "kevlar_layered", "faux_fur" ], + "material": [ "kevlar", "faux_fur" ], "symbol": "[", "warmth": 65, "looks_like": "hood_survivor", @@ -188,7 +203,7 @@ "id": "xl_hood_wsurvivor_nofur", "type": "ARMOR", "copy-from": "hood_wsurvivor", - "material": [ "kevlar_layered", "faux_fur" ], + "material": [ "kevlar", "faux_fur" ], "color": "pink", "warmth": 65, "name": { "str": "winter faux fur survivor hood" }, @@ -434,25 +449,63 @@ }, { "id": "helmet_scavenger", - "type": "ARMOR", - "name": { "str": "scavenger cowl" }, - "description": "A sturdy protective cowl extending down to the neck, fitted with a respirator and eye protection. For dangerous scavenging ventures.", + "type": "TOOL_ARMOR", + "//": "I based these changes on the OKZK cap, as a general design but with a few changes and considerations. I removed the ballistic kevlar primarily due to it being unsuitable for headwear", + "name": { "str": "mercenary cowl" }, + "description": "A sturdy canvas hat and cowl extending down to the neck, fitted with a shade brim, plastic eye visor and integrated filter cartridge intake built into the mouth section. Provides smoke protection, and is cleverly designed to be relatively unencumbering and protective.", "weight": "695 g", "volume": "2500 ml", "price": "550 USD", "price_postapoc": "35 USD", - "material": [ "kevlar_layered", "cotton" ], + "to_hit": -3, + "material": [ "canvas", "plastic" ], "symbol": "[", "looks_like": "mask_gas", "color": "white", "armor": [ - { "covers": [ "head" ], "coverage": 100, "encumbrance_modifiers": [ "NONE" ] }, - { "covers": [ "eyes", "mouth" ], "coverage": 100, "encumbrance": 5 } + { + "material": [ { "type": "canvas", "covered_by_mat": 100, "thickness": 1.5 } ], + "covers": [ "head" ], + "specifically_covers": [ "head_crown", "head_nape", "head_ear_l", "head_ear_r", "head_forehead" ], + "coverage": 100, + "encumbrance": 16 + }, + { + "material": [ { "type": "canvas", "covered_by_mat": 100, "thickness": 1.5 } ], + "covers": [ "head" ], + "specifically_covers": [ "head_throat" ], + "coverage": 100, + "encumbrance": 0 + }, + { + "material": [ { "type": "plastic", "covered_by_mat": 100, "thickness": 2.0 } ], + "covers": [ "eyes" ], + "coverage": 100, + "encumbrance": 5 + }, + { + "material": [ { "type": "plastic", "covered_by_mat": 100, "thickness": 2.0 } ], + "covers": [ "mouth" ], + "coverage": 100, + "encumbrance": 5 + } ], - "warmth": 40, - "material_thickness": 3, - "environmental_protection": 7, - "flags": [ "VARSIZE", "STURDY", "WATERPROOF", "SUN_GLASSES" ] + "warmth": 15, + "material_thickness": 2, + "environmental_protection": 4, + "environmental_protection_with_filter": 7, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "rigid": true, + "flag_restriction": [ "GASFILTER_SM" ], + "default_magazine": "gasfilter_sm" + } + ], + "ammo": "gasfilter_s", + "use_action": [ "GASMASK_ACTIVATE" ], + "tick_action": [ "GASMASK" ], + "flags": [ "VARSIZE", "SUN_GLASSES", "RAINPROOF", "PADDED" ] }, { "id": "xl_helmet_scavenger", From f469ed64ccb99a05e384320d887a852a941e18ac Mon Sep 17 00:00:00 2001 From: Kantonine <91917075+Kantonine@users.noreply.github.com> Date: Sat, 23 Nov 2024 19:10:18 +0000 Subject: [PATCH 2/2] Removed to_hit values for headgear --- data/json/items/armor/bespoke_armor/custom_headgear.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/json/items/armor/bespoke_armor/custom_headgear.json b/data/json/items/armor/bespoke_armor/custom_headgear.json index 7cf6c3a1911f9..fd9774e64c74c 100644 --- a/data/json/items/armor/bespoke_armor/custom_headgear.json +++ b/data/json/items/armor/bespoke_armor/custom_headgear.json @@ -85,7 +85,6 @@ "volume": "2 L", "price": "580 USD", "price_postapoc": "40 USD", - "to_hit": -1, "material": [ "kevlar", "leather" ], "symbol": "[", "looks_like": "hood_rain", @@ -107,7 +106,6 @@ "volume": "1500 ml", "price": "580 USD", "price_postapoc": "35 USD", - "to_hit": -1, "material": [ "kevlar", "fur" ], "symbol": "[", "looks_like": "hood_survivor", @@ -160,7 +158,6 @@ "volume": "750 ml", "price": "580 USD", "price_postapoc": "30 USD", - "to_hit": -1, "material": [ "kevlar", "cotton" ], "symbol": "[", "looks_like": "hood_survivor", @@ -457,7 +454,6 @@ "volume": "2500 ml", "price": "550 USD", "price_postapoc": "35 USD", - "to_hit": -3, "material": [ "canvas", "plastic" ], "symbol": "[", "looks_like": "mask_gas",