From 932a2bd8001a3ad4b8e36a63b8c02f3eeb418806 Mon Sep 17 00:00:00 2001 From: fae Date: Tue, 1 Jun 2021 01:41:37 +0100 Subject: [PATCH 01/11] Flight gear --- data/json/items/armor/suits_protection.json | 29 ++++++ data/json/items/tool_armor.json | 105 ++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index d0c6c03f1bae3..b5df4a2f4b919 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -1136,5 +1136,34 @@ "material_thickness": 6, "environmental_protection": 3, "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] + }, + { + "id": "mil_flight_suit", + "type": "ARMOR", + "name": { "str": "military flight suit" }, + "description": "A sage-green US military flight suit. It has various insignia embroidered onto it.", + "weight": "1315 g", + "volume": "4687 ml", + "price": 22065, + "price_postapoc": 500, + "to_hit": -3, + "material": [ "nomex" ], + "symbol": "[", + "looks_like": "touring_suit", + "color": "green", + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 1, 2 ] }, + { "covers": [ "arm_l", "arm_r" ], "coverage": 50, "encumbrance": [ 1, 1 ] }, + { "covers": [ "leg_l", "leg_r" ], "coverage": 80, "encumbrance": [ 1, 2 ] } + ], + "pocket_data": [ + { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 }, + { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 } + ], + "warmth": 25, + "material_thickness": 0.8, + "flags": [ "VARSIZE", "POCKETS" ] } ] diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 7e1260ebc6548..61f60b4c78783 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -3152,5 +3152,110 @@ "need_worn": true }, "delete": { "flags": [ "DEAF" ] } + }, + { + "id": "flight_helmet", + "repairs_like": "nomex_hood", + "type": "TOOL_ARMOR", + "category": "armor", + "name": { "str": "military flight helmet" }, + "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitting with plastic rails to allow for different load-outs.", + "weight": "1324 g", + "volume": "2 L", + "price": 50000, + "price_postapoc": 1000, + "to_hit": -1, + "bashing": 10, + "material": [ "nomex" ], + "symbol": "[", + "looks_like": "helmet_motor", + "color": "dark_gray", + "armor_portion_data": [ + { "covers": [ "head" ], "coverage": 100, "encumbrance": 30 }, + { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 5 } + ], + "warmth": 15, + "material_thickness": 5, + "environmental_protection": 2, + "techniques": [ "WBLOCK_1" ], + "flags": [ "VARSIZE", "STURDY", "DEAF", "SUN_GLASSES" ], + "charges_per_use": 1, + "ammo": "battery", + "use_action": { + "type": "transform", + "msg": "You turn the flight helmet on.", + "target": "flight_helmet_on", + "active": true, + "need_charges": 1, + "need_charges_msg": "The helmets batteries are dead." + }, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "rigid": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ + "light_plus_battery_cell", + "light_battery_cell", + "light_minus_battery_cell", + "light_atomic_battery_cell", + "light_minus_atomic_battery_cell", + "light_minus_disposable_cell", + "light_disposable_cell" + ] + } + ] + }, + { + "id": "flight_helmet_on", + "repairs_like": "nomex_hood", + "type": "TOOL_ARMOR", + "category": "armor", + "name": { "str": "military flight helmet" }, + "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitting with plastic rails to allow for different load-outs.", + "weight": "1324 g", + "volume": "2 L", + "price": 50000, + "price_postapoc": 1000, + "to_hit": -1, + "bashing": 10, + "material": [ "kevlar_rigid", "plastic" ], + "symbol": "[", + "looks_like": "helmet_motor", + "color": "dark_gray", + "armor_portion_data": [ + { "covers": [ "head" ], "coverage": 100, "encumbrance": 30 }, + { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 5 } + ], + "warmth": 15, + "material_thickness": 5, + "environmental_protection": 2, + "techniques": [ "WBLOCK_1" ], + "flags": [ "VARSIZE", "STURDY", "PARTIAL_DEAF", "SUN_GLASSES" ], + "charges_per_use": 1, + "ammo": "battery", + "power_draw": 60, + "revert_to": "flight_helmet", + "use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s flicks off.", "target": "flight_helmet" }, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "rigid": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ + "light_plus_battery_cell", + "light_battery_cell", + "light_minus_battery_cell", + "light_atomic_battery_cell", + "light_minus_atomic_battery_cell", + "light_minus_disposable_cell", + "light_disposable_cell" + ] + } + ] } ] From 283751794ee606a035619cab28a5df372c7d66c3 Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Tue, 1 Jun 2021 13:44:20 +0100 Subject: [PATCH 02/11] Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong --- data/json/items/tool_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index d8e7653a981c6..e6090a49b0bc9 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -3159,7 +3159,7 @@ "type": "TOOL_ARMOR", "category": "armor", "name": { "str": "military flight helmet" }, - "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitting with plastic rails to allow for different load-outs.", + "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitting with plastic rails to allow for different load-outs.", "weight": "1324 g", "volume": "2 L", "price": 50000, From 80d09058fbbceab7f46f51d7ab3de43a46e36bab Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Tue, 1 Jun 2021 13:44:49 +0100 Subject: [PATCH 03/11] Update data/json/items/tool_armor.json Co-authored-by: Anton Burmistrov --- data/json/items/tool_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index e6090a49b0bc9..16a4c16a48b89 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -3187,7 +3187,7 @@ "target": "flight_helmet_on", "active": true, "need_charges": 1, - "need_charges_msg": "The helmets batteries are dead." + "need_charges_msg": "The helmet's batteries are dead." }, "pocket_data": [ { From 5897e7c2c55513b222e34a4ef19b5477a9bd53d3 Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Tue, 1 Jun 2021 14:22:45 +0100 Subject: [PATCH 04/11] Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com> --- data/json/items/tool_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 16a4c16a48b89..5513c46fe24c4 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -3159,7 +3159,7 @@ "type": "TOOL_ARMOR", "category": "armor", "name": { "str": "military flight helmet" }, - "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitting with plastic rails to allow for different load-outs.", + "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitted with plastic rails to allow for different load-outs.", "weight": "1324 g", "volume": "2 L", "price": 50000, From 0c784b0cd558df6643f46bbcd2548c368302bfd2 Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Tue, 1 Jun 2021 14:23:01 +0100 Subject: [PATCH 05/11] Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <46550455+chaohedgehogs@users.noreply.github.com> --- data/json/items/tool_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 5513c46fe24c4..68c6f4acdbd7d 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -3214,7 +3214,7 @@ "type": "TOOL_ARMOR", "category": "armor", "name": { "str": "military flight helmet" }, - "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitting with plastic rails to allow for different load-outs.", + "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitted with plastic rails to allow for different load-outs.", "weight": "1324 g", "volume": "2 L", "price": 50000, From 2bb3bc780d1d502c4244c5820c80c145dd323e8b Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Tue, 1 Jun 2021 14:45:42 +0100 Subject: [PATCH 06/11] Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong --- data/json/items/tool_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 68c6f4acdbd7d..1b298a06c6033 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -3214,7 +3214,7 @@ "type": "TOOL_ARMOR", "category": "armor", "name": { "str": "military flight helmet" }, - "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitted with plastic rails to allow for different load-outs.", + "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitted with plastic rails to allow for different load-outs.", "weight": "1324 g", "volume": "2 L", "price": 50000, From c7376e9101b931275c5680339fd5c7fad814cea0 Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Tue, 1 Jun 2021 22:20:27 +0100 Subject: [PATCH 07/11] Update tool_armor.json Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched. --- data/json/items/tool_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 1b298a06c6033..2b8cfd5674a61 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -3233,7 +3233,7 @@ "material_thickness": 5, "environmental_protection": 2, "techniques": [ "WBLOCK_1" ], - "flags": [ "VARSIZE", "STURDY", "PARTIAL_DEAF", "SUN_GLASSES" ], + "flags": [ "VARSIZE", "STURDY", "PARTIAL_DEAF", "SUN_GLASSES", "TWO_WAY_RADIO" ], "charges_per_use": 1, "ammo": "battery", "power_draw": 60, From dc8197e99c63c01590923aeb039de87b9d820801 Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Wed, 2 Jun 2021 22:08:56 +0100 Subject: [PATCH 08/11] Update 9mm.json 9x19mm +P+ is about double the price of 9x19mm +P as per my cursory research. --- data/json/items/ammo/9mm.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/ammo/9mm.json b/data/json/items/ammo/9mm.json index 8b9ecde6cad75..00819fdb2eef4 100644 --- a/data/json/items/ammo/9mm.json +++ b/data/json/items/ammo/9mm.json @@ -37,7 +37,7 @@ "name": { "str_sp": "9x19mm +P" }, "description": "Overpressure 9x19mm ammunition. The round's increased velocity results in superior accuracy and stopping power at the cost of higher recoil.", "price": 300, - "price_postapoc": 800, + "price_postapoc": 400, "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "count": 25, "relative": { "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": 2 }, "dispersion": -15 }, @@ -50,7 +50,7 @@ "name": { "str_sp": "9x19mm +P+" }, "description": "A step beyond the high-pressure 9x19mm +P round, the +P+ has even higher internal pressure offering superior damage, accuracy, and penetration.", "price": 350, - "price_postapoc": 400, + "price_postapoc": 800, "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "count": 10, "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 4 }, "dispersion": -30 }, From 14c09285f524616c00b6d080053ddfe30074f556 Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Wed, 2 Jun 2021 22:11:17 +0100 Subject: [PATCH 09/11] Update suits_protection.json --- data/json/items/armor/suits_protection.json | 29 --------------------- 1 file changed, 29 deletions(-) diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index b5df4a2f4b919..d0c6c03f1bae3 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -1136,34 +1136,5 @@ "material_thickness": 6, "environmental_protection": 3, "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "POCKETS", "HOOD", "RAINPROOF", "STURDY" ] - }, - { - "id": "mil_flight_suit", - "type": "ARMOR", - "name": { "str": "military flight suit" }, - "description": "A sage-green US military flight suit. It has various insignia embroidered onto it.", - "weight": "1315 g", - "volume": "4687 ml", - "price": 22065, - "price_postapoc": 500, - "to_hit": -3, - "material": [ "nomex" ], - "symbol": "[", - "looks_like": "touring_suit", - "color": "green", - "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 1, 2 ] }, - { "covers": [ "arm_l", "arm_r" ], "coverage": 50, "encumbrance": [ 1, 1 ] }, - { "covers": [ "leg_l", "leg_r" ], "coverage": 80, "encumbrance": [ 1, 2 ] } - ], - "pocket_data": [ - { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", "moves": 80 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 100 } - ], - "warmth": 25, - "material_thickness": 0.8, - "flags": [ "VARSIZE", "POCKETS" ] } ] From d561acb1b14cbb2a72b058c50bd6debea7fb4f5c Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Wed, 2 Jun 2021 22:12:43 +0100 Subject: [PATCH 10/11] Update tool_armor.json --- data/json/items/tool_armor.json | 105 -------------------------------- 1 file changed, 105 deletions(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 2b8cfd5674a61..56219a9427799 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -3152,110 +3152,5 @@ "need_worn": true }, "delete": { "flags": [ "DEAF" ] } - }, - { - "id": "flight_helmet", - "repairs_like": "nomex_hood", - "type": "TOOL_ARMOR", - "category": "armor", - "name": { "str": "military flight helmet" }, - "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitted with plastic rails to allow for different load-outs.", - "weight": "1324 g", - "volume": "2 L", - "price": 50000, - "price_postapoc": 1000, - "to_hit": -1, - "bashing": 10, - "material": [ "nomex" ], - "symbol": "[", - "looks_like": "helmet_motor", - "color": "dark_gray", - "armor_portion_data": [ - { "covers": [ "head" ], "coverage": 100, "encumbrance": 30 }, - { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 5 } - ], - "warmth": 15, - "material_thickness": 5, - "environmental_protection": 2, - "techniques": [ "WBLOCK_1" ], - "flags": [ "VARSIZE", "STURDY", "DEAF", "SUN_GLASSES" ], - "charges_per_use": 1, - "ammo": "battery", - "use_action": { - "type": "transform", - "msg": "You turn the flight helmet on.", - "target": "flight_helmet_on", - "active": true, - "need_charges": 1, - "need_charges_msg": "The helmet's batteries are dead." - }, - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "holster": true, - "rigid": true, - "max_contains_volume": "20 L", - "max_contains_weight": "20 kg", - "item_restriction": [ - "light_plus_battery_cell", - "light_battery_cell", - "light_minus_battery_cell", - "light_atomic_battery_cell", - "light_minus_atomic_battery_cell", - "light_minus_disposable_cell", - "light_disposable_cell" - ] - } - ] - }, - { - "id": "flight_helmet_on", - "repairs_like": "nomex_hood", - "type": "TOOL_ARMOR", - "category": "armor", - "name": { "str": "military flight helmet" }, - "description": "A military flight helmet. Adorned with a visor, microphone and a noise dampening system. The helmet is also fitted with plastic rails to allow for different load-outs.", - "weight": "1324 g", - "volume": "2 L", - "price": 50000, - "price_postapoc": 1000, - "to_hit": -1, - "bashing": 10, - "material": [ "kevlar_rigid", "plastic" ], - "symbol": "[", - "looks_like": "helmet_motor", - "color": "dark_gray", - "armor_portion_data": [ - { "covers": [ "head" ], "coverage": 100, "encumbrance": 30 }, - { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 5 } - ], - "warmth": 15, - "material_thickness": 5, - "environmental_protection": 2, - "techniques": [ "WBLOCK_1" ], - "flags": [ "VARSIZE", "STURDY", "PARTIAL_DEAF", "SUN_GLASSES", "TWO_WAY_RADIO" ], - "charges_per_use": 1, - "ammo": "battery", - "power_draw": 60, - "revert_to": "flight_helmet", - "use_action": { "type": "transform", "menu_text": "Turn off", "msg": "The %s flicks off.", "target": "flight_helmet" }, - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "holster": true, - "rigid": true, - "max_contains_volume": "20 L", - "max_contains_weight": "20 kg", - "item_restriction": [ - "light_plus_battery_cell", - "light_battery_cell", - "light_minus_battery_cell", - "light_atomic_battery_cell", - "light_minus_atomic_battery_cell", - "light_minus_disposable_cell", - "light_disposable_cell" - ] - } - ] } ] From 1d4c504c42d9bb6c9f759f2bc755427bdb4be799 Mon Sep 17 00:00:00 2001 From: faefux <49350286+faefux@users.noreply.github.com> Date: Wed, 2 Jun 2021 22:14:50 +0100 Subject: [PATCH 11/11] Update 9mm.json --- data/json/items/ammo/9mm.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/ammo/9mm.json b/data/json/items/ammo/9mm.json index 00819fdb2eef4..6be9b828e6619 100644 --- a/data/json/items/ammo/9mm.json +++ b/data/json/items/ammo/9mm.json @@ -36,7 +36,7 @@ "type": "AMMO", "name": { "str_sp": "9x19mm +P" }, "description": "Overpressure 9x19mm ammunition. The round's increased velocity results in superior accuracy and stopping power at the cost of higher recoil.", - "price": 300, + "price": 200, "price_postapoc": 400, "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "count": 25, @@ -49,7 +49,7 @@ "type": "AMMO", "name": { "str_sp": "9x19mm +P+" }, "description": "A step beyond the high-pressure 9x19mm +P round, the +P+ has even higher internal pressure offering superior damage, accuracy, and penetration.", - "price": 350, + "price": 400, "price_postapoc": 800, "flags": [ "IRREPLACEABLE_CONSUMABLE" ], "count": 10,