From f13322a2b4fa1501bca13c0dc8c5838efb60c292 Mon Sep 17 00:00:00 2001 From: SirPendrak <43266802+SirPendrak@users.noreply.github.com> Date: Sat, 27 Jul 2024 21:49:43 +0200 Subject: [PATCH 1/6] Give EXOTIC HWP BURST 2 instead of AUTO 5 --- data/json/items/gun/robofac_gun.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/robofac_gun.json b/data/json/items/gun/robofac_gun.json index 7070619169d1b..1e4105586cd08 100644 --- a/data/json/items/gun/robofac_gun.json +++ b/data/json/items/gun/robofac_gun.json @@ -373,7 +373,7 @@ "location": "bore", "mod_targets": [ "robofac_gun" ], "name": { "str_sp": "HWP EXOTIC configuration" }, - "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], + "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "burst", 2 ] ], "install_time": "1 m", "ammo_modifier": [ "123ln" ], "min_skills": [ [ "weapon", 1 ] ], From 10cb29ae4e4491b034d6445c7058157ba3ec455c Mon Sep 17 00:00:00 2001 From: SirPendrak <43266802+SirPendrak@users.noreply.github.com> Date: Sat, 27 Jul 2024 22:13:29 +0200 Subject: [PATCH 2/6] Change time and skill penalty of Q&T, romove word "repatedly" --- data/json/proficiencies/metalwork.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/proficiencies/metalwork.json b/data/json/proficiencies/metalwork.json index 9698feb1a0abd..43bc6f75ad21a 100644 --- a/data/json/proficiencies/metalwork.json +++ b/data/json/proficiencies/metalwork.json @@ -133,10 +133,10 @@ "id": "prof_quenching", "category": "prof_smithing", "name": { "str": "Quenching & Tempering" }, - "description": "Quenching involves repeatedly heating the steel, quenching it in water, then tempering it to create extremely tough metal.", + "description": "Quenching involves heating the steel, quenching it in water, then tempering it to create extremely tough metal.", "can_learn": true, - "default_time_multiplier": 3, - "default_skill_penalty": 0.25, + "default_time_multiplier": 1.5, + "default_skill_penalty": 1, "time_to_learn": "20 h" } ] From 9bb6cd7a26c3ae568a65515cb349b4c6265ff330 Mon Sep 17 00:00:00 2001 From: SirPendrak <43266802+SirPendrak@users.noreply.github.com> Date: Sat, 27 Jul 2024 22:20:50 +0200 Subject: [PATCH 3/6] Revert oooopsie --- data/json/proficiencies/metalwork.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/proficiencies/metalwork.json b/data/json/proficiencies/metalwork.json index 43bc6f75ad21a..9698feb1a0abd 100644 --- a/data/json/proficiencies/metalwork.json +++ b/data/json/proficiencies/metalwork.json @@ -133,10 +133,10 @@ "id": "prof_quenching", "category": "prof_smithing", "name": { "str": "Quenching & Tempering" }, - "description": "Quenching involves heating the steel, quenching it in water, then tempering it to create extremely tough metal.", + "description": "Quenching involves repeatedly heating the steel, quenching it in water, then tempering it to create extremely tough metal.", "can_learn": true, - "default_time_multiplier": 1.5, - "default_skill_penalty": 1, + "default_time_multiplier": 3, + "default_skill_penalty": 0.25, "time_to_learn": "20 h" } ] From d859562fbcdc266d01119d814af15cee08a04e2a Mon Sep 17 00:00:00 2001 From: SirPendrak <43266802+SirPendrak@users.noreply.github.com> Date: Mon, 29 Jul 2024 19:03:14 +0200 Subject: [PATCH 4/6] Dialogue doesnt mention original magazines the weapon cant use --- .../robofac/robofac_intercom/robofac_intercom_prototypes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json index 265dea1fec4de..96717e070dd73 100644 --- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json +++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json @@ -1141,7 +1141,7 @@ "id": "TALK_ROBOFAC_INTERCOM_HWP_EXODII_COMPLETE", "//": "creating EXODII barrel", "type": "talk_topic", - "dynamic_line": "The project was a success! The ammo is fairly rudimentary, but ultimately proved simple to manufacture, and has lent itself well to large magazines. We will transfer a copy of the conversion kit in a moment; it is capable of accepting the standard magazines that Exodii weapons usually use, and we have also begun production of specialized magazines ourselves. Thank you for allowing us this opportunity.", + "dynamic_line": "The project was a success! The ammo is fairly rudimentary, but ultimately proved simple to manufacture, and has lent itself well to large magazines. We will transfer a copy of the conversion kit in a moment; it is capable of accepting specialized magazines that we have just begun to produce ourselves. Thank you for allowing us this opportunity.", "speaker_effect": { "effect": [ { "math": [ "hub01_hwp_exotic_researched", "=", "1" ] } ] }, "responses": [ { From 3320141a27e1835ecb163f16a7e87288248e2562 Mon Sep 17 00:00:00 2001 From: SirPendrak <43266802+SirPendrak@users.noreply.github.com> Date: Wed, 31 Jul 2024 16:04:18 +0200 Subject: [PATCH 5/6] Bring AUTO 5 back, make it more like a LMG --- data/json/items/gun/robofac_gun.json | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/data/json/items/gun/robofac_gun.json b/data/json/items/gun/robofac_gun.json index 1e4105586cd08..a3e3c698c04b6 100644 --- a/data/json/items/gun/robofac_gun.json +++ b/data/json/items/gun/robofac_gun.json @@ -356,14 +356,14 @@ { "id": "robofac_gun_exodii", "looks_like": "retool_ar15_300blk", - "//": "based off attributes of the EXODII BR", - "weight": "1000 g", - "volume": "500 ml", - "integral_volume": "250 ml", - "integral_weight": "1000 g", + "//0": "based off attributes of the EXODII BR", + "weight": "2380 g", + "volume": "950 ml", + "integral_volume": "700 ml", + "integral_weight": "2380 g", "integral_longest_side": "30 cm", "longest_side": "55 cm", - "barrel_length": "610 mm", + "barrel_length": "508 mm", "price": "500 USD", "price_postapoc": "30 USD", "type": "GUNMOD", @@ -373,12 +373,18 @@ "location": "bore", "mod_targets": [ "robofac_gun" ], "name": { "str_sp": "HWP EXOTIC configuration" }, - "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "burst", 2 ] ], + "mode_modifier": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], "install_time": "1 m", "ammo_modifier": [ "123ln" ], "min_skills": [ [ "weapon", 1 ] ], + "//1": "combined effects of muzzle brake and ported barrel", + "dispersion_modifier": 30, + "handling_modifier": 8, + "loudness_modifier": 22, + "//2": "this makes damage the same as pamd68", + "damage_modifier": { "damage_type": "bullet", "amount": 2 }, "overwrite_min_cycle_recoil": 3500, - "description": "A Hub 01 Hybrid Weapons Platform quick swap conversion kit. This version has a long barrel with \"EXODIC\" stamped into the metal. The typo appears to be intentional." + "description": "A Hub 01 Hybrid Weapons Platform quick swap conversion kit. This version has a heavy, ported barrel with an integrated muzzle brake and \"EXODIC\" stamped into the metal. The typo appears to be intentional." }, { "id": "robofac_laser_sight", From 6f357b6c0cbf0b2b505430753d35dfdf1a8c9077 Mon Sep 17 00:00:00 2001 From: SirPendrak <43266802+SirPendrak@users.noreply.github.com> Date: Wed, 31 Jul 2024 17:34:01 +0200 Subject: [PATCH 6/6] Remove integrated muzzle brake and ported barrel, give integrated bipod and threaded muzzle --- data/json/items/gun/robofac_gun.json | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/data/json/items/gun/robofac_gun.json b/data/json/items/gun/robofac_gun.json index a3e3c698c04b6..b9569641bb0d7 100644 --- a/data/json/items/gun/robofac_gun.json +++ b/data/json/items/gun/robofac_gun.json @@ -357,10 +357,10 @@ "id": "robofac_gun_exodii", "looks_like": "retool_ar15_300blk", "//0": "based off attributes of the EXODII BR", - "weight": "2380 g", - "volume": "950 ml", - "integral_volume": "700 ml", - "integral_weight": "2380 g", + "weight": "2400 g", + "volume": "1200 ml", + "integral_volume": "950 ml", + "integral_weight": "2400 g", "integral_longest_side": "30 cm", "longest_side": "55 cm", "barrel_length": "508 mm", @@ -377,14 +377,13 @@ "install_time": "1 m", "ammo_modifier": [ "123ln" ], "min_skills": [ [ "weapon", 1 ] ], - "//1": "combined effects of muzzle brake and ported barrel", - "dispersion_modifier": 30, - "handling_modifier": 8, - "loudness_modifier": 22, - "//2": "this makes damage the same as pamd68", + "add_mod": [ [ "muzzle", 1 ] ], + "handling_modifier": 18, + "//1": "this makes damage the same as pamd68", "damage_modifier": { "damage_type": "bullet", "amount": 2 }, "overwrite_min_cycle_recoil": 3500, - "description": "A Hub 01 Hybrid Weapons Platform quick swap conversion kit. This version has a heavy, ported barrel with an integrated muzzle brake and \"EXODIC\" stamped into the metal. The typo appears to be intentional." + "flags": [ "BIPOD", "SLOW_WIELD" ], + "description": "A Hub 01 Hybrid Weapons Platform quick swap conversion kit. This version has a heavy barrel with an integrated bipod, threaded muzzle and \"EXODIC\" stamped into the metal. The typo appears to be intentional." }, { "id": "robofac_laser_sight",