summaryrefslogtreecommitdiff
path: root/world/map/npc/029-2
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2015-05-13 10:30:14 -0400
committermekolat <mekolat@users.noreply.github.com>2015-05-13 22:09:03 -0400
commit414b37aedff74320b0c991a113e752fa3e014bd7 (patch)
treea2b03602e3c54a9968f5b8961dc5fab85da8b803 /world/map/npc/029-2
parentda0f4578b83cc2f9df249dc1bb5bb33d720cb7a8 (diff)
downloadserverdata-414b37aedff74320b0c991a113e752fa3e014bd7.tar.gz
serverdata-414b37aedff74320b0c991a113e752fa3e014bd7.tar.bz2
serverdata-414b37aedff74320b0c991a113e752fa3e014bd7.tar.xz
serverdata-414b37aedff74320b0c991a113e752fa3e014bd7.zip
a few fixes/modifications here and there
Diffstat (limited to 'world/map/npc/029-2')
-rw-r--r--world/map/npc/029-2/barrels_config.txt1
-rw-r--r--world/map/npc/029-2/morgan.txt2
-rw-r--r--world/map/npc/029-2/sorfina.txt1
-rw-r--r--world/map/npc/029-2/stat_reset.txt2
-rw-r--r--world/map/npc/029-2/tanisha.txt1
5 files changed, 7 insertions, 0 deletions
diff --git a/world/map/npc/029-2/barrels_config.txt b/world/map/npc/029-2/barrels_config.txt
index b2e340a6..8ad1cfd5 100644
--- a/world/map/npc/029-2/barrels_config.txt
+++ b/world/map/npc/029-2/barrels_config.txt
@@ -42,6 +42,7 @@ function|script|CheckBarrel
{
set @npc_distance, 2;
callfunc "PCtoNPCRange";
+ if(@npc_check) goto L_Return;
if (!(QL_ZEGAS == 2))
goto L_NoI;
if (STARTAREA & $@BarrelBits[@barrel])
diff --git a/world/map/npc/029-2/morgan.txt b/world/map/npc/029-2/morgan.txt
index 3f7d3e1e..20000a11 100644
--- a/world/map/npc/029-2/morgan.txt
+++ b/world/map/npc/029-2/morgan.txt
@@ -26,6 +26,8 @@ OnInit:
029-2,101,57,0|script|Morgan#_M|355
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
+
if (Int >= 5)
goto L_Learn;
goto L_NotMagic;
diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 984312cf..181a2589 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -4,6 +4,7 @@
{
set @npc_distance, 2;
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
goto L_Main;
L_Main:
diff --git a/world/map/npc/029-2/stat_reset.txt b/world/map/npc/029-2/stat_reset.txt
index c1dafd7b..6123f632 100644
--- a/world/map/npc/029-2/stat_reset.txt
+++ b/world/map/npc/029-2/stat_reset.txt
@@ -3,6 +3,8 @@
029-2,98,92,0|script|Jessie|159
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
+
if (BaseLevel >= 10)
goto L_Sorry;
diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index 9a7ee081..0a594410 100644
--- a/world/map/npc/029-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -5,6 +5,7 @@
029-2,110,88,0|script|Tanisha|114
{
callfunc "PCtoNPCRange";
+ if(@npc_check) end;
if (isin("029-2", 98, 84, 106, 89))
goto L_Fighting;