summaryrefslogtreecommitdiff
path: root/world/map/npc/009-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/009-2')
-rw-r--r--world/map/npc/009-2/airlia.txt11
-rw-r--r--world/map/npc/009-2/alan.txt11
-rw-r--r--world/map/npc/009-2/nurse.txt24
-rw-r--r--world/map/npc/009-2/wyara.txt12
4 files changed, 32 insertions, 26 deletions
diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt
index b02627c8..3748269d 100644
--- a/world/map/npc/009-2/airlia.txt
+++ b/world/map/npc/009-2/airlia.txt
@@ -53,11 +53,12 @@ L_Caretaker:
menu
"Sorry, no.", L_Next,
"My what?", L_Caretaker_mount;
- //else ==
- menu
- "Sorry, no.", L_Next,
- "I have a letter from your father.", L_Caretaker_first_reward,
- "My what?", L_Caretaker_mount;
+ if (QUEST_Graveyard_Caretaker == @Q_STATUS_RECIEVED_FIRST_LETTER)
+ menu
+ "Sorry, no.", L_Next,
+ "I have a letter from your father.", L_Caretaker_first_reward,
+ "My what?", L_Caretaker_mount;
+ goto L_Next;
L_Next:
mes "[Airlia]";
diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt
index 6d39e3e2..cf425d6a 100644
--- a/world/map/npc/009-2/alan.txt
+++ b/world/map/npc/009-2/alan.txt
@@ -98,11 +98,14 @@ L_State_2:
next;
if (@inspector == 1)
menu
- "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo,
+ "Yes, I did. He said that the trees turned into dangerous monsters.", L_Next,
"Have you seen anything strange recently that might be connected to the robberies?", L_NohMask_Answer;
- menu
- "Yes, I did. He said that the trees turned into dangerous monsters.", L_Foo;
-L_Foo:
+ if (@inspector != 1)
+ menu
+ "Yes, I did. He said that the trees turned into dangerous monsters.", L_Next1;
+ goto L_Next1;
+
+L_Next1:
mes "[Alan]";
mes "\"Oh, that's really bad news. Maybe you can do his job?";
mes "When you kill some of these tree monsters and bring me their wood I can take a look at them.";
diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt
index 4a432db4..63ae6a67 100644
--- a/world/map/npc/009-2/nurse.txt
+++ b/world/map/npc/009-2/nurse.txt
@@ -335,9 +335,9 @@ L_choosePut:
if ( (@hlPut > @hlNeed) && (@vnPut <= @vnNeed) )
goto L_m_hl_l_vn;
if ( (@hlPut <= @hlNeed) && (@vnPut > @vnNeed) )
- goto L_l_hl_m_vn;
+ goto L_hl_m_vn;
if ( (@hlPut < @hlNeed) && (@vnPut < @vnNeed) )
- goto L_l_hl_l_vn;
+ goto L_hl_l_vn;
mes "You feel quite normal.";
mes "[Nurse]";
@@ -377,7 +377,7 @@ L_m_hl_l_vn:
next;
goto L_check_st;
-L_l_hl_m_vn:
+L_hl_m_vn:
// first poison for 10 minutes, player will die anyway
sc_start sc_poison, 1, 20;
mes "You feel a sting in your stomach and your heart starts pounding loudly.";
@@ -393,7 +393,7 @@ L_l_hl_m_vn:
goto L_Close;
// goto L_check_st;
-L_l_hl_l_vn:
+L_hl_l_vn:
//poison for 1 minute
sc_start sc_poison, 1, 20;
mes "The antidote seems to have no effect.";
@@ -401,30 +401,30 @@ L_l_hl_l_vn:
L_check_st:
if ( (@stPut < @stNeed) )
- goto L_l_st;
+ goto L_st;
if ( (@stPut > @stNeed) )
goto L_m_st;
if (@hl_vn_ok == 1)
- goto L_allcorrect;
+ goto L_AllCorrect;
mes "[Nurse]";
mes "\"The amount of the stabilizer seems alright, but we have to think again about the other ingredients.\"";
next;
- goto L_notallcorrect;
+ goto L_NotAllCorrect;
-L_l_st:
+L_st:
mes "[Nurse]";
mes "\"It looks like we used not enough of the stabilizer. The antidote will lose its effect after some time.\"";
next;
- goto L_notallcorrect;
+ goto L_NotAllCorrect;
L_m_st:
mes "[Nurse]";
mes "\"It looks like we used too much of the stabilizer. The antidote will turn into venom again after some time.\"";
next;
- goto L_notallcorrect;
+ goto L_NotAllCorrect;
-L_allcorrect:
+L_AllCorrect:
mes "You feel totally normal again.";
next;
mes "[Nurse]";
@@ -440,7 +440,7 @@ L_allcorrect:
callsub S_Update_Var;
goto L_Close;
-L_notallcorrect:
+L_NotAllCorrect:
mes "[Nurse]";
mes "\"It didn't work. You are a really brave person. Now you should rest and recover. I hope you won't give up now. Please come back later, so we can try it again.\"";
next;
diff --git a/world/map/npc/009-2/wyara.txt b/world/map/npc/009-2/wyara.txt
index da2b8dc5..cf1912fc 100644
--- a/world/map/npc/009-2/wyara.txt
+++ b/world/map/npc/009-2/wyara.txt
@@ -47,11 +47,13 @@ L_Main:
"Can you help me learn magic?", L_Magic,
"I would like to buy potions.", L_Shop,
"Bye!", L_Close;
- menu
- "What do you know about...", L_Question,
- "Can you help me learn magic?", L_Magic,
- "I would like to buy potions.", L_Shop,
- "Bye!", L_Close;
+ if (!(!@has_magic && (MAGIC_FLAGS & MFLAG_TOUCHED_MANASEED)))
+ menu
+ "What do you know about...", L_Question,
+ "Can you help me learn magic?", L_Magic,
+ "I would like to buy potions.", L_Shop,
+ "Bye!", L_Close;
+ goto L_Shop;
L_Shop:
mes "[Wyara the Witch]";