- 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://svn.code.sf.net/p/rathena/svn/trunk@16161 54d463be-8e91-2dee-dedb-b68131a5f0ec

db/quest_db.txt

@@ -291,7 +291,7 @@
 3088,0,0,0,0,0,0,0,"Report to the continent - Accident!"
 3089,0,0,0,0,0,0,0,"Report to the continent - How to restore"
 3090,0,0,0,0,0,0,0,"Report to the continent - Location of reports"
-3091,0,0,0,0,0,0,0,"Report to the continent - Location of reports"
+3091,1800,0,0,0,0,0,0,"Report to the continent - Location of reports"
 3092,0,0,0,0,0,0,0,"Report to the continent - Success to restore!"
 3093,0,0,0,0,0,0,0,"Report to the continent - Report to the continent"
 3094,0,0,0,0,0,0,0,"Report to the continent - Return to the expedition"
@@ -354,7 +354,7 @@
 3217,0,0,0,0,0,0,0,"Job changes to Rune knight - The final test"
 3218,0,0,0,0,0,0,0,"Job changes to Rune knight - Pass the final test"
 3219,0,0,0,0,0,0,0,"Job changes to Rune knight - The end of all tes"
-3220,0,0,0,0,0,0,0,"Job changes to Rune knight - Waiting time of test"
+3220,600,0,0,0,0,0,0,"Job changes to Rune knight - Waiting time of test"
 
 3250,0,1041,30,0,0,0,0,"Request - What is this bandage for?"
 3251,0,1271,30,0,0,0,0,"Request - An alligator of Counterattack"
@@ -506,7 +506,7 @@
 7070,0,0,0,0,0,0,0,"Messenger - Terra's Return"
 7071,0,0,0,0,0,0,0,"Messenger - Invitation"
 //7072,0,0,0,0,0,0,0,""
-//7073,0,0,0,0,0,0,0,""
+//7073,86400,0,0,0,0,0,0,""
 7074,0,2017,1,0,0,0,0,"Rata Hunt"
 7075,0,2018,1,0,0,0,0,"Duneyrr Hunt"
 7076,0,2026,1,0,0,0,0,"Wanted: Dandelion"
@@ -1014,7 +1014,7 @@
 10084,0,0,0,0,0,0,0,"Escape from the reality, into the broad world"
 10085,86400,0,0,0,0,0,0,"Escape from the reality, into the broad world"
 10086,0,0,0,0,0,0,0,"Escape from the reality, into the broad world"
-10087,0,0,0,0,0,0,0,"Escape from the reality, into the broad world"
+10087,86400,0,0,0,0,0,0,"Escape from the reality, into the broad world"
 10088,0,0,0,0,0,0,0,"Escape from the reality, into the broad world"
 10089,0,0,0,0,0,0,0,"Escape from the reality, into the broad world"
 
@@ -1147,7 +1147,7 @@
 11101,0,0,0,0,0,0,0,"Secret note of Bazet"
 11102,0,0,0,0,0,0,0,"Secret note of Bazet"
 11103,0,0,0,0,0,0,0,"Secret note of Bazet"
-11104,0,0,0,0,0,0,0,"Resting time"
+11104,82800,0,0,0,0,0,0,"Resting time"
 11105,0,0,0,0,0,0,0,"Tendrilrion skin"
 
 11106,0,0,0,0,0,0,0,"Job changing to Warlock"
@@ -1157,7 +1157,7 @@
 11110,0,0,0,0,0,0,0,"Job changing to Warlock"
 11111,0,0,0,0,0,0,0,"Job changing to Warlock"
 11112,0,0,0,0,0,0,0,"Job changing to Warlock"
-11113,0,0,0,0,0,0,0,"Until radering is functioning"
+11113,82800,0,0,0,0,0,0,"Until radering is functioning"
 
 11114,0,1004,10,0,0,0,0,"Request : Hunt Honet"
 11115,0,1009,20,0,0,0,0,"Request : Hunt Condor"
@@ -1263,12 +1263,12 @@
 12055,0,0,0,0,0,0,0,"Job Quest - Assassin"
 12056,0,0,0,0,0,0,0,"Job Quest - Assassin"
 12057,0,0,0,0,0,0,0,"Pass to the Lab"
-12058,0,0,0,0,0,0,0,"Admission Restricted to the 102 Tower"
+12058,604800,0,0,0,0,0,0,"Admission Restricted to the 102 Tower"
 12059,7200,0,0,0,0,0,0,"Orc's Memory Time Limit"
 12060,86400,0,0,0,0,0,0,"Today's Fishing Closed"
-12061,0,0,0,0,0,0,0,"Concentration"
+12061,10,0,0,0,0,0,0,"Concentration"
 12062,86400,0,0,0,0,0,0,"Today's Mining Closed"
-12070,0,0,0,0,0,0,0,"Limited time for enter"
+12070,14400,0,0,0,0,0,0,"Limited time for enter"
 
 12072,0,1034,20,0,0,0,0,"Hunt tharafrog"
 12073,0,1248,15,0,0,0,0,"Remove Cruiser"

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";