diff options
author | wushin <pasekei@gmail.com> | 2014-08-24 22:09:43 -0500 |
---|---|---|
committer | wushin <pasekei@gmail.com> | 2014-08-24 22:40:01 -0500 |
commit | 2c07459b6d045f7a510811c507533e204319473a (patch) | |
tree | eea6c599f268ecfd86cb95aecdb19c4a2ef87805 /world/map/npc/042-2/tanisha.txt | |
parent | d8e03d3b02cd6c2964b94e3c4bc3f40dad9e9888 (diff) | |
download | serverdata-2c07459b6d045f7a510811c507533e204319473a.tar.gz serverdata-2c07459b6d045f7a510811c507533e204319473a.tar.bz2 serverdata-2c07459b6d045f7a510811c507533e204319473a.tar.xz serverdata-2c07459b6d045f7a510811c507533e204319473a.zip |
Quest Log Fixed STARTAREA
Diffstat (limited to 'world/map/npc/042-2/tanisha.txt')
-rw-r--r-- | world/map/npc/042-2/tanisha.txt | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt index 77a02948..77e95ab7 100644 --- a/world/map/npc/042-2/tanisha.txt +++ b/world/map/npc/042-2/tanisha.txt @@ -4,13 +4,17 @@ 042-2.gat,110,88,0|script|Tanisha|114, { + setarray @npc_loc, 110, 88, 4; + callfunc "PCtoNPCRange"; + if (@npc_check) + goto L_Close; + if (isin("042-2.gat", 98, 84, 106, 89)) goto L_Fighting; - callfunc "TutorialState"; - if ((@tutorial == 11) && !(@tanisha_hasan)) goto L_Hasan; - if ((@tutorial >= 8) || (FLAGS & FLAG_TUTORIAL_DONE)) goto L_Tut_Done; + if (@tutorial == 10) goto L_Hasan; + if (@tutorial >= 8) goto L_Tut_Done; if (@tutorial == 7) goto L_Stats; if (@tutorial == 6) goto L_Fail; if (@tutorial == 5) goto L_Maggots; @@ -146,7 +150,6 @@ L_Money: mes "You can have my pocket money. Here.\""; set @tutorial_tmp, 8; callfunc "SetTutorialMask"; - callfunc "TutorialCompleted"; set Zeny, Zeny + 5; next; goto L_Advice; @@ -204,7 +207,8 @@ L_Next3: mes "\"The only thing he's afraid of are scorpions."; mes "I'm not sure why, some bad experience when he was a child."; mes "That was before I was born.\""; - set TUTORIAL, TUTORIAL | $@TanishaHasanBit; + set @tutorial_tmp, 11; + callfunc "SetTutorialMask"; goto L_Close; L_Tut_Done: @@ -311,7 +315,6 @@ OnMaggotDeath: end; L_Close: - set @menu, 0; close; OnInit: @@ -325,18 +328,9 @@ OnInit: OnTouch: callfunc "TutorialState"; - if ((@tutorial >= 8) && !(FLAGS & FLAG_TUTORIAL_DONE)) - goto L_Complete; - goto L_Check; - -L_Complete: - callfunc "TutorialCompleted"; - goto L_Warp; - -L_Check: - if (!(FLAGS & FLAG_TUTORIAL_DONE)) - goto L_Block; - goto L_Warp; + if (@tutorial >= 8) + goto L_Warp; + goto L_Block; L_Warp: warp "042-1.gat", 63, 48; |