From 392861ac0936aa711e0f0b477ee00428ac9671cd Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 Date: Thu, 13 Feb 2020 05:13:19 -0600 Subject: [PATCH 01/16] PASGT and better helmets This adds PASGT vests and helmets to various locations along with modifying existing helmets to be more in line with reality --- data/json/itemgroups/clothing.json | 6 ++-- data/json/itemgroups/item_groups.json | 5 +++- data/json/itemgroups/locations.json | 3 +- .../json/itemgroups/locations_commercial.json | 6 +++- data/json/items/armor/ballistic_armor.json | 30 +++++++++++++++++++ data/json/items/armor/helmets.json | 27 ++++++++++++----- 6 files changed, 65 insertions(+), 12 deletions(-) diff --git a/data/json/itemgroups/clothing.json b/data/json/itemgroups/clothing.json index 70bf9d1eed772..c691053807059 100644 --- a/data/json/itemgroups/clothing.json +++ b/data/json/itemgroups/clothing.json @@ -2195,7 +2195,8 @@ [ "jacket_leather", 12 ], [ "jacket_jean", 8 ], [ "jacket_flannel", 6 ], - [ "cuirass_scrap", 12 ] + [ "cuirass_scrap", 12 ], + [ "pasgt_vest", 1 ] ] }, { @@ -2282,7 +2283,8 @@ [ "helmet_plate", 1 ], [ "helmet_scrap", 12 ], [ "survivor_goggles", 10 ], - [ "hood_rain", 14 ] + [ "hood_rain", 14 ], + [ "pasgt_helmet", 1 ] ] }, { diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 59e544f0cad7e..3096fee85fd5d 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -733,6 +733,8 @@ [ "eclipse_glasses", 1 ], [ "bodypillow", 2 ], [ "reading_light", 8 ], + [ "pasgt_vest", 1 ], + [ "pasgt_helmet", 1 ], { "item": "condom", "prob": 50, "count": [ 1, 5 ] } ] }, @@ -1367,7 +1369,8 @@ [ "briefcase", 5 ], [ "survnote", 2 ], [ "robot_controls", 3 ], - [ "solarpack", 1 ] + [ "solarpack", 1 ], + [ "pasgt_helmet", 1 ] ] }, { diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index adc7246323c0e..5719119030423 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -44,7 +44,8 @@ [ "l_dsr_223_kit", 5 ], [ "l_lmg_223_kit", 5 ], [ "l_mbr_223_kit", 5 ], - [ "survnote", 1 ] + [ "survnote", 1 ], + [ "pasgt_helmet", 1 ] ] }, { diff --git a/data/json/itemgroups/locations_commercial.json b/data/json/itemgroups/locations_commercial.json index 111f6f81c3ed2..bb0eb9906cd7e 100644 --- a/data/json/itemgroups/locations_commercial.json +++ b/data/json/itemgroups/locations_commercial.json @@ -593,6 +593,8 @@ [ "bronze_medal", 3 ], [ "silver_medal", 2 ], [ "gold_medal", 1 ], + [ "pasgt_vest", 1], + [ "pasgt_helmet", 1], { "group": "tinware", "prob": 10 } ] }, @@ -705,7 +707,9 @@ [ "chem_hexamine", 5 ], [ "esbit_stove", 10 ], [ "mess_tin", 10 ], - [ "angle_grinder", 4 ] + [ "angle_grinder", 4 ], + [ "pasgt_vest", 1 ], + [ "pasgt_helmet", 1 ] ] }, { diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index ef6eab77aa866..106fe8b96e4c6 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -85,5 +85,35 @@ "warmth": 10, "material_thickness": 2, "flags": [ "STURDY", "OUTER" ] + }, + { + "id": "pasgt_vest", + "type": "ARMOR", + "name": "PASGT vest", + "description": "An old military surplus flak vest with a woodland camouflage from the early 80's made of kevlar and nylon. The vest is meant to stop shrapnel from small explosives like grenades, but may stop a 9mm. Though later replaced by better armor models, these are still in use by foreign militaries.", + "weight": "4082 g", + "volume": "3 L", + "price": 2000, + "to_hit": -1, + "material": [ "nylon", "kevlar" ], + "symbol": "[", + "looks_like": "vest_leather", + "color": "green", + "covers": [ "TORSO" ], + "coverage": 100, + "encumbrance": 20, + "storage": "500 ml", + "warmth": 20, + "material_thickness": 2, + "environmental_protection": 1, + "flags": [ "OUTER", "WATER_FRIENDLY" ] + "use_action": + "type": "holster", + "holster_prompt": "Stash grenades", + "holster_msg": "You stash your %s.", + "multi": 2, + "max_volume": "750 ml", + "draw_cost": 30, + "flags": [ "GRENADE" ] } ] diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index 03030e21cf257..8545839f1ea01 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -48,14 +48,14 @@ "repairs_like": "xlkevlar", "type": "ARMOR", "category": "armor", - "name": "army helmet", + "name": "ACH Helmet", "description": "A heavy helmet that provides excellent protection from all sorts of damage. It is labeled as the advanced combat helmet.", "weight": "1383 g", "volume": "1750 ml", "price": 15000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_rigid" ], "symbol": "[", "looks_like": "hat_hard", "color": "green", @@ -65,7 +65,7 @@ "warmth": 20, "material_thickness": 9, "techniques": [ "WBLOCK_1" ], - "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ] + "flags": [ "NO_REPAIR", "WATERPROOF", "STURDY" ] }, { "id": "tac_fullhelmet", @@ -79,7 +79,7 @@ "price": 50000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_rigid" ], "symbol": "[", "looks_like": "helmet_motor", "color": "dark_gray", @@ -90,7 +90,7 @@ "material_thickness": 5, "environmental_protection": 2, "techniques": [ "WBLOCK_1" ], - "flags": [ "VARSIZE", "STURDY", "SUN_GLASSES" ] + "flags": [ "NO_REPAIR", "STURDY", "SUN_GLASSES" ] }, { "id": "tac_helmet", @@ -104,7 +104,7 @@ "price": 37000, "to_hit": -1, "bashing": 10, - "material": [ "kevlar", "plastic" ], + "material": [ "kevlar_rigid" ], "symbol": "[", "looks_like": "tac_fullhelmet", "color": "dark_gray", @@ -114,7 +114,7 @@ "warmth": 10, "material_thickness": 4, "techniques": [ "WBLOCK_1" ], - "flags": [ "WATER_FRIENDLY", "STURDY" ] + "flags": [ "NO_REPAIR", "WATER_FRIENDLY", "STURDY" ] }, { "id": "firehelmet", @@ -622,5 +622,18 @@ "material_thickness": 2, "techniques": [ "WBLOCK_1" ], "flags": [ "OVERSIZE" ] + }, + { + "id": "pasgt_helmet", + "copy-from": "helmet_army", + "type": "ARMOR", + "name": "PASGT helmet", + "description": "An older helmet from the early 80's made of 19 layers of kevlar and treated with phenolic resin. The helmet was designed to protect the wearer from shrapnel, but may still stop a 9mm. Though later replaced by better armor models, these are still in use by foreign militaries.", + "symbol": "[", + "color": "green", + "weight": "1633 g", + "material": [ "kevlar_rigid" ], + "material_thickness": 8, + "flags": [ "WATERPROOF", "STURDY" ] } ] From 04929be3fada207bd8be006091c7a1322e161380 Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 05:52:29 -0600 Subject: [PATCH 02/16] Update ballistic_armor.json --- data/json/items/armor/ballistic_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index 106fe8b96e4c6..937a2adb3b320 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -106,7 +106,7 @@ "warmth": 20, "material_thickness": 2, "environmental_protection": 1, - "flags": [ "OUTER", "WATER_FRIENDLY" ] + "flags": [ "OUTER", "WATER_FRIENDLY" ], "use_action": "type": "holster", "holster_prompt": "Stash grenades", From 1b54d1e2b5e14b1c8544fa23bc2728a1ccd04e2d Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 05:59:38 -0600 Subject: [PATCH 03/16] Update ballistic_armor.json --- data/json/items/armor/ballistic_armor.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index 937a2adb3b320..f0984096d4c0c 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -107,7 +107,7 @@ "material_thickness": 2, "environmental_protection": 1, "flags": [ "OUTER", "WATER_FRIENDLY" ], - "use_action": + "use_action": { "type": "holster", "holster_prompt": "Stash grenades", "holster_msg": "You stash your %s.", @@ -115,5 +115,7 @@ "max_volume": "750 ml", "draw_cost": 30, "flags": [ "GRENADE" ] + } } ] + From 15c863b91b81cfba5f3c143e6bc87c726ced5b9f Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 06:03:32 -0600 Subject: [PATCH 04/16] Update ballistic_armor.json --- data/json/items/armor/ballistic_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index f0984096d4c0c..6c724d6b55bf5 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -90,7 +90,7 @@ "id": "pasgt_vest", "type": "ARMOR", "name": "PASGT vest", - "description": "An old military surplus flak vest with a woodland camouflage from the early 80's made of kevlar and nylon. The vest is meant to stop shrapnel from small explosives like grenades, but may stop a 9mm. Though later replaced by better armor models, these are still in use by foreign militaries.", + "description": "An old military surplus flak vest with a woodland camouflage from the early 80's made of kevlar and nylon. The vest is meant to stop shrapnel from small explosives like grenades, but may stop a 9mm. Though later replaced by better armor models, these are still in use by foreign militaries. There is a set of elsatic webbing to hold 4 grenades.", "weight": "4082 g", "volume": "3 L", "price": 2000, From f42cbfc7980bf1422644957905842aedad491039 Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 06:20:26 -0600 Subject: [PATCH 05/16] Update ballistic_armor.json https:// --- data/json/items/armor/ballistic_armor.json | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index 6c724d6b55bf5..b45a71cddeda6 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -90,7 +90,7 @@ "id": "pasgt_vest", "type": "ARMOR", "name": "PASGT vest", - "description": "An old military surplus flak vest with a woodland camouflage from the early 80's made of kevlar and nylon. The vest is meant to stop shrapnel from small explosives like grenades, but may stop a 9mm. Though later replaced by better armor models, these are still in use by foreign militaries. There is a set of elsatic webbing to hold 4 grenades.", + "description": "An early 1980's flak jacket made of Kevlar in a woodland camouflage nylon shell. The vest was designed to stop fragmentation from explosives, but may provide protection from low-energy handguns. Though still in limited use, it has largely been replaced by more effective armor. Though later replaced by better armor models, these are still in use by foreign militaries.", "weight": "4082 g", "volume": "3 L", "price": 2000, @@ -106,16 +106,7 @@ "warmth": 20, "material_thickness": 2, "environmental_protection": 1, - "flags": [ "OUTER", "WATER_FRIENDLY" ], - "use_action": { - "type": "holster", - "holster_prompt": "Stash grenades", - "holster_msg": "You stash your %s.", - "multi": 2, - "max_volume": "750 ml", - "draw_cost": 30, - "flags": [ "GRENADE" ] - } + "flags": [ "OUTER", "WATER_FRIENDLY" ] } ] From ec7544357b9ffc206aaee4fcc16d34ed4aa85321 Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 06:24:23 -0600 Subject: [PATCH 06/16] Update ballistic_armor.json --- data/json/items/armor/ballistic_armor.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index b45a71cddeda6..88fca689cd876 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -109,4 +109,3 @@ "flags": [ "OUTER", "WATER_FRIENDLY" ] } ] - From 93156ea8016b81fcd23704db0250b0d52905f435 Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 06:50:09 -0600 Subject: [PATCH 07/16] Update locations_commercial.json --- data/json/itemgroups/locations_commercial.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/itemgroups/locations_commercial.json b/data/json/itemgroups/locations_commercial.json index bb0eb9906cd7e..49186cd511ac9 100644 --- a/data/json/itemgroups/locations_commercial.json +++ b/data/json/itemgroups/locations_commercial.json @@ -593,8 +593,8 @@ [ "bronze_medal", 3 ], [ "silver_medal", 2 ], [ "gold_medal", 1 ], - [ "pasgt_vest", 1], - [ "pasgt_helmet", 1], + [ "pasgt_helmet", 1 ], + [ "pasgt_vest", 1 ], { "group": "tinware", "prob": 10 } ] }, @@ -708,8 +708,8 @@ [ "esbit_stove", 10 ], [ "mess_tin", 10 ], [ "angle_grinder", 4 ], - [ "pasgt_vest", 1 ], - [ "pasgt_helmet", 1 ] + [ "pasgt_vest", 1 ], + [ "pasgt_helmet", 1 ] ] }, { From 7efc89d1d82cbfc5f38ef78377073db39a7de654 Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 06:50:32 -0600 Subject: [PATCH 08/16] Update locations_commercial.json From 28d04b89d4fcd99657f6efca67446231075ab0fd Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 06:55:32 -0600 Subject: [PATCH 09/16] Update locations.json --- data/json/itemgroups/locations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index 5719119030423..9287148f3d943 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -45,7 +45,7 @@ [ "l_lmg_223_kit", 5 ], [ "l_mbr_223_kit", 5 ], [ "survnote", 1 ], - [ "pasgt_helmet", 1 ] + [ "pasgt_helmet", 1 ] ] }, { From 18b72befbe723e10a61f890a5b26c1e1e444a0ad Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 06:55:43 -0600 Subject: [PATCH 10/16] Update locations.json From 2608daff72abffa754d3623831cc691e23ffc7de Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 06:56:03 -0600 Subject: [PATCH 11/16] Update locations.json From 1114fae7faa46d4949f4966254d6df7540341e0a Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 07:33:11 -0600 Subject: [PATCH 12/16] Update ballistic_armor.json --- data/json/items/armor/ballistic_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index 88fca689cd876..2bf3f2653a0d6 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -90,7 +90,7 @@ "id": "pasgt_vest", "type": "ARMOR", "name": "PASGT vest", - "description": "An early 1980's flak jacket made of Kevlar in a woodland camouflage nylon shell. The vest was designed to stop fragmentation from explosives, but may provide protection from low-energy handguns. Though still in limited use, it has largely been replaced by more effective armor. Though later replaced by better armor models, these are still in use by foreign militaries.", + "description": "An early 1980's flak jacket made of Kevlar in a woodland camouflage nylon shell. The vest was designed to stop fragmentation from explosives, but may provide protection from low-energy handguns. Though still in limited use, it has largely been replaced by more effective armor. Though later replaced by better armor models, these are still in use by foreign militaries.", "weight": "4082 g", "volume": "3 L", "price": 2000, From a1db4f6b79f4ce68d6f7fb3c1a9a8122536ce3a4 Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 08:17:09 -0600 Subject: [PATCH 13/16] Update ballistic_armor.json --- data/json/items/armor/ballistic_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index 2bf3f2653a0d6..4b84270e39b3a 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -93,7 +93,7 @@ "description": "An early 1980's flak jacket made of Kevlar in a woodland camouflage nylon shell. The vest was designed to stop fragmentation from explosives, but may provide protection from low-energy handguns. Though still in limited use, it has largely been replaced by more effective armor. Though later replaced by better armor models, these are still in use by foreign militaries.", "weight": "4082 g", "volume": "3 L", - "price": 2000, + "price": 14000, "to_hit": -1, "material": [ "nylon", "kevlar" ], "symbol": "[", From 10b42f146b03cca57d47873f8a427fa847a141db Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 08:20:05 -0600 Subject: [PATCH 14/16] Update helmets.json --- data/json/items/armor/helmets.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json index 8545839f1ea01..55695084ac1bb 100644 --- a/data/json/items/armor/helmets.json +++ b/data/json/items/armor/helmets.json @@ -632,6 +632,7 @@ "symbol": "[", "color": "green", "weight": "1633 g", + "price": 22000, "material": [ "kevlar_rigid" ], "material_thickness": 8, "flags": [ "WATERPROOF", "STURDY" ] From 6eafd4345dff4ba05c5bcc6274bc43ba53a3e84f Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Thu, 13 Feb 2020 08:20:16 -0600 Subject: [PATCH 15/16] Update helmets.json From d76eef05b3d76ba1b15c04130ea69010e2008b65 Mon Sep 17 00:00:00 2001 From: TheGamingFox1911 <52058797+TheGamingFox1911@users.noreply.github.com> Date: Fri, 14 Feb 2020 08:38:32 -0600 Subject: [PATCH 16/16] Update data/json/items/armor/ballistic_armor.json Co-Authored-By: matskuman5 --- data/json/items/armor/ballistic_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/ballistic_armor.json b/data/json/items/armor/ballistic_armor.json index 4b84270e39b3a..658a85edb3e03 100644 --- a/data/json/items/armor/ballistic_armor.json +++ b/data/json/items/armor/ballistic_armor.json @@ -90,7 +90,7 @@ "id": "pasgt_vest", "type": "ARMOR", "name": "PASGT vest", - "description": "An early 1980's flak jacket made of Kevlar in a woodland camouflage nylon shell. The vest was designed to stop fragmentation from explosives, but may provide protection from low-energy handguns. Though still in limited use, it has largely been replaced by more effective armor. Though later replaced by better armor models, these are still in use by foreign militaries.", + "description": "An early 1980's flak jacket made of Kevlar in a woodland camouflage nylon shell. The vest was designed to stop fragmentation from explosives, but may provide protection from low-energy handguns. Though later replaced by better armor models, these are still in use by foreign militaries.", "weight": "4082 g", "volume": "3 L", "price": 14000,