From f42ba750008f7985d6ada20fbf6b21a1ab6bf19c Mon Sep 17 00:00:00 2001 From: CwasCard Date: Sat, 21 Dec 2024 23:03:37 -0500 Subject: [PATCH 1/9] Update enchanted_bracers.json --- data/mods/Magiclysm/items/enchanted_bracers.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/items/enchanted_bracers.json b/data/mods/Magiclysm/items/enchanted_bracers.json index 42471ab86eec7..53a432813df0e 100644 --- a/data/mods/Magiclysm/items/enchanted_bracers.json +++ b/data/mods/Magiclysm/items/enchanted_bracers.json @@ -121,7 +121,8 @@ "values": [ { "value": "RANGED_DAMAGE", "multiply": 0.25 }, { "value": "RANGE", "multiply": 0.2 }, - { "value": "WEAPON_DISPERSION", "multiply": -0.33 } + { "value": "WEAPON_DISPERSION", "multiply": -0.33 }, + { "value": "WEAKPOINT_ACCURACY", "multiply": 1 } ], "ench_effects": [ { "effect": "effect_plus_two_to_hit", "intensity": 1 } ] } From 1b9bea71602f5aa79a27af2e3d5ae6a39f96f575 Mon Sep 17 00:00:00 2001 From: CwasCard Date: Sun, 22 Dec 2024 16:56:04 -0500 Subject: [PATCH 2/9] Update enchanted_bracers.json --- data/mods/Magiclysm/items/enchanted_bracers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/items/enchanted_bracers.json b/data/mods/Magiclysm/items/enchanted_bracers.json index 53a432813df0e..b73167fc1751b 100644 --- a/data/mods/Magiclysm/items/enchanted_bracers.json +++ b/data/mods/Magiclysm/items/enchanted_bracers.json @@ -122,7 +122,7 @@ { "value": "RANGED_DAMAGE", "multiply": 0.25 }, { "value": "RANGE", "multiply": 0.2 }, { "value": "WEAPON_DISPERSION", "multiply": -0.33 }, - { "value": "WEAKPOINT_ACCURACY", "multiply": 1 } + { "value": "WEAKPOINT_ACCURACY", "multiply": 3} ], "ench_effects": [ { "effect": "effect_plus_two_to_hit", "intensity": 1 } ] } From 9dd25f8f84a6346aafd7b2355460615b3674c82c Mon Sep 17 00:00:00 2001 From: CwasCard Date: Sun, 22 Dec 2024 16:56:20 -0500 Subject: [PATCH 3/9] Update enchanted_bracers.json --- data/mods/Magiclysm/items/enchanted_bracers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/items/enchanted_bracers.json b/data/mods/Magiclysm/items/enchanted_bracers.json index b73167fc1751b..79ef54f261446 100644 --- a/data/mods/Magiclysm/items/enchanted_bracers.json +++ b/data/mods/Magiclysm/items/enchanted_bracers.json @@ -122,7 +122,7 @@ { "value": "RANGED_DAMAGE", "multiply": 0.25 }, { "value": "RANGE", "multiply": 0.2 }, { "value": "WEAPON_DISPERSION", "multiply": -0.33 }, - { "value": "WEAKPOINT_ACCURACY", "multiply": 3} + { "value": "WEAKPOINT_ACCURACY", "multiply": 2.5} ], "ench_effects": [ { "effect": "effect_plus_two_to_hit", "intensity": 1 } ] } From d457796d1b168cc5953b9d2ce826a9936f2fbd44 Mon Sep 17 00:00:00 2001 From: CwasCard Date: Sun, 22 Dec 2024 17:07:29 -0500 Subject: [PATCH 4/9] Update enchanted_bracers.json --- data/mods/Magiclysm/items/enchanted_bracers.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Magiclysm/items/enchanted_bracers.json b/data/mods/Magiclysm/items/enchanted_bracers.json index 79ef54f261446..35b3e10ea6e93 100644 --- a/data/mods/Magiclysm/items/enchanted_bracers.json +++ b/data/mods/Magiclysm/items/enchanted_bracers.json @@ -119,7 +119,6 @@ "has": "WORN", "condition": { "u_has_wielded_with_flag": "SHEATH_BOW" }, "values": [ - { "value": "RANGED_DAMAGE", "multiply": 0.25 }, { "value": "RANGE", "multiply": 0.2 }, { "value": "WEAPON_DISPERSION", "multiply": -0.33 }, { "value": "WEAKPOINT_ACCURACY", "multiply": 2.5} From c4db33dc5235453101f0cb7cca614f5974272251 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:38:37 -0600 Subject: [PATCH 5/9] Update data/mods/Magiclysm/items/enchanted_bracers.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/items/enchanted_bracers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/items/enchanted_bracers.json b/data/mods/Magiclysm/items/enchanted_bracers.json index 35b3e10ea6e93..ddf29149472d4 100644 --- a/data/mods/Magiclysm/items/enchanted_bracers.json +++ b/data/mods/Magiclysm/items/enchanted_bracers.json @@ -121,7 +121,7 @@ "values": [ { "value": "RANGE", "multiply": 0.2 }, { "value": "WEAPON_DISPERSION", "multiply": -0.33 }, - { "value": "WEAKPOINT_ACCURACY", "multiply": 2.5} + { "value": "WEAKPOINT_ACCURACY", "multiply": 2.5 } ], "ench_effects": [ { "effect": "effect_plus_two_to_hit", "intensity": 1 } ] } From b3bbcea2d963959ce91c7d7a8c15d59c2e761e1f Mon Sep 17 00:00:00 2001 From: CwasCard Date: Wed, 25 Dec 2024 00:52:11 -0500 Subject: [PATCH 6/9] Changes WEAKPOINT_ACCURACY to an enchantment effect. --- data/mods/Magiclysm/effects/effects.json | 9 +++++++++ data/mods/Magiclysm/items/enchanted_bracers.json | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 793c3d78e22fb..9beb53f190ef4 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1701,6 +1701,15 @@ "rating": "good", "base_mods": { "hit_mod": [ 2 ] } }, + { + "type": "effect_type", + "id": "archerybracers", + "name": [""], + "desc": [""], + "rating": "good", + "enchantments": [ { "values": [ {"value": "WEAKPOINT_ACCURACY", "multiply": {"math": [ "1+(u_skill('archery'))" ]}}]}] + + }, { "type": "effect_type", "id": "effect_feral_stormshaper_stormhammer", diff --git a/data/mods/Magiclysm/items/enchanted_bracers.json b/data/mods/Magiclysm/items/enchanted_bracers.json index 35b3e10ea6e93..812095f10dc4d 100644 --- a/data/mods/Magiclysm/items/enchanted_bracers.json +++ b/data/mods/Magiclysm/items/enchanted_bracers.json @@ -120,10 +120,9 @@ "condition": { "u_has_wielded_with_flag": "SHEATH_BOW" }, "values": [ { "value": "RANGE", "multiply": 0.2 }, - { "value": "WEAPON_DISPERSION", "multiply": -0.33 }, - { "value": "WEAKPOINT_ACCURACY", "multiply": 2.5} + { "value": "WEAPON_DISPERSION", "multiply": -0.33 } ], - "ench_effects": [ { "effect": "effect_plus_two_to_hit", "intensity": 1 } ] + "ench_effects": [ { "effect": "effect_plus_two_to_hit", "intensity": 1 }, {"effect": "archerybracers", "intensity": 1}] } ] } From 87420198c07167ff0ab40efdd8f9f36ba71b34f9 Mon Sep 17 00:00:00 2001 From: CwasCard <46525736+CwasCard@users.noreply.github.com> Date: Wed, 25 Dec 2024 11:51:35 -0500 Subject: [PATCH 7/9] Update data/mods/Magiclysm/effects/effects.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/mods/Magiclysm/effects/effects.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 9beb53f190ef4..9592928d1cd47 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1704,8 +1704,8 @@ { "type": "effect_type", "id": "archerybracers", - "name": [""], - "desc": [""], + "name": [ "" ], + "desc": [ "" ], "rating": "good", "enchantments": [ { "values": [ {"value": "WEAKPOINT_ACCURACY", "multiply": {"math": [ "1+(u_skill('archery'))" ]}}]}] From a578515a7933c8fb8d3e08d8255f6dcff0d187ae Mon Sep 17 00:00:00 2001 From: CwasCard <46525736+CwasCard@users.noreply.github.com> Date: Thu, 26 Dec 2024 12:51:08 -0500 Subject: [PATCH 8/9] divide archery skill multiplier by 3 --- data/mods/Magiclysm/effects/effects.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index 9592928d1cd47..cc0704ff9494a 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1707,7 +1707,7 @@ "name": [ "" ], "desc": [ "" ], "rating": "good", - "enchantments": [ { "values": [ {"value": "WEAKPOINT_ACCURACY", "multiply": {"math": [ "1+(u_skill('archery'))" ]}}]}] + "enchantments": [ { "values": [ {"value": "WEAKPOINT_ACCURACY", "multiply": {"math": [ "1+((u_skill('archery'))/3)" ]}}]}] }, { From 37067c38494e24efbcdba66734f545ef2bd14ffe Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Wed, 8 Jan 2025 08:16:07 +0100 Subject: [PATCH 9/9] Lint --- data/mods/Magiclysm/effects/effects.json | 3 +-- data/mods/Magiclysm/items/enchanted_bracers.json | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json index cc0704ff9494a..e250fcf3948fc 100644 --- a/data/mods/Magiclysm/effects/effects.json +++ b/data/mods/Magiclysm/effects/effects.json @@ -1707,8 +1707,7 @@ "name": [ "" ], "desc": [ "" ], "rating": "good", - "enchantments": [ { "values": [ {"value": "WEAKPOINT_ACCURACY", "multiply": {"math": [ "1+((u_skill('archery'))/3)" ]}}]}] - + "enchantments": [ { "values": [ { "value": "WEAKPOINT_ACCURACY", "multiply": { "math": [ "1+((u_skill('archery'))/3)" ] } } ] } ] }, { "type": "effect_type", diff --git a/data/mods/Magiclysm/items/enchanted_bracers.json b/data/mods/Magiclysm/items/enchanted_bracers.json index 812095f10dc4d..d97d15dacc4cc 100644 --- a/data/mods/Magiclysm/items/enchanted_bracers.json +++ b/data/mods/Magiclysm/items/enchanted_bracers.json @@ -118,11 +118,8 @@ { "has": "WORN", "condition": { "u_has_wielded_with_flag": "SHEATH_BOW" }, - "values": [ - { "value": "RANGE", "multiply": 0.2 }, - { "value": "WEAPON_DISPERSION", "multiply": -0.33 } - ], - "ench_effects": [ { "effect": "effect_plus_two_to_hit", "intensity": 1 }, {"effect": "archerybracers", "intensity": 1}] + "values": [ { "value": "RANGE", "multiply": 0.2 }, { "value": "WEAPON_DISPERSION", "multiply": -0.33 } ], + "ench_effects": [ { "effect": "effect_plus_two_to_hit", "intensity": 1 }, { "effect": "archerybracers", "intensity": 1 } ] } ] }