summaryrefslogtreecommitdiff
path: root/npc/quests/quests_13_1.txt
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-28 13:18:18 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-28 13:18:18 +0000
commit99fcf492f77c4a33ec851b85f2459d28be450ce1 (patch)
tree11e90a39a5ecfd41fda492b76197fb5a71a8df45 /npc/quests/quests_13_1.txt
parent981d0299cb0a66ba0f2363c6d9f1c35038689a63 (diff)
downloadhercules-99fcf492f77c4a33ec851b85f2459d28be450ce1.tar.gz
hercules-99fcf492f77c4a33ec851b85f2459d28be450ce1.tar.bz2
hercules-99fcf492f77c4a33ec851b85f2459d28be450ce1.tar.xz
hercules-99fcf492f77c4a33ec851b85f2459d28be450ce1.zip
- Fixed a bug in quests_13_1.txt where sometimes it wouldn't correctly or at all trigger the OnMyMobDead trigger. bugreport:5023
- Updated quest_db.txt with some time durations. bugreport:5023 - Follow up r16152, it's finally and forever done! git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16161 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/quests/quests_13_1.txt')
-rw-r--r--npc/quests/quests_13_1.txt85
1 files changed, 43 insertions, 42 deletions
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index dd60d379b..11db0d6b2 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -6181,48 +6181,6 @@ mid_camp,212,237,5 script Camp Guard Captain#man1 852,{
// The Tripartite Union's Feud
//============================================================
mid_campin,376,120,0 script Research Official#ep131 754,3,3,{
- mes "[United Research Official]";
- mes "Hmm? What did you just say?";
- next;
- mes "[United Research Official]";
- mes "I can't really hear you. Could you speak louder?";
- close;
-
-OnInit:
- enablenpc "Research Official#ep131";
- end;
-
-OnEnable:
- enablenpc "Research Official#ep131";
- end;
-
-OnDisable:
- disablenpc "Research Official#ep131";
- end;
-
-Onmeet:
- donpcevent "Ryosen#ep131_rhea05::OnEnable";
- donpcevent "Hue#ep131_rhea06::OnEnable";
- donpcevent "Hansenne#ep131_rhea07::OnEnable";
- end;
-
-Oncall:
- initnpctimer;
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
- donpcevent "Research Official#ep131::OnDisable";
- donpcevent "Ryosen#ep131_rhea05::OnDisable";
- donpcevent "Hue#ep131_rhea06::OnDisable";
- donpcevent "Hansenne#ep131_rhea07::OnDisable";
- end;
OnTouch:
if (checkweight(1201,1) == 0) {
@@ -6678,6 +6636,49 @@ OnTouch:
}
end;
+ mes "[United Research Official]";
+ mes "Hmm? What did you just say?";
+ next;
+ mes "[United Research Official]";
+ mes "I can't really hear you. Could you speak louder?";
+ close;
+
+OnInit:
+ enablenpc "Research Official#ep131";
+ end;
+
+OnEnable:
+ hideoffnpc "Research Official#ep131";
+ end;
+
+OnDisable:
+ hideonnpc "Research Official#ep131";
+ end;
+
+Onmeet:
+ donpcevent "Ryosen#ep131_rhea05::OnEnable";
+ donpcevent "Hue#ep131_rhea06::OnEnable";
+ donpcevent "Hansenne#ep131_rhea07::OnEnable";
+ end;
+
+Oncall:
+ initnpctimer;
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ monster "mid_campin",376,134,"Thief Bug",1051,1,"Research Official#ep131::OnMyMobDead";
+ donpcevent "Research Official#ep131::OnDisable";
+ donpcevent "Ryosen#ep131_rhea05::OnDisable";
+ donpcevent "Hue#ep131_rhea06::OnDisable";
+ donpcevent "Hansenne#ep131_rhea07::OnDisable";
+ end;
+
OnMyMobDead:
if (mobcount("mid_campin","Research Official#ep131::OnMyMobDead") < 1) {
donpcevent "Research Official#ep131::OnEnable";