Added updates to crusader job quest from bugreport:1887.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13210 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 10 insertions, 60 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 84def921a..c9bbd9633 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/09/14
+	* Rev. 13210 Added updates to crusader job quest from bugreport:1887. [L0ne_W0lf] 
 	* Rev. 13209 Corrected a typo in monster races. (bugreport:2147)
 	* Rev. 13208 Updated refiner function to allow for addition features per npc. [L0ne_W0lf]
 	* Updated repairmen positions and function. Now repairs all items at once.
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index f3695cce6..316d23da3 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -4,7 +4,7 @@
 //= Made by: Black Dragon
 //= Converted by: Shin
 //===== Current Version: ===================================== 
-//= 3.0
+//= 3.1
 //===== Compatible With: ===================================== 
 //= eAthena  SVN
 //===== Description: ========================================= 
@@ -29,6 +29,7 @@
 //= 2.9 Minor fixes, typos, an incorrect answer. Thanks to yyCC. [L0ne_W0lf]
 //= 2.9a Deleted unused variables. [Samuray22]
 //= 3.0 Updated waiting room. (Removes global var) [L0ne_W0lf]
+//= 3.1 Adding Hermemton's changes. [L0ne_W0lf]
 //============================================================
 
 
@@ -1261,6 +1262,7 @@ OnMonster2:
 	end;
 
 OnMonster3:
+	monster "job_cru",168,110,"Archer Skeleton",1016,1,"Monster Summon#cr0::OnDead";
 	monster "job_cru",168,115,"Mummy",1041,1,"Monster Summon#cr0::OnDead";
 	end;
 
@@ -1322,7 +1324,6 @@ OnInit:
 	end;
 
 OnTouch:
-	monster "job_cru",168,110,"Archer Skeleton",1016,1;
 	donpcevent "Monster Summon#cr0::OnMonster3";
 	donpcevent "Monster Summon#cr3::OnEnd";
 	end;
@@ -1378,10 +1379,12 @@ OnInit:
 OnTouch:
 	warp "prt_castle",35,147;
 	donpcevent "Monster Summon#cr0::OnReset";
+	donpcevent "Monster Summon#cr4::OnReset";
 	donpcevent "Monster Summon#cr0::OnEnd";
+	donpcevent "Monster Summon#cr4::OnEnd";
+	donpcevent "Monster Summon#cr5::OnEnd";
 	donpcevent "Monster Summon#cr6::OnStop";
 	donpcevent "Monster Summon#cr6::OnEnd";
-	donpcevent "Monster Summon#cr5::OnEnd";
 	donpcevent "Waiting Room#cr1::OnStart";
 	end;
 
@@ -1395,33 +1398,16 @@ OnEnd:
 }
 
 job_cru,2,2,1	script	Monster Summon#cr6	-1,{
-OnTimer60000:
-	donpcevent "Monster Summon#cr8::OnStart";
-	end;
-
-OnTimer61000:
-	donpcevent "Monster Summon#cr8::OnEnd";
-	end;
-
-OnTimer240000:
-	donpcevent "Monster Summon#cr7::OnStart";
-	end;
-
 OnTimer241000:
+	areawarp "job_cru",160,14,175,178,"job_cru",24,169;
 	donpcevent "Monster Summon#cr0::OnReset";
 	donpcevent "Monster Summon#cr4::OnReset";
-	end;
-
-OnTimer242000:
 	donpcevent "Monster Summon#cr0::OnEnd";
 	donpcevent "Monster Summon#cr4::OnEnd";
-	donpcevent "Monster Summon#cr7::OnEnd";
-	end;
-
-OnTimer243000:
+	donpcevent "Monster Summon#cr5::OnEnd";
+	donpcevent "Monster Summon#cr6::OnStop";
 	donpcevent "Monster Summon#cr6::OnEnd";
 	donpcevent "Waiting Room#cr1::OnStart";
-	stopnpctimer;
 	end;
 
 OnInit:
@@ -1442,43 +1428,6 @@ OnStop:
 	end;
 }
 
-job_cru,168,110,0	script	Monster Summon#cr7	-1,14,82,{
-OnInit:
-	disablenpc "Monster Summon#cr7";
-	end;
-
-OnTouch:
-	warp "prontera",234,318;
-	end;
-
-OnStart:
-	enablenpc "Monster Summon#cr7";
-	end;
-
-OnEnd:
-	disablenpc "Monster Summon#cr7";
-	end;
-}
-
-job_cru,168,17,0	script	Monster Summon#cr8	-1,14,5,{
-OnInit:
-	disablenpc "Monster Summon#cr8";
-	end;
-
-OnTouch:
-	warp "prontera",234,318;
-	end;
-
-OnStart:
-	enablenpc "Monster Summon#cr8";
-	end;
-
-OnEnd:
-	disablenpc "Monster Summon#cr8";
-	end;
-
-}
-
 //============================================================ 
 // mapflag
 //============================================================