summaryrefslogtreecommitdiff
path: root/npc/quests/quests_13_2.txt
diff options
context:
space:
mode:
authorLiYu <cairoliyu@gmail.com>2013-05-29 04:49:48 -0700
committerLiYu <cairoliyu@gmail.com>2013-05-29 04:49:48 -0700
commit49813bb4ecb1ddd5ce5036fc9040e620c7ccc7b7 (patch)
tree140c5976d9e82d18e3520fcb7d675c02a22a06fc /npc/quests/quests_13_2.txt
parent7f1ebe25ba78b33cb1dc9169fdaedf4335423739 (diff)
parent156c500bd24fe2bc11eefad5cfd9df128c6903cd (diff)
downloadhercules-49813bb4ecb1ddd5ce5036fc9040e620c7ccc7b7.tar.gz
hercules-49813bb4ecb1ddd5ce5036fc9040e620c7ccc7b7.tar.bz2
hercules-49813bb4ecb1ddd5ce5036fc9040e620c7ccc7b7.tar.xz
hercules-49813bb4ecb1ddd5ce5036fc9040e620c7ccc7b7.zip
Merge pull request #1 from HerculesWS/master
- 合并Hercules最新的内容
Diffstat (limited to 'npc/quests/quests_13_2.txt')
-rw-r--r--npc/quests/quests_13_2.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 1da301ac9..de8f86970 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -3324,23 +3324,23 @@ mid_camp,192,239,4 script Wanted Sign#ep13_2ect01 857,{
if ((ep13_2_dayegg == 1) && (countitem(6093) < 10)) {
mes "We just got fresh eggs from the dragon nest.";
getitem 6093,1; //Egg_Of_Draco
- disablenpc strnpcinfo(1);
+ disablenpc strnpcinfo(0);
initnpctimer;
close;
}
end;
OnTimer420000:
- enablenpc strnpcinfo(1);
+ enablenpc strnpcinfo(0);
stopnpctimer;
end;
OnEnable:
- enablenpc strnpcinfo(1);
+ enablenpc strnpcinfo(0);
end;
OnDisable:
- disablenpc strnpcinfo(1);
+ disablenpc strnpcinfo(0);
end;
}
@@ -3560,7 +3560,7 @@ OnTimer300000:
// Otherworld language
//============================================================
mid_camp,197,237,3 script Schwartzvalt Mechanic#1 869,{
- if (ep13_1_edq > 2) {
+ if (ep13_1_edq > 2 || ep13_start == 100) {
if (ep13_2_rhea < 1) {
mes "[Mechanic Engineer Dorance]";
mes "Do you know about the Ring of the Ancient Wise King? If you wear that Ring, you can talk to animals.";