summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-01-29 01:15:57 -0300
committerJesusaves <cpntb1@ymail.com>2020-01-29 01:15:57 -0300
commit409510c5610fc394001a5687c2cda0f190b068ef (patch)
tree644f86be053fc17e09c120e363c4fa25c0046649 /npc
parentf55357d76602fea93160d26412e38a8e4ad8df52 (diff)
downloadserverdata-409510c5610fc394001a5687c2cda0f190b068ef.tar.gz
serverdata-409510c5610fc394001a5687c2cda0f190b068ef.tar.bz2
serverdata-409510c5610fc394001a5687c2cda0f190b068ef.tar.xz
serverdata-409510c5610fc394001a5687c2cda0f190b068ef.zip
Move the code from Enzo to the Magic School Building Door (more effective)
Diffstat (limited to 'npc')
-rw-r--r--npc/003-0/enzo.txt4
-rw-r--r--npc/003-1/magic.txt4
2 files changed, 4 insertions, 4 deletions
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;