summaryrefslogtreecommitdiff
path: root/world/map/npc/042-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/042-2')
-rw-r--r--world/map/npc/042-2/sorfina.txt36
-rw-r--r--world/map/npc/042-2/tanisha.txt32
2 files changed, 35 insertions, 33 deletions
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt
index e9bc30ed..b750dd7a 100644
--- a/world/map/npc/042-2/sorfina.txt
+++ b/world/map/npc/042-2/sorfina.txt
@@ -48,11 +48,12 @@ L_Tut:
next;
L_Carpet:
+ mes "[Sorfina]";
mes "\"Try to take a few steps and walk to that red carpet over there.";
mes "Just use the arrow keys or click on the place you want to go to.\"";
if (!sorfina)
set sorfina, 1;
- close;
+ goto L_Close;
L_Chest:
mes "[Sorfina]";
@@ -61,15 +62,16 @@ L_Chest:
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;
mes "\"Now get the shirt out of the chest.\"";
- close;
+ goto L_Close;
L_Naked:
+ mes "[Sorfina]";
mes "\"Press F3 or click on the Inventory button in the bar at the upper right corner to open your bag.\"";
next;
mes "\"Once we stop talking, click on the shirt and press the equip button.\"";
next;
mes "\"Talk to me again after you get dressed. You can either click on me, or press N to focus on me and T to talk.\"";
- close;
+ goto L_Close;
L_Clothes:
if (getequipid(equip_torso) < 0)
@@ -91,7 +93,7 @@ L_Clothes:
mes "Good luck!\"";
set Zeny, Zeny + 30;
set sorfina, 4;
- close;
+ goto L_Close;
L_Again:
mes "[Sorfina]";
@@ -105,7 +107,6 @@ L_Again:
menu
"Yes, could you explain about...",L_Explain,
"No, thanks.",L_Close;
- close;
L_Explain:
menu
@@ -115,14 +116,13 @@ L_Explain:
"... shortcuts?",L_Shortcut,
"... what to do in Tulimshar?",L_Aidan,
"... nevermind.",L_Close;
- close;
L_Walk:
mes "[Sorfina]";
mes "\"You can use the arrow keys to walk around.";
mes "Or just click on the place you want to go to.";
mes "But this only works if that place is reachable and walkable.\"";
- close;
+ goto L_Close;
L_Talk:
mes "[Sorfina]";
@@ -137,7 +137,7 @@ L_Talk:
mes "Or you can right click on someone and choose the whisper option.\"";
next;
mes "\"Press F7 to show and hide your chat window.\"";
- close;
+ goto L_Close;
L_Items:
mes "[Sorfina]";
@@ -157,7 +157,7 @@ L_Items:
next;
mes "\"To use or equip an item, select it by clicking on it.";
mes "Then press Use or Equip.\"";
- close;
+ goto L_Close;
L_Shortcut:
mes "[Sorfina]";
@@ -166,7 +166,7 @@ L_Shortcut:
mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\"";
next;
mes "\"Now you can use or equip/unequip it by pressing the number of the shortcut.\"";
- close;
+ goto L_Close;
L_Aidan:
mes "[Sorfina]";
@@ -176,13 +176,13 @@ L_Aidan:
mes "\"When you leave this area to the Southeast, you'll come to the docks.";
mes "Follow the street to the south to pass the old town gates.\"";
next;
- mes "\"Turn West at the next intersection. You'll pass by the gates of Tulimshar's famos magic school there.";
+ mes "\"Turn west at the next intersection. You'll pass by the gates of Tulimshar's famos magic school there.";
mes "Just follow the street to the south and you'll reach the bazaar.\"";
next;
mes "\"I heard Aidan is looking for brave adventurers, you might want to talk to him.";
- mes "Usually the bazaar is bustling with activity, there are many people who can help. ";
+ mes "Usually the bazaar is bustling with activity, there are many people who can help.";
mes "Talk to everybody. You can never tell when they might know something useful.\"";
- close;
+ goto L_Close;
L_Hasan:
mes "[Sorfina]";
@@ -208,7 +208,7 @@ L_Hasan:
mes "She sighs.";
if (hasan == 1)
set hasan, 2;
- close;
+ goto L_Close;
L_SkipTut:
mes "[Sorfina]";
@@ -229,16 +229,16 @@ L_SkipTut:
getitem "CottonShirt", 1;
set Zeny, Zeny + 50;
mes "Good luck.\"";
- close;
+ goto L_Close;
L_Close:
close;
OnTouch:
- if (TUT_var != 0) close;
- callfunc "GameRules";
+ if (TUT_var != 0)
+ end;
+ callfunc "GameRules";
goto L_Start;
- close;
}
042-2.gat,33,27,0|script|#Carpet|32767,1,1{
diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt
index d9f60209..9363d1b6 100644
--- a/world/map/npc/042-2/tanisha.txt
+++ b/world/map/npc/042-2/tanisha.txt
@@ -19,8 +19,8 @@
mes "\"Are you feeling better?\"";
next;
menu
- "Yes, thank you.", -,
- "Yeah, but all my stuff is gone.", -;
+ "Yes, thank you.",-,
+ "Yeah, but all my stuff is gone.",-;
mes "[Tanisha]";
mes "\"I'm glad you're feeling better. It was really bad luck what happened to you.";
mes "Hey, I have an idea.\"";
@@ -28,6 +28,7 @@
set tanisha, 1;
L_Maggots:
+ mes "[Tanisha]";
mes "\"There are some maggots eating the goods and I'm supposed to get rid of them.";
mes "But they're so yucky!\"";
next;
@@ -35,8 +36,8 @@ L_Maggots:
mes "What do you say?\"";
next;
menu
- "Sure!", -,
- "That's your job.", L_Close;
+ "Sure!",-,
+ "That's your job.",L_Close;
mes "[Tanisha]";
mes "\"Wonderful!\"";
// since the check happens here, it is actually possible to have
@@ -131,20 +132,20 @@ L_Again:
next;
if (hasan)
menu
- "A guy named Hasan won't let me enter Tulimshar.", L_Hasan,
- "Yes, could you explain again about...", L_Explain,
- "No, thanks.", L_Close;
+ "A guy named Hasan won't let me enter Tulimshar.",L_Hasan,
+ "Yes, could you explain again about...",L_Explain,
+ "No, thanks.",L_Close;
menu
- "Yes, could you explain again about...", L_Explain,
- "No, thanks.", L_Close;
+ "Yes, could you explain again about...",L_Explain,
+ "No, thanks.",L_Close;
L_Explain:
menu
- "... how to fight?", L_Fight,
- "... monsters?", L_Mob,
- "... status points?", L_StatsRe,
- "... what to do in Tulimshar?", L_Advice,
- "... nevermind.", L_Close;
+ "... how to fight?",L_Fight,
+ "... monsters?",L_Mob,
+ "... status points?",L_StatsRe,
+ "... what to do in Tulimshar?",L_Advice,
+ "... nevermind.",L_Close;
L_Fight:
mes "[Tanisha]";
@@ -209,9 +210,10 @@ L_Sleep:
mes "Come back when you're serious.\"";
set @Maggot_Kills, 0;
set @time, 0;
+ close2;
if (getareausers("042-2.gat", 30, 85, 36, 89) == 0)
goto L_CleanUp;
- goto L_Close;
+ end;
L_Fail:
mes "Tanisha seems to be trying hard to supress laughter.";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-20 16:28:42 +0000