From f88e7c3db60fee24336ec09d12061006ce5f28cd Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 1 Dec 2020 09:27:24 -0300
Subject: Fix a few bugs on Christmas 2020 while running low on ammo or using
 magic.

---
 world/map/npc/annuals/xmas/2020.txt | 80 +++++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 8 deletions(-)

(limited to 'world/map/npc')

diff --git a/world/map/npc/annuals/xmas/2020.txt b/world/map/npc/annuals/xmas/2020.txt
index f60dfd4e..9747d244 100644
--- a/world/map/npc/annuals/xmas/2020.txt
+++ b/world/map/npc/annuals/xmas/2020.txt
@@ -22,9 +22,25 @@ OnHit:
     if ((BaseLevel < 30) || (gettimetick(2) - TUT_var < 2*7*86400))
         end;
 
-    // Not equipped to hunt Grinchboos
-    if (getequipid(equip_arrow) != 5260)
+    // Magic cheat
+    if (@wandspell[4])
+        end;
+    if (@ingravspell[2])
+        end;
+    if (@chizaspell[2])
+        end;
+    if (@flarspell[2])
+        end;
+    if (@phlexspell[3])
         end;
+    if (@chipchipspell[2])
+        end;
+    if (@upmarmuspell[1])
+        end;
+
+    // Not equipped to hunt Grinchboos
+    //if (getequipid(equip_arrow) != 5260)
+    //    end;
     if (getequipid(equip_hand1) != 5261)
         end;
 
@@ -352,9 +368,25 @@ OnHit:
     if ((BaseLevel < 30) || (gettimetick(2) - TUT_var < 2*7*86400))
         end;
 
-    // Not equipped to hunt Grinchboos
-    if (getequipid(equip_arrow) != 5260)
+    // Magic cheat
+    if (@wandspell[4])
+        end;
+    if (@ingravspell[2])
+        end;
+    if (@chizaspell[2])
+        end;
+    if (@flarspell[2])
+        end;
+    if (@phlexspell[3])
         end;
+    if (@chipchipspell[2])
+        end;
+    if (@upmarmuspell[1])
+        end;
+
+    // Not equipped to hunt Grinchboos
+    //if (getequipid(equip_arrow) != 5260)
+    //    end;
     if (getequipid(equip_hand1) != 5261)
         end;
 
@@ -465,9 +497,25 @@ OnHit:
     if ((BaseLevel < 30) || (gettimetick(2) - TUT_var < 2*7*86400))
         end;
 
-    // Not equipped to hunt Grinchboos
-    if (getequipid(equip_arrow) != 5260)
+    // Magic cheat
+    if (@wandspell[4])
+        end;
+    if (@ingravspell[2])
+        end;
+    if (@chizaspell[2])
+        end;
+    if (@flarspell[2])
+        end;
+    if (@phlexspell[3])
         end;
+    if (@chipchipspell[2])
+        end;
+    if (@upmarmuspell[1])
+        end;
+
+    // Not equipped to hunt Grinchboos
+    //if (getequipid(equip_arrow) != 5260)
+    //    end;
     if (getequipid(equip_hand1) != 5261)
         end;
 
@@ -578,9 +626,25 @@ OnHit:
     if ((BaseLevel < 30) || (gettimetick(2) - TUT_var < 2*7*86400))
         end;
 
-    // Not equipped to hunt Grinchboos
-    if (getequipid(equip_arrow) != 5260)
+    // Magic cheat
+    if (@wandspell[4])
+        end;
+    if (@ingravspell[2])
+        end;
+    if (@chizaspell[2])
+        end;
+    if (@flarspell[2])
+        end;
+    if (@phlexspell[3])
         end;
+    if (@chipchipspell[2])
+        end;
+    if (@upmarmuspell[1])
+        end;
+
+    // Not equipped to hunt Grinchboos
+    //if (getequipid(equip_arrow) != 5260)
+    //    end;
     if (getequipid(equip_hand1) != 5261)
         end;
 
-- 
cgit v1.2.3-60-g2f50