Added Complete Eclage NPCs,Quests and Instances

2 files changed, 56 insertions, 30 deletions

diff --git a/npc/re/warps/cities/eclage.txt b/npc/re/warps/cities/eclage.txt
index dd9e1d55e..a9ab2e385 100644
--- a/npc/re/warps/cities/eclage.txt
+++ b/npc/re/warps/cities/eclage.txt
@@ -3,30 +3,54 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.0a
+//= 1.1
 //===== Description: =========================================
 //= Warp Points for Eclage
 //===== Additional Comments: =================================
 //= 1.0 First Version.
 //= 1.0a Disabled quest warp. [Euphy]
+//= 1.1 Warps corresponds to official co-ordinates and
+//=	Warp Portal official names. [Dastgir]
 //============================================================
 
 // Town Warps
-bif_fild02,292,351,0	warp	eclage_field0001	1,1,ecl_fild01,205,74
-ecl_fild01,207,72,0	warp	eclage_field0002	1,1,bif_fild02,294,349
+ecl_fild01,207,72,0	warp	fild01-1_biffild	1,1,bif_fild02,294,350
+bif_fild02,292,351,0	warp	biffild_fild01-1	1,1,ecl_fild01,205,76
 //ecl_fild01,97,320,0	warp	eclage_field0003	1,1,eclage,100,28
-eclage,98,26,0	warp	eclage_field0004	1,1,ecl_fild01,97,317
-eclage,299,309,0	warp	eclage_field0005	1,1,ecl_in01,47,11
-ecl_in01,47,8,0	warp	eclage_field0006	1,1,eclage,297,307
-ecl_in01,8,67,0	warp	eclage_field0007	1,1,ecl_hub01,38,94
-ecl_hub01,40,95,0	warp	eclage_field0008	1,1,ecl_in01,11,67
-ecl_hub01,22,109,0	warp	eclage_field0009	1,1,ecl_in02,98,7
-ecl_in02,98,4,0	warp	eclage_field0010	1,1,ecl_hub01,23,107
-ecl_in02,81,18,0	warp	eclage_field0011	1,1,ecl_in02,157,65
-ecl_in02,157,68,0	warp	eclage_field0012	1,1,ecl_in02,83,18
-ecl_in01,84,68,0	warp	eclage_field0013	1,1,ecl_hub01,107,107
-ecl_hub01,107,110,0	warp	eclage_field0014	1,1,ecl_in01,81,68
-ecl_hub01,127,95,0	warp	eclage_field0015	1,1,ecl_hub01,18,31
-ecl_hub01,18,34,0	warp	eclage_field0016	1,1,ecl_hub01,124,95
-ecl_hub01,40,14,0	warp	eclage_field0017	1,1,ecl_in03,144,17
-ecl_in03,144,14,0	warp	eclage_field0018	1,1,ecl_hub01,40,11
+eclage,98,26,0	warp	eclageS_EclEnter	1,1,eclage,100,28
+eclage,299,309,0	warp	eclageN_in01s	1,1,ecl_in01,47,11
+ecl_in01,47,8,0	warp	in01s_eclageN	1,1,eclage,297,307
+ecl_in01,8,67,0	warp	in01w_hub1-1	1,1,ecl_hub01,38,94
+ecl_hub01,40,95,0	warp	hub1-1_in01w	1,1,ecl_in01,11,67
+ecl_hub01,22,109,0	warp	hub1-2_in02-1	1,1,ecl_in02,99,7
+ecl_in02,98,4,0	warp	in02-1_hub1-2	1,1,ecl_hub01,23,107
+ecl_in02,80,18,0	warp	in02-2_in02-3	1,1,ecl_in02,157,66
+ecl_in02,157,68,0	warp	in02-3_in02-2	1,1,ecl_in02,83,18
+ecl_in01,84,68,0	script	in01e_hub2-1	WARPNPC,1,1,{
+	end;
+OnTouch:
+	if (ep14_2_mylord == 29) {
+		warp "ecl_hub01",106,31;
+	}
+	else {
+		warp "ecl_hub01",107,107;
+	}
+end;
+}
+ecl_hub01,107,110,0	warp	hub2-1_in01e	1,1,ecl_in01,82,68
+ecl_hub01,127,95,0	warp	hub2-2_hub3-1	1,1,ecl_hub01,18,32
+ecl_hub01,18,34,0	script	hub3-1_hub2-2	WARPNPC,1,1,{
+	end;
+OnTouch:
+	if (ep14_2_mylord == 29) {
+		warp "ecl_hub01",135,14;
+	}
+	else {
+		warp "ecl_hub01",125,94;
+	}
+end;
+}
+ecl_hub01,40,14,0	warp	hub3-2_in03	1,1,ecl_in03,144,17
+ecl_in03,144,14,0	warp	in03_hub3-2	1,1,ecl_hub01,40,11
+ecl_hub01,105,36,0	warp	hub4-1_in01e	1,1,ecl_in01,82,68
+ecl_hub01,138,17,0	warp	hub4-2_hub3-1	1,1,ecl_hub01,18,32
diff --git a/npc/re/warps/dungeons/ecl_dun.txt b/npc/re/warps/dungeons/ecl_dun.txt
index d3ce45cc7..e0677c3a9 100644
--- a/npc/re/warps/dungeons/ecl_dun.txt
+++ b/npc/re/warps/dungeons/ecl_dun.txt
@@ -3,20 +3,22 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.0
+//= 1.0a
 //===== Description: =========================================
-//= Warp Points for Eclage Dungeon
+//= Warp Portals for Eclage Dungeon
 //===== Additional Comments: =================================
 //= 1.0 First Version.
+//= 1.0a Corrected Warp Co-ordinates and 
+//=      name of Warp Portal. [Dastgir]
 //============================================================
 
-ecl_fild01,182,82,0	warp	eclage_dun0001	1,1,ecl_tdun01,60,13
-ecl_tdun01,61,11,0	warp	eclage_dun0002	1,1,ecl_fild01,182,85
-ecl_tdun01,67,106,0	warp	eclage_dun0003	1,1,ecl_tdun02,60,88
-ecl_tdun02,60,90,0	warp	eclage_dun0004	1,1,ecl_tdun01,70,105
-ecl_tdun02,52,9,0	warp	eclage_dun0005	1,1,ecl_tdun03,47,13
-ecl_tdun03,49,11,0	warp	eclage_dun0006	1,1,ecl_tdun02,50,11
-ecl_tdun03,50,46,0	warp	eclage_dun0007	1,1,ecl_tdun04,26,23
-ecl_tdun04,26,26,0	warp	eclage_dun0008	1,1,ecl_tdun03,50,43
-ecl_tdun04,34,17,0	warp	eclage_dun0009	1,1,ecl_fild01,183,73
-ecl_fild01,183,70,0	warp	eclage_dun0010	1,1,ecl_tdun04,32,19
+ecl_fild01,182,82,0	warp	Tenter_TOut	1,1,ecl_tdun01,60,13
+ecl_tdun01,61,11,0	warp	TOut_Tenter	1,1,ecl_fild01,182,85
+ecl_tdun01,67,106,0	warp	tdun1up_tdun2dn	1,1,ecl_tdun02,60,88
+ecl_tdun02,60,90,0	warp	tdun2dn_tdun1up	1,1,ecl_tdun01,70,105
+ecl_tdun02,52,9,0	warp	tdun2up_tdun3dn	1,1,ecl_tdun03,47,13
+ecl_tdun03,49,11,0	warp	tdun3dn_tdun2up	1,1,ecl_tdun02,50,11
+ecl_tdun03,50,46,0	warp	tdun3up_tdun4dn	1,1,ecl_tdun04,26,24
+ecl_tdun04,26,26,0	warp	tdun4dn_tdun3up	1,1,ecl_tdun03,50,44
+ecl_tdun04,34,17,0	warp	tdun4-1_ttop	1,1,ecl_fild01,183,73
+ecl_fild01,183,70,0	warp	ttop_tdun4-1	1,1,ecl_tdun04,33,19