From 19e2021fd657664bb854f1b73247eade047fe58a Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 2 Dec 2020 04:04:21 -0300
Subject: Fix a bug reported to Hello=) during the event. One of the magic
 spells was not being considered and... was quite dramatic.

---
 world/map/npc/annuals/xmas/2020.txt | 52 +++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'world/map')

diff --git a/world/map/npc/annuals/xmas/2020.txt b/world/map/npc/annuals/xmas/2020.txt
index 9747d244..dd82f134 100644
--- a/world/map/npc/annuals/xmas/2020.txt
+++ b/world/map/npc/annuals/xmas/2020.txt
@@ -44,6 +44,13 @@ OnHit:
     if (getequipid(equip_hand1) != 5261)
         end;
 
+    // By last, check for Arrow Hail
+    set @nearby, 0;
+    foreach 1, getmap(), @away[0] - 14, @away[1] - 14, @away[0] + 14, @away[1] + 14,
+            strnpcinfo(0) + "::OnNearbyNpc";
+    if (@nearby)
+        end;
+
     // Grinchboo slain
     set XMAS2020, XMAS2020 + 1;
     set $XMAS2020_BOO, $XMAS2020_BOO + 1;
@@ -131,6 +138,12 @@ OnClock0600:
     goto OnClock1800;
 OnClock0630:
     goto OnClock1830;
+
+OnNearbyNpc:
+    explode .@nearby$[0], strnpcinfo(0,@target_id), "#";
+    if(.@nearby$[0] == "arrow-hail" || .@nearby$[1] == "arrow-hail")
+        set @nearby, @nearby + 1;
+    end;
 }
 
 // Scatter the grinchboos
@@ -390,6 +403,13 @@ OnHit:
     if (getequipid(equip_hand1) != 5261)
         end;
 
+    // By last, check for Arrow Hail
+    set @nearby, 0;
+    foreach 1, getmap(), @away[0] - 14, @away[1] - 14, @away[0] + 14, @away[1] + 14,
+            strnpcinfo(0) + "::OnNearbyNpc";
+    if (@nearby)
+        end;
+
     // Grinchboo slain
     set XMAS2020, XMAS2020 + 1;
     set $XMAS2020_BOO, $XMAS2020_BOO + 1;
@@ -477,6 +497,12 @@ OnClock0600:
     goto OnClock1800;
 OnClock0630:
     goto OnClock1830;
+
+OnNearbyNpc:
+    explode .@nearby$[0], strnpcinfo(0,@target_id), "#";
+    if(.@nearby$[0] == "arrow-hail" || .@nearby$[1] == "arrow-hail")
+        set @nearby, @nearby + 1;
+    end;
 }
 
 046-1,0,0,0|script|XXmas0461|32767
@@ -519,6 +545,13 @@ OnHit:
     if (getequipid(equip_hand1) != 5261)
         end;
 
+    // By last, check for Arrow Hail
+    set @nearby, 0;
+    foreach 1, getmap(), @away[0] - 14, @away[1] - 14, @away[0] + 14, @away[1] + 14,
+            strnpcinfo(0) + "::OnNearbyNpc";
+    if (@nearby)
+        end;
+
     // Grinchboo slain
     set XMAS2020, XMAS2020 + 1;
     set $XMAS2020_BOO, $XMAS2020_BOO + 1;
@@ -606,6 +639,12 @@ OnClock0600:
     goto OnClock1800;
 OnClock0630:
     goto OnClock1830;
+
+OnNearbyNpc:
+    explode .@nearby$[0], strnpcinfo(0,@target_id), "#";
+    if(.@nearby$[0] == "arrow-hail" || .@nearby$[1] == "arrow-hail")
+        set @nearby, @nearby + 1;
+    end;
 }
 
 047-1,0,0,0|script|XXmas0471|32767
@@ -648,6 +687,13 @@ OnHit:
     if (getequipid(equip_hand1) != 5261)
         end;
 
+    // By last, check for Arrow Hail
+    set @nearby, 0;
+    foreach 1, getmap(), @away[0] - 14, @away[1] - 14, @away[0] + 14, @away[1] + 14,
+            strnpcinfo(0) + "::OnNearbyNpc";
+    if (@nearby)
+        end;
+
     // Grinchboo slain
     set XMAS2020, XMAS2020 + 1;
     set $XMAS2020_BOO, $XMAS2020_BOO + 1;
@@ -735,5 +781,11 @@ OnClock0600:
     goto OnClock1800;
 OnClock0630:
     goto OnClock1830;
+
+OnNearbyNpc:
+    explode .@nearby$[0], strnpcinfo(0,@target_id), "#";
+    if(.@nearby$[0] == "arrow-hail" || .@nearby$[1] == "arrow-hail")
+        set @nearby, @nearby + 1;
+    end;
 }
 
-- 
cgit v1.2.3-60-g2f50