Fixed some file types

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

4 files changed, 290 insertions, 290 deletions

diff --git a/npc/guild/nguild/nguild_dunsw.txt b/npc/guild/nguild/nguild_dunsw.txt
index 8e8b779fc..52fd1dbab 100644
--- a/npc/guild/nguild/nguild_dunsw.txt
+++ b/npc/guild/nguild/nguild_dunsw.txt
@@ -1,39 +1,39 @@
-//===== eAthena Script =======================================

-//= War of Emperium Dungeon Switch for NGuild Castles

-//===== By: ==================================================

-//= jAthena - kalen (1.0)

-//= 1.1 by Akaru, ho|yAnge|X, and Valaris

-//===== Current Version: =====================================

-//= 1.2

-//===== Compatible With: =====================================

-//= eAthena 0.1+; RO Episode 4+

-//===== Description: =========================================

-//= Switch that warps guild members to the guild dungeon

-//===== Additional Comments: =================================

-//Based off existing guild scripts.  Do not know if it is accurate.[kobra_k88]

-//============================================================

-

-

-// Castle 1 ===============================================

-nguild_alde.gat,212,181,0	script	Switch#DunN01	111,{

-	callfunc "F_GldDunSw","nguild_alde","02",32,122;

-	close;

-}

-

-// Castle 2 ===============================================

-nguild_gef.gat,78,84,0	script	Switch#DunN02	111,{

-	callfunc "F_GldDunSw","nguild_gef","04",39,258;

-	close;

-}

-

-// Castle 3 ===============================================

-nguild_pay.gat,101,25,0	script	Switch#DunN03	111,{

-	callfunc "F_GldDunSw","nguild_pay","01",186,165;

-	close;

-}

-

-// Castle 4 ===============================================

-nguild_prt.gat,94,200,0	script	Switch#DunN04	111,{

-	callfunc "F_GldDunSw","nguild_prt","03",28,251;

-	close;

-}

+//===== eAthena Script =======================================
+//= War of Emperium Dungeon Switch for NGuild Castles
+//===== By: ==================================================
+//= jAthena - kalen (1.0)
+//= 1.1 by Akaru, ho|yAnge|X, and Valaris
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= eAthena 0.1+; RO Episode 4+
+//===== Description: =========================================
+//= Switch that warps guild members to the guild dungeon
+//===== Additional Comments: =================================
+//Based off existing guild scripts.  Do not know if it is accurate.[kobra_k88]
+//============================================================
+
+
+// Castle 1 ===============================================
+nguild_alde.gat,212,181,0	script	Switch#DunN01	111,{
+	callfunc "F_GldDunSw","nguild_alde","02",32,122;
+	close;
+}
+
+// Castle 2 ===============================================
+nguild_gef.gat,78,84,0	script	Switch#DunN02	111,{
+	callfunc "F_GldDunSw","nguild_gef","04",39,258;
+	close;
+}
+
+// Castle 3 ===============================================
+nguild_pay.gat,101,25,0	script	Switch#DunN03	111,{
+	callfunc "F_GldDunSw","nguild_pay","01",186,165;
+	close;
+}
+
+// Castle 4 ===============================================
+nguild_prt.gat,94,200,0	script	Switch#DunN04	111,{
+	callfunc "F_GldDunSw","nguild_prt","03",28,251;
+	close;
+}
diff --git a/npc/guild/nguild/nguild_ev_agit.txt b/npc/guild/nguild/nguild_ev_agit.txt
index 75d2c1990..ee5b71255 100644
--- a/npc/guild/nguild/nguild_ev_agit.txt
+++ b/npc/guild/nguild/nguild_ev_agit.txt
@@ -1,107 +1,107 @@
-//===== eAthena Script =======================================

-//= War of Emperium - NGuild Wars Events

-//===== By: ==================================================

-//= jAthena (1.0)

-//= 1.1 by Akaru and ho|yAnge|

-//===== Current Version: =====================================

-//= 1.2

-//===== Compatible With: =====================================

-//= eAthena 0.1+; RO Episode 4+

-//===== Description: =========================================

-//= Event Triggers for NGuild Wars

-//===== Additional Comments: =================================

-// Based off existing guild scripts.  Do not know if it is accurate.[kobra_k88]

-//============================================================

-

-

-// Castle 1 ================================================================

-nguild_alde.gat,0,0,0	script	Agit_N01	-1,{

-OnInterIfInit:

-	GetCastleData "nguild_alde.gat",0,"::OnRecvCastleN01";

-	end;

-OnRecvCastleN01:

-	RequestGuildInfo GetCastleData("nguild_alde.gat",1);

-	end;

-OnAgitStart:

-	callfunc "F_AgitStart","nguild_alde","N01",216,24;

-	end;

-OnAgitBreak:

-	callfunc "F_AgitBreak","nguild_alde","N01";

-	end;

-OnAgitEliminate:

-	MapRespawnGuildID "nguild_alde.gat",GetCastleData("nguild_alde.gat",1),6;

-	Monster "nguild_alde.gat",216,24,"EMPERIUM",1288,1,"Agit_N01::OnAgitBreak";

-	end;

-OnAgitEnd:

-	callfunc "F_AgitEnd","nguild_alde","N01";

-	end;

-}

-

-// Castle 2 ================================================================

-nguild_gef.gat,0,0,0	script	Agit_N02	-1,{

-OnInterIfInit:

-	GetCastleData "nguild_gef.gat",0,"::OnRecvCastleN02";

-	end;

-OnRecvCastleN02:

-	RequestGuildInfo GetCastleData("nguild_gef.gat",1);

-	end;

-OnAgitStart:

-	callfunc "F_AgitStart","nguild_gef","N02",198,182;

-	end;

-OnAgitBreak:

-	callfunc "F_AgitBreak","nguild_gef","N02";

-	end;

-OnAgitEliminate:

-	MapRespawnGuildID "nguild_gef.gat",GetCastleData("nguild_gef.gat",1),6;

-	Monster "nguild_gef.gat",198,182,"EMPERIUM",1288,1,"Agit_N02::OnAgitBreak";

-	end;

-OnAgitEnd:

-	callfunc "F_AgitEnd","nguild_gef","N02";

-	end;

-}

-

-// Castle 3 ================================================================

-nguild_pay.gat,0,0,0	script	Agit_N03	-1,{

-OnInterIfInit:

-	GetCastleData "nguild_pay.gat",0,"::OnRecvCastleN03";

-	end;

-OnRecvCastleN03:

-	RequestGuildInfo GetCastleData("nguild_pay.gat",1);

-	end;

-OnAgitStart:

-	callfunc "F_AgitStart","nguild_pay","N03",139,139;

-	end;

-OnAgitBreak:

-	callfunc "F_AgitBreak","nguild_pay","N03";

-	end;

-OnAgitEliminate:

-	MapRespawnGuildID "nguild_pay.gat",GetCastleData("nguild_pay.gat",1),6;

-	Monster "nguild_pay.gat",139,139,"EMPERIUM",1288,1,"Agit_N03::OnAgitBreak";

-	end;

-OnAgitEnd:

-	callfunc "F_AgitEnd","nguild_pay","N03";

-	end;

-}

-

-// Castle 4 ================================================================

-nguild_prt.gat,0,0,0	script	Agit_N04	-1,{

-OnInterIfInit:

-	GetCastleData "nguild_prt.gat",0,"::OnRecvCastleN04";

-	end;

-OnRecvCastleN04:

-	RequestGuildInfo GetCastleData("nguild_prt.gat",1);

-	end;

-OnAgitStart:

-	callfunc "F_AgitStart","nguild_prt","N04",197,197;

-	end;

-OnAgitBreak:

-	callfunc "F_AgitBreak","nguild_prt","N04";

-	end;

-OnAgitEliminate:

-	MapRespawnGuildID "nguild_prt.gat",GetCastleData("nguild_prt.gat",1),6;

-	Monster "nguild_prt.gat",197,197,"EMPERIUM",1288,1,"Agit_N04::OnAgitBreak";

-	end;

-OnAgitEnd:

-	callfunc "F_AgitEnd","nguild_prt","N04";

-	end;

-}

+//===== eAthena Script =======================================
+//= War of Emperium - NGuild Wars Events
+//===== By: ==================================================
+//= jAthena (1.0)
+//= 1.1 by Akaru and ho|yAnge|
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= eAthena 0.1+; RO Episode 4+
+//===== Description: =========================================
+//= Event Triggers for NGuild Wars
+//===== Additional Comments: =================================
+// Based off existing guild scripts.  Do not know if it is accurate.[kobra_k88]
+//============================================================
+
+
+// Castle 1 ================================================================
+nguild_alde.gat,0,0,0	script	Agit_N01	-1,{
+OnInterIfInit:
+	GetCastleData "nguild_alde.gat",0,"::OnRecvCastleN01";
+	end;
+OnRecvCastleN01:
+	RequestGuildInfo GetCastleData("nguild_alde.gat",1);
+	end;
+OnAgitStart:
+	callfunc "F_AgitStart","nguild_alde","N01",216,24;
+	end;
+OnAgitBreak:
+	callfunc "F_AgitBreak","nguild_alde","N01";
+	end;
+OnAgitEliminate:
+	MapRespawnGuildID "nguild_alde.gat",GetCastleData("nguild_alde.gat",1),6;
+	Monster "nguild_alde.gat",216,24,"EMPERIUM",1288,1,"Agit_N01::OnAgitBreak";
+	end;
+OnAgitEnd:
+	callfunc "F_AgitEnd","nguild_alde","N01";
+	end;
+}
+
+// Castle 2 ================================================================
+nguild_gef.gat,0,0,0	script	Agit_N02	-1,{
+OnInterIfInit:
+	GetCastleData "nguild_gef.gat",0,"::OnRecvCastleN02";
+	end;
+OnRecvCastleN02:
+	RequestGuildInfo GetCastleData("nguild_gef.gat",1);
+	end;
+OnAgitStart:
+	callfunc "F_AgitStart","nguild_gef","N02",198,182;
+	end;
+OnAgitBreak:
+	callfunc "F_AgitBreak","nguild_gef","N02";
+	end;
+OnAgitEliminate:
+	MapRespawnGuildID "nguild_gef.gat",GetCastleData("nguild_gef.gat",1),6;
+	Monster "nguild_gef.gat",198,182,"EMPERIUM",1288,1,"Agit_N02::OnAgitBreak";
+	end;
+OnAgitEnd:
+	callfunc "F_AgitEnd","nguild_gef","N02";
+	end;
+}
+
+// Castle 3 ================================================================
+nguild_pay.gat,0,0,0	script	Agit_N03	-1,{
+OnInterIfInit:
+	GetCastleData "nguild_pay.gat",0,"::OnRecvCastleN03";
+	end;
+OnRecvCastleN03:
+	RequestGuildInfo GetCastleData("nguild_pay.gat",1);
+	end;
+OnAgitStart:
+	callfunc "F_AgitStart","nguild_pay","N03",139,139;
+	end;
+OnAgitBreak:
+	callfunc "F_AgitBreak","nguild_pay","N03";
+	end;
+OnAgitEliminate:
+	MapRespawnGuildID "nguild_pay.gat",GetCastleData("nguild_pay.gat",1),6;
+	Monster "nguild_pay.gat",139,139,"EMPERIUM",1288,1,"Agit_N03::OnAgitBreak";
+	end;
+OnAgitEnd:
+	callfunc "F_AgitEnd","nguild_pay","N03";
+	end;
+}
+
+// Castle 4 ================================================================
+nguild_prt.gat,0,0,0	script	Agit_N04	-1,{
+OnInterIfInit:
+	GetCastleData "nguild_prt.gat",0,"::OnRecvCastleN04";
+	end;
+OnRecvCastleN04:
+	RequestGuildInfo GetCastleData("nguild_prt.gat",1);
+	end;
+OnAgitStart:
+	callfunc "F_AgitStart","nguild_prt","N04",197,197;
+	end;
+OnAgitBreak:
+	callfunc "F_AgitBreak","nguild_prt","N04";
+	end;
+OnAgitEliminate:
+	MapRespawnGuildID "nguild_prt.gat",GetCastleData("nguild_prt.gat",1),6;
+	Monster "nguild_prt.gat",197,197,"EMPERIUM",1288,1,"Agit_N04::OnAgitBreak";
+	end;
+OnAgitEnd:
+	callfunc "F_AgitEnd","nguild_prt","N04";
+	end;
+}
diff --git a/npc/guild/nguild/nguild_guardians.txt b/npc/guild/nguild/nguild_guardians.txt
index bed162100..98872d9f9 100644
--- a/npc/guild/nguild/nguild_guardians.txt
+++ b/npc/guild/nguild/nguild_guardians.txt
@@ -1,91 +1,91 @@
-//===== eAthena Script =======================================

-//= War of Emperium - nguild guardians script

-//===== By: ==================================================

-//= holyAngelX (1.0)

-//= 1.1 by joedukk

-//= 1.2 by Akaru and Valaris

-//===== Current Version: =====================================

-//= 1.2a

-//===== Compatible With: =====================================

-//= eAthena 0.1+; RO Episode 4+

-//===== Description: =========================================

-//= Re-spawns guardians on server start if they have been

-//= purchased.  Also announces when a guardian dies.

-//===== Additional Comments: =================================

-//= Based off existing guild scripts.  Do not know if it is accurate.[kobra_k88]

-//============================================================

-

-

-//------------------------------------------------------------------------------

-nguild_alde.gat,216,24,0	script	Guardian_N01	-1,{

-OnAgitInit:

-	if (GetCastleData("nguild_alde.gat",10) == 1) guardian "nguild_alde.gat",18,219,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",0;

-	if (GetCastleData("nguild_alde.gat",11) == 1) guardian "nguild_alde.gat",117,42,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",1;

-	if (GetCastleData("nguild_alde.gat",12) == 1) guardian "nguild_alde.gat",207,153,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",2;

-	if (GetCastleData("nguild_alde.gat",13) == 1) guardian "nguild_alde.gat",68,70,"Archer Guardian",1285,1,"Guardian_N01::OnGuardianDied",3;

-	if (GetCastleData("nguild_alde.gat",14) == 1) guardian "nguild_alde.gat",187,140,"Archer Guardian",1285,1,"Guardian_N01::OnGuardianDied",4;

-	if (GetCastleData("nguild_alde.gat",15) == 1) guardian "nguild_alde.gat",62,204,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",5;

-	if (GetCastleData("nguild_alde.gat",16) == 1) guardian "nguild_alde.gat",113,100,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",6;

-	if (GetCastleData("nguild_alde.gat",17) == 1) guardian "nguild_alde.gat",211,174,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",7;

-	end;

-

-OnGuardianDied:

-	// Event when Guardian dies

-	MapAnnounce "nguild_alde.gat","A Guardian Has Fallen",17;

-	end;

-}

-

-//------------------------------------------------------------------------------

-nguild_gef.gat,198,182,0	script	Guardian_N02	-1,{

-OnAgitInit:

-	if (GetCastleData("nguild_gef.gat",10) == 1) guardian "nguild_gef.gat",30,178,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",0;

-	if (GetCastleData("nguild_gef.gat",11) == 1) guardian "nguild_gef.gat",64,180,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",1;

-	if (GetCastleData("nguild_gef.gat",12) == 1) guardian "nguild_gef.gat",61,25,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",2;

-	if (GetCastleData("nguild_gef.gat",13) == 1) guardian "nguild_gef.gat",61,44,"Archer Guardian",1285,1,"Guardian_N02::OnGuardianDied",3;

-	if (GetCastleData("nguild_gef.gat",14) == 1) guardian "nguild_gef.gat",189,43,"Archer Guardian",1285,1,"Guardian_N02::OnGuardianDied",4;

-	if (GetCastleData("nguild_gef.gat",15) == 1) guardian "nguild_gef.gat",51,192,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",5;

-	if (GetCastleData("nguild_gef.gat",16) == 1) guardian "nguild_gef.gat",49,67,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",6;

-	if (GetCastleData("nguild_gef.gat",17) == 1) guardian "nguild_gef.gat",181,14,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",7;

-	end;

-

-OnGuardianDied:

-	// Event when Guardian dies

-	MapAnnounce "nguild_gef.gat","A Guardian Has Fallen",17;

-	end;

-}

-//------------------------------------------------------------------------------

-nguild_pay.gat,139,139,0	script	Guardian_N03	-1,{

-OnAgitInit:

-	if (GetCastleData("nguild_pay.gat",10) == 1) guardian "nguild_pay.gat",210,120,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",0;

-	if (GetCastleData("nguild_pay.gat",11) == 1) guardian "nguild_pay.gat",69,26,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",1; 

-	if (GetCastleData("nguild_pay.gat",12) == 1) guardian "nguild_pay.gat",23,141,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",2;

-	if (GetCastleData("nguild_pay.gat",13) == 1) guardian "nguild_pay.gat",224,87,"Archer Guardian",1285,1,"Guardian_N03::OnGuardianDied",3;

-	if (GetCastleData("nguild_pay.gat",14) == 1) guardian "nguild_pay.gat",81,45,"Archer Guardian",1285,1,"Guardian_N03::OnGuardianDied",4;

-	if (GetCastleData("nguild_pay.gat",15) == 1) guardian "nguild_pay.gat",214,53,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",5;

-	if (GetCastleData("nguild_pay.gat",16) == 1) guardian "nguild_pay.gat",69,26,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",6;

-	if (GetCastleData("nguild_pay.gat",17) == 1) guardian "nguild_pay.gat",23,141,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",7;

-	end;

-

-OnGuardianDied:

-	// Event when Guardian dies

-	MapAnnounce "nguild_pay.gat","A Guardian Has Fallen",17;

-	end;

-}

-//------------------------------------------------------------------------------

-nguild_prt.gat,197,197,0	script	Guardian_N04	-1,{

-OnAgitInit:

-	if (GetCastleData("nguild_prt.gat",10) == 1) guardian "nguild_prt.gat",196,92,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",0;

-	if (GetCastleData("nguild_prt.gat",11) == 1) guardian "nguild_prt.gat",113,200,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",1;

-	if (GetCastleData("nguild_prt.gat",12) == 1) guardian "nguild_prt.gat",111,186,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",2;

-	if (GetCastleData("nguild_prt.gat",13) == 1) guardian "nguild_prt.gat",76,202,"Archer Guardian",1285,1,"Guardian_N04::OnGuardianDied",3;

-	if (GetCastleData("nguild_prt.gat",14) == 1) guardian "nguild_prt.gat",90,26,"Archer Guardian",1285,1,"Guardian_N04::OnGuardianDied",4;

-	if (GetCastleData("nguild_prt.gat",15) == 1) guardian "nguild_prt.gat",58,59,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",5;

-	if (GetCastleData("nguild_prt.gat",16) == 1) guardian "nguild_prt.gat",112,200,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",6;

-	if (GetCastleData("nguild_prt.gat",17) == 1) guardian "nguild_prt.gat",101,194,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",7;

-	end;

-

-OnGuardianDied:

-	// Event when Guardian dies

-	MapAnnounce "nguild_prt.gat","A Guardian Has Fallen",17;

-	end;

-}

+//===== eAthena Script =======================================
+//= War of Emperium - nguild guardians script
+//===== By: ==================================================
+//= holyAngelX (1.0)
+//= 1.1 by joedukk
+//= 1.2 by Akaru and Valaris
+//===== Current Version: =====================================
+//= 1.2a
+//===== Compatible With: =====================================
+//= eAthena 0.1+; RO Episode 4+
+//===== Description: =========================================
+//= Re-spawns guardians on server start if they have been
+//= purchased.  Also announces when a guardian dies.
+//===== Additional Comments: =================================
+//= Based off existing guild scripts.  Do not know if it is accurate.[kobra_k88]
+//============================================================
+
+
+//------------------------------------------------------------------------------
+nguild_alde.gat,216,24,0	script	Guardian_N01	-1,{
+OnAgitInit:
+	if (GetCastleData("nguild_alde.gat",10) == 1) guardian "nguild_alde.gat",18,219,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",0;
+	if (GetCastleData("nguild_alde.gat",11) == 1) guardian "nguild_alde.gat",117,42,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",1;
+	if (GetCastleData("nguild_alde.gat",12) == 1) guardian "nguild_alde.gat",207,153,"Soldier Guardian",1287,1,"Guardian_N01::OnGuardianDied",2;
+	if (GetCastleData("nguild_alde.gat",13) == 1) guardian "nguild_alde.gat",68,70,"Archer Guardian",1285,1,"Guardian_N01::OnGuardianDied",3;
+	if (GetCastleData("nguild_alde.gat",14) == 1) guardian "nguild_alde.gat",187,140,"Archer Guardian",1285,1,"Guardian_N01::OnGuardianDied",4;
+	if (GetCastleData("nguild_alde.gat",15) == 1) guardian "nguild_alde.gat",62,204,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",5;
+	if (GetCastleData("nguild_alde.gat",16) == 1) guardian "nguild_alde.gat",113,100,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",6;
+	if (GetCastleData("nguild_alde.gat",17) == 1) guardian "nguild_alde.gat",211,174,"Knight Guardian",1286,1,"Guardian_N01::OnGuardianDied",7;
+	end;
+
+OnGuardianDied:
+	// Event when Guardian dies
+	MapAnnounce "nguild_alde.gat","A Guardian Has Fallen",17;
+	end;
+}
+
+//------------------------------------------------------------------------------
+nguild_gef.gat,198,182,0	script	Guardian_N02	-1,{
+OnAgitInit:
+	if (GetCastleData("nguild_gef.gat",10) == 1) guardian "nguild_gef.gat",30,178,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",0;
+	if (GetCastleData("nguild_gef.gat",11) == 1) guardian "nguild_gef.gat",64,180,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",1;
+	if (GetCastleData("nguild_gef.gat",12) == 1) guardian "nguild_gef.gat",61,25,"Soldier Guardian",1287,1,"Guardian_N02::OnGuardianDied",2;
+	if (GetCastleData("nguild_gef.gat",13) == 1) guardian "nguild_gef.gat",61,44,"Archer Guardian",1285,1,"Guardian_N02::OnGuardianDied",3;
+	if (GetCastleData("nguild_gef.gat",14) == 1) guardian "nguild_gef.gat",189,43,"Archer Guardian",1285,1,"Guardian_N02::OnGuardianDied",4;
+	if (GetCastleData("nguild_gef.gat",15) == 1) guardian "nguild_gef.gat",51,192,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",5;
+	if (GetCastleData("nguild_gef.gat",16) == 1) guardian "nguild_gef.gat",49,67,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",6;
+	if (GetCastleData("nguild_gef.gat",17) == 1) guardian "nguild_gef.gat",181,14,"Knight Guardian",1286,1,"Guardian_N02::OnGuardianDied",7;
+	end;
+
+OnGuardianDied:
+	// Event when Guardian dies
+	MapAnnounce "nguild_gef.gat","A Guardian Has Fallen",17;
+	end;
+}
+//------------------------------------------------------------------------------
+nguild_pay.gat,139,139,0	script	Guardian_N03	-1,{
+OnAgitInit:
+	if (GetCastleData("nguild_pay.gat",10) == 1) guardian "nguild_pay.gat",210,120,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",0;
+	if (GetCastleData("nguild_pay.gat",11) == 1) guardian "nguild_pay.gat",69,26,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",1; 
+	if (GetCastleData("nguild_pay.gat",12) == 1) guardian "nguild_pay.gat",23,141,"Soldier Guardian",1287,1,"Guardian_N03::OnGuardianDied",2;
+	if (GetCastleData("nguild_pay.gat",13) == 1) guardian "nguild_pay.gat",224,87,"Archer Guardian",1285,1,"Guardian_N03::OnGuardianDied",3;
+	if (GetCastleData("nguild_pay.gat",14) == 1) guardian "nguild_pay.gat",81,45,"Archer Guardian",1285,1,"Guardian_N03::OnGuardianDied",4;
+	if (GetCastleData("nguild_pay.gat",15) == 1) guardian "nguild_pay.gat",214,53,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",5;
+	if (GetCastleData("nguild_pay.gat",16) == 1) guardian "nguild_pay.gat",69,26,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",6;
+	if (GetCastleData("nguild_pay.gat",17) == 1) guardian "nguild_pay.gat",23,141,"Knight Guardian",1286,1,"Guardian_N03::OnGuardianDied",7;
+	end;
+
+OnGuardianDied:
+	// Event when Guardian dies
+	MapAnnounce "nguild_pay.gat","A Guardian Has Fallen",17;
+	end;
+}
+//------------------------------------------------------------------------------
+nguild_prt.gat,197,197,0	script	Guardian_N04	-1,{
+OnAgitInit:
+	if (GetCastleData("nguild_prt.gat",10) == 1) guardian "nguild_prt.gat",196,92,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",0;
+	if (GetCastleData("nguild_prt.gat",11) == 1) guardian "nguild_prt.gat",113,200,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",1;
+	if (GetCastleData("nguild_prt.gat",12) == 1) guardian "nguild_prt.gat",111,186,"Soldier Guardian",1287,1,"Guardian_N04::OnGuardianDied",2;
+	if (GetCastleData("nguild_prt.gat",13) == 1) guardian "nguild_prt.gat",76,202,"Archer Guardian",1285,1,"Guardian_N04::OnGuardianDied",3;
+	if (GetCastleData("nguild_prt.gat",14) == 1) guardian "nguild_prt.gat",90,26,"Archer Guardian",1285,1,"Guardian_N04::OnGuardianDied",4;
+	if (GetCastleData("nguild_prt.gat",15) == 1) guardian "nguild_prt.gat",58,59,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",5;
+	if (GetCastleData("nguild_prt.gat",16) == 1) guardian "nguild_prt.gat",112,200,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",6;
+	if (GetCastleData("nguild_prt.gat",17) == 1) guardian "nguild_prt.gat",101,194,"Knight Guardian",1286,1,"Guardian_N04::OnGuardianDied",7;
+	end;
+
+OnGuardianDied:
+	// Event when Guardian dies
+	MapAnnounce "nguild_prt.gat","A Guardian Has Fallen",17;
+	end;
+}
diff --git a/npc/guild/nguild/nguild_kafras.txt b/npc/guild/nguild/nguild_kafras.txt
index b5d6b2d3a..a302efece 100644
--- a/npc/guild/nguild/nguild_kafras.txt
+++ b/npc/guild/nguild/nguild_kafras.txt
@@ -1,53 +1,53 @@
-//===== eAthena Script =======================================

-//= War of Emperium Kafras for N Guild Castles

-//===== By: ==================================================

-//= jAthena - kalen (1.0)

-//= 1.1 by Akaru, ho|yAnge|X, and Valaris

-//===== Current Version: =====================================

-//= 1.2

-//===== Compatible With: =====================================

-//= eAthena 0.1+; RO Episode 4+

-//===== Description: =========================================

-//= Provides Kafra services for guild members of NGuild Castles.

-//= Used in conjuction with function F_Kafra.

-//===== Additional Comments: =================================

-//= Based off existing guild scripts.  Do not know if it is accurate.[kobra_k88]

-//============================================================

-

-

-// Castle 1 ===============================================

-nguild_alde.gat,218,170,0	script	Kafra Service#N01	117,{

-	callfunc "F_GKafra", "nguild_alde", "Al De Baran";

-	end;

-OnRecvCastleN01:

-	if (GetCastleData("nguild_alde.gat",9) < 1) disablenpc "Kafra Service#N01";

-	end;

-}

-

-// Castle 2 ===============================================

-//nguild_gef,96,173,0	script	Kafra Service#N02	117,{

-nguild_gef.gat,35,37,0	script	Kafra Service#N02	117,{

-	callfunc "F_GKafra", "nguild_gef", "Geffen";

-	end;

-OnRecvCastleN02:

-	if (GetCastleData("nguild_gef.gat",9) < 1) disablenpc "Kafra Service#N02";

-	end;

-}

-

-// Castle 3 ===============================================

-nguild_pay.gat,128,58,3	script	Kafra Service#N03	117,{

-	callfunc "F_GKafra", "nguild_pay", "Payon";

-	end;

-OnRecvCastleN03:

-	if (GetCastleData("nguild_pay.gat",9) < 1) disablenpc "Kafra Service#N03";

-	end;

-}

-

-// Castle 4 ===============================================

-nguild_prt.gat,96,173,0	script	Kafra Service#N04	117,{

-	callfunc "F_GKafra", "nguild_prt", "Prontera";

-	end;

-OnRecvCastleN04:

-	if (GetCastleData("nguild_prt.gat",9) < 1) disablenpc "Kafra Service#N04";

-	end;

-}

+//===== eAthena Script =======================================
+//= War of Emperium Kafras for N Guild Castles
+//===== By: ==================================================
+//= jAthena - kalen (1.0)
+//= 1.1 by Akaru, ho|yAnge|X, and Valaris
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
+//= eAthena 0.1+; RO Episode 4+
+//===== Description: =========================================
+//= Provides Kafra services for guild members of NGuild Castles.
+//= Used in conjuction with function F_Kafra.
+//===== Additional Comments: =================================
+//= Based off existing guild scripts.  Do not know if it is accurate.[kobra_k88]
+//============================================================
+
+
+// Castle 1 ===============================================
+nguild_alde.gat,218,170,0	script	Kafra Service#N01	117,{
+	callfunc "F_GKafra", "nguild_alde", "Al De Baran";
+	end;
+OnRecvCastleN01:
+	if (GetCastleData("nguild_alde.gat",9) < 1) disablenpc "Kafra Service#N01";
+	end;
+}
+
+// Castle 2 ===============================================
+//nguild_gef,96,173,0	script	Kafra Service#N02	117,{
+nguild_gef.gat,35,37,0	script	Kafra Service#N02	117,{
+	callfunc "F_GKafra", "nguild_gef", "Geffen";
+	end;
+OnRecvCastleN02:
+	if (GetCastleData("nguild_gef.gat",9) < 1) disablenpc "Kafra Service#N02";
+	end;
+}
+
+// Castle 3 ===============================================
+nguild_pay.gat,128,58,3	script	Kafra Service#N03	117,{
+	callfunc "F_GKafra", "nguild_pay", "Payon";
+	end;
+OnRecvCastleN03:
+	if (GetCastleData("nguild_pay.gat",9) < 1) disablenpc "Kafra Service#N03";
+	end;
+}
+
+// Castle 4 ===============================================
+nguild_prt.gat,96,173,0	script	Kafra Service#N04	117,{
+	callfunc "F_GKafra", "nguild_prt", "Prontera";
+	end;
+OnRecvCastleN04:
+	if (GetCastleData("nguild_prt.gat",9) < 1) disablenpc "Kafra Service#N04";
+	end;
+}