From b4ca7cac87e4ca4d861be488088137ffed31863a Mon Sep 17 00:00:00 2001
From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com>
Date: Thu, 26 Sep 2024 20:28:15 -0500
Subject: [PATCH] Magiclysm] Add Bracers of Archery (#76663)

* Add bracers

* Add hit bonus effect

* Add to loot groups

* Update data/mods/Magiclysm/effects/effects.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/Magiclysm/items/enchanted_bracers.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/mods/Magiclysm/items/enchanted_bracers.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Linting + use BOW_SHEATH

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 data/mods/Magiclysm/effects/effects.json      |  9 ++++++++
 .../mods/Magiclysm/itemgroups/itemgroups.json | 13 ++++++++++-
 .../Magiclysm/items/enchanted_bracers.json    | 22 +++++++++++++++++++
 data/mods/Magiclysm/items/ethereal_items.json |  1 -
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json
index 1882352811afe..82b0fd2b44529 100644
--- a/data/mods/Magiclysm/effects/effects.json
+++ b/data/mods/Magiclysm/effects/effects.json
@@ -1443,6 +1443,15 @@
     "remove_message": "Your magical flight ends.",
     "flags": [ "CLIMB_FLYING", "LEVITATION" ]
   },
+  {
+    "type": "effect_type",
+    "id": "effect_plus_two_to_hit",
+    "//": "Self-explanatory",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "rating": "good",
+    "base_mods": { "hit_mod": [ 2 ] }
+  },
   {
     "id": "effect_dispel_magic",
     "type": "effect_type",
diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json
index 23532d26d6691..e6bfd13a35a19 100644
--- a/data/mods/Magiclysm/itemgroups/itemgroups.json
+++ b/data/mods/Magiclysm/itemgroups/itemgroups.json
@@ -877,7 +877,11 @@
     "type": "item_group",
     "//": "lesser enchanted bracers",
     "subtype": "collection",
-    "items": [ { "item": "mbracer_defense_lesser", "prob": 10 }, { "item": "mbracer_lightning_lesser", "prob": 10 } ]
+    "items": [
+      { "item": "mbracer_defense_lesser", "prob": 10 },
+      { "item": "mbracer_lightning_lesser", "prob": 10 },
+      { "item": "mbracer_archery", "prob": 5 }
+    ]
   },
   {
     "id": "enchanted_bracers_greater",
@@ -1898,5 +1902,12 @@
       [ "gold_anklet", 20 ],
       [ "silver_anklet", 30 ]
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "SUS_hunting_archery",
+    "copy-from": "SUS_hunting_archery",
+    "subtype": "collection",
+    "extend": { "items": [ { "item": "mbracer_archery", "prob": 1 } ] }
   }
 ]
diff --git a/data/mods/Magiclysm/items/enchanted_bracers.json b/data/mods/Magiclysm/items/enchanted_bracers.json
index 9b6bd24c104f2..5d0cb397ec076 100644
--- a/data/mods/Magiclysm/items/enchanted_bracers.json
+++ b/data/mods/Magiclysm/items/enchanted_bracers.json
@@ -105,5 +105,27 @@
       "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "ARMOR_ELEC", "add": -10 } ] } ]
     },
     "use_action": { "type": "cast_spell", "spell_id": "lightning_bolt", "no_fail": true, "level": 15, "need_worn": true }
+  },
+  {
+    "copy-from": "armguard_larmor",
+    "type": "ARMOR",
+    "id": "mbracer_archery",
+    "name": { "str": "pair of bracers of archery", "str_pl": "pairs of bracers of archery" },
+    "price_postapoc": "750 USD",
+    "description": "A set of leather bracers worked with images of arrows in flight and scenes of hunting parties.  Bows you wield will be more accurate and do more damage while you wear these, and you can shoot your arrows farther as well.",
+    "relic_data": {
+      "passive_effects": [
+        {
+          "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 }
+          ],
+          "ench_effects": [ { "effect": "effect_plus_two_to_hit", "intensity": 1 } ]
+        }
+      ]
+    }
   }
 ]
diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json
index 404180d2d06e9..772ad2994c0b9 100644
--- a/data/mods/Magiclysm/items/ethereal_items.json
+++ b/data/mods/Magiclysm/items/ethereal_items.json
@@ -315,7 +315,6 @@
   },
   {
     "id": "druid_recurve",
-    "//": "Not using copy-from 'reflexbow', since wearability causes druid bow not to be wielded, and ammo / clip type causes it to require real arrows",
     "type": "GUN",
     "symbol": "(",
     "color": "yellow",