Enforce the no-ranged-weapon rule at Divine Rage skill.

Switching to a ranged weapon cancels the buff. Range is the base here!

4 files changed, 21 insertions, 4 deletions

diff --git a/npc/003-2/_import.txt b/npc/003-2/_import.txt
index f6711989e..fffe69267 100644
--- a/npc/003-2/_import.txt
+++ b/npc/003-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 003-2: Tulimshar Guild 
+// Map 003-2: Tulimshar Guild
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-2/_warps.txt",
 "npc/003-2/eistein.txt",
diff --git a/npc/012-8/doorbell.txt b/npc/012-8/doorbell.txt
index 4b15e191e..3b85335ec 100644
--- a/npc/012-8/doorbell.txt
+++ b/npc/012-8/doorbell.txt
@@ -25,7 +25,7 @@
 
 // The sign is the main controller
 012-8,32,34,0	script	Doorbell#RES_0128	NPC_NO_SPRITE,{
-    // Name, Layer, Price, ID, x1, y1, x2, y2, 
+    // Name, Layer, Price, ID, x1, y1, x2, y2,
     function create_object {
         array_push(.name$, getarg(0));
         array_push(.layer, getarg(1));
diff --git a/npc/014-4/thorn.txt b/npc/014-4/thorn.txt
index 52e9f430d..99dfe81e4 100644
--- a/npc/014-4/thorn.txt
+++ b/npc/014-4/thorn.txt
@@ -7,7 +7,7 @@
 //
 //    SQuest_Spring
 //      0 - Not Assigned
-//      1 - 
+//      1 -
 
 014-4,149,98,0	script	Thorn	NPC_THORN_NPC,{
     if (season() != SPRING && !$@GM_OVERRIDE)
diff --git a/npc/magic/demure.txt b/npc/magic/demure.txt
index 0a6f6d8bf..79dfa6601 100644
--- a/npc/magic/demure.txt
+++ b/npc/magic/demure.txt
@@ -62,7 +62,7 @@
 	SC_MOVHASTE_INFINITY:              60
 	SC_PLUSATTACKPOWER:                61
 	SC_PLUSMAGICPOWER:                 62
-    
+
 */
 
 OnCall:
@@ -73,6 +73,13 @@ OnCall:
         end;
     }
 
+    // non-melee weapons not allowed
+    // TODO: Run this check on a loop in case player is switching weapons
+    if (getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_RANGE) > 3) {
+        dispbottom l("Only melee weapons are permitted for use with this skill.");
+        end;
+    }
+
     // Check requisites
     if (!MagicCheck(TMW2_DEMURE, 100, 100))
         end;
@@ -96,6 +103,16 @@ OnCall:
     GetManaExp(TMW2_DEMURE, rand(1,getskilllv(TMW2_DEMURE)));
     end;
 
+// If you switch to a bow, you lose the effect at once and loop dies
+OnTMW2DemureCheck:
+    if (@demure_at < gettimetick(2))
+        end;
+    if (getiteminfo(getequipid(EQI_HAND_R), ITEMINFO_RANGE) > 3)
+        sc_start SC_ATTHASTE_POTION2, 100, -50;
+    else
+        addtimer(rand(786,1346), "::OnTMW2DemureCheck");
+    end;
+
 OnInit:
     bindatcmd "sk-demure", "sk#demure::OnCall", 0, 100, 0;
     end;