summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-12-12 08:57:22 -0600
committerwushin <pasekei@gmail.com>2014-12-12 08:57:22 -0600
commite335bb592b54d511cd526007089ff9247f6e531e (patch)
treeb12c392e420fbe1a963ae70502ff2ee578493ccb /world/map/npc
parenta98ebf9bfff4be6b0c4600859d42ee28f61c63e2 (diff)
parent45646d16455482b4683775e7831de978a9cad4c5 (diff)
downloadserverdata-e335bb592b54d511cd526007089ff9247f6e531e.tar.gz
serverdata-e335bb592b54d511cd526007089ff9247f6e531e.tar.bz2
serverdata-e335bb592b54d511cd526007089ff9247f6e531e.tar.xz
serverdata-e335bb592b54d511cd526007089ff9247f6e531e.zip
Merge branch 'tanisha-exploit-fix'
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/042-2/tanisha.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index 72d68d84..2bfdf9ee 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -79,6 +79,8 @@ L_Fight_Again:
goto L_ContinueFight;
L_GetFightItems:
+ set @tutorial_tmp, 6;
+ callfunc "SetTutorialMask";
getitem "Knife", 1;
getitem "SlingShot", 1;
getitem "SlingBullet", 100;
@@ -141,7 +143,10 @@ L_StatsRe:
next;
mes "[Tanisha]";
mes "\"But I doubt he'd do that without a service in return.\"";
- goto L_Money;
+ callfunc "TutorialState";
+ if (@tutorial == 7)
+ goto L_Money;
+ goto L_Advice;
L_Money:
next;