* Added new broadcasting support from r14120 to WoE scripts.

- "Conquered" messages can now be effectively toggled off in Battle log
- Added fontsizes for WoESE messages. (At least the non-default sizes.)
* Added font weight constants, although they don't seem to do anything.

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

13 files changed, 63 insertions, 56 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 38c0869e9..2cd9c5541 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,9 @@
 Date		Added
 ======
+2009/11/03
+	* Rev. 14122 Added new broadcasting support from r14120 to WoE scripts. [L0ne_W0lf]
+	- "Conquered" messages can now be effectively toggled off in Battle log
+	- Added fontsizes for WoESE messages. (At least the non-default sizes.)
 2009/11/02
 	* Rev. 14118 Implemented "Part-Time Work", another 13.1 quest and related NPCs. [L0ne_W0lf]
 2009/11/02
diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt
index f642e316c..7fafd962f 100644
--- a/npc/guild/agit_controller.txt
+++ b/npc/guild/agit_controller.txt
@@ -4,7 +4,7 @@
 //= kalen (1.0)
 //= 1.1 by Akaru and ho|yAnge|
 //===== Current Version: =====================================
-//= 1.9
+//= 2.0
 //===== Compatible With: =====================================
 //= eAthena SVN; RO Episode 4+
 //===== Description: =========================================
@@ -30,6 +30,7 @@
 //= 1.8b Whoops. Fixed a mistake :D [L0ne_W0lf]
 //= 1.9 Rearranged the time-checks so they no longer use goto. [L0ne_W0lf]
 //=	Removed treasure spawning function calls. (No longer needed)
+//= 2.0 Added WoE Battle Log support for broadcasts. [L0ne_W0lf]
 //============================================================
 //| To know how to set up WoE times, go to doc\woe_time_explanation.txt
 // WoE Start/Stop times
@@ -73,10 +74,10 @@ S_DisplayOwners:
 	setarray .@maps$[15],"prtg_cas01","prtg_cas02","prtg_cas03","prtg_cas04","prtg_cas05";
 	for( set .@i, 0; .@i <= 19; set .@i, .@i+1 ) {
 		if (GetCastleData(.@maps$[.@i],1)) {
-			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle has been conquered by the [" + GetGuildName(GetCastleData(.@maps$[.@i],1)) + "] guild.",bc_all;
+			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle has been conquered by the [" + GetGuildName(GetCastleData(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe;
 		}
 		else {
-			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all;
+			Announce "The [" + GetCastleName(.@maps$[.@i]) + "] castle is currently unoccupied.",bc_all|bc_woe;
 		}		
 	}
 	end;
diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt
index 486f34c1c..981cbc08e 100644
--- a/npc/guild/agit_template.txt
+++ b/npc/guild/agit_template.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.6a
+//= 1.7
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -47,6 +47,8 @@
 //=     Investing now happens at the turn of the day.
 //= 1.6a Corrected conditions in the new investing blocks. [L0ne_W0lf]
 //= 1.6b Moved where investments are added to eco/def. [L0ne_W0lf]
+//= 1.7 Updated Agitbreak announcements, added bc_woe [L0ne_W0lf]
+//=     and added extended anouncement format for mapannounce.
 //============================================================
 
 // AGIT Manager Template
@@ -121,7 +123,7 @@ OnAgitBreak:
 	SetCastleData strnpcinfo(2),1, .@GID;
 
 	// Announce that the Emperium is destroyed, and respawn all but new castle-occupants.
-	mapannounce strnpcinfo(2),"The emperium has been destroyed.",bc_map,"0x00CCFF";
+	mapannounce strnpcinfo(2),"The emperium has been destroyed.",bc_map|bc_woe,"0x00CCFF",FW_NORMAL,12;
 	MapRespawnGuildID strnpcinfo(2),.@GID,2;
 
 	// Refresh castle data, disable Kafra and reset Invest information.
@@ -141,7 +143,7 @@ OnAgitBreak:
 	if( agitcheck() )
 		donpcevent "Agit#"+strnpcinfo(2)+"::OnStartArena";
 	sleep getbattleflag("gvg_eliminate_time");
-	announce "The [" + getcastlename(strnpcinfo(2)) + "] castle has been conquered by the [" + getguildName(.@GID) + "] guild.",bc_all;
+	announce "The [" + getcastlename(strnpcinfo(2)) + "] castle has been conquered by the [" + getguildName(.@GID) + "] guild.",bc_all|bc_woe;
 	end;
 
 // War of Emperium has ended.
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index f55845069..863ad8ee1 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -2678,12 +2678,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("arug_cas01") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas01") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru01_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 1] stronghold of " + GetCastleName("arug_cas01"),bc_all;
-		mapannounce "arug_cas01","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 1] stronghold of " + GetCastleName("arug_cas01"),bc_all|bc_woe;
+		mapannounce "arug_cas01","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#aru01_02::Onreset";
 			initnpctimer;
@@ -2694,7 +2694,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("arug_cas01") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas01") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru01_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2705,7 +2705,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "Manager#aru01_02::Onchange";
-	mapannounce "arug_cas01","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "arug_cas01","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }
 
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index 844a9039a..6b1705b84 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -2639,12 +2639,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("arug_cas02") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas02") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru02_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 2] stronghold of "+GetCastleName("arug_cas02"),bc_all;
-		mapannounce "arug_cas02","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 2] stronghold of "+GetCastleName("arug_cas02"),bc_all|bc_woe;
+		mapannounce "arug_cas02","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#aru02_02::Onreset";
 			initnpctimer;
@@ -2655,7 +2655,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("arug_cas02") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas02") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru02_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2666,7 +2666,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "Manager#aru02_02::Onchange";
-	mapannounce "arug_cas02","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "arug_cas02","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }
 
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index b9e5193c0..3b6a1bbcb 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -2684,12 +2684,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("arug_cas03") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas03") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru03_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 3] stronghold of "+GetCastleName("arug_cas03"),bc_all;
-		mapannounce "arug_cas03","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 3] stronghold of "+GetCastleName("arug_cas03"),bc_all|bc_woe;
+		mapannounce "arug_cas03","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#aru03_02::Onreset";
 			initnpctimer;
@@ -2700,7 +2700,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("arug_cas03") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas03") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru03_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2711,7 +2711,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "Manager#aru03_02::Onchange";
-	mapannounce "arug_cas03","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "arug_cas03","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }
 
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index de8b1d104..ca3cb2e88 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -2686,12 +2686,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("arug_cas04") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas04") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru04_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 4] stronghold of "+GetCastleName("arug_cas04"),bc_all;
-		mapannounce "arug_cas04","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 4] stronghold of "+GetCastleName("arug_cas04"),bc_all|bc_woe;
+		mapannounce "arug_cas04","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#aru04_02::Onreset";
 			initnpctimer;
@@ -2702,7 +2702,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("arug_cas04") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas04") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru04_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2713,7 +2713,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "Manager#aru04_02::Onchange";
-	mapannounce "arug_cas04","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "arug_cas04","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }
 
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index f739c6d17..b5e551975 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -2686,12 +2686,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("arug_cas05") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas05") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru05_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 5] stronghold of "+GetCastleName("arug_cas05"),bc_all;
-		mapannounce "arug_cas05","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Valfreyja 5] stronghold of "+GetCastleName("arug_cas05"),bc_all|bc_woe;
+		mapannounce "arug_cas05","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#aru05_02::Onreset";
 			initnpctimer;
@@ -2702,7 +2702,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("arug_cas05") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("arug_cas05") + "]'s 'Valfreyja' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#aru05_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2713,7 +2713,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "Manager#aru05_02::Onchange";
-	mapannounce "arug_cas05","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "arug_cas05","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }
 
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index b5036406a..acc375039 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -2686,12 +2686,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("schg_cas01") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas01") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch01_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 1] stronghold of "+GetCastleName("schg_cas01"),bc_all;
-		mapannounce "schg_cas01","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 1] stronghold of "+GetCastleName("schg_cas01"),bc_all|bc_woe;
+		mapannounce "schg_cas01","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#sch01_02::Onreset";
 			initnpctimer;
@@ -2702,7 +2702,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("schg_cas01") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas01") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch01_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2713,7 +2713,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "Manager#sch01_02::Onchange";
-	mapannounce "schg_cas01","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "schg_cas01","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }
 
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index a009ea410..2a8c5b36c 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -2620,12 +2620,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("schg_cas02") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas02") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch02_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 2] stronghold of "+GetCastleName("schg_cas02"),bc_all;
-		mapannounce "schg_cas02","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 2] stronghold of "+GetCastleName("schg_cas02"),bc_all|bc_woe;
+		mapannounce "schg_cas02","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#sch02_02::Onreset";
 			initnpctimer;
@@ -2636,7 +2636,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("schg_cas02") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas02") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch02_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2647,7 +2647,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "Manager#sch02_02::Onchange";
-	mapannounce "schg_cas02","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "schg_cas02","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }
 
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 59b09c8b5..3a25e86f6 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -2679,12 +2679,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("schg_cas03") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas03") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch03_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 3] stronghold of "+GetCastleName("schg_cas03"),bc_all;
-		mapannounce "schg_cas03","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 3] stronghold of "+GetCastleName("schg_cas03"),bc_all|bc_woe;
+		mapannounce "schg_cas03","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#sch03_02::Onreset";
 			initnpctimer;
@@ -2695,7 +2695,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("schg_cas03") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas03") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch03_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2706,7 +2706,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "manager#sch03_02::Onchange";
-	mapannounce "schg_cas03","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "schg_cas03","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }
 
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index 751945e0d..057874e5a 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -2683,12 +2683,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("schg_cas04") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas04") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch04_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 4] stronghold of "+GetCastleName("schg_cas04"),bc_all;
-		mapannounce "schg_cas04","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 4] stronghold of "+GetCastleName("schg_cas04"),bc_all|bc_woe;
+		mapannounce "schg_cas04","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#sch04_02::Onreset";
 			initnpctimer;
@@ -2699,7 +2699,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("schg_cas04") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas04") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch04_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2710,7 +2710,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "Manager#sch04_02::Onchange";
-	mapannounce "schg_cas04","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "schg_cas04","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }
 
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index c5357a2f0..aaa15e4c3 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -2683,12 +2683,12 @@ OnStartArena:
 
 	set .msg,2;
 	if (.msg == 1) {
-		announce "Fortress [" + GetCastleName("schg_cas05") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas05") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch05_02::Onstart";
 	}
 	else if (.msg == 2) {
-		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 5] stronghold of "+GetCastleName("schg_cas05"),bc_all;
-		mapannounce "schg_cas05","The emperium has been shattered!",bc_map,"0x00FF00";
+		announce "The [" + getguildname(.@gid) + "] conquered the [Nithafjoll 5] stronghold of "+GetCastleName("schg_cas05"),bc_all|bc_woe;
+		mapannounce "schg_cas05","The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 		if (agitcheck2()) {
 			donpcevent "Manager#sch05_02::Onreset";
 			initnpctimer;
@@ -2699,7 +2699,7 @@ OnStartArena:
 		}
 	}
 	else if (.msg == 0) {
-		announce "Fortress [" + GetCastleName("schg_cas05") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all;
+		announce "Fortress [" + GetCastleName("schg_cas05") + "]'s 'Nithafjoll' was captured by [" + getguildname(.@gid) + "] Guild.",bc_all|bc_woe;
 		donpcevent "Manager#sch05_02::Onreset";
 		stopnpctimer;
 		end;
@@ -2710,7 +2710,7 @@ OnStartArena:
 
 OnTimer10000:
 	donpcevent "Manager#sch05_02::Onchange";
-	mapannounce "schg_cas05","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00";
+	mapannounce "schg_cas05","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
 	end;
 }