From 3d853f1c8e21667bbe6959d6aca2f28f145b7af0 Mon Sep 17 00:00:00 2001 From: mekolat Date: Thu, 21 May 2015 19:16:39 -0400 Subject: npc actions & map mask in tutorial --- world/map/db/const-mapflags.txt | 2 +- world/map/npc/029-2/mapflags.txt | 1 + world/map/npc/029-2/sorfina.txt | 21 ++++++++++++++++++++- world/map/npc/029-2/tanisha.txt | 2 ++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/world/map/db/const-mapflags.txt b/world/map/db/const-mapflags.txt index 94b1710a..486ab375 100644 --- a/world/map/db/const-mapflags.txt +++ b/world/map/db/const-mapflags.txt @@ -22,7 +22,7 @@ MF_PVP_NOCALCRANK 25 MF_NOWARP 13 MF_NOWARPTO 26 MF_NOPVP 14 -//MF_NOICEWALL 15 +MF_MASK 15 MF_SNOW 16 MF_FOG 17 MF_SAKURA 18 diff --git a/world/map/npc/029-2/mapflags.txt b/world/map/npc/029-2/mapflags.txt index 1de2d675..09b62b45 100644 --- a/world/map/npc/029-2/mapflags.txt +++ b/world/map/npc/029-2/mapflags.txt @@ -1,2 +1,3 @@ 029-2|mapflag|nosave|029-2,22,24 029-2|mapflag|resave|029-2,22,24 +029-2|mapflag|mask|1 diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt index 940c61a4..6af2912e 100644 --- a/world/map/npc/029-2/sorfina.txt +++ b/world/map/npc/029-2/sorfina.txt @@ -55,6 +55,11 @@ L_Tut: L_Carpet: mes "[Sorfina]"; mes "\"Try to take a few steps and walk to that carpet over there."; + next; + npcaction 2, "#Carpet"; + mapmask getmask() | 4; + next; + npcaction 3; mes "Press [###keyMoveUp;] to move up, press [###keyMoveDown;] to move down, "; mes "press [###keyMoveLeft;] to move left, press [###keyMoveRight;] to move right "; mes " or click on the place you want to go to.\""; @@ -63,8 +68,14 @@ L_Carpet: L_Dresser: mes "[Sorfina]"; + mes "\"You should get dressed now.\""; + next; + npcaction 2, "Dresser#tutorial"; + mapmask getmask() | 32; mes "\"In that dresser there are some clothes you can wear.\""; mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press [###keyTargetNPC;] to focus and [###keyTalk;] to talk/activate.\""; + next; + npcaction 3; mes "\"Now get the clothes out of the dresser.\""; goto L_Close; @@ -94,6 +105,7 @@ L_Clothes: mes "She digs in her pocket for a moment."; mes "\"And here is some money for you. Don't spend it all in one place."; mes "Now go help Tanisha downstairs.\""; + mapmask getmask() | 8; set Zeny, Zeny + 30; set QL_BEGIN, 4; goto L_Close; @@ -253,15 +265,20 @@ OnTouch: goto L_Start; } -029-2,33,27,0|script|#Carpet|32767,1,1 +029-2,33,27,0|script|#Carpet|127,1,1 { if (QL_BEGIN != 1) end; + mapmask getmask(); mes "[Sorfina]"; mes "\"You should get dressed now.\""; + next; + npcaction 2, "Dresser#tutorial"; + mapmask getmask() | 16; mes "\"In that dresser there are some clothes you can wear.\""; mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press N to focus and T to talk/activate.\""; next; + npcaction 3; mes "\"Now get the clothes out of the dresser.\""; set QL_BEGIN, 2; close; @@ -284,6 +301,7 @@ L_Walk: close; L_Shirt: + mapmask getmask(); mes "You take a simple Cotton Shirt and some very worn-out Ragged Shorts out of the dresser."; getitem "CottonShirt", 1; getitem "RaggedShorts", 1; @@ -308,6 +326,7 @@ L_CloseDis: { if (QL_BEGIN < 4) goto L_Block; + mapmask getmask(); warp "029-2", 112, 85; end; diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt index 012f93ff..d69195a5 100644 --- a/world/map/npc/029-2/tanisha.txt +++ b/world/map/npc/029-2/tanisha.txt @@ -95,6 +95,7 @@ L_Stats: mes "\"And it seems you became stronger and more experienced."; mes "That means you got some status points which you can use to increase your abilities.\""; mes "\"Press [###keyWindowStatus;] or click the Status button in the bar at the upper right to see your status window. There you can distribute your points on six different properties.\""; + mapmask getmask() | 2; next; goto L_StatsRe; @@ -279,6 +280,7 @@ OnTouch: goto L_Block; L_Warp: + mapmask getmask(); warp "029-1", 32, 100; end; -- cgit v1.2.3-60-g2f50