From a69cbbf1e27026f930ed5ebc9b83d6b8e65ea346 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 6 Aug 2021 12:46:50 -0300
Subject: This should fix and close serverdata#70 Alters Bull Helmet code
 regarding weapon range.

---
 db/pre-re/item_db.conf | 2 --
 npc/magic/final.txt    | 6 ++++++
 npc/scripts.conf       | 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 15412e8d..1bb0bee0 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -9501,8 +9501,6 @@ item_db: (
 	">
 	Script: <"
 		bonus bMatkRate, -14;
-		// FIXME Maybe this works? Or maybe not and need a timer.
-		bonus bAtkRange, 1-readbattleparam(getcharid(3), UDT_ATKRANGE);
 		bonus bDoubleAddRate, 20;
 		bonus bStr, 10;
 		bonus bCritical, 15;
diff --git a/npc/magic/final.txt b/npc/magic/final.txt
index 30dce5e9..9000c3f3 100644
--- a/npc/magic/final.txt
+++ b/npc/magic/final.txt
@@ -254,6 +254,12 @@ function	script	HUB_PCBonus	{
 		bonus bAtkRange, (2+getskilllv(SKILL_MALLARDS_EYE))/3;
 		bonus bHit, 5*getskilllv(SKILL_MALLARDS_EYE);
     }
+
+    /* Class A Equipment */
+    if (getequipid(EQI_HAND_R) > 1) {
+        if (isequipped(BullHelmet))
+            bonus bAtkRange, 1-getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_RANGE);
+    }
     return;
 }
 
diff --git a/npc/scripts.conf b/npc/scripts.conf
index df258287..a6a19493 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -54,6 +54,8 @@
 "npc/functions/location.txt",
 "npc/functions/weather.txt",
 "npc/functions/marriage.txt",
+"npc/functions/npcmovegraph.txt",
+"npc/functions/npcmove.txt",
 
 // Items
 "npc/items/purification_potion.txt",
-- 
cgit v1.2.3-70-g09d2