summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/jobs/2-1/wizard.txt4
-rw-r--r--npc/quests/first_class/tu_magician01.txt4
-rw-r--r--npc/quests/quests_rachel.txt5
3 files changed, 8 insertions, 5 deletions
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index fdbbcef25..be8192762 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -1423,7 +1423,7 @@ OnTimer60000:
end;
OnTimer61000:
- donpcevent "Room of Earth#Failed::OnEnable";
+ enablenpc "Room of Earth#Failed";
end;
OnTimer62000:
@@ -1527,7 +1527,7 @@ OnTimer183000:
end;
OnTimer184000:
- donpcevent "Room of Fire#Failed::OnEnable";
+ enablenpc "Room of Fire#Failed";
end;
OnTimer185000:
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index 9e815347f..39298db93 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -669,7 +669,7 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{
next;
mes "[Mana]";
mes "So if you can use";
- mes "Fire Well strategically";
+ mes "Fire Wall strategically";
mes "and effectively, it can";
mes "be a very powerful skill~";
.@skill_e6 = 1;
@@ -781,7 +781,7 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{
mes "a message, saying that";
mes "you've done a great job in";
mes "completing your mission.";
- mes "Very nice work, "+PcName+"~";
+ mes "Very nice work, "+strcharinfo(0)+"~";
next;
mes "[Mana]";
mes "It seems like there are";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 41e72deee..1fb7f95eb 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -7244,7 +7244,10 @@ OnTouch:
mes "For now, you may as well";
mes "talk to High Priest Zhed.^000000";
ra_tem_q = 19;
- changequest 8102,8103;
+ if (questprogress(8102) == 1)
+ changequest 8102,8103;
+ else
+ changequest 8101,8103;
close;
}
end;