From 623f98ef8f4efa72d6ff7355517b0ace7235ef72 Mon Sep 17 00:00:00 2001 From: wushin Date: Mon, 23 Jun 2014 18:57:52 -0500 Subject: Starting Area Redux * Tutorial is a quick funnel * Exits are obvious and open * New Side Quests ** Valon's Beast Mastery ** Zegas's Barrels ** Magic Wand * Some Quests stay open after tutorial is done * House Maggot & Tame Scorpion added * Made Magic usable for lowbies with Wand --- world/map/npc/042-2/tanisha.txt | 85 +++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 29 deletions(-) (limited to 'world/map/npc/042-2/tanisha.txt') diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt index 482224f0..fb67989d 100644 --- a/world/map/npc/042-2/tanisha.txt +++ b/world/map/npc/042-2/tanisha.txt @@ -2,15 +2,15 @@ // Authors: Jenalya, alastrim // Cleanup: o11c -042-2.gat,37,90,0|script|Tanisha|114, +042-2.gat,110,88,0|script|Tanisha|114, { - if (isin("042-2.gat", 30, 85, 36, 89)) + if (isin("042-2.gat", 98, 84, 106, 89)) goto L_Fighting; - if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; callfunc "TutorialState"; if ((@tutorial == 11) && !(@tanisha_hasan)) goto L_Hasan; + if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done; if (@tutorial >= 8) goto L_Again; if (@tutorial == 7) goto L_Stats; if (@tutorial == 6) goto L_Fail; @@ -42,8 +42,7 @@ L_Maggots: mes "\"If you kill them, I'll give you my knife."; mes "What do you say?\""; menu - "Sure!",L_Next1, - "That's your job.",L_Close; + "I guess it's the least I can do.",L_Next1; L_Next1: mes "[Tanisha]"; @@ -51,7 +50,7 @@ L_Next1: // since the check happens here, it is actually possible to have // more than $@Maggot_MaxHunters in the area at one time // but that's not a BIG problem - if (getareausers("042-2.gat", 30, 85, 36, 89) >= $@Maggot_MaxHunters) + if (getareausers("042-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters) goto L_Crowded; next; goto L_Fight_Again; @@ -60,14 +59,14 @@ L_Fight_Again: mes "\"Ok, listen what to do."; mes "Equip a weapon and kill the maggots.\""; next; - mes "\"Press A to focus on a monster. With X you can focus and start attacking the same time."; + mes "\"Press A to focus on a monster. With ###keyTargetAttack; you can focus and start attacking the same time."; mes "But it also works to click on the monster with your mouse.\""; next; - mes "\"If you press the left Shift button, you can abort your attack.\""; + mes "\"If you press the ###keyTarget;, you can abort your attack.\""; next; mes "\"Maggots aren't aggressive, so they won't harm you until you attack them first. Take them out one by one.\""; next; - mes "\"Sometimes dead monsters leave some useful things. You can pick them up by pressing Z or clicking on the items with your mouse.\""; + mes "\"Sometimes dead monsters leave some useful things. You can pick them up by pressing ###keyPickup; or clicking on the items with your mouse.\""; close2; // The getitem must be in the same place as set @tutorial, 2; // since it was moved to after L_Fight_Again, add it conditionally @@ -87,13 +86,13 @@ L_ContinueFight: callfunc "SetTutorialMask"; set @Maggot_Kills, 0; set @time, 0; - if (getareausers("042-2.gat", 30, 85, 36, 89) == 0) + if (getareausers("042-2.gat", 98, 84, 106, 89) == 0) initnpctimer; - warp "042-2.gat", 33, 87; + warp "042-2.gat", 101, 87; goto L_Summon; L_Summon: - areamonster "042-2.gat", 30, 85, 36, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; + areamonster "042-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; end; L_Stats: @@ -103,7 +102,13 @@ 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.\""; next; - mes "\"Press F2 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.\""; + 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.\""; + next; + mes "\"My Uncle sitting at the counter knows a spell to help the younglings reset their stats.\""; + next; + mes "\"He also knows of mages with even more powerful reset spells.\""; + next; + mes "\"Some strange wizard lurking around in the Tulimshar Noble Quarter.\""; next; goto L_StatsRe; @@ -123,7 +128,12 @@ L_StatsRe: next; mes "\"Think about how you want to play before assigning the points.\""; next; - mes "\"Also I heard rumors about a strange guy lurking around in the desert south of Tulimshar who can help you to forget your abilities!\""; + mes "\"My Uncle sitting at the counter knows a spell to help the younglings reset their stats.\""; + next; + mes "\"He also knows of mages with even more powerful reset spells.\""; + next; + mes "\"Some strange wizard lurking around in the Tulimshar Noble Quarter.\""; + next; mes "Tanisha looks at you with wide opened eyes."; next; mes "[Tanisha]"; @@ -153,6 +163,7 @@ L_Advice: L_SetTutorial: set @tutorial_tmp, 8; callfunc "SetTutorialMask"; + callfunc "TutorialCompleted"; goto L_Close; L_Again: @@ -172,14 +183,14 @@ L_Explain: L_Fight: mes "[Tanisha]"; - mes "\"Press A to focus on a monster. With X you can focus and attack."; + mes "\"Press ###keyTargetMonster; to focus on a monster. With ###keyTargetAttack; you can focus and attack."; mes "But it also works to click on the monster with your mouse.\""; next; - mes "\"If you press the left Shift button, you can abort your attack.\""; + mes "\"If you press the ###keyTarget; button, you can abort your attack.\""; next; - mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking on the items with your mouse.\""; + mes "\"Sometimes dead monsters leave some useful things. You can pick them up with pressing ###keyPickup; or clicking on the items with your mouse.\""; next; - mes "\"If you feel exhausted from battle you can sit down by pressing S to recover faster.\""; + mes "\"If you feel exhausted from battle you can sit down by pressing ###keyBeingSit; to recover faster.\""; goto L_Close; L_Mob: @@ -198,7 +209,7 @@ L_Hasan: mes "[Tanisha]"; mes "\"Hi there! Is everything alright? Do you have questions?\""; menu - "A guy named Hasan won't let me enter Tulimshar.",L_Next3, + "A guy named Hasan is being mean.",L_Next3, "Yes, could you explain again about...",L_Explain, "No, thanks.",L_Close; @@ -233,7 +244,7 @@ L_Crowded: goto L_Close; L_Sleep: - warp "042-2.gat", 36, 90; + warp "042-2.gat", 101, 87; mes "[Tanisha]"; mes "\"What are you doing in there?"; mes "Sleeping?"; @@ -241,7 +252,7 @@ L_Sleep: set @Maggot_Kills, 0; set @time, 0; close2; - if (getareausers("042-2.gat", 30, 85, 36, 89) == 0) + if (getareausers("042-2.gat", 98, 84, 106, 89) == 0) goto L_CleanUp; end; @@ -259,7 +270,7 @@ L_Fail: "No, I need a rest.", L_Close; L_Next2: - if (getareausers("042-2.gat", 30, 85, 36, 89) >= $@Maggot_MaxHunters) + if (getareausers("042-2.gat", 98, 84, 106, 89) >= $@Maggot_MaxHunters) goto L_Crowded; goto L_Fight_Again; @@ -269,17 +280,17 @@ L_Fighting: OnTimer1000: setnpctimer 0; - if (getareausers("042-2.gat", 30, 85, 36, 89) == 0) + if (getareausers("042-2.gat", 98, 84, 106, 89) == 0) goto L_CleanUp; // This is needed because multiple players can be in the area at once - areatimer "042-2.gat", 30, 85, 36, 89, 0, "Tanisha::OnTick"; + areatimer "042-2.gat", 98, 84, 106, 89, 0, "Tanisha::OnTick"; end; L_CleanUp: killmonster "042-2.gat", "Tanisha::OnMaggotDeath"; set $@Maggot_Hunters, 0; stopnpctimer; - areamonster "042-2.gat", 30, 85, 36, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; + areamonster "042-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; end; OnTick: @@ -301,17 +312,17 @@ OnMaggotDeath: message strcharinfo(0), "Tanisha: Ohh... Irrhk... Eeeeww... They just appear from nowhere!"; if (@Maggot_Kills == 3) message strcharinfo(0), "Tanisha: Yuck... I think I am getting sick."; - if (isin("042-2.gat", 30, 85, 36, 89)) + if (isin("042-2.gat", 98, 84, 106, 89)) set @Maggot_Kills, @Maggot_Kills + 1; if (@Maggot_Kills < 5) goto L_Summon; // else, complete - warp "042-2.gat", 36, 90; + warp "042-2.gat", 110, 88; set @tutorial_tmp, 7; callfunc "SetTutorialMask"; set @Maggot_Kills, 0; set @time, 0; - if (getareausers("042-2.gat", 30, 85, 36, 89) == 0) + if (getareausers("042-2.gat", 98, 84, 106, 89) == 0) goto L_CleanUp; end; @@ -321,6 +332,22 @@ L_Close: OnInit: set $@Maggot_MaxHunters, 4; - areamonster "042-2.gat", 30, 85, 36, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; + areamonster "042-2.gat", 98, 84, 106, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; end; } +042-2.gat,114,93,0|script|#DoorOutTut2|45,0,0 +{ + end; + +OnTouch: + callfunc "TutorialState"; + if (!(FLAGS & FLAG_TUTORIAL_DONE)) + goto L_Block; + warp "042-1.gat", 63, 48; + end; + +L_Block: + message strcharinfo(0), "Tanisha: Please come here. I'd like some help!"; + end; +} + -- cgit v1.2.3-60-g2f50