From 569866b2d53aed76d2487f947f3ef8769f73ae08 Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Wed, 29 Dec 2021 10:06:34 -0400 Subject: [PATCH 01/14] first iteration --- data/json/flags.json | 12 ++ data/json/items/armor/hub_armor.json | 211 ++++++++++++++++++++ data/json/items/armor/suits_protection.json | 8 +- 3 files changed, 225 insertions(+), 6 deletions(-) create mode 100644 data/json/items/armor/hub_armor.json diff --git a/data/json/flags.json b/data/json/flags.json index 731485216d576..e14f4c3d6ef2b 100644 --- a/data/json/flags.json +++ b/data/json/flags.json @@ -5,12 +5,24 @@ "info": "This plate will fit in large armor pockets", "restriction": "Item must be a large ablative plate" }, + { + "id": "ABLATIVE_MANTLE", + "type": "json_flag", + "info": "This will hook to a Hub 01 proprietary mantle connector", + "restriction": "Item must be an armored mantle" + }, { "id": "ABLATIVE_MEDIUM", "type": "json_flag", "info": "This plate will fit in medium armor pockets", "restriction": "Item must be a medium ablative plate" }, + { + "id": "ABLATIVE_SKIRT", + "type": "json_flag", + "info": "This will hook to a Hub 01 proprietary skirt connector", + "restriction": "Item must be an armored skirt" + }, { "id": "ACTIVE_CLOAKING", "type": "json_flag", diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json new file mode 100644 index 0000000000000..2fa8646313255 --- /dev/null +++ b/data/json/items/armor/hub_armor.json @@ -0,0 +1,211 @@ +[ + { + "id": "robofac_armor_rig", + "type": "ARMOR", + "category": "ARMOR", + "name": { "str": "Hub 01 modular defense system" }, + "description": "A custom-designed extremely thick ripstop and aramid poncho for the true frontier explorer. Striped in brown and blue, the white seal of Hub 01 is emblazoned proudly on the front. Integrating quick access pouches attached to a waist drawstring and two waterproof internal reservoirs it touts plenty of storage. This poncho also has notable clips just below the waist and around the shoulders, perhaps something attaches there.", + "//": "at least 3x thicker than a normal poncho", + "weight": "960 g", + "volume": "250 ml", + "price": 4000, + "price_postapoc": 750, + "symbol": "[", + "material": [ "nylon", "kevlar" ], + "color": "light_gray", + "warmth": 5, + "flags": [ "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF" ], + "material_thickness": 3, + "pocket_data": [ + { + "description": "Watertight internal reservoir", + "pocket_type": "CONTAINER", + "max_contains_volume": "1500 ml", + "watertight": true, + "spoil_multiplier": 0.8, + "max_contains_weight": "4 kg", + "moves": 120 + }, + { + "description": "Watertight internal reservoir", + "pocket_type": "CONTAINER", + "max_contains_volume": "1500 ml", + "watertight": true, + "spoil_multiplier": 0.8, + "max_contains_weight": "4 kg", + "moves": 120 + }, + { + "description": "Quick access pouches", + "pocket_type": "CONTAINER", + "max_contains_volume": "700 ml", + "max_contains_weight": "2 kg", + "moves": 80 + }, + { + "description": "Quick access pouches", + "pocket_type": "CONTAINER", + "max_contains_volume": "700 ml", + "max_contains_weight": "2 kg", + "moves": 80 + }, + { + "pocket_type": "CONTAINER", + "ablative": true, + "max_contains_volume": "1600 ml", + "max_contains_weight": "5 kg", + "moves": 200, + "description": "Hooks for an armored mantle", + "flag_restriction": [ "ABLATIVE_MANTLE" ] + }, + { + "pocket_type": "CONTAINER", + "ablative": true, + "max_contains_volume": "1600 ml", + "max_contains_weight": "5 kg", + "moves": 200, + "description": "Hooks for an armored skirt", + "flag_restriction": [ "ABLATIVE_SKIRT" ] + } + ], + "armor": [ + { "encumbrance": [ 4, 6 ], "coverage": 100, "cover_vitals": 90, "covers": [ "torso" ], "layers": [ "Outer", "Belted" ] }, + { + "encumbrance": [ 4, 4 ], + "coverage": 100, + "cover_vitals": 90, + "covers": [ "arm_l", "arm_r" ], + "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r", "arm_upper_l", "arm_upper_r" ] + }, + { + "encumbrance": [ 4, 4 ], + "coverage": 100, + "cover_vitals": 90, + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_hip_l", "leg_hip_r", "leg_upper_r", "leg_upper_l" ] + } + ] + }, + { + "abstract": "robofac_mantle", + "type": "ARMOR", + "category": "armor", + "name": "abstract mantle", + "weight": "1 kg", + "volume": "1533 ml", + "price": 60000, + "price_postapoc": 100, + "material": [ "ceramic" ], + "symbol": ",", + "color": "dark_gray", + "material_thickness": 4, + "flags": [ "ABLATIVE_MANTLE", "CANT_WEAR" ], + "armor": [ + { "encumbrance": 2, "coverage": 95, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] }, + { + "//": "skip encumbrance for additional parts of same body part", + "encumbrance": 0, + "coverage": 60, + "covers": [ "torso" ], + "specifically_covers": [ "torso_lower" ] + }, + { + "encumbrance": 2, + "coverage": 95, + "covers": [ "arm_l", "arm_r" ], + "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r" ] + }, + { + "//": "skip encumbrance for additional parts of same body part", + "encumbrance": 0, + "coverage": 85, + "covers": [ "arm_l", "arm_r" ], + "specifically_covers": [ "arm_upper_l", "arm_upper_r" ] + } + ] + }, + { + "abstract": "robofac_skirt", + "type": "ARMOR", + "category": "armor", + "name": "abstract armored skirt", + "weight": "1 kg", + "volume": "900 ml", + "price": 60000, + "price_postapoc": 100, + "material": [ "ceramic" ], + "symbol": ",", + "color": "dark_gray", + "material_thickness": 4, + "flags": [ "ABLATIVE_MANTLE", "CANT_WEAR" ], + "armor": [ + { + "encumbrance": 2, + "coverage": 100, + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_hip_l", "leg_hip_r" ] + }, + { + "//": "skip encumbrance for additional parts of same body part", + "encumbrance": 0, + "coverage": 85, + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_upper_l", "leg_upper_r" ] + } + ] + }, + { + "abstract": "robofac_vambraces", + "type": "ARMOR", + "category": "armor", + "name": "abstract armored vambraces", + "weight": "1 kg", + "volume": "900 ml", + "price": 60000, + "price_postapoc": 100, + "material": [ "ceramic" ], + "symbol": ",", + "color": "dark_gray", + "material_thickness": 4, + "flags": [ "BLOCK_WHILE_WORN", "OUTER" ], + "armor": [ + { + "encumbrance": 3, + "coverage": 95, + "covers": [ "arm_l", "arm_r" ], + "specifically_covers": [ "arm_elbow_l", "arm_elbow_r", "arm_lower_l", "arm_lower_r" ] + } + ] + }, + { + "abstract": "robofac_shinguards", + "type": "ARMOR", + "category": "armor", + "name": "abstract armored shin guards", + "weight": "1 kg", + "volume": "900 ml", + "price": 60000, + "price_postapoc": 100, + "material": [ "ceramic" ], + "symbol": ",", + "color": "dark_gray", + "material_thickness": 4, + "flags": [ "OUTER" ], + "armor": [ + { + "encumbrance": 3, + "coverage": 95, + "covers": [ "leg_l", "leg_r" ], + "specifically_covers": [ "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ] + } + ] + }, + { + "id": "robofac_basic_mantle", + "type": "ARMOR", + "copy-from": "robofac_mantle", + "name": "test mantle", + "description": "test mantle", + "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] + } +] diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json index 0f9a0e87a6bf9..3d09d69e623a9 100644 --- a/data/json/items/armor/suits_protection.json +++ b/data/json/items/armor/suits_protection.json @@ -790,17 +790,13 @@ "color": "brown", "armor": [ { "covers": [ "head" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] }, - { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 7, 10 ] }, + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, + { "covers": [ "leg_l", "leg_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, { "covers": [ "foot_l", "foot_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, { "covers": [ "arm_l", "arm_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, { "covers": [ "hand_l", "hand_r" ], "coverage": 100, "encumbrance": [ 7, 7 ] } ], "pocket_data": [ - { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 }, - { "pocket_type": "CONTAINER", "max_contains_volume": "1500 ml", "max_contains_weight": "4 kg", "moves": 80 }, - { "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": 80 }, { "pocket_type": "CONTAINER", "max_contains_volume": "250 ml", "max_contains_weight": "1 kg", "moves": 80 } ], From 9eff530463e956f78ff2e4e5c0170f085aedca3d Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Wed, 29 Dec 2021 10:31:32 -0400 Subject: [PATCH 02/14] first materials itter --- data/json/items/armor/hub_armor.json | 52 ++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json index 2fa8646313255..6e1c2f51c59b6 100644 --- a/data/json/items/armor/hub_armor.json +++ b/data/json/items/armor/hub_armor.json @@ -201,11 +201,59 @@ ] }, { + "//": "Tier 1 mantle", "id": "robofac_basic_mantle", "type": "ARMOR", "copy-from": "robofac_mantle", - "name": "test mantle", - "description": "test mantle", + "name": "Hub 01 prototype mantle", + "description": "3d printed upper body armor, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] + }, + { + "//": "Tier 2 mantle", + "id": "robofac_rubber_mantle", + "type": "ARMOR", + "copy-from": "robofac_mantle", + "name": "Hub 01 kinetic mantle", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ] + }, + { + "//": "Tier 2 mantle", + "id": "robofac_nomex_mantle", + "type": "ARMOR", + "copy-from": "robofac_mantle", + "name": "Hub 01 turnout mantle", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ] + }, + { + "//": "Tier 2 mantle", + "id": "robofac_kevlar_mantle", + "type": "ARMOR", + "copy-from": "robofac_mantle", + "name": "Hub 01 ballistic mantle", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ] + }, + { + "//": "Tier 3 mantle", + "id": "robofac_military_mantle", + "type": "ARMOR", + "copy-from": "robofac_mantle", + "name": "Hub 01 soldier mantle", + "description": "3d printed upper body armor, it has a professional finish is lightweight and it seems perfectly designed to move with your body. This is made of 3d printed hardened and treated aramid with a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "steel", "portion": 1 }, { "type": "kevlar_rigid", "portion": 3 } ], + "extend": { "flags": [ "STURDY" ] } + }, + { + "//": "Tier 3 mantle", + "id": "robofac_explorers_mantle", + "type": "ARMOR", + "copy-from": "robofac_mantle", + "name": "Hub 01 explorers mantle", + "description": "3d printed upper body armor, it has a professional finish is lightweight and it seems perfectly designed to move with your body. This is made of 3d printed ultra high molecular weight polyethylene (UHMWPE) with a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "steel", "portion": 1 }, { "type": "kevlar_rigid", "portion": 3 } ], + "extend": { "flags": [ "STURDY" ] } } ] From 548cdf48094976979c4222e498ce05d01380157b Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Wed, 29 Dec 2021 11:03:42 -0400 Subject: [PATCH 03/14] first pass of mantles --- data/json/items/armor/hub_armor.json | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json index 6e1c2f51c59b6..c0d60a64c7462 100644 --- a/data/json/items/armor/hub_armor.json +++ b/data/json/items/armor/hub_armor.json @@ -99,9 +99,10 @@ "symbol": ",", "color": "dark_gray", "material_thickness": 4, + "environmental_protection": 5, "flags": [ "ABLATIVE_MANTLE", "CANT_WEAR" ], "armor": [ - { "encumbrance": 2, "coverage": 95, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] }, + { "encumbrance": 5, "coverage": 95, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] }, { "//": "skip encumbrance for additional parts of same body part", "encumbrance": 0, @@ -137,6 +138,7 @@ "symbol": ",", "color": "dark_gray", "material_thickness": 4, + "environmental_protection": 5, "flags": [ "ABLATIVE_MANTLE", "CANT_WEAR" ], "armor": [ { @@ -167,6 +169,7 @@ "symbol": ",", "color": "dark_gray", "material_thickness": 4, + "environmental_protection": 5, "flags": [ "BLOCK_WHILE_WORN", "OUTER" ], "armor": [ { @@ -190,6 +193,7 @@ "symbol": ",", "color": "dark_gray", "material_thickness": 4, + "environmental_protection": 5, "flags": [ "OUTER" ], "armor": [ { @@ -206,7 +210,7 @@ "type": "ARMOR", "copy-from": "robofac_mantle", "name": "Hub 01 prototype mantle", - "description": "3d printed upper body armor, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed upper body armor, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] }, { @@ -215,7 +219,7 @@ "type": "ARMOR", "copy-from": "robofac_mantle", "name": "Hub 01 kinetic mantle", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ] }, { @@ -224,7 +228,7 @@ "type": "ARMOR", "copy-from": "robofac_mantle", "name": "Hub 01 turnout mantle", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ] }, { @@ -233,7 +237,7 @@ "type": "ARMOR", "copy-from": "robofac_mantle", "name": "Hub 01 ballistic mantle", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ] }, { @@ -242,18 +246,8 @@ "type": "ARMOR", "copy-from": "robofac_mantle", "name": "Hub 01 soldier mantle", - "description": "3d printed upper body armor, it has a professional finish is lightweight and it seems perfectly designed to move with your body. This is made of 3d printed hardened and treated aramid with a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", - "material": [ { "type": "steel", "portion": 1 }, { "type": "kevlar_rigid", "portion": 3 } ], - "extend": { "flags": [ "STURDY" ] } - }, - { - "//": "Tier 3 mantle", - "id": "robofac_explorers_mantle", - "type": "ARMOR", - "copy-from": "robofac_mantle", - "name": "Hub 01 explorers mantle", - "description": "3d printed upper body armor, it has a professional finish is lightweight and it seems perfectly designed to move with your body. This is made of 3d printed ultra high molecular weight polyethylene (UHMWPE) with a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulder the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", - "material": [ { "type": "steel", "portion": 1 }, { "type": "kevlar_rigid", "portion": 3 } ], + "description": "3d printed upper body armor, it has a professional finish, is lightweight and it seems perfectly designed to move with your body. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "thermo_resin", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar_rigid", "portion": 2 } ], "extend": { "flags": [ "STURDY" ] } } ] From bb55ea72d23a1ba407caef38b1ed49694447785a Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Wed, 29 Dec 2021 11:53:36 -0400 Subject: [PATCH 04/14] a few more details for the poncho --- data/json/items/armor/hub_armor.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json index c0d60a64c7462..9cf34ce1da0f4 100644 --- a/data/json/items/armor/hub_armor.json +++ b/data/json/items/armor/hub_armor.json @@ -3,8 +3,10 @@ "id": "robofac_armor_rig", "type": "ARMOR", "category": "ARMOR", + "repairs_like": "coat_rain", + "looks_like": "wool poncho", "name": { "str": "Hub 01 modular defense system" }, - "description": "A custom-designed extremely thick ripstop and aramid poncho for the true frontier explorer. Striped in brown and blue, the white seal of Hub 01 is emblazoned proudly on the front. Integrating quick access pouches attached to a waist drawstring and two waterproof internal reservoirs it touts plenty of storage. This poncho also has notable clips just below the waist and around the shoulders, perhaps something attaches there.", + "description": "A custom-designed extremely thick ripstop and aramid poncho for the true frontier explorer. Striped in brown and blue, the white seal of Hub 01 is emblazoned proudly on the front. Integrating quick access pouches attached to a waist drawstring and two waterproof internal dry bags it touts plenty of storage. This poncho also has notable clips and velcro just below the waist and around the shoulders, perhaps something attaches there.", "//": "at least 3x thicker than a normal poncho", "weight": "960 g", "volume": "250 ml", @@ -14,7 +16,7 @@ "material": [ "nylon", "kevlar" ], "color": "light_gray", "warmth": 5, - "flags": [ "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF" ], + "flags": [ "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF", "HOOD" ], "material_thickness": 3, "pocket_data": [ { From df3450e32c5ac9f1ff8ec93bdfaeb2aedaffe0a5 Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Wed, 29 Dec 2021 11:55:46 -0400 Subject: [PATCH 05/14] learning to spell --- data/json/items/armor/hub_armor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json index 9cf34ce1da0f4..f505dc306e3d6 100644 --- a/data/json/items/armor/hub_armor.json +++ b/data/json/items/armor/hub_armor.json @@ -4,7 +4,7 @@ "type": "ARMOR", "category": "ARMOR", "repairs_like": "coat_rain", - "looks_like": "wool poncho", + "looks_like": "poncho", "name": { "str": "Hub 01 modular defense system" }, "description": "A custom-designed extremely thick ripstop and aramid poncho for the true frontier explorer. Striped in brown and blue, the white seal of Hub 01 is emblazoned proudly on the front. Integrating quick access pouches attached to a waist drawstring and two waterproof internal dry bags it touts plenty of storage. This poncho also has notable clips and velcro just below the waist and around the shoulders, perhaps something attaches there.", "//": "at least 3x thicker than a normal poncho", From aece808d4100632e7a6fb4954a4ff9f09cd216fd Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Wed, 29 Dec 2021 12:11:16 -0400 Subject: [PATCH 06/14] fix styling --- data/json/items/armor/hub_armor.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json index f505dc306e3d6..55b0df80294c4 100644 --- a/data/json/items/armor/hub_armor.json +++ b/data/json/items/armor/hub_armor.json @@ -249,7 +249,11 @@ "copy-from": "robofac_mantle", "name": "Hub 01 soldier mantle", "description": "3d printed upper body armor, it has a professional finish, is lightweight and it seems perfectly designed to move with your body. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", - "material": [ { "type": "thermo_resin", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar_rigid", "portion": 2 } ], + "material": [ + { "type": "thermo_resin", "portion": 1 }, + { "type": "steel", "portion": 1 }, + { "type": "kevlar_rigid", "portion": 2 } + ], "extend": { "flags": [ "STURDY" ] } } ] From 55369c393a671a87c52abb415d6255542998b33c Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Wed, 29 Dec 2021 22:08:11 -0400 Subject: [PATCH 07/14] added the rest of the items --- data/json/items/armor/hub_armor.json | 188 +++++++++++++++++++++++++-- 1 file changed, 177 insertions(+), 11 deletions(-) diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json index 55b0df80294c4..76c9b995a48e2 100644 --- a/data/json/items/armor/hub_armor.json +++ b/data/json/items/armor/hub_armor.json @@ -102,7 +102,7 @@ "color": "dark_gray", "material_thickness": 4, "environmental_protection": 5, - "flags": [ "ABLATIVE_MANTLE", "CANT_WEAR" ], + "flags": [ "ABLATIVE_MANTLE", "CANT_WEAR", "OUTER" ], "armor": [ { "encumbrance": 5, "coverage": 95, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] }, { @@ -132,7 +132,7 @@ "type": "ARMOR", "category": "armor", "name": "abstract armored skirt", - "weight": "1 kg", + "weight": "800 g", "volume": "900 ml", "price": 60000, "price_postapoc": 100, @@ -141,7 +141,7 @@ "color": "dark_gray", "material_thickness": 4, "environmental_protection": 5, - "flags": [ "ABLATIVE_MANTLE", "CANT_WEAR" ], + "flags": [ "ABLATIVE_SKIRT", "CANT_WEAR", "OUTER" ], "armor": [ { "encumbrance": 2, @@ -163,7 +163,7 @@ "type": "ARMOR", "category": "armor", "name": "abstract armored vambraces", - "weight": "1 kg", + "weight": "500 g", "volume": "900 ml", "price": 60000, "price_postapoc": 100, @@ -183,11 +183,11 @@ ] }, { - "abstract": "robofac_shinguards", + "abstract": "robofac_greaves", "type": "ARMOR", "category": "armor", - "name": "abstract armored shin guards", - "weight": "1 kg", + "name": "abstract armored greaves", + "weight": "500 g", "volume": "900 ml", "price": 60000, "price_postapoc": 100, @@ -222,7 +222,8 @@ "copy-from": "robofac_mantle", "name": "Hub 01 kinetic mantle", "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", - "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ] + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ], + "proportional": { "weight": 2.5 } }, { "//": "Tier 2 mantle", @@ -231,7 +232,8 @@ "copy-from": "robofac_mantle", "name": "Hub 01 turnout mantle", "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", - "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ] + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], + "proportional": { "weight": 2.5 } }, { "//": "Tier 2 mantle", @@ -240,7 +242,8 @@ "copy-from": "robofac_mantle", "name": "Hub 01 ballistic mantle", "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", - "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ] + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], + "proportional": { "weight": 2.5 } }, { "//": "Tier 3 mantle", @@ -254,6 +257,169 @@ { "type": "steel", "portion": 1 }, { "type": "kevlar_rigid", "portion": 2 } ], - "extend": { "flags": [ "STURDY" ] } + "extend": { "flags": [ "STURDY" ] }, + "proportional": { "weight": 2 } + }, + { + "//": "Tier 1 skirt", + "id": "robofac_basic_skirt", + "type": "ARMOR", + "copy-from": "robofac_skirt", + "name": "Hub 01 prototype skirt", + "description": "3d printed lower body armor, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] + }, + { + "//": "Tier 2 skirt", + "id": "robofac_rubber_skirt", + "type": "ARMOR", + "copy-from": "robofac_skirt", + "name": "Hub 01 kinetic skirt", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ], + "proportional": { "weight": 2.5 } + }, + { + "//": "Tier 2 skirt", + "id": "robofac_nomex_skirt", + "type": "ARMOR", + "copy-from": "robofac_skirt", + "name": "Hub 01 turnout skirt", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], + "proportional": { "weight": 2.5 } + }, + { + "//": "Tier 2 skirt", + "id": "robofac_kevlar_skirt", + "type": "ARMOR", + "copy-from": "robofac_skirt", + "name": "Hub 01 ballistic skirt", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], + "proportional": { "weight": 2.5 } + }, + { + "//": "Tier 3 skirt", + "id": "robofac_military_skirt", + "type": "ARMOR", + "copy-from": "robofac_skirt", + "name": "Hub 01 soldier skirt", + "description": "3d printed upper body armor, it has a professional finish, is lightweight and it seems perfectly designed to move with your body. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ + { "type": "thermo_resin", "portion": 1 }, + { "type": "steel", "portion": 1 }, + { "type": "kevlar_rigid", "portion": 2 } + ], + "extend": { "flags": [ "STURDY" ] }, + "proportional": { "weight": 2 } + }, + { + "//": "Tier 1 vambraces", + "id": "robofac_basic_vambraces", + "type": "ARMOR", + "copy-from": "robofac_vambraces", + "name": "Hub 01 prototype vambraces", + "description": "3d printed lower body armor, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] + }, + { + "//": "Tier 2 vambraces", + "id": "robofac_rubber_vambraces", + "type": "ARMOR", + "copy-from": "robofac_vambraces", + "name": "Hub 01 kinetic vambraces", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ], + "proportional": { "weight": 2.5 } + }, + { + "//": "Tier 2 vambraces", + "id": "robofac_nomex_vambraces", + "type": "ARMOR", + "copy-from": "robofac_vambraces", + "name": "Hub 01 turnout vambraces", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], + "proportional": { "weight": 2.5 } + }, + { + "//": "Tier 2 vambraces", + "id": "robofac_kevlar_vambraces", + "type": "ARMOR", + "copy-from": "robofac_vambraces", + "name": "Hub 01 ballistic vambraces", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], + "proportional": { "weight": 2.5 } + }, + { + "//": "Tier 3 vambraces", + "id": "robofac_military_greaves", + "type": "ARMOR", + "copy-from": "robofac_greaves", + "name": "Hub 01 soldier greaves", + "description": "3d printed upper body armor, it has a professional finish, is lightweight and it seems perfectly designed to move with your body. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ + { "type": "thermo_resin", "portion": 1 }, + { "type": "steel", "portion": 1 }, + { "type": "kevlar_rigid", "portion": 2 } + ], + "extend": { "flags": [ "STURDY" ] }, + "proportional": { "weight": 2 } + }, + { + "//": "Tier 1 greaves", + "id": "robofac_basic_greaves", + "type": "ARMOR", + "copy-from": "robofac_greaves", + "name": "Hub 01 prototype greaves", + "description": "3d printed lower body armor, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] + }, + { + "//": "Tier 2 greaves", + "id": "robofac_rubber_greaves", + "type": "ARMOR", + "copy-from": "robofac_greaves", + "name": "Hub 01 kinetic greaves", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ], + "proportional": { "weight": 2.5 } + }, + { + "//": "Tier 2 greaves", + "id": "robofac_nomex_greaves", + "type": "ARMOR", + "copy-from": "robofac_greaves", + "name": "Hub 01 turnout greaves", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], + "proportional": { "weight": 2.5 } + }, + { + "//": "Tier 2 greaves", + "id": "robofac_kevlar_greaves", + "type": "ARMOR", + "copy-from": "robofac_greaves", + "name": "Hub 01 ballistic greaves", + "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], + "proportional": { "weight": 2.5 } + }, + { + "//": "Tier 3 greaves", + "id": "robofac_military_greaves", + "type": "ARMOR", + "copy-from": "robofac_greaves", + "name": "Hub 01 soldier greaves", + "description": "3d printed upper body armor, it has a professional finish, is lightweight and it seems perfectly designed to move with your body. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "material": [ + { "type": "thermo_resin", "portion": 1 }, + { "type": "steel", "portion": 1 }, + { "type": "kevlar_rigid", "portion": 2 } + ], + "extend": { "flags": [ "STURDY" ] }, + "proportional": { "weight": 2 } } ] From b542e64f8695a643cb31d5613206983f83dee54a Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Thu, 30 Dec 2021 16:55:05 -0400 Subject: [PATCH 08/14] organized and added descriptions to all --- data/json/items/armor/hub_armor.json | 45 ++++++++++++++++------------ 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json index 76c9b995a48e2..dfd66fc069daf 100644 --- a/data/json/items/armor/hub_armor.json +++ b/data/json/items/armor/hub_armor.json @@ -100,7 +100,7 @@ "material": [ "ceramic" ], "symbol": ",", "color": "dark_gray", - "material_thickness": 4, + "material_thickness": 8, "environmental_protection": 5, "flags": [ "ABLATIVE_MANTLE", "CANT_WEAR", "OUTER" ], "armor": [ @@ -109,12 +109,14 @@ "//": "skip encumbrance for additional parts of same body part", "encumbrance": 0, "coverage": 60, + "cover_vitals": 90, "covers": [ "torso" ], "specifically_covers": [ "torso_lower" ] }, { "encumbrance": 2, "coverage": 95, + "cover_vitals": 90, "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_shoulder_l", "arm_shoulder_r" ] }, @@ -122,6 +124,7 @@ "//": "skip encumbrance for additional parts of same body part", "encumbrance": 0, "coverage": 85, + "cover_vitals": 90, "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_upper_l", "arm_upper_r" ] } @@ -139,13 +142,14 @@ "material": [ "ceramic" ], "symbol": ",", "color": "dark_gray", - "material_thickness": 4, + "material_thickness": 8, "environmental_protection": 5, "flags": [ "ABLATIVE_SKIRT", "CANT_WEAR", "OUTER" ], "armor": [ { "encumbrance": 2, "coverage": 100, + "cover_vitals": 90, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_hip_l", "leg_hip_r" ] }, @@ -153,6 +157,7 @@ "//": "skip encumbrance for additional parts of same body part", "encumbrance": 0, "coverage": 85, + "cover_vitals": 90, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ] } @@ -170,13 +175,14 @@ "material": [ "ceramic" ], "symbol": ",", "color": "dark_gray", - "material_thickness": 4, + "material_thickness": 6, "environmental_protection": 5, "flags": [ "BLOCK_WHILE_WORN", "OUTER" ], "armor": [ { "encumbrance": 3, "coverage": 95, + "cover_vitals": 90, "covers": [ "arm_l", "arm_r" ], "specifically_covers": [ "arm_elbow_l", "arm_elbow_r", "arm_lower_l", "arm_lower_r" ] } @@ -194,13 +200,14 @@ "material": [ "ceramic" ], "symbol": ",", "color": "dark_gray", - "material_thickness": 4, + "material_thickness": 6, "environmental_protection": 5, "flags": [ "OUTER" ], "armor": [ { "encumbrance": 3, "coverage": 95, + "cover_vitals": 90, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_knee_l", "leg_knee_r", "leg_lower_l", "leg_lower_r" ] } @@ -266,7 +273,7 @@ "type": "ARMOR", "copy-from": "robofac_skirt", "name": "Hub 01 prototype skirt", - "description": "3d printed lower body armor, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed segmented armored skirt, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the waist and near the knees the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] }, { @@ -275,7 +282,7 @@ "type": "ARMOR", "copy-from": "robofac_skirt", "name": "Hub 01 kinetic skirt", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed segmented armored skirt, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the waist and near the knees the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -285,7 +292,7 @@ "type": "ARMOR", "copy-from": "robofac_skirt", "name": "Hub 01 turnout skirt", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed segmented armored skirt, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the waist and near the knees the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -295,7 +302,7 @@ "type": "ARMOR", "copy-from": "robofac_skirt", "name": "Hub 01 ballistic skirt", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed segmented armored skirt, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the waist and near the knees the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -305,7 +312,7 @@ "type": "ARMOR", "copy-from": "robofac_skirt", "name": "Hub 01 soldier skirt", - "description": "3d printed upper body armor, it has a professional finish, is lightweight and it seems perfectly designed to move with your body. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed segmented armored skirt, it has a professional finish, is lightweight and it seems perfectly designed to move with your body. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement. Designed to clip to the waist and near the knees the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", "material": [ { "type": "thermo_resin", "portion": 1 }, { "type": "steel", "portion": 1 }, @@ -320,7 +327,7 @@ "type": "ARMOR", "copy-from": "robofac_vambraces", "name": "Hub 01 prototype vambraces", - "description": "3d printed lower body armor, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed arm guards, despite its rough finish it's still lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] }, { @@ -329,7 +336,7 @@ "type": "ARMOR", "copy-from": "robofac_vambraces", "name": "Hub 01 kinetic vambraces", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -339,7 +346,7 @@ "type": "ARMOR", "copy-from": "robofac_vambraces", "name": "Hub 01 turnout vambraces", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -349,7 +356,7 @@ "type": "ARMOR", "copy-from": "robofac_vambraces", "name": "Hub 01 ballistic vambraces", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -359,7 +366,7 @@ "type": "ARMOR", "copy-from": "robofac_greaves", "name": "Hub 01 soldier greaves", - "description": "3d printed upper body armor, it has a professional finish, is lightweight and it seems perfectly designed to move with your body. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed arm guards, it has a professional finish, is lightweight and is perfectly balanced. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement.", "material": [ { "type": "thermo_resin", "portion": 1 }, { "type": "steel", "portion": 1 }, @@ -374,7 +381,7 @@ "type": "ARMOR", "copy-from": "robofac_greaves", "name": "Hub 01 prototype greaves", - "description": "3d printed lower body armor, despite its rough finish it's still lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed leg guards, despite its rough finish it's still lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] }, { @@ -383,7 +390,7 @@ "type": "ARMOR", "copy-from": "robofac_greaves", "name": "Hub 01 kinetic greaves", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed leg guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -393,7 +400,7 @@ "type": "ARMOR", "copy-from": "robofac_greaves", "name": "Hub 01 turnout greaves", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed leg guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -403,7 +410,7 @@ "type": "ARMOR", "copy-from": "robofac_greaves", "name": "Hub 01 ballistic greaves", - "description": "3d printed upper body armor, it is well finished, lightweight and it seems a lot of thought went into the ergonomics. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed leg guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -413,7 +420,7 @@ "type": "ARMOR", "copy-from": "robofac_greaves", "name": "Hub 01 soldier greaves", - "description": "3d printed upper body armor, it has a professional finish, is lightweight and it seems perfectly designed to move with your body. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement. Designed to clip to the chest and shoulders the interior side reads ATTACH TO MODULAR DEFENSE SYSTEM.", + "description": "3d printed leg guards, it has a professional finish, is lightweight and is perfectly balanced. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement.", "material": [ { "type": "thermo_resin", "portion": 1 }, { "type": "steel", "portion": 1 }, From db3020885a3a99bd5b78223764066d3dbe040037 Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Thu, 30 Dec 2021 16:59:54 -0400 Subject: [PATCH 09/14] added single plurals --- data/json/items/armor/hub_armor.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json index dfd66fc069daf..2a9f1f8a5028a 100644 --- a/data/json/items/armor/hub_armor.json +++ b/data/json/items/armor/hub_armor.json @@ -167,7 +167,7 @@ "abstract": "robofac_vambraces", "type": "ARMOR", "category": "armor", - "name": "abstract armored vambraces", + "name": { "str_sp": "abstract armored vambraces" }, "weight": "500 g", "volume": "900 ml", "price": 60000, @@ -192,7 +192,7 @@ "abstract": "robofac_greaves", "type": "ARMOR", "category": "armor", - "name": "abstract armored greaves", + "name": { "str_sp": "abstract armored greaves" }, "weight": "500 g", "volume": "900 ml", "price": 60000, @@ -326,7 +326,7 @@ "id": "robofac_basic_vambraces", "type": "ARMOR", "copy-from": "robofac_vambraces", - "name": "Hub 01 prototype vambraces", + "name": { "str_sp": "Hub 01 prototype vambraces" }, "description": "3d printed arm guards, despite its rough finish it's still lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] }, @@ -335,7 +335,7 @@ "id": "robofac_rubber_vambraces", "type": "ARMOR", "copy-from": "robofac_vambraces", - "name": "Hub 01 kinetic vambraces", + "name": { "str_sp": "Hub 01 kinetic vambraces" }, "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ], "proportional": { "weight": 2.5 } @@ -345,7 +345,7 @@ "id": "robofac_nomex_vambraces", "type": "ARMOR", "copy-from": "robofac_vambraces", - "name": "Hub 01 turnout vambraces", + "name": { "str_sp": "Hub 01 turnout vambraces" }, "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], "proportional": { "weight": 2.5 } @@ -355,17 +355,17 @@ "id": "robofac_kevlar_vambraces", "type": "ARMOR", "copy-from": "robofac_vambraces", - "name": "Hub 01 ballistic vambraces", + "name": { "str_sp": "Hub 01 ballistic vambraces" }, "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], "proportional": { "weight": 2.5 } }, { "//": "Tier 3 vambraces", - "id": "robofac_military_greaves", + "id": "robofac_military_vambraces", "type": "ARMOR", - "copy-from": "robofac_greaves", - "name": "Hub 01 soldier greaves", + "copy-from": "robofac_vambraces", + "name": { "str_sp": "Hub 01 soldier vambraces" }, "description": "3d printed arm guards, it has a professional finish, is lightweight and is perfectly balanced. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement.", "material": [ { "type": "thermo_resin", "portion": 1 }, @@ -380,7 +380,7 @@ "id": "robofac_basic_greaves", "type": "ARMOR", "copy-from": "robofac_greaves", - "name": "Hub 01 prototype greaves", + "name": { "str_sp": "Hub 01 prototype greaves" }, "description": "3d printed leg guards, despite its rough finish it's still lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", "material": [ { "type": "plastic", "portion": 3 }, { "type": "aluminum", "portion": 1 } ] }, @@ -389,7 +389,7 @@ "id": "robofac_rubber_greaves", "type": "ARMOR", "copy-from": "robofac_greaves", - "name": "Hub 01 kinetic greaves", + "name": { "str_sp": "Hub 01 kinetic greaves" }, "description": "3d printed leg guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with printed rubber and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "rubber", "portion": 2 } ], "proportional": { "weight": 2.5 } @@ -399,7 +399,7 @@ "id": "robofac_nomex_greaves", "type": "ARMOR", "copy-from": "robofac_greaves", - "name": "Hub 01 turnout greaves", + "name": { "str_sp": "Hub 01 turnout greaves" }, "description": "3d printed leg guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], "proportional": { "weight": 2.5 } @@ -409,7 +409,7 @@ "id": "robofac_kevlar_greaves", "type": "ARMOR", "copy-from": "robofac_greaves", - "name": "Hub 01 ballistic greaves", + "name": { "str_sp": "Hub 01 ballistic greaves" }, "description": "3d printed leg guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], "proportional": { "weight": 2.5 } @@ -419,7 +419,7 @@ "id": "robofac_military_greaves", "type": "ARMOR", "copy-from": "robofac_greaves", - "name": "Hub 01 soldier greaves", + "name": { "str_sp": "Hub 01 soldier greaves" }, "description": "3d printed leg guards, it has a professional finish, is lightweight and is perfectly balanced. This is made of UHMWPE combined with hardened and treated aramid and a hardened metal core to give significant reinforcement.", "material": [ { "type": "thermo_resin", "portion": 1 }, From abd1adc378a339362e380ef6b6ad33667272442e Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Thu, 30 Dec 2021 21:52:25 -0400 Subject: [PATCH 10/14] almost all done, need to finalize last chunk of things --- .../Locations_MapExtras/robofac_trade.json | 36 ++++++++ data/json/items/armor/hub_armor.json | 8 ++ data/json/items/generic.json | 12 +++ .../robofaq_locs/robofac_mission_chunks.json | 3 +- .../robofac/NC_ROBOFAC_FIELD_RESEARCHER.json | 3 + .../npcs/robofac/NC_ROBOFAC_SCIENTIST.json | 1 + .../npcs/robofac/NPC_ROBOFAC_INTERCOM.json | 84 +++++++++++++++++++ .../json/npcs/robofac/NPC_ROBOFAC_MERC_1.json | 9 +- 8 files changed, 150 insertions(+), 6 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/robofac_trade.json b/data/json/itemgroups/Locations_MapExtras/robofac_trade.json index 28c2b7b53881d..20f54fd6faaa1 100644 --- a/data/json/itemgroups/Locations_MapExtras/robofac_trade.json +++ b/data/json/itemgroups/Locations_MapExtras/robofac_trade.json @@ -11,6 +11,7 @@ { "group": "robofac_basic_robots", "prob": 100 }, { "group": "robofac_id_cards", "prob": 100 }, { "group": "robofac_basic_grenades", "prob": 100 }, + { "group": "robofac_armor_pieces", "prob": 100 }, { "group": "cop_armory", "prob": 100 }, { "group": "ammo_any_batteries_full", "prob": 100 } ] @@ -32,5 +33,40 @@ "id": "robofac_basic_robots", "subtype": "distribution", "items": [ [ "bot_manhack", 40 ], [ "bot_skitterbot", 25 ] ] + }, + { + "type": "item_group", + "id": "robofac_armor_pieces", + "subtype": "distribution", + "items": [ + [ "robofac_rubber_mantle", 25 ], + [ "robofac_nomex_mantle", 25 ], + [ "robofac_kevlar_mantle", 25 ], + [ "robofac_rubber_skirt", 25 ], + [ "robofac_nomex_skirt", 25 ], + [ "robofac_kevlar_skirt", 25 ], + [ "robofac_rubber_vambraces", 25 ], + [ "robofac_nomex_vambraces", 25 ], + [ "robofac_kevlar_vambraces", 25 ], + [ "robofac_rubber_greaves", 25 ], + [ "robofac_nomex_greaves", 25 ], + [ "robofac_kevlar_greaves", 25 ] + ] + }, + { + "id": "robofac_mantle_merc", + "type": "item_group", + "//": "a robofac poncho with a few armored bits", + "container-item": "robofac_armor_rig", + "subtype": "collection", + "entries": [ { "item": "robofac_kevlar_skirt" }, { "item": "robofac_kevlar_mantle" }, { "group": "army_mags_m4" } ] + }, + { + "id": "robofac_mantle_prototype", + "type": "item_group", + "//": "a robofac poncho with a few basic bits", + "container-item": "robofac_armor_rig", + "subtype": "collection", + "entries": [ { "item": "robofac_basic_skirt" }, { "item": "robofac_basic_mantle" } ] } ] diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/hub_armor.json index 2a9f1f8a5028a..d32684a032296 100644 --- a/data/json/items/armor/hub_armor.json +++ b/data/json/items/armor/hub_armor.json @@ -42,6 +42,7 @@ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", + "max_item_length": "270 mm", "moves": 80 }, { @@ -49,6 +50,7 @@ "pocket_type": "CONTAINER", "max_contains_volume": "700 ml", "max_contains_weight": "2 kg", + "max_item_length": "270 mm", "moves": 80 }, { @@ -93,6 +95,7 @@ "type": "ARMOR", "category": "armor", "name": "abstract mantle", + "repairs_like": "armor_lightplate", "weight": "1 kg", "volume": "1533 ml", "price": 60000, @@ -135,6 +138,7 @@ "type": "ARMOR", "category": "armor", "name": "abstract armored skirt", + "repairs_like": "armor_lightplate", "weight": "800 g", "volume": "900 ml", "price": 60000, @@ -168,6 +172,8 @@ "type": "ARMOR", "category": "armor", "name": { "str_sp": "abstract armored vambraces" }, + "looks_like": "armguard_hard", + "repairs_like": "armguard_hard", "weight": "500 g", "volume": "900 ml", "price": 60000, @@ -193,6 +199,8 @@ "type": "ARMOR", "category": "armor", "name": { "str_sp": "abstract armored greaves" }, + "looks_like": "legguard_hard", + "repairs_like": "legguard_hard", "weight": "500 g", "volume": "900 ml", "price": 60000, diff --git a/data/json/items/generic.json b/data/json/items/generic.json index b1ccba259825f..8796633614ace 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -1707,6 +1707,18 @@ "//": "actually worth millions", "flags": [ "TRADER_AVOID" ] }, + { + "type": "GENERIC", + "id": "template_armor", + "copy-from": "standard_template_construct", + "color": "yellow", + "name": { "str": "nanofabricator template (UHMWPE)", "str_pl": "nanofabricator templates (UHMWPE)" }, + "description": "A state-of-the-art optical storage system, containing the instruction set required for the fabrication of advanced armor materials. This seems to just be routines to work with the materials not actual armor schematics.", + "price": 100000000, + "price_postapoc": 3000, + "//": "given to HUB 01 for even better armor", + "flags": [ "TRADER_AVOID" ] + }, { "type": "GENERIC", "id": "antenna", diff --git a/data/json/mapgen/robofaq_locs/robofac_mission_chunks.json b/data/json/mapgen/robofaq_locs/robofac_mission_chunks.json index ca3ea104ba154..43b7415d52a33 100644 --- a/data/json/mapgen/robofaq_locs/robofac_mission_chunks.json +++ b/data/json/mapgen/robofaq_locs/robofac_mission_chunks.json @@ -53,7 +53,8 @@ "mapgensize": [ 1, 1 ], "rows": [ "T" ], "terrain": { "T": "t_metal_floor" }, - "item": { "T": { "item": "template_photonics", "chance": 100 } } + "item": { "T": { "item": "template_photonics", "chance": 100 } }, + "items": { "T": { "item": "template_armor", "chance": 100 } } } }, { diff --git a/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json b/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json index a56a7ee4d40a3..0cff48f3579cd 100644 --- a/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json +++ b/data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json @@ -7,6 +7,9 @@ { "item": "under_armor" }, { "item": "under_armor_shorts" }, { "item": "robofac_enviro_suit" }, + { "group": "robofac_mantle_prototype" }, + { "item": "robofac_basic_greaves" }, + { "item": "robofac_basic_vambraces" }, { "item": "mask_gas" }, { "collection": [ { "group": "guns_pistol_milspec" }, { "item": "holster" } ], "prob": 50 }, { "item": "tacvest" } diff --git a/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json b/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json index 45067d9802ec5..14a5a568e1ed9 100644 --- a/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json +++ b/data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json @@ -7,6 +7,7 @@ { "item": "under_armor" }, { "item": "under_armor_shorts" }, { "item": "robofac_jumpsuit" }, + { "group": "robofac_mantle_prototype" }, { "item": "coat_lab" }, { "item": "boots" } ] diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json index 90d438d03271f..edcc535284f5f 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json @@ -487,6 +487,28 @@ }, "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ASK" }, + { + "text": "What was your person wearing?", + "condition": { + "and": [ + { "u_has_var": "completed_robofac_intercom_1", "type": "dialogue", "context": "intercom", "value": "yes" }, + { + "not": { "npc_has_var": "told_about_armor", "type": "dialogue", "context": "intercom", "value": "yes" } + } + ] + }, + "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_ASK" + }, + { + "text": "I found this in the facility with the other data is it of any value to you're people?", + "condition": { + "and": [ + { "u_has_var": "completed_robofac_intercom_1", "type": "dialogue", "context": "intercom", "value": "yes" }, + { "u_has_items": { "item": "template_armor", "count": 1 } } + ] + }, + "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_NANO_ASK" + }, { "text": "So, about that protective gear?", "condition": { @@ -535,6 +557,68 @@ "dynamic_line": "I guess the lab can do without some of this stuff.", "responses": [ { "text": "…", "effect": "start_trade", "topic": "TALK_DONE" } ] }, + { + "id": "TALK_ROBOFAC_INTERCOM_ARMOR_ASK", + "type": "talk_topic", + "dynamic_line": "Oh that, we have been working on specialized gear for our agents in the field…. It seems we still have some work to do.", + "speaker_effect": { + "effect": { "npc_add_var": "told_about_armor", "type": "dialogue", "context": "intercom", "value": "yes" }, + "sentinel": "told_about_armor" + }, + "responses": [ + { "text": "…", "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_NEUTRAL" }, + { + "text": "[int 10] The armor seemed warped. Whatever you are using to reinforce the core of the pieces isn't strong enough.", + "condition": { "u_has_intelligence": 10 }, + "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_POSITIVE" + } + ] + }, + { + "id": "TALK_ROBOFAC_INTERCOM_ARMOR_NANO_ASK", + "type": "talk_topic", + "dynamic_line": "We'll need at least a day to verify what is on the disk.", + "speaker_effect": { + "effect": { "npc_add_var": "told_about_armor", "type": "dialogue", "context": "intercom", "value": "yes" }, + "sentinel": "told_about_armor" + }, + "responses": [ + { "text": "very well.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" }, + { "text": "I'll see you then.", "topic": "TALK_DONE" } + ] + }, + { + "id": "TALK_ROBOFAC_INTERCOM_ARMOR_NEUTRAL", + "type": "talk_topic", + "dynamic_line": "[You hear a short, muffled conversation from across the intercom] understood. [the microphone squeals as the voice gets close again] As an additional reward for helping us please keep the modular defense system. Recently we have been developing some additional pieces and would be happy to trade for some. Please let us know how they perform in the field.", + "responses": [ + { "text": "Thanks!", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" }, + { "text": "I've always wanted to be a lab rat.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" }, + { "text": "…", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" } + ] + }, + { + "id": "TALK_ROBOFAC_INTERCOM_ARMOR_POSITIVE", + "type": "talk_topic", + "dynamic_line": "We've solved that issue with our more recent proto - types… [there is a brief pause] To gather additional field data here are the additional pieces to complete that prototype set. The core armor platform is solid and we have been iterating on additional pieces we would be happy to trade for. Any feedback on performance would be appreciated.", + "responses": [ + { + "text": "Thanks!", + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES", + "effect": [ { "u_spawn_item": "robofac_basic_vambraces" }, { "u_spawn_item": "robofac_basic_greaves" } ] + }, + { + "text": "Hope it serves me better than the last guy.", + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES", + "effect": [ { "u_spawn_item": "robofac_basic_vambraces" }, { "u_spawn_item": "robofac_basic_greaves" } ] + }, + { + "text": "…", + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES", + "effect": [ { "u_spawn_item": "robofac_basic_vambraces" }, { "u_spawn_item": "robofac_basic_greaves" } ] + } + ] + }, { "id": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ASK", "type": "talk_topic", diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json index 93244821ba47a..928290537ea47 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json @@ -38,15 +38,14 @@ "id": "NC_ROBOFAC_MERC_1_worn", "subtype": "collection", "items": [ - { "group": "military_ballistic_vest_pristine" }, - { "item": "chestrig", "contents-group": "army_mags_m4" }, { "item": "under_armor" }, { "item": "under_armor_shorts" }, { "item": "robofac_enviro_suit" }, { "item": "slingpack" }, - { "item": "armguard_hard" }, - { "item": "legguard_hard" }, - { "item": "knife_combat", "container-item": "bootsheath" } + { "item": "robofac_kevlar_vambraces" }, + { "item": "robofac_kevlar_greaves" }, + { "item": "knife_combat", "container-item": "bootsheath" }, + { "group": "robofac_mantle_merc" } ] }, { From 21259859de813fa1837575d9061ae09c759ca98e Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Fri, 31 Dec 2021 09:35:16 -0400 Subject: [PATCH 11/14] everything in its place --- .../{hub_armor.json => robofac_armor.json} | 0 .../npcs/robofac/NPC_ROBOFAC_INTERCOM.json | 124 ++++++++++++++++-- 2 files changed, 111 insertions(+), 13 deletions(-) rename data/json/items/armor/{hub_armor.json => robofac_armor.json} (100%) diff --git a/data/json/items/armor/hub_armor.json b/data/json/items/armor/robofac_armor.json similarity index 100% rename from data/json/items/armor/hub_armor.json rename to data/json/items/armor/robofac_armor.json diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json index edcc535284f5f..90129770ce494 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json @@ -509,6 +509,11 @@ }, "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_NANO_ASK" }, + { + "text": "I'm here to check on a prototype.", + "condition": { "u_has_var": "u_hub_prototypes", "type": "dialogue", "context": "intercom", "value": "yes" }, + "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ASK" + }, { "text": "So, about that protective gear?", "condition": { @@ -557,6 +562,22 @@ "dynamic_line": "I guess the lab can do without some of this stuff.", "responses": [ { "text": "…", "effect": "start_trade", "topic": "TALK_DONE" } ] }, + { + "id": "TALK_ROBOFAC_INTERCOM_ARMOR_NANO_ASK", + "type": "talk_topic", + "dynamic_line": "We'll need at least a day to verify what is on the disk.", + "speaker_effect": { + "effect": [ + { "u_add_faction_trust": 2 }, + { "u_add_var": "u_waiting_on_armor", "type": "timer", "context": "hub_rnd", "time": true }, + { "u_add_var": "u_hub_prototypes", "type": "dialogue", "context": "intercom", "value": "yes" } + ] + }, + "responses": [ + { "text": "very well.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" }, + { "text": "I'll see you then.", "topic": "TALK_DONE" } + ] + }, { "id": "TALK_ROBOFAC_INTERCOM_ARMOR_ASK", "type": "talk_topic", @@ -574,19 +595,6 @@ } ] }, - { - "id": "TALK_ROBOFAC_INTERCOM_ARMOR_NANO_ASK", - "type": "talk_topic", - "dynamic_line": "We'll need at least a day to verify what is on the disk.", - "speaker_effect": { - "effect": { "npc_add_var": "told_about_armor", "type": "dialogue", "context": "intercom", "value": "yes" }, - "sentinel": "told_about_armor" - }, - "responses": [ - { "text": "very well.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" }, - { "text": "I'll see you then.", "topic": "TALK_DONE" } - ] - }, { "id": "TALK_ROBOFAC_INTERCOM_ARMOR_NEUTRAL", "type": "talk_topic", @@ -667,6 +675,96 @@ { "text": "I have to give it a thought.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" } ] }, + { + "id": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ONGOING", + "//": "default response to any project that isn't completed", + "type": "talk_topic", + "dynamic_line": "Sorry progress on that is still ongoing.", + "responses": [ + { "text": "What about another project?", "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ASK" }, + { "text": "I want to talk about something else.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" }, + { "text": "I'll check in later.", "topic": "TALK_DONE" } + ] + }, + { + "id": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ASK", + "type": "talk_topic", + "dynamic_line": "Sure what project would you like to know about?", + "responses": [ + { + "text": "How goes work on the armor disk?", + "condition": { "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "hub_rnd", "op": "<", "time": "2 d" }, + "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ONGOING" + }, + { + "text": "The armor disk should be complete by now right?", + "condition": { "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "hub_rnd", "op": ">", "time": "2 d" }, + "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_BREAKTHROUGH" + }, + { + "text": "[ 6 HGC ] I'd like to buy the rest of the armor set", + "condition": { + "and": [ + { "u_has_items": { "item": "RobofacCoin", "count": 6 } }, + { "u_has_var": "u_can_buy_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" } + ] + }, + "effect": [ + { "u_sell_item": "RobofacCoin", "count": 6 }, + { "u_spawn_item": "robofac_military_skirt" }, + { "u_spawn_item": "robofac_military_vambraces" }, + { "u_spawn_item": "robofac_military_greaves" }, + { "u_add_var": "u_can_buy_armor", "type": "dialogue", "context": "hub_rnd", "value": "no" } + ], + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" + }, + { "text": "Lets talk about something else.", "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" } + ] + }, + { + "id": "TALK_ROBOFAC_INTERCOM_ARMOR_BREAKTHROUGH", + "//": "armor reward blurb after waiting", + "type": "talk_topic", + "dynamic_line": "Yes we've made great progress! I'll spare you the details but we've developed much more resiliant materials for our armors while sacrificing no maneuvrability. As a thank you for bringing this to us the first working model is yours merc. That said these do take a considerable ammount of high end materials. If you want the matching pieces we'll need 6 of our coins to barely cover the materials cost.", + "responses": [ + { + "text": "[ 6 HGC ] I'll take it now.", + "condition": { "u_has_items": { "item": "RobofacCoin", "count": 6 } }, + "effect": [ + { "u_sell_item": "RobofacCoin", "count": 6 }, + { "u_spawn_item": "robofac_military_skirt" }, + { "u_spawn_item": "robofac_military_vambraces" }, + { "u_spawn_item": "robofac_military_greaves" }, + { "u_spawn_item": "robofac_military_mantle" } + ], + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" + }, + { + "text": "What about another project?", + "effect": [ + { "u_add_var": "u_can_buy_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, + { "u_spawn_item": "robofac_military_mantle" } + ], + "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ASK" + }, + { + "text": "I want to talk about something else.", + "effect": [ + { "u_add_var": "u_can_buy_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, + { "u_spawn_item": "robofac_military_mantle" } + ], + "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" + }, + { + "text": "I'll check in later.", + "effect": [ + { "u_add_var": "u_can_buy_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, + { "u_spawn_item": "robofac_military_mantle" } + ], + "topic": "TALK_DONE" + } + ] + }, { "id": "TALK_ROBOFAC_INTERCOM_FREE_MERCHANT_DELIVERY_1", "type": "talk_topic", From 069d6c6bed9fb7c326a725b35318b2cb6a98f770 Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Fri, 31 Dec 2021 10:41:12 -0400 Subject: [PATCH 12/14] final pass of everything --- .../Locations_MapExtras/robofac_trade.json | 12 +++++-- data/json/items/armor/robofac_armor.json | 8 ++--- .../robofaq_locs/robofac_mission_chunks.json | 3 +- .../npcs/robofac/NPC_ROBOFAC_INTERCOM.json | 34 +++++++++++++++---- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/robofac_trade.json b/data/json/itemgroups/Locations_MapExtras/robofac_trade.json index 20f54fd6faaa1..e69bb57bf901f 100644 --- a/data/json/itemgroups/Locations_MapExtras/robofac_trade.json +++ b/data/json/itemgroups/Locations_MapExtras/robofac_trade.json @@ -11,7 +11,6 @@ { "group": "robofac_basic_robots", "prob": 100 }, { "group": "robofac_id_cards", "prob": 100 }, { "group": "robofac_basic_grenades", "prob": 100 }, - { "group": "robofac_armor_pieces", "prob": 100 }, { "group": "cop_armory", "prob": 100 }, { "group": "ammo_any_batteries_full", "prob": 100 } ] @@ -50,7 +49,8 @@ [ "robofac_kevlar_vambraces", 25 ], [ "robofac_rubber_greaves", 25 ], [ "robofac_nomex_greaves", 25 ], - [ "robofac_kevlar_greaves", 25 ] + [ "robofac_kevlar_greaves", 25 ], + [ "robofac_armor_rig", 25 ] ] }, { @@ -68,5 +68,13 @@ "container-item": "robofac_armor_rig", "subtype": "collection", "entries": [ { "item": "robofac_basic_skirt" }, { "item": "robofac_basic_mantle" } ] + }, + { + "id": "nano_templates", + "type": "item_group", + "//": "a group of nano templates for one of the missions", + "container-item": "box_small_wood", + "subtype": "collection", + "entries": [ { "item": "template_armor" }, { "item": "template_photonics" } ] } ] diff --git a/data/json/items/armor/robofac_armor.json b/data/json/items/armor/robofac_armor.json index d32684a032296..daaace453e1f3 100644 --- a/data/json/items/armor/robofac_armor.json +++ b/data/json/items/armor/robofac_armor.json @@ -99,7 +99,7 @@ "weight": "1 kg", "volume": "1533 ml", "price": 60000, - "price_postapoc": 100, + "price_postapoc": 5000, "material": [ "ceramic" ], "symbol": ",", "color": "dark_gray", @@ -142,7 +142,7 @@ "weight": "800 g", "volume": "900 ml", "price": 60000, - "price_postapoc": 100, + "price_postapoc": 5000, "material": [ "ceramic" ], "symbol": ",", "color": "dark_gray", @@ -177,7 +177,7 @@ "weight": "500 g", "volume": "900 ml", "price": 60000, - "price_postapoc": 100, + "price_postapoc": 5000, "material": [ "ceramic" ], "symbol": ",", "color": "dark_gray", @@ -204,7 +204,7 @@ "weight": "500 g", "volume": "900 ml", "price": 60000, - "price_postapoc": 100, + "price_postapoc": 5000, "material": [ "ceramic" ], "symbol": ",", "color": "dark_gray", diff --git a/data/json/mapgen/robofaq_locs/robofac_mission_chunks.json b/data/json/mapgen/robofaq_locs/robofac_mission_chunks.json index 43b7415d52a33..b95ff086f0b62 100644 --- a/data/json/mapgen/robofaq_locs/robofac_mission_chunks.json +++ b/data/json/mapgen/robofaq_locs/robofac_mission_chunks.json @@ -53,8 +53,7 @@ "mapgensize": [ 1, 1 ], "rows": [ "T" ], "terrain": { "T": "t_metal_floor" }, - "item": { "T": { "item": "template_photonics", "chance": 100 } }, - "items": { "T": { "item": "template_armor", "chance": 100 } } + "items": { "T": { "item": "nano_templates", "chance": 100 } } } }, { diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json index 90129770ce494..b39ed4fefa675 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json @@ -30,7 +30,10 @@ "type": "item_group", "id": "NC_ROBOFAC_INTERCOM_trade", "subtype": "collection", - "entries": [ { "group": "robofac_basic_trade", "count": [ 15, 25 ] } ] + "entries": [ + { "group": "robofac_basic_trade", "count": [ 15, 25 ], "prob": 100 }, + { "group": "robofac_armor_pieces", "count": [ 4, 8 ], "prob": 100 } + ] }, { "type": "item_group", @@ -500,7 +503,7 @@ "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_ASK" }, { - "text": "I found this in the facility with the other data is it of any value to you're people?", + "text": "I found this in the facility with the other data is it of any value to your people?", "condition": { "and": [ { "u_has_var": "completed_robofac_intercom_1", "type": "dialogue", "context": "intercom", "value": "yes" }, @@ -570,7 +573,8 @@ "effect": [ { "u_add_faction_trust": 2 }, { "u_add_var": "u_waiting_on_armor", "type": "timer", "context": "hub_rnd", "time": true }, - { "u_add_var": "u_hub_prototypes", "type": "dialogue", "context": "intercom", "value": "yes" } + { "u_add_var": "u_hub_prototypes", "type": "dialogue", "context": "intercom", "value": "yes" }, + { "u_sell_item": "template_armor", "count": 1 } ] }, "responses": [ @@ -693,12 +697,26 @@ "responses": [ { "text": "How goes work on the armor disk?", - "condition": { "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "hub_rnd", "op": "<", "time": "2 d" }, + "condition": { + "and": [ + { "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "hub_rnd", "op": "<", "time": "1 d" }, + { + "not": { "u_has_var": "u_has_researched_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" } + } + ] + }, "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ONGOING" }, { "text": "The armor disk should be complete by now right?", - "condition": { "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "hub_rnd", "op": ">", "time": "2 d" }, + "condition": { + "and": [ + { "u_compare_time_since_var": "u_waiting_on_armor", "type": "timer", "context": "hub_rnd", "op": ">", "time": "1 d" }, + { + "not": { "u_has_var": "u_has_researched_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" } + } + ] + }, "topic": "TALK_ROBOFAC_INTERCOM_ARMOR_BREAKTHROUGH" }, { @@ -725,12 +743,13 @@ "id": "TALK_ROBOFAC_INTERCOM_ARMOR_BREAKTHROUGH", "//": "armor reward blurb after waiting", "type": "talk_topic", - "dynamic_line": "Yes we've made great progress! I'll spare you the details but we've developed much more resiliant materials for our armors while sacrificing no maneuvrability. As a thank you for bringing this to us the first working model is yours merc. That said these do take a considerable ammount of high end materials. If you want the matching pieces we'll need 6 of our coins to barely cover the materials cost.", + "dynamic_line": "Yes, we've made great progress! I'll spare you the details but we've developed much more resilient materials for our armors while sacrificing no maneuvrability. As a thank you for bringing this to us the first working model is yours merc. That said these do take a considerable amount of high-end materials. If you want the matching pieces we'll need 6 of our coins to barely cover the materials cost. Also, I've been told to inform you we would be happy to collaborate like this again in the future.", "responses": [ { "text": "[ 6 HGC ] I'll take it now.", "condition": { "u_has_items": { "item": "RobofacCoin", "count": 6 } }, "effect": [ + { "u_add_var": "u_has_researched_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, { "u_sell_item": "RobofacCoin", "count": 6 }, { "u_spawn_item": "robofac_military_skirt" }, { "u_spawn_item": "robofac_military_vambraces" }, @@ -743,6 +762,7 @@ "text": "What about another project?", "effect": [ { "u_add_var": "u_can_buy_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, + { "u_add_var": "u_has_researched_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, { "u_spawn_item": "robofac_military_mantle" } ], "topic": "TALK_ROBOFAC_INTERCOM_PROTOTYPE_ASK" @@ -751,6 +771,7 @@ "text": "I want to talk about something else.", "effect": [ { "u_add_var": "u_can_buy_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, + { "u_add_var": "u_has_researched_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, { "u_spawn_item": "robofac_military_mantle" } ], "topic": "TALK_ROBOFAC_INTERCOM_SERVICES" @@ -759,6 +780,7 @@ "text": "I'll check in later.", "effect": [ { "u_add_var": "u_can_buy_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, + { "u_add_var": "u_has_researched_armor", "type": "dialogue", "context": "hub_rnd", "value": "yes" }, { "u_spawn_item": "robofac_military_mantle" } ], "topic": "TALK_DONE" From 933d3a500cd2bb34f98d091e9ba255bd928202fb Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Fri, 31 Dec 2021 10:46:10 -0400 Subject: [PATCH 13/14] My spell checker missed this --- data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json index b39ed4fefa675..554a5cdda4e6c 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_INTERCOM.json @@ -743,7 +743,7 @@ "id": "TALK_ROBOFAC_INTERCOM_ARMOR_BREAKTHROUGH", "//": "armor reward blurb after waiting", "type": "talk_topic", - "dynamic_line": "Yes, we've made great progress! I'll spare you the details but we've developed much more resilient materials for our armors while sacrificing no maneuvrability. As a thank you for bringing this to us the first working model is yours merc. That said these do take a considerable amount of high-end materials. If you want the matching pieces we'll need 6 of our coins to barely cover the materials cost. Also, I've been told to inform you we would be happy to collaborate like this again in the future.", + "dynamic_line": "Yes, we've made great progress! I'll spare you the details but we've developed much more resilient materials for our armors while sacrificing no maneuverability. As a thank you for bringing this to us the first working model is yours merc. That said these do take a considerable amount of high-end materials. If you want the matching pieces we'll need 6 of our coins to barely cover the materials cost. Also, I've been told to inform you we would be happy to collaborate like this again in the future.", "responses": [ { "text": "[ 6 HGC ] I'll take it now.", From 862fdd60770871c227cbbe07db1ceff7f2fb40f2 Mon Sep 17 00:00:00 2001 From: bombasticSlacks Date: Fri, 31 Dec 2021 10:48:47 -0400 Subject: [PATCH 14/14] missed some description copy --- data/json/items/armor/robofac_armor.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/robofac_armor.json b/data/json/items/armor/robofac_armor.json index daaace453e1f3..fb5d8683bee78 100644 --- a/data/json/items/armor/robofac_armor.json +++ b/data/json/items/armor/robofac_armor.json @@ -354,7 +354,7 @@ "type": "ARMOR", "copy-from": "robofac_vambraces", "name": { "str_sp": "Hub 01 turnout vambraces" }, - "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", + "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with printed nomex and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "nomex", "portion": 2 } ], "proportional": { "weight": 2.5 } }, @@ -364,7 +364,7 @@ "type": "ARMOR", "copy-from": "robofac_vambraces", "name": { "str_sp": "Hub 01 ballistic vambraces" }, - "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic with an unhardened metal core to give some reinforcement.", + "description": "3d printed arm guards, it is well finished, lightweight and secure. This is made of 3d printed plastic combined with aramid fabric and a hardened metal core to give significant reinforcement.", "material": [ { "type": "plastic", "portion": 1 }, { "type": "steel", "portion": 1 }, { "type": "kevlar", "portion": 2 } ], "proportional": { "weight": 2.5 } },