summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/002-3/merchant.txt2
-rw-r--r--world/map/npc/042-2/tanisha.txt7
2 files changed, 7 insertions, 2 deletions
diff --git a/world/map/npc/002-3/merchant.txt b/world/map/npc/002-3/merchant.txt
index c67441c2..21cab7c7 100644
--- a/world/map/npc/002-3/merchant.txt
+++ b/world/map/npc/002-3/merchant.txt
@@ -1,3 +1,3 @@
//
-002-3.gat,60,47,0|shop|Ishyah|109,MinersHat:*800,MinerGloves:*3000,ShortBow:*800,Arrow:*2,LeatherShield:*2000
+002-3.gat,60,47,0|shop|Ishyah|109,MinersHat:*800,MinerGloves:*3000,ShortBow:*8000,Arrow:*2,LeatherShield:*2000
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;