From 409510c5610fc394001a5687c2cda0f190b068ef Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 29 Jan 2020 01:15:57 -0300
Subject: Move the code from Enzo to the Magic School Building Door (more
 effective)

---
 npc/003-0/enzo.txt  | 4 ----
 npc/003-1/magic.txt | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'npc')

diff --git a/npc/003-0/enzo.txt b/npc/003-0/enzo.txt
index 0e111e56c..2ac2ef4ac 100644
--- a/npc/003-0/enzo.txt
+++ b/npc/003-0/enzo.txt
@@ -5,10 +5,6 @@
 //  Forgetful
 
 003-0,68,25,0	script	Enzo	NPC_BLACKWIZARD,{
-    if (countitem(Event1HSword)+countitem(Event2HSword)+countitem(EventBow)+countitem(EventWand)) {
-        mesc l("You cannot use this NPC while you have event weapons."), 1;
-        close;
-    }
     mesn l("Enzo, the Forgetful");
     mesq l("What was I doing before...? I forgot!");
     next;
diff --git a/npc/003-1/magic.txt b/npc/003-1/magic.txt
index 4582bad6d..499d3a509 100644
--- a/npc/003-1/magic.txt
+++ b/npc/003-1/magic.txt
@@ -7,6 +7,10 @@
 003-1,34,33,0	script	#MagicSchoolGate1	NPC_HIDDEN,0,0,{
     end;
 OnTouch:
+    if (countitem(Event1HSword)+countitem(Event2HSword)+countitem(EventBow)+countitem(EventWand)+countitem(RentCart)) {
+        mesc l("You cannot enter here while you have event weapons or a cart."), 1;
+        close;
+    }
     /*
     if (countitem(JesusalvaGrimorium) <= 0 || MAGIC_LVL < 2) {
         slide 36, 39;
-- 
cgit v1.2.3-60-g2f50