Fixed some file types

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

7 files changed, 764 insertions, 764 deletions

diff --git a/npc/guild/gefg/gefg_dunsw.txt b/npc/guild/gefg/gefg_dunsw.txt
index f7f794fd2..f64c64541 100644
--- a/npc/guild/gefg/gefg_dunsw.txt
+++ b/npc/guild/gefg/gefg_dunsw.txt
@@ -1,49 +1,49 @@
-//===== eAthena Script =======================================

-//= War of Emperium Dungeon Switch for Geffen 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: =========================================

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

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

-//= v1.2 Optimized with functions.[kobra_k88]

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

-

-

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

-gefg_cas01.gat,78,84,0	script	Switch#DunG01	111,{

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

-	close;

-}

-

-

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

-gefg_cas02.gat,167,40,0	script	Switch#DunG02	111,{

-	callfunc "F_GldDunSw","gefg_cas02","04",125,270;

-	close;

-}

-

-

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

-gefg_cas03.gat,221,43,0	script	Switch#DunG03	111,{

-	callfunc "F_GldDunSw","gefg_cas03","04",268,251;

-	close;

-}

-

-

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

-gefg_cas04.gat,58,75,0	script	Switch#DunG04	111,{

-	callfunc "F_GldDunSw","gefg_cas04","04",268,108;

-	close;

-}

-

-

-// Castle 5 ================================================

-gefg_cas05.gat,66,29,0	script	Switch#DunG05	111,{

-	callfunc "F_GldDunSw","gefg_cas05","04",230,35;

-	close;

-}

+//===== eAthena Script =======================================
+//= War of Emperium Dungeon Switch for Geffen 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: =========================================
+//= Switch that warps guild members to the guild dungeon
+//===== Additional Comments: =================================
+//= v1.2 Optimized with functions.[kobra_k88]
+//============================================================
+
+
+// Castle 1 ================================================
+gefg_cas01.gat,78,84,0	script	Switch#DunG01	111,{
+	callfunc "F_GldDunSw","gefg_cas01","04",39,258;
+	close;
+}
+
+
+// Castle 2 ================================================
+gefg_cas02.gat,167,40,0	script	Switch#DunG02	111,{
+	callfunc "F_GldDunSw","gefg_cas02","04",125,270;
+	close;
+}
+
+
+// Castle 3 ================================================
+gefg_cas03.gat,221,43,0	script	Switch#DunG03	111,{
+	callfunc "F_GldDunSw","gefg_cas03","04",268,251;
+	close;
+}
+
+
+// Castle 4 ================================================
+gefg_cas04.gat,58,75,0	script	Switch#DunG04	111,{
+	callfunc "F_GldDunSw","gefg_cas04","04",268,108;
+	close;
+}
+
+
+// Castle 5 ================================================
+gefg_cas05.gat,66,29,0	script	Switch#DunG05	111,{
+	callfunc "F_GldDunSw","gefg_cas05","04",230,35;
+	close;
+}
diff --git a/npc/guild/gefg/gefg_ev_agit.txt b/npc/guild/gefg/gefg_ev_agit.txt
index 48417b2af..5be223f03 100644
--- a/npc/guild/gefg/gefg_ev_agit.txt
+++ b/npc/guild/gefg/gefg_ev_agit.txt
@@ -1,130 +1,130 @@
-//===== eAthena Script =======================================

-//= War of Emperium - Geffen Guild 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 of Geffen Guild Wars

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

-//= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88]

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

-

-

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

-gefg_cas01.gat,198,182,0	script	Agit_G01	-1,{

-OnInterIfInit:

-	GetCastleData "gefg_cas01.gat",0,"::OnRecvCastleG01";

-	end;

-OnRecvCastleG01:

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

-	end;

-OnAgitStart:

-	callfunc "F_AgitStart","gefg_cas01","G01",198,182;

-	end;

-OnAgitBreak:

-	callfunc "F_AgitBreak","gefg_cas01","G01";

-	end;

-OnAgitEliminate:

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

-	Monster "gefg_cas01.gat",198,182,"EMPERIUM",1288,1,"Agit_G01::OnAgitBreak";

-	end;

-OnAgitEnd:

-	callfunc "F_AgitEnd","gefg_cas01","G01";

-	end;

-}

-

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

-gefg_cas02.gat,176,178,0	script	Agit_G02	-1,{

-OnInterIfInit:

-	GetCastleData "gefg_cas02.gat",0,"::OnRecvCastleG02";

-	end;

-OnRecvCastleG02:

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

-	end;

-OnAgitStart:

-	callfunc "F_AgitStart","gefg_cas02","G02",176,178;

-	end;

-OnAgitBreak:

-	callfunc "F_AgitBreak","gefg_cas02","G02";

-	end;

-OnAgitEliminate:

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

-	Monster "gefg_cas02.gat",176,178,"EMPERIUM",1288,1,"Agit_G02::OnAgitBreak";

-	end;

-OnAgitEnd:

-	callfunc "F_AgitEnd","gefg_cas02","G02";

-	end;

-}

-

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

-gefg_cas03.gat,245,167,0	script	Agit_G03	-1,{

-OnInterIfInit:

-	GetCastleData "gefg_cas03.gat",0,"::OnRecvCastleG03";

-	end;

-OnRecvCastleG03:

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

-	end;

-OnAgitStart:

-	callfunc "F_AgitStart","gefg_cas03","G03",245,167;

-	end;

-OnAgitBreak:

-	callfunc "F_AgitBreak","gefg_cas03","G03";

-	end;

-OnAgitEliminate:

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

-	Monster "gefg_cas03.gat",245,167,"EMPERIUM",1288,1,"Agit_G03::OnAgitBreak";

-	end;

-OnAgitEnd:

-	callfunc "F_AgitEnd","gefg_cas03","G03";

-	end;

-}

-

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

-gefg_cas04.gat,174,178,0	script	Agit_G04	-1,{

-OnInterIfInit:

-	GetCastleData "gefg_cas04.gat",0,"::OnRecvCastleG04";

-	end;

-OnRecvCastleG04:

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

-	end;

-OnAgitStart:

-	callfunc "F_AgitStart","gefg_cas04","G04",174,178;

-	end;

-OnAgitBreak:

-	callfunc "F_AgitBreak","gefg_cas04","G04";

-	end;

-OnAgitEliminate:

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

-	Monster "gefg_cas04.gat",174,178,"EMPERIUM",1288,1,"Agit_G04::OnAgitBreak";

-	end;

-OnAgitEnd:

-	callfunc "F_AgitEnd","gefg_cas04","G04";

-	end;

-}

-

-// Castle 5 ================================================================

-gefg_cas05.gat,194,184,0	script	Agit_G05	-1,{

-OnInterIfInit:

-	GetCastleData "gefg_cas05.gat",0,"::OnRecvCastleG05";

-	end;

-OnRecvCastleG05:

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

-	end;

-OnAgitStart:

-	callfunc "F_AgitStart","gefg_cas05","G05",194,184;

-	end;

-OnAgitBreak:

-	callfunc "F_AgitBreak","gefg_cas05","G05";

-	end;

-OnAgitEliminate:

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

-	Monster "gefg_cas05.gat",194,184,"EMPERIUM",1288,1,"Agit_G05::OnAgitBreak";

-	end;

-OnAgitEnd:

-	callfunc "F_AgitEnd","gefg_cas05","G05";

-	end;

-}

+//===== eAthena Script =======================================
+//= War of Emperium - Geffen Guild 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 of Geffen Guild Wars
+//===== Additional Comments: =================================
+//= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88]
+//============================================================
+
+
+// Castle 1 ================================================================
+gefg_cas01.gat,198,182,0	script	Agit_G01	-1,{
+OnInterIfInit:
+	GetCastleData "gefg_cas01.gat",0,"::OnRecvCastleG01";
+	end;
+OnRecvCastleG01:
+	RequestGuildInfo GetCastleData("gefg_cas01.gat",1);
+	end;
+OnAgitStart:
+	callfunc "F_AgitStart","gefg_cas01","G01",198,182;
+	end;
+OnAgitBreak:
+	callfunc "F_AgitBreak","gefg_cas01","G01";
+	end;
+OnAgitEliminate:
+	MapRespawnGuildID "gefg_cas01.gat",GetCastleData("gefg_cas01.gat",1),6;
+	Monster "gefg_cas01.gat",198,182,"EMPERIUM",1288,1,"Agit_G01::OnAgitBreak";
+	end;
+OnAgitEnd:
+	callfunc "F_AgitEnd","gefg_cas01","G01";
+	end;
+}
+
+// Castle 2 ================================================================
+gefg_cas02.gat,176,178,0	script	Agit_G02	-1,{
+OnInterIfInit:
+	GetCastleData "gefg_cas02.gat",0,"::OnRecvCastleG02";
+	end;
+OnRecvCastleG02:
+	RequestGuildInfo GetCastleData("gefg_cas02.gat",1);
+	end;
+OnAgitStart:
+	callfunc "F_AgitStart","gefg_cas02","G02",176,178;
+	end;
+OnAgitBreak:
+	callfunc "F_AgitBreak","gefg_cas02","G02";
+	end;
+OnAgitEliminate:
+	MapRespawnGuildID "gefg_cas02.gat",GetCastleData("gefg_cas02.gat",1),6;
+	Monster "gefg_cas02.gat",176,178,"EMPERIUM",1288,1,"Agit_G02::OnAgitBreak";
+	end;
+OnAgitEnd:
+	callfunc "F_AgitEnd","gefg_cas02","G02";
+	end;
+}
+
+// Castle 3 ================================================================
+gefg_cas03.gat,245,167,0	script	Agit_G03	-1,{
+OnInterIfInit:
+	GetCastleData "gefg_cas03.gat",0,"::OnRecvCastleG03";
+	end;
+OnRecvCastleG03:
+	RequestGuildInfo GetCastleData("gefg_cas03.gat",1);
+	end;
+OnAgitStart:
+	callfunc "F_AgitStart","gefg_cas03","G03",245,167;
+	end;
+OnAgitBreak:
+	callfunc "F_AgitBreak","gefg_cas03","G03";
+	end;
+OnAgitEliminate:
+	MapRespawnGuildID "gefg_cas03.gat",GetCastleData("gefg_cas03.gat",1),6;
+	Monster "gefg_cas03.gat",245,167,"EMPERIUM",1288,1,"Agit_G03::OnAgitBreak";
+	end;
+OnAgitEnd:
+	callfunc "F_AgitEnd","gefg_cas03","G03";
+	end;
+}
+
+// Castle 4 ================================================================
+gefg_cas04.gat,174,178,0	script	Agit_G04	-1,{
+OnInterIfInit:
+	GetCastleData "gefg_cas04.gat",0,"::OnRecvCastleG04";
+	end;
+OnRecvCastleG04:
+	RequestGuildInfo GetCastleData("gefg_cas04.gat",1);
+	end;
+OnAgitStart:
+	callfunc "F_AgitStart","gefg_cas04","G04",174,178;
+	end;
+OnAgitBreak:
+	callfunc "F_AgitBreak","gefg_cas04","G04";
+	end;
+OnAgitEliminate:
+	MapRespawnGuildID "gefg_cas04.gat",GetCastleData("gefg_cas04.gat",1),6;
+	Monster "gefg_cas04.gat",174,178,"EMPERIUM",1288,1,"Agit_G04::OnAgitBreak";
+	end;
+OnAgitEnd:
+	callfunc "F_AgitEnd","gefg_cas04","G04";
+	end;
+}
+
+// Castle 5 ================================================================
+gefg_cas05.gat,194,184,0	script	Agit_G05	-1,{
+OnInterIfInit:
+	GetCastleData "gefg_cas05.gat",0,"::OnRecvCastleG05";
+	end;
+OnRecvCastleG05:
+	RequestGuildInfo GetCastleData("gefg_cas05.gat",1);
+	end;
+OnAgitStart:
+	callfunc "F_AgitStart","gefg_cas05","G05",194,184;
+	end;
+OnAgitBreak:
+	callfunc "F_AgitBreak","gefg_cas05","G05";
+	end;
+OnAgitEliminate:
+	MapRespawnGuildID "gefg_cas05.gat",GetCastleData("gefg_cas05.gat",1),6;
+	Monster "gefg_cas05.gat",194,184,"EMPERIUM",1288,1,"Agit_G05::OnAgitBreak";
+	end;
+OnAgitEnd:
+	callfunc "F_AgitEnd","gefg_cas05","G05";
+	end;
+}
diff --git a/npc/guild/gefg/gefg_flags.txt b/npc/guild/gefg/gefg_flags.txt
index d31db1f69..8f1e30d0c 100644
--- a/npc/guild/gefg/gefg_flags.txt
+++ b/npc/guild/gefg/gefg_flags.txt
@@ -1,154 +1,154 @@
-//===== eAthena Script =======================================

-//= War of Emperium Geffen Guild Flags

-//===== 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: =========================================

-//= WoE flag scripts.  Display guild emblems on flags.

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

-//= v1.2 Optimized with functions.[kobra_k88]

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

-

-

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

-// 					Castle 1

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

-geffen.gat,109,123,2	script	Reprion#g1-1::Reprion	722,

-{

-	callfunc "F_Flags","Geffen","gefg_cas01",83,47;

-	close;

-

-OnRecvCastleG01:

-	FlagEmblem GetCastleData("gefg_cas01.gat",1);

-	end;

-}

-// In Guild  ===============================================

-gef_fild13.gat,148,51,5	duplicate(Reprion)	Reprion#g1-2	722

-gef_fild13.gat,155,54,5	duplicate(Reprion)	Reprion#g1-3	722

-gef_fild13.gat,212,79,6	duplicate(Reprion)	Reprion#g1-4	722

-gef_fild13.gat,211,71,6	duplicate(Reprion)	Reprion#g1-5	722

-// In Castle =============================================

-gefg_cas01.gat,28,157,4	duplicate(Reprion)	Reprion#g1-6	722

-gefg_cas01.gat,32,157,4	duplicate(Reprion)	Reprion#g1-7	722

-gefg_cas01.gat,22,156,5	duplicate(Reprion)	Reprion#g1-8	722

-gefg_cas01.gat,68,185,3	duplicate(Reprion)	Reprion#g1-9	722

-gefg_cas01.gat,17,171,5	duplicate(Reprion)	Reprion#g1-10	722

-gefg_cas01.gat,59,16,4	duplicate(Reprion)	Reprion#g1-11	722

-gefg_cas01.gat,64,16,4	duplicate(Reprion)	Reprion#g1-12	722

-

-

-

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

-//					Castle 2

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

-geffen.gat,112,129,1	script	Yolbriger#g2-1::Yolbriger	722,

-{

-	callfunc "F_Flags","Geffen","gefg_cas02",23,66;

-	close;

-

-OnRecvCastleG02:

-	FlagEmblem GetCastleData("gefg_cas02.gat",1);

-	end;

-}

-// In Guild ==============================================

-gef_fild13.gat,303,243,4	duplicate(Yolbriger)	Yolbriger#g2-2	722

-gef_fild13.gat,312,243,4	duplicate(Yolbriger)	Yolbriger#g2-3	722

-gef_fild13.gat,290,243,4	duplicate(Yolbriger)	Yolbriger#g2-4	722

-gef_fild13.gat,324,243,4	duplicate(Yolbriger)	Yolbriger#g2-5	722

-// In Castle ============================================

-gefg_cas02.gat,65,130,5	duplicate(Yolbriger)	Yolbriger#g2-6	722

-gefg_cas02.gat,30,123,5	duplicate(Yolbriger)	Yolbriger#g2-7	722

-gefg_cas02.gat,65,139,6	duplicate(Yolbriger)	Yolbriger#g2-8	722

-gefg_cas02.gat,37,177,6	duplicate(Yolbriger)	Yolbriger#g2-9	722

-gefg_cas02.gat,37,168,6	duplicate(Yolbriger)	Yolbriger#g2-10	722

-gefg_cas02.gat,68,47,2	duplicate(Yolbriger)	Yolbriger#g2-11	722

-gefg_cas02.gat,68,36,2	duplicate(Yolbriger)	Yolbriger#g2-12	722

-

-

-

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

-// 					Castle 3

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

-geffen.gat,120,132,8	script	Isinlife#g3-1::Isinlife	722,

-{

-	callfunc "F_Flags","Geffen","gefg_cas03",116,89;

-	close;

-

-OnRecvCastleG03:

-	FlagEmblem GetCastleData("gefg_cas03.gat",1);

-	end;

-}

-// In Guild  ===============================================

-gef_fild13.gat,78,182,4	duplicate(Isinlife)	Isinlife#g3-2	722

-gef_fild13.gat,87,182,4	duplicate(Isinlife)	Isinlife#g3-3	722

-gef_fild13.gat,73,295,7	duplicate(Isinlife)	Isinlife#g3-4	722

-gef_fild13.gat,113,274,7	duplicate(Isinlife)	Isinlife#g3-5	722

-gef_fild13.gat,144,235,6	duplicate(Isinlife)	Isinlife#g3-6	722

-gef_fild13.gat,144,244,4	duplicate(Isinlife)	Isinlife#g3-7	722

-// In Castle =============================================

-gefg_cas03.gat,122,220,6	duplicate(Isinlife)	Isinlife#g3-8	722

-gefg_cas03.gat,122,229,6	duplicate(Isinlife)	Isinlife#g3-9	722

-gefg_cas03.gat,91,257,7	duplicate(Isinlife)	Isinlife#g3-10	722

-gefg_cas03.gat,52,276,7	duplicate(Isinlife)	Isinlife#g3-11	722

-gefg_cas03.gat,56,164,4	duplicate(Isinlife)	Isinlife#g3-12	722

-gefg_cas03.gat,65,164,4	duplicate(Isinlife)	Isinlife#g3-13	722

-gefg_cas03.gat,37,214,1	duplicate(Isinlife)	Isinlife#g3-14	722

-gefg_cas03.gat,34,208,1	duplicate(Isinlife)	Isinlife#g3-15	722

-

-

-

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

-// 					Castle 4

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

-geffen.gat,127,130,7	script	Berigel#g4-1::Berigel	722,

-{

-	callfunc "F_Flags","Geffen","gefg_cas04",59,70;

-	close;

-

-OnRecvCastleG04:

-	FlagEmblem GetCastleData("gefg_cas04.gat",1);

-	end;

-}

-// In Guild  ===============================================

-gef_fild13.gat,190,283,3	duplicate(Berigel)	Berigel#g4-2	722

-gef_fild13.gat,199,274,3	duplicate(Berigel)	Berigel#g4-3	722

-// In Castle =============================================

-gefg_cas04.gat,24,157,4	duplicate(Berigel)	Berigel#g4-4	722

-gefg_cas04.gat,35,158,4	duplicate(Berigel)	Berigel#g4-5	722

-gefg_cas04.gat,44,184,4	duplicate(Berigel)	Berigel#g4-6	722

-gefg_cas04.gat,51,184,4	duplicate(Berigel)	Berigel#g4-7	722

-gefg_cas04.gat,39,212,7	duplicate(Berigel)	Berigel#g4-8	722

-gefg_cas04.gat,29,212,1	duplicate(Berigel)	Berigel#g4-9	722

-gefg_cas04.gat,24,73,1	duplicate(Berigel)	Berigel#g4-10	722

-gefg_cas04.gat,35,73,4	duplicate(Berigel)	Berigel#g4-11	722

-

-

-

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

-// 					Castle 5

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

-geffen.gat,131,123,6	script	Melsedetsu#g5-1::Melsedetsu	722,

-{

-	callfunc "F_Flags","Geffen","gefg_cas05",61,52;

-	close;

-

-OnRecvCastleG05:

-	FlagEmblem GetCastleData("gefg_cas05.gat",1);

-	end;

-}

-// In Guild  ===============================================

-gef_fild13.gat,302,87,7	duplicate(Melsedetsu)	Melsedetsu#g5-2	722

-gef_fild13.gat,313,83,0	duplicate(Melsedetsu)	Melsedetsu#g5-3	722

-gef_fild13.gat,252,51,2	duplicate(Melsedetsu)	Melsedetsu#g5-4	722

-gef_fild13.gat,26,147,2	duplicate(Melsedetsu)	Melsedetsu#g5-5	722

-// In Castle =============================================

-gefg_cas05.gat,77,185,7	duplicate(Melsedetsu)	Melsedetsu#g5-6	722

-gefg_cas05.gat,92,181,0	duplicate(Melsedetsu)	Melsedetsu#g5-7	722

-gefg_cas05.gat,83,158,1	duplicate(Melsedetsu)	Melsedetsu#g5-8	722

-gefg_cas05.gat,62,144,7	duplicate(Melsedetsu)	Melsedetsu#g5-9	722

-gefg_cas05.gat,62,66,4	duplicate(Melsedetsu)	Melsedetsu#g5-10	722

-gefg_cas05.gat,69,66,4	duplicate(Melsedetsu)	Melsedetsu#g5-11	722

+//===== eAthena Script =======================================
+//= War of Emperium Geffen Guild Flags
+//===== 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: =========================================
+//= WoE flag scripts.  Display guild emblems on flags.
+//===== Additional Comments: =================================
+//= v1.2 Optimized with functions.[kobra_k88]
+//============================================================
+
+
+//================================================================================//
+// 					Castle 1
+//================================================================================//
+geffen.gat,109,123,2	script	Reprion#g1-1::Reprion	722,
+{
+	callfunc "F_Flags","Geffen","gefg_cas01",83,47;
+	close;
+
+OnRecvCastleG01:
+	FlagEmblem GetCastleData("gefg_cas01.gat",1);
+	end;
+}
+// In Guild  ===============================================
+gef_fild13.gat,148,51,5	duplicate(Reprion)	Reprion#g1-2	722
+gef_fild13.gat,155,54,5	duplicate(Reprion)	Reprion#g1-3	722
+gef_fild13.gat,212,79,6	duplicate(Reprion)	Reprion#g1-4	722
+gef_fild13.gat,211,71,6	duplicate(Reprion)	Reprion#g1-5	722
+// In Castle =============================================
+gefg_cas01.gat,28,157,4	duplicate(Reprion)	Reprion#g1-6	722
+gefg_cas01.gat,32,157,4	duplicate(Reprion)	Reprion#g1-7	722
+gefg_cas01.gat,22,156,5	duplicate(Reprion)	Reprion#g1-8	722
+gefg_cas01.gat,68,185,3	duplicate(Reprion)	Reprion#g1-9	722
+gefg_cas01.gat,17,171,5	duplicate(Reprion)	Reprion#g1-10	722
+gefg_cas01.gat,59,16,4	duplicate(Reprion)	Reprion#g1-11	722
+gefg_cas01.gat,64,16,4	duplicate(Reprion)	Reprion#g1-12	722
+
+
+
+//===================================================================================//
+//					Castle 2
+//===================================================================================//
+geffen.gat,112,129,1	script	Yolbriger#g2-1::Yolbriger	722,
+{
+	callfunc "F_Flags","Geffen","gefg_cas02",23,66;
+	close;
+
+OnRecvCastleG02:
+	FlagEmblem GetCastleData("gefg_cas02.gat",1);
+	end;
+}
+// In Guild ==============================================
+gef_fild13.gat,303,243,4	duplicate(Yolbriger)	Yolbriger#g2-2	722
+gef_fild13.gat,312,243,4	duplicate(Yolbriger)	Yolbriger#g2-3	722
+gef_fild13.gat,290,243,4	duplicate(Yolbriger)	Yolbriger#g2-4	722
+gef_fild13.gat,324,243,4	duplicate(Yolbriger)	Yolbriger#g2-5	722
+// In Castle ============================================
+gefg_cas02.gat,65,130,5	duplicate(Yolbriger)	Yolbriger#g2-6	722
+gefg_cas02.gat,30,123,5	duplicate(Yolbriger)	Yolbriger#g2-7	722
+gefg_cas02.gat,65,139,6	duplicate(Yolbriger)	Yolbriger#g2-8	722
+gefg_cas02.gat,37,177,6	duplicate(Yolbriger)	Yolbriger#g2-9	722
+gefg_cas02.gat,37,168,6	duplicate(Yolbriger)	Yolbriger#g2-10	722
+gefg_cas02.gat,68,47,2	duplicate(Yolbriger)	Yolbriger#g2-11	722
+gefg_cas02.gat,68,36,2	duplicate(Yolbriger)	Yolbriger#g2-12	722
+
+
+
+//================================================================================//
+// 					Castle 3
+//================================================================================//
+geffen.gat,120,132,8	script	Isinlife#g3-1::Isinlife	722,
+{
+	callfunc "F_Flags","Geffen","gefg_cas03",116,89;
+	close;
+
+OnRecvCastleG03:
+	FlagEmblem GetCastleData("gefg_cas03.gat",1);
+	end;
+}
+// In Guild  ===============================================
+gef_fild13.gat,78,182,4	duplicate(Isinlife)	Isinlife#g3-2	722
+gef_fild13.gat,87,182,4	duplicate(Isinlife)	Isinlife#g3-3	722
+gef_fild13.gat,73,295,7	duplicate(Isinlife)	Isinlife#g3-4	722
+gef_fild13.gat,113,274,7	duplicate(Isinlife)	Isinlife#g3-5	722
+gef_fild13.gat,144,235,6	duplicate(Isinlife)	Isinlife#g3-6	722
+gef_fild13.gat,144,244,4	duplicate(Isinlife)	Isinlife#g3-7	722
+// In Castle =============================================
+gefg_cas03.gat,122,220,6	duplicate(Isinlife)	Isinlife#g3-8	722
+gefg_cas03.gat,122,229,6	duplicate(Isinlife)	Isinlife#g3-9	722
+gefg_cas03.gat,91,257,7	duplicate(Isinlife)	Isinlife#g3-10	722
+gefg_cas03.gat,52,276,7	duplicate(Isinlife)	Isinlife#g3-11	722
+gefg_cas03.gat,56,164,4	duplicate(Isinlife)	Isinlife#g3-12	722
+gefg_cas03.gat,65,164,4	duplicate(Isinlife)	Isinlife#g3-13	722
+gefg_cas03.gat,37,214,1	duplicate(Isinlife)	Isinlife#g3-14	722
+gefg_cas03.gat,34,208,1	duplicate(Isinlife)	Isinlife#g3-15	722
+
+
+
+//================================================================================//
+// 					Castle 4
+//================================================================================//
+geffen.gat,127,130,7	script	Berigel#g4-1::Berigel	722,
+{
+	callfunc "F_Flags","Geffen","gefg_cas04",59,70;
+	close;
+
+OnRecvCastleG04:
+	FlagEmblem GetCastleData("gefg_cas04.gat",1);
+	end;
+}
+// In Guild  ===============================================
+gef_fild13.gat,190,283,3	duplicate(Berigel)	Berigel#g4-2	722
+gef_fild13.gat,199,274,3	duplicate(Berigel)	Berigel#g4-3	722
+// In Castle =============================================
+gefg_cas04.gat,24,157,4	duplicate(Berigel)	Berigel#g4-4	722
+gefg_cas04.gat,35,158,4	duplicate(Berigel)	Berigel#g4-5	722
+gefg_cas04.gat,44,184,4	duplicate(Berigel)	Berigel#g4-6	722
+gefg_cas04.gat,51,184,4	duplicate(Berigel)	Berigel#g4-7	722
+gefg_cas04.gat,39,212,7	duplicate(Berigel)	Berigel#g4-8	722
+gefg_cas04.gat,29,212,1	duplicate(Berigel)	Berigel#g4-9	722
+gefg_cas04.gat,24,73,1	duplicate(Berigel)	Berigel#g4-10	722
+gefg_cas04.gat,35,73,4	duplicate(Berigel)	Berigel#g4-11	722
+
+
+
+//================================================================================//
+// 					Castle 5
+//================================================================================//
+geffen.gat,131,123,6	script	Melsedetsu#g5-1::Melsedetsu	722,
+{
+	callfunc "F_Flags","Geffen","gefg_cas05",61,52;
+	close;
+
+OnRecvCastleG05:
+	FlagEmblem GetCastleData("gefg_cas05.gat",1);
+	end;
+}
+// In Guild  ===============================================
+gef_fild13.gat,302,87,7	duplicate(Melsedetsu)	Melsedetsu#g5-2	722
+gef_fild13.gat,313,83,0	duplicate(Melsedetsu)	Melsedetsu#g5-3	722
+gef_fild13.gat,252,51,2	duplicate(Melsedetsu)	Melsedetsu#g5-4	722
+gef_fild13.gat,26,147,2	duplicate(Melsedetsu)	Melsedetsu#g5-5	722
+// In Castle =============================================
+gefg_cas05.gat,77,185,7	duplicate(Melsedetsu)	Melsedetsu#g5-6	722
+gefg_cas05.gat,92,181,0	duplicate(Melsedetsu)	Melsedetsu#g5-7	722
+gefg_cas05.gat,83,158,1	duplicate(Melsedetsu)	Melsedetsu#g5-8	722
+gefg_cas05.gat,62,144,7	duplicate(Melsedetsu)	Melsedetsu#g5-9	722
+gefg_cas05.gat,62,66,4	duplicate(Melsedetsu)	Melsedetsu#g5-10	722
+gefg_cas05.gat,69,66,4	duplicate(Melsedetsu)	Melsedetsu#g5-11	722
diff --git a/npc/guild/gefg/gefg_guardians.txt b/npc/guild/gefg/gefg_guardians.txt
index 13947fd12..fe3e0958b 100644
--- a/npc/guild/gefg/gefg_guardians.txt
+++ b/npc/guild/gefg/gefg_guardians.txt
@@ -1,108 +1,108 @@
-//===== eAthena Script =======================================

-//= War of Emperium - gefg_cas guardians script

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

-//= holyAngelX (1.0)

-//===== 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: =================================

-//= 1.1 by joedukk

-//= 1.2 by Akaru and Valaris

-//= 1.2a Guardians for all gefg castles are now in this file.

-//= Minor optimizations.[kobra_k88]

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

-

-

-gefg_cas01.gat,198,182,0	script	Guardian_G01	-1,{

-OnAgitInit:

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

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

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

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

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

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

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

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

-	end;

-

-OnGuardianDied:

-	// Event when Guardian dies

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

-	end;

-}

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

-gefg_cas02.gat,176,178,0	script	Guardian_G02	-1,{

-OnAgitInit:

-	if (GetCastleData("gefg_cas02.gat",10) == 1) guardian "gefg_cas02.gat",22,135,"Soldier Guardian",1287,1,"Guardian_G02::OnGuardianDied",0;

-	if (GetCastleData("gefg_cas02.gat",11) == 1) guardian "gefg_cas02.gat",33,40,"Soldier Guardian",1287,1,"Guardian_G02::OnGuardianDied",1;

-	if (GetCastleData("gefg_cas02.gat",12) == 1) guardian "gefg_cas02.gat",158,11,"Soldier Guardian",1287,1,"Guardian_G02::OnGuardianDied",2;

-	if (GetCastleData("gefg_cas02.gat",13) == 1) guardian "gefg_cas02.gat",64,140,"Archer Guardian",1285,1,"Guardian_G02::OnGuardianDied",3;

-	if (GetCastleData("gefg_cas02.gat",14) == 1) guardian "gefg_cas02.gat",36,140,"Archer Guardian",1285,1,"Guardian_G02::OnGuardianDied",4;

-	if (GetCastleData("gefg_cas02.gat",15) == 1) guardian "gefg_cas02.gat",166,45,"Knight Guardian",1286,1,"Guardian_G02::OnGuardianDied",5;

-	if (GetCastleData("gefg_cas02.gat",16) == 1) guardian "gefg_cas02.gat",10,39,"Knight Guardian",1286,1,"Guardian_G02::OnGuardianDied",6;

-	if (GetCastleData("gefg_cas02.gat",17) == 1) guardian "gefg_cas02.gat",166,35,"Knight Guardian",1286,1,"Guardian_G02::OnGuardianDied",7;

-	end;

-

-OnGuardianDied:

-	// Event when Guardian dies

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

-	end;

-}

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

-gefg_cas03.gat,245,167,0	script	Guardian_G03	-1,{

-OnAgitInit:

-	if (GetCastleData("gefg_cas03.gat",10) == 1) guardian "gefg_cas03.gat",101,53,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",0;

-	if (GetCastleData("gefg_cas03.gat",11) == 1) guardian "gefg_cas03.gat",158,40,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",1;

-	if (GetCastleData("gefg_cas03.gat",12) == 1) guardian "gefg_cas03.gat",158,67,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",2;

-	if (GetCastleData("gefg_cas03.gat",13) == 1) guardian "gefg_cas03.gat",229,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",3;

-	if (GetCastleData("gefg_cas03.gat",14) == 1) guardian "gefg_cas03.gat",248,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",4;

-	if (GetCastleData("gefg_cas03.gat",15) == 1) guardian "gefg_cas03.gat",122,53,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",5;

-	if (GetCastleData("gefg_cas03.gat",16) == 1) guardian "gefg_cas03.gat",243,35,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",6;

-	if (GetCastleData("gefg_cas03.gat",17) == 1) guardian "gefg_cas03.gat",234,33,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",7;

-	end;

-

-OnGuardianDied:

-	// Event when Guardian dies

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

-	end;

-}

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

-gefg_cas04.gat,174,178,0	script	Guardian_G04	-1,{

-OnAgitInit:

-	if (GetCastleData("gefg_cas04.gat",10) == 1) guardian "gefg_cas04.gat",49,203,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",0;

-	if (GetCastleData("gefg_cas04.gat",11) == 1) guardian "gefg_cas04.gat",148,50,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",1;

-	if (GetCastleData("gefg_cas04.gat",12) == 1) guardian "gefg_cas04.gat",57,20,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",2;

-	if (GetCastleData("gefg_cas04.gat",13) == 1) guardian "gefg_cas04.gat",34,218,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",3;

-	if (GetCastleData("gefg_cas04.gat",14) == 1) guardian "gefg_cas04.gat",167,42,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",4;

-	if (GetCastleData("gefg_cas04.gat",15) == 1) guardian "gefg_cas04.gat",18,52,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",5;

-	if (GetCastleData("gefg_cas04.gat",16) == 1) guardian "gefg_cas04.gat",50,48,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",6;

-	if (GetCastleData("gefg_cas04.gat",17) == 1) guardian "gefg_cas04.gat",160,66,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",7;

-	end;

-

-OnGuardianDied:

-	// Event when Guardian dies

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

-	end;

-}

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

-gefg_cas05.gat,194,184,0	script	Guardian_G05	-1,{

-OnAgitInit:

-	if (GetCastleData("gefg_cas05.gat",10) == 1) guardian "gefg_cas05.gat",54,149,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",0;

-	if (GetCastleData("gefg_cas05.gat",11) == 1) guardian "gefg_cas05.gat",80,31,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",1;

-	if (GetCastleData("gefg_cas05.gat",12) == 1) guardian "gefg_cas05.gat",52,32,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",2;

-	if (GetCastleData("gefg_cas05.gat",13) == 1) guardian "gefg_cas05.gat",77,149,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",3;

-	if (GetCastleData("gefg_cas05.gat",14) == 1) guardian "gefg_cas05.gat",65,18,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",4;

-	if (GetCastleData("gefg_cas05.gat",15) == 1) guardian "gefg_cas05.gat",66,54,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",5;

-	if (GetCastleData("gefg_cas05.gat",16) == 1) guardian "gefg_cas05.gat",187,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",6;

-	if (GetCastleData("gefg_cas05.gat",17) == 1) guardian "gefg_cas05.gat",167,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",7;

-	end;

-

-OnGuardianDied:

-	// Event when Guardian dies

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

-	end;

-}

+//===== eAthena Script =======================================
+//= War of Emperium - gefg_cas guardians script
+//===== By: ==================================================
+//= holyAngelX (1.0)
+//===== 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: =================================
+//= 1.1 by joedukk
+//= 1.2 by Akaru and Valaris
+//= 1.2a Guardians for all gefg castles are now in this file.
+//= Minor optimizations.[kobra_k88]
+//============================================================
+
+
+gefg_cas01.gat,198,182,0	script	Guardian_G01	-1,{
+OnAgitInit:
+	if (GetCastleData("gefg_cas01.gat",10) == 1) guardian "gefg_cas01.gat",30,178,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas01.gat",11) == 1) guardian "gefg_cas01.gat",64,180,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas01.gat",12) == 1) guardian "gefg_cas01.gat",61,25,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas01.gat",13) == 1) guardian "gefg_cas01.gat",61,44,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas01.gat",14) == 1) guardian "gefg_cas01.gat",189,43,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas01.gat",15) == 1) guardian "gefg_cas01.gat",51,192,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas01.gat",16) == 1) guardian "gefg_cas01.gat",49,67,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas01.gat",17) == 1) guardian "gefg_cas01.gat",181,14,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",7;
+	end;
+
+OnGuardianDied:
+	// Event when Guardian dies
+	MapAnnounce "gefg_cas01.gat","A Guardian Has Fallen",17;
+	end;
+}
+//------------------------------------------------------------------------------
+gefg_cas02.gat,176,178,0	script	Guardian_G02	-1,{
+OnAgitInit:
+	if (GetCastleData("gefg_cas02.gat",10) == 1) guardian "gefg_cas02.gat",22,135,"Soldier Guardian",1287,1,"Guardian_G02::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas02.gat",11) == 1) guardian "gefg_cas02.gat",33,40,"Soldier Guardian",1287,1,"Guardian_G02::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas02.gat",12) == 1) guardian "gefg_cas02.gat",158,11,"Soldier Guardian",1287,1,"Guardian_G02::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas02.gat",13) == 1) guardian "gefg_cas02.gat",64,140,"Archer Guardian",1285,1,"Guardian_G02::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas02.gat",14) == 1) guardian "gefg_cas02.gat",36,140,"Archer Guardian",1285,1,"Guardian_G02::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas02.gat",15) == 1) guardian "gefg_cas02.gat",166,45,"Knight Guardian",1286,1,"Guardian_G02::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas02.gat",16) == 1) guardian "gefg_cas02.gat",10,39,"Knight Guardian",1286,1,"Guardian_G02::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas02.gat",17) == 1) guardian "gefg_cas02.gat",166,35,"Knight Guardian",1286,1,"Guardian_G02::OnGuardianDied",7;
+	end;
+
+OnGuardianDied:
+	// Event when Guardian dies
+	MapAnnounce "gefg_cas02.gat","A Guardian Has Fallen",17;
+	end;
+}
+//------------------------------------------------------------------------------
+gefg_cas03.gat,245,167,0	script	Guardian_G03	-1,{
+OnAgitInit:
+	if (GetCastleData("gefg_cas03.gat",10) == 1) guardian "gefg_cas03.gat",101,53,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas03.gat",11) == 1) guardian "gefg_cas03.gat",158,40,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas03.gat",12) == 1) guardian "gefg_cas03.gat",158,67,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas03.gat",13) == 1) guardian "gefg_cas03.gat",229,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas03.gat",14) == 1) guardian "gefg_cas03.gat",248,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas03.gat",15) == 1) guardian "gefg_cas03.gat",122,53,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas03.gat",16) == 1) guardian "gefg_cas03.gat",243,35,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas03.gat",17) == 1) guardian "gefg_cas03.gat",234,33,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",7;
+	end;
+
+OnGuardianDied:
+	// Event when Guardian dies
+	MapAnnounce "gefg_cas03.gat","A Guardian Has Fallen",17;
+	end;
+}
+//------------------------------------------------------------------------------
+gefg_cas04.gat,174,178,0	script	Guardian_G04	-1,{
+OnAgitInit:
+	if (GetCastleData("gefg_cas04.gat",10) == 1) guardian "gefg_cas04.gat",49,203,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas04.gat",11) == 1) guardian "gefg_cas04.gat",148,50,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas04.gat",12) == 1) guardian "gefg_cas04.gat",57,20,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas04.gat",13) == 1) guardian "gefg_cas04.gat",34,218,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas04.gat",14) == 1) guardian "gefg_cas04.gat",167,42,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas04.gat",15) == 1) guardian "gefg_cas04.gat",18,52,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas04.gat",16) == 1) guardian "gefg_cas04.gat",50,48,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas04.gat",17) == 1) guardian "gefg_cas04.gat",160,66,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",7;
+	end;
+
+OnGuardianDied:
+	// Event when Guardian dies
+	MapAnnounce "gefg_cas04.gat","A Guardian Has Fallen",17;
+	end;
+}
+//------------------------------------------------------------------------------
+gefg_cas05.gat,194,184,0	script	Guardian_G05	-1,{
+OnAgitInit:
+	if (GetCastleData("gefg_cas05.gat",10) == 1) guardian "gefg_cas05.gat",54,149,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",0;
+	if (GetCastleData("gefg_cas05.gat",11) == 1) guardian "gefg_cas05.gat",80,31,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",1;
+	if (GetCastleData("gefg_cas05.gat",12) == 1) guardian "gefg_cas05.gat",52,32,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",2;
+	if (GetCastleData("gefg_cas05.gat",13) == 1) guardian "gefg_cas05.gat",77,149,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",3;
+	if (GetCastleData("gefg_cas05.gat",14) == 1) guardian "gefg_cas05.gat",65,18,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",4;
+	if (GetCastleData("gefg_cas05.gat",15) == 1) guardian "gefg_cas05.gat",66,54,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",5;
+	if (GetCastleData("gefg_cas05.gat",16) == 1) guardian "gefg_cas05.gat",187,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",6;
+	if (GetCastleData("gefg_cas05.gat",17) == 1) guardian "gefg_cas05.gat",167,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",7;
+	end;
+
+OnGuardianDied:
+	// Event when Guardian dies
+	MapAnnounce "gefg_cas05.gat","A Guardian Has Fallen",17;
+	end;
+}
diff --git a/npc/guild/gefg/gefg_kafras.txt b/npc/guild/gefg/gefg_kafras.txt
index 77fccddfa..94eaa093a 100644
--- a/npc/guild/gefg/gefg_kafras.txt
+++ b/npc/guild/gefg/gefg_kafras.txt
@@ -1,71 +1,71 @@
-//===== eAthena Script =======================================

-//= War of Emperium Kafras for Geffen 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 Geffen Castles.

-//= Used in conjuction with function F_Kafra.

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

-//= v1.2 Optimized with functions.[kobra_k88]

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

-

-

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

-//gefg_cas01.gat,96,173,0	script	Kafra Service#G01	117,{

-gefg_cas01.gat,35,37,0	script	Kafra Service#G01	117,

-{

-	callfunc "F_GKafra", "gefg_cas01", "Geffen";

-	end;

-OnRecvCastleG01:

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

-	end;

-}

-

-

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

-gefg_cas02.gat,23,66,3	script	Kafra Service#G02	117,

-{

-	callfunc "F_GKafra", "gefg_cas02", "Geffen";

-	end;

-OnRecvCastleG02:

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

-	end;

-}

-

-

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

-gefg_cas03.gat,116,89,5	script	Kafra Service#G03	117,

-{

-	callfunc "F_GKafra", "gefg_cas03", "Geffen";

-	end;

-OnRecvCastleG03:

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

-	end;

-}

-

-

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

-gefg_cas04.gat,59,70,3	script	Kafra Service#G04	117,

-{

-	callfunc "F_GKafra", "gefg_cas04", "Geffen";

-	end;

-OnRecvCastleG04:

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

-	end;

-}

-

-

-// Castle 5 ===============================================

-gefg_cas05.gat,61,52,5	script	Kafra Service#G05	117,

-{

-	callfunc "F_GKafra", "gefg_cas05", "Geffen";

-	end;

-OnRecvCastleG05:

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

-	end;

-}

+//===== eAthena Script =======================================
+//= War of Emperium Kafras for Geffen 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 Geffen Castles.
+//= Used in conjuction with function F_Kafra.
+//===== Additional Comments: =================================
+//= v1.2 Optimized with functions.[kobra_k88]
+//============================================================
+
+
+// Castle 1 ===============================================
+//gefg_cas01.gat,96,173,0	script	Kafra Service#G01	117,{
+gefg_cas01.gat,35,37,0	script	Kafra Service#G01	117,
+{
+	callfunc "F_GKafra", "gefg_cas01", "Geffen";
+	end;
+OnRecvCastleG01:
+	if (GetCastleData("gefg_cas01.gat",9) < 1) disablenpc "Kafra Service#G01";
+	end;
+}
+
+
+// Castle 2 ===============================================
+gefg_cas02.gat,23,66,3	script	Kafra Service#G02	117,
+{
+	callfunc "F_GKafra", "gefg_cas02", "Geffen";
+	end;
+OnRecvCastleG02:
+	if (GetCastleData("gefg_cas02.gat",9) < 1) disablenpc "Kafra Service#G02";
+	end;
+}
+
+
+// Castle 3 ===============================================
+gefg_cas03.gat,116,89,5	script	Kafra Service#G03	117,
+{
+	callfunc "F_GKafra", "gefg_cas03", "Geffen";
+	end;
+OnRecvCastleG03:
+	if (GetCastleData("gefg_cas03.gat",9) < 1) disablenpc "Kafra Service#G03";
+	end;
+}
+
+
+// Castle 4 ===============================================
+gefg_cas04.gat,59,70,3	script	Kafra Service#G04	117,
+{
+	callfunc "F_GKafra", "gefg_cas04", "Geffen";
+	end;
+OnRecvCastleG04:
+	if (GetCastleData("gefg_cas04.gat",9) < 1) disablenpc "Kafra Service#G04";
+	end;
+}
+
+
+// Castle 5 ===============================================
+gefg_cas05.gat,61,52,5	script	Kafra Service#G05	117,
+{
+	callfunc "F_GKafra", "gefg_cas05", "Geffen";
+	end;
+OnRecvCastleG05:
+	if (GetCastleData("gefg_cas05.gat",9) < 1) disablenpc "Kafra Service#G05";
+	end;
+}
diff --git a/npc/guild/gefg/gefg_managers.txt b/npc/guild/gefg/gefg_managers.txt
index 07e62e5bc..8a5ba3a0f 100644
--- a/npc/guild/gefg/gefg_managers.txt
+++ b/npc/guild/gefg/gefg_managers.txt
@@ -1,104 +1,104 @@
-//===== eAthena Script =======================================

-//= War of Emperium Managers for Geffen 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: =========================================

-//= 

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

-//= v1.2 Optimized with functions.[kobra_k88]

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

-

-

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

-gefg_cas01.gat,40,48,5	script	Gnaucher	55,{

-	if(callfunc("F_GldManager","Gnaucher","gefg_cas01",155,112,"G01") == 0) close;

-

-	if(@GDnum==10) guardian "gefg_cas01.gat",30,178,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",0; 

-	if(@GDnum==11) guardian "gefg_cas01.gat",64,180,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",1;

-	if(@GDnum==12) guardian "gefg_cas01.gat",61,25,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",2;

-	if(@GDnum==13) guardian "gefg_cas01.gat",61,44,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",3; 

-	if(@GDnum==14) guardian "gefg_cas01.gat",189,43,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",4; 

-	if(@GDnum==15) guardian "gefg_cas01.gat",51,192,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",5; 

-	if(@GDnum==16) guardian "gefg_cas01.gat",49,67,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",6; 

-	if(@GDnum==17) guardian "gefg_cas01.gat",181,14,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",7;

-	mes "[ Gnaucher ]";

-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";

-	close;

-}

-

-

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

-gefg_cas02.gat,12,66,5	script	Esmark	55,{

-	if(callfunc("F_GldManager","Esmark","gefg_cas02",141,115,"G02") == 0) close;

-

-	if(@GDnum==10) guardian "gefg_cas02.gat",22,135,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",0; 

-	if(@GDnum==11) guardian "gefg_cas02.gat",33,40,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",1;

-	if(@GDnum==12) guardian "gefg_cas02.gat",158,11,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",2;

-	if(@GDnum==13) guardian "gefg_cas02.gat",64,140,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",3; 

-	if(@GDnum==14) guardian "gefg_cas02.gat",36,140,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",4; 

-	if(@GDnum==15) guardian "gefg_cas02.gat",166,45,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",5; 

-	if(@GDnum==16) guardian "gefg_cas02.gat",10,39,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",6; 

-	if(@GDnum==17) guardian "gefg_cas02.gat",166,35,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",7;

-	mes "[ Esmark ]";

-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";

-	close;

-}

-

-

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

-gefg_cas03.gat,106,23,5	script	Jyang	55,{

-	if(callfunc("F_GldManager","Jyang","gefg_cas03",270,290,"G03") == 0) close;

-

-	if(@GDnum==10) guardian "gefg_cas03.gat",101,53,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",0;

-	if(@GDnum==11) guardian "gefg_cas03.gat",158,40,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",1;

-	if(@GDnum==12) guardian "gefg_cas03.gat",158,67,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",2;

-	if(@GDnum==13) guardian "gefg_cas03.gat",229,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",3; 

-	if(@GDnum==14) guardian "gefg_cas03.gat",248,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",4; 

-	if(@GDnum==15) guardian "gefg_cas03.gat",122,53,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",5; 

-	if(@GDnum==16) guardian "gefg_cas03.gat",243,35,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",6; 

-	if(@GDnum==17) guardian "gefg_cas03.gat",234,33,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",7;

-	mes "[ Jyang ]";

-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";

-	close;

-}

-

-

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

-gefg_cas04.gat,73,46,5	script	Kelbany	55,{

-	if(callfunc("F_GldManager","Kelbany","gefg_cas04",116,118,"G04") == 0) close;

-

-	if(@GDnum==10) guardian "gefg_cas04.gat",49,203,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",0; 

-	if(@GDnum==11) guardian "gefg_cas04.gat",148,50,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",1;

-	if(@GDnum==12) guardian "gefg_cas04.gat",57,20,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",2;

-	if(@GDnum==13) guardian "gefg_cas04.gat",34,218,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",3; 

-	if(@GDnum==14) guardian "gefg_cas04.gat",167,42,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",4; 

-	if(@GDnum==15) guardian "gefg_cas04.gat",18,52,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",5; 

-	if(@GDnum==16) guardian "gefg_cas04.gat",50,48,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",6; 

-	if(@GDnum==17) guardian "gefg_cas04.gat",160,66,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",7;

-	mes "[ Kelbany ]";

-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";

-	close;

-}

-

-

-// Castle 5 ==================================================================================

-gefg_cas05.gat,70,52,5	script	Beeor	55,{

-	if(callfunc("F_GldManager","Beeor","gefg_cas05",144,110,"G05") == 0) close;

-

-	if(@GDnum==10) guardian "gefg_cas05.gat",54,149,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",0; 

-	if(@GDnum==11) guardian "gefg_cas05.gat",80,31,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",1;

-	if(@GDnum==12) guardian "gefg_cas05.gat",52,32,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",2;

-	if(@GDnum==13) guardian "gefg_cas05.gat",77,149,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",3; 

-	if(@GDnum==14) guardian "gefg_cas05.gat",65,18,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",4; 

-	if(@GDnum==15) guardian "gefg_cas05.gat",66,54,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",5; 

-	if(@GDnum==16) guardian "gefg_cas05.gat",187,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",6; 

-	if(@GDnum==17) guardian "gefg_cas05.gat",167,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",7;

-	mes "[ Beeor ]";

-	mes "Guardian has been installed, guardian will protect our guild base against enemies.";

-	close;

-}

+//===== eAthena Script =======================================
+//= War of Emperium Managers for Geffen 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: =========================================
+//= 
+//===== Additional Comments: =================================
+//= v1.2 Optimized with functions.[kobra_k88]
+//============================================================
+
+
+// Castle 1 ==================================================================================
+gefg_cas01.gat,40,48,5	script	Gnaucher	55,{
+	if(callfunc("F_GldManager","Gnaucher","gefg_cas01",155,112,"G01") == 0) close;
+
+	if(@GDnum==10) guardian "gefg_cas01.gat",30,178,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "gefg_cas01.gat",64,180,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas01.gat",61,25,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas01.gat",61,44,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas01.gat",189,43,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas01.gat",51,192,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas01.gat",49,67,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas01.gat",181,14,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",7;
+	mes "[ Gnaucher ]";
+	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	close;
+}
+
+
+// Castle 2 ==================================================================================
+gefg_cas02.gat,12,66,5	script	Esmark	55,{
+	if(callfunc("F_GldManager","Esmark","gefg_cas02",141,115,"G02") == 0) close;
+
+	if(@GDnum==10) guardian "gefg_cas02.gat",22,135,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "gefg_cas02.gat",33,40,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas02.gat",158,11,"Soldier Guardian",1287,1,"Guardian_G01::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas02.gat",64,140,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas02.gat",36,140,"Archer Guardian",1285,1,"Guardian_G01::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas02.gat",166,45,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas02.gat",10,39,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas02.gat",166,35,"Knight Guardian",1286,1,"Guardian_G01::OnGuardianDied",7;
+	mes "[ Esmark ]";
+	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	close;
+}
+
+
+// Castle 3 ==================================================================================
+gefg_cas03.gat,106,23,5	script	Jyang	55,{
+	if(callfunc("F_GldManager","Jyang","gefg_cas03",270,290,"G03") == 0) close;
+
+	if(@GDnum==10) guardian "gefg_cas03.gat",101,53,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",0;
+	if(@GDnum==11) guardian "gefg_cas03.gat",158,40,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas03.gat",158,67,"Soldier Guardian",1287,1,"Guardian_G03::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas03.gat",229,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas03.gat",248,53,"Archer Guardian",1285,1,"Guardian_G03::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas03.gat",122,53,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas03.gat",243,35,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas03.gat",234,33,"Knight Guardian",1286,1,"Guardian_G03::OnGuardianDied",7;
+	mes "[ Jyang ]";
+	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	close;
+}
+
+
+// Castle 4 ==================================================================================
+gefg_cas04.gat,73,46,5	script	Kelbany	55,{
+	if(callfunc("F_GldManager","Kelbany","gefg_cas04",116,118,"G04") == 0) close;
+
+	if(@GDnum==10) guardian "gefg_cas04.gat",49,203,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "gefg_cas04.gat",148,50,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas04.gat",57,20,"Soldier Guardian",1287,1,"Guardian_G04::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas04.gat",34,218,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas04.gat",167,42,"Archer Guardian",1285,1,"Guardian_G04::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas04.gat",18,52,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas04.gat",50,48,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas04.gat",160,66,"Knight Guardian",1286,1,"Guardian_G04::OnGuardianDied",7;
+	mes "[ Kelbany ]";
+	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	close;
+}
+
+
+// Castle 5 ==================================================================================
+gefg_cas05.gat,70,52,5	script	Beeor	55,{
+	if(callfunc("F_GldManager","Beeor","gefg_cas05",144,110,"G05") == 0) close;
+
+	if(@GDnum==10) guardian "gefg_cas05.gat",54,149,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",0; 
+	if(@GDnum==11) guardian "gefg_cas05.gat",80,31,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",1;
+	if(@GDnum==12) guardian "gefg_cas05.gat",52,32,"Soldier Guardian",1287,1,"Guardian_G05::OnGuardianDied",2;
+	if(@GDnum==13) guardian "gefg_cas05.gat",77,149,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",3; 
+	if(@GDnum==14) guardian "gefg_cas05.gat",65,18,"Archer Guardian",1285,1,"Guardian_G05::OnGuardianDied",4; 
+	if(@GDnum==15) guardian "gefg_cas05.gat",66,54,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",5; 
+	if(@GDnum==16) guardian "gefg_cas05.gat",187,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",6; 
+	if(@GDnum==17) guardian "gefg_cas05.gat",167,43,"Knight Guardian",1286,1,"Guardian_G05::OnGuardianDied",7;
+	mes "[ Beeor ]";
+	mes "Guardian has been installed, guardian will protect our guild base against enemies.";
+	close;
+}
diff --git a/npc/guild/gefg/gefg_treas.txt b/npc/guild/gefg/gefg_treas.txt
index 331756b79..95bd57542 100644
--- a/npc/guild/gefg/gefg_treas.txt
+++ b/npc/guild/gefg/gefg_treas.txt
@@ -1,148 +1,148 @@
-//===== eAthena Script =======================================

-//= War of Emperium Treasure Rooms for Geffen 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: =========================================

-//=

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

-//= v1.2 Optimized with functions.[kobra_k88]

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

-

-

-//<============================ Castle 1 ==================================>\\

-

-// Treasure Spawn ---------------------------------------------------------

-gefg_cas01.gat,1,1,1	script	Treasure_G01	-1,{

-

-OnRecvCastleG01:

-	if($boxNumG01 == 0) end;

-	set $@bxG01, $boxNumG01;

-	callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,1;

-	end;

-OnClock1200:

-	callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,0;

-	end;

-OnDied:

-	mapannounce "gefg_cas01.gat","Treasure Chest Broken Open",17;

-	set $boxNumG01, $boxNumG01 -1;

-	if($boxNumG01 == 0) mapannounce "gefg_cas01.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;

-	end;

-}

-

-// Room Switch ---------------------------------------------------------

-gefg_cas01.gat,152,117,0	script	Switch#TresG01	111,{

-	callfunc "F_GldTreasSw","gefg_cas01",40,49;

-	end;

-}

-

-

-//<================================ Castle 2 ================================>\\

-

-// Treasure Spawn ---------------------------------------------------------

-gefg_cas02.gat,1,1,1	script	Treasure_G02	-1,{

-

-OnRecvCastleG02:

-	if($boxNumG02 == 0) end;

-	set $@bxG02, $boxNumG02;

-	callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,1;

-	end;

-OnClock1200:

-	callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,0;

-	end;

-OnDied:

-	mapannounce "gefg_cas02.gat","Treasure Chest Broken Open",17;

-	set $boxNumG02, $boxNumG02 -1;

-	if($boxNumG02 == 0) mapannounce "gefg_cas02.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;

-	end;

-}

-

-// Room Switch ---------------------------------------------------------

-gefg_cas02.gat,145,115,0	script	Switch#TresG02	111,{

-	callfunc "F_GldTreasSw", "gefg_cas02",12,67;

-}

-

-

-//<================================= Castle 3 ===============================>\\

-

-// Treasure Spawn ---------------------------------------------------------

-gefg_cas03.gat,1,1,1	script	Treasure_G03	-1,{

-

-OnRecvCastleG03:

-	if($boxNumG03 == 0) end;

-	set $@bxG03, $boxNumG03;

-	callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,1;

-	end;

-OnClock1200:

-	callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,0;

-	end;

-OnDied:

-	mapannounce "gefg_cas03.gat","Treasure Chest Broken Open",17;

-	set $boxNumG03, $boxNumG03 -1;

-	if($boxNumG03 == 0) mapannounce "gefg_cas03.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;

-	end;

-}

-

-// Room Switch ---------------------------------------------------------

-gefg_cas03.gat,275,289,0	script	Switch#TresG03	111,{

-	callfunc "F_GldTreasSw", "gefg_cas03",106,24;

-	end;

-}

-

-

-//<=============================== Castle 4 ================================>\\

-

-// Treasure Spawn ---------------------------------------------------------

-gefg_cas04.gat,1,1,1	script	Treasure_G04	-1,{

-

-OnRecvCastleG04:

-	if($boxNumG04 == 0) end;

-	set $@bxG04, $boxNumG04;

-	callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,1;

-	end;

-OnClock1200:

-	callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,0;

-	end;

-OnDied:

-	mapannounce "gefg_cas04.gat","Treasure Chest Broken Open",17;

-	set $boxNumG04, $boxNumG04 -1;

-	if($boxNumG04 == 0) mapannounce "gefg_cas04.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;

-	end;

-}

-

-// Room Switch ---------------------------------------------------------

-gefg_cas04.gat,117,123,0	script	Switch#TresG04	111,{

-	callfunc "F_GldTreasSw", "gefg_cas04",73,47;

-	end;

-}

-

-

-//<================================ Castle 5 ================================>\\

-

-// Treasure Spawn ---------------------------------------------------------

-gefg_cas05.gat,1,1,1	script	Treasure_G05	-1,{

-

-OnRecvCastleG05:

-	if($boxNumG05 == 0) end;

-	set $@bxG05, $boxNumG05;

-	callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,1;

-	end;

-OnClock1200:

-	callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,0;

-	end;

-OnDied:

-	mapannounce "gefg_cas05.gat","Treasure Chest Broken Open",17;

-	set $boxNumG05, $boxNumG05 -1;

-	if($boxNumG05 == 0) mapannounce "gefg_cas05.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;

-	end;

-}

-

-// Room Switch ---------------------------------------------------------

-gefg_cas05.gat,149,107,0	script	Switch#TresG05	111,{

-	callfunc "F_GldTreasSw", "gefg_cas05",70,53;

-	close;

-}

+//===== eAthena Script =======================================
+//= War of Emperium Treasure Rooms for Geffen 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: =========================================
+//=
+//===== Additional Comments: =================================
+//= v1.2 Optimized with functions.[kobra_k88]
+//============================================================
+
+
+//<============================ Castle 1 ==================================>\\
+
+// Treasure Spawn ---------------------------------------------------------
+gefg_cas01.gat,1,1,1	script	Treasure_G01	-1,{
+
+OnRecvCastleG01:
+	if($boxNumG01 == 0) end;
+	set $@bxG01, $boxNumG01;
+	callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,1;
+	end;
+OnClock1200:
+	callfunc "F_GldTreas","gefg_cas01","G01",$boxNumG01,$@bxG01,$@boxIdG01,1334,150,108,158,114,0;
+	end;
+OnDied:
+	mapannounce "gefg_cas01.gat","Treasure Chest Broken Open",17;
+	set $boxNumG01, $boxNumG01 -1;
+	if($boxNumG01 == 0) mapannounce "gefg_cas01.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
+	end;
+}
+
+// Room Switch ---------------------------------------------------------
+gefg_cas01.gat,152,117,0	script	Switch#TresG01	111,{
+	callfunc "F_GldTreasSw","gefg_cas01",40,49;
+	end;
+}
+
+
+//<================================ Castle 2 ================================>\\
+
+// Treasure Spawn ---------------------------------------------------------
+gefg_cas02.gat,1,1,1	script	Treasure_G02	-1,{
+
+OnRecvCastleG02:
+	if($boxNumG02 == 0) end;
+	set $@bxG02, $boxNumG02;
+	callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,1;
+	end;
+OnClock1200:
+	callfunc "F_GldTreas","gefg_cas02","G02",$boxNumG02,$@bxG02,$@boxIdG02,1336,136,112,145,118,0;
+	end;
+OnDied:
+	mapannounce "gefg_cas02.gat","Treasure Chest Broken Open",17;
+	set $boxNumG02, $boxNumG02 -1;
+	if($boxNumG02 == 0) mapannounce "gefg_cas02.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
+	end;
+}
+
+// Room Switch ---------------------------------------------------------
+gefg_cas02.gat,145,115,0	script	Switch#TresG02	111,{
+	callfunc "F_GldTreasSw", "gefg_cas02",12,67;
+}
+
+
+//<================================= Castle 3 ===============================>\\
+
+// Treasure Spawn ---------------------------------------------------------
+gefg_cas03.gat,1,1,1	script	Treasure_G03	-1,{
+
+OnRecvCastleG03:
+	if($boxNumG03 == 0) end;
+	set $@bxG03, $boxNumG03;
+	callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,1;
+	end;
+OnClock1200:
+	callfunc "F_GldTreas","gefg_cas03","G03",$boxNumG03,$@bxG03,$@boxIdG03,1338,266,286,275,293,0;
+	end;
+OnDied:
+	mapannounce "gefg_cas03.gat","Treasure Chest Broken Open",17;
+	set $boxNumG03, $boxNumG03 -1;
+	if($boxNumG03 == 0) mapannounce "gefg_cas03.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
+	end;
+}
+
+// Room Switch ---------------------------------------------------------
+gefg_cas03.gat,275,289,0	script	Switch#TresG03	111,{
+	callfunc "F_GldTreasSw", "gefg_cas03",106,24;
+	end;
+}
+
+
+//<=============================== Castle 4 ================================>\\
+
+// Treasure Spawn ---------------------------------------------------------
+gefg_cas04.gat,1,1,1	script	Treasure_G04	-1,{
+
+OnRecvCastleG04:
+	if($boxNumG04 == 0) end;
+	set $@bxG04, $boxNumG04;
+	callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,1;
+	end;
+OnClock1200:
+	callfunc "F_GldTreas","gefg_cas04","G04",$boxNumG04,$@bxG04,$@boxIdG04,1340,112,114,119,123,0;
+	end;
+OnDied:
+	mapannounce "gefg_cas04.gat","Treasure Chest Broken Open",17;
+	set $boxNumG04, $boxNumG04 -1;
+	if($boxNumG04 == 0) mapannounce "gefg_cas04.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
+	end;
+}
+
+// Room Switch ---------------------------------------------------------
+gefg_cas04.gat,117,123,0	script	Switch#TresG04	111,{
+	callfunc "F_GldTreasSw", "gefg_cas04",73,47;
+	end;
+}
+
+
+//<================================ Castle 5 ================================>\\
+
+// Treasure Spawn ---------------------------------------------------------
+gefg_cas05.gat,1,1,1	script	Treasure_G05	-1,{
+
+OnRecvCastleG05:
+	if($boxNumG05 == 0) end;
+	set $@bxG05, $boxNumG05;
+	callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,1;
+	end;
+OnClock1200:
+	callfunc "F_GldTreas","gefg_cas05","G05",$boxNumG05,$@bxG05,$@boxIdG05,1342,140,106,147,113,0;
+	end;
+OnDied:
+	mapannounce "gefg_cas05.gat","Treasure Chest Broken Open",17;
+	set $boxNumG05, $boxNumG05 -1;
+	if($boxNumG05 == 0) mapannounce "gefg_cas05.gat", "All of the treasure boxes have been opened.  You must wait untill the next day for them to appear again.",0;
+	end;
+}
+
+// Room Switch ---------------------------------------------------------
+gefg_cas05.gat,149,107,0	script	Switch#TresG05	111,{
+	callfunc "F_GldTreasSw", "gefg_cas05",70,53;
+	close;
+}