- Guild folder update.

* Partially rewrote all castle files and updated all Castle flags, NPC's and warp coordinations to latest available official file.
* Renamed agit_template to agit_main and also updated it to latest available official file.
* Removed the Treasure Room Protection from agit_template and separated it into another file which will now be known as trs_rp.txt
- trs_rp.txt will allow that only the Guildleader can be in the Treasure Room, if you want to disable this protection just set an // in scripts_guild.conf before npc: npc/guild/trs_rp.txt .
- Moved payon castle map warps from warps/cities/payon.txt to warps/guild/guildcastles.txt .

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

1 files changed, 74 insertions, 75 deletions

diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt
index da68f8eb5..944648b89 100644
--- a/npc/guild/aldeg_cas04.txt
+++ b/npc/guild/aldeg_cas04.txt
@@ -1,9 +1,9 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Al De baran)
+//= War of Emperium (Al De Baran)
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -11,26 +11,19 @@
 //===== Additional Comments: =================================
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
 //= 1.1 Removed dialog from interior flags. [L0ne_W0lf]
+//= 1.2 Partially rewrote Script. [Masao]
 //============================================================
 
-// Guild Flag (Town)
-//============================================================
-aldebaran,131,97,4	script	Wuerzburg#a4-1::Wuerzburg	722,{
-	end;
-
-OnRecvCastleA04:
-	FlagEmblem GetCastleData("aldeg_cas04",1);
-	end;
-}
-
 // Guild Flag (Outside Castle)
 //============================================================
-alde_gld,239,246,2	script	Wuerzburg#a4-2::Wuerzburg2	722,{
+-	script	Wuerzburg#1::OutsideFlagsA4	722,{
+
 	set .@GID, GetCastleData("aldeg_cas04",1);
+
 	if (.@GID == 0) {
-		mes " [ Edict of the Divine Rune Midgard Kingdom ]";
+		mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
 		mes " ";
-		mes "1. Follow the ordinance of The Divine Rune Midgard Kingdom, ";
+		mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
 		mes "We declare that";
 		mes "there is no formal master of this castle.";
 		mes " ";
@@ -39,33 +32,33 @@ alde_gld,239,246,2	script	Wuerzburg#a4-2::Wuerzburg2	722,{
 		mes "and destroy the Emperium,";
 		mes "the king will endow the one with";
 		mes "ownership of this castle.";
+		close;
 	}
-	else {
-		if (getcharid(2) == .@GID) {
-			mes "Brave ones...";
-			mes "Do you wish to return to your honorable place?";
-			next;
-			if (select("Return to the guild castle.:Quit.") == 1) {
-				if (getcharid(2) == GetCastleData("aldeg_cas04",1)) {
-					warp "aldeg_cas04",45,88;
-					//warp "aldeg_cas04",116,217;
-					end;
-				}
+	if (getcharid(2) == .@GID) {
+		mes "[ Echoing Voice ]";
+		mes "Brave ones...";
+		mes "Do you wish to return to your honorable place?";
+		next;
+		if(select("Return to the guild castle.:Quit.") == 1) {
+			close2;
+			if (getcharid(2) == GetCastleData("aldeg_cas04",1)) {
+				warp "aldeg_cas04",116,217;
+				end;
 			}
-			close;
+			end;
 		}
-		mes "[ Edict of the Divine Rune Midgard Kingdom ]";
-		mes " ";
-		mes "1. Following the ordinance of the";
-		mes "Divine Rune Midgard Kingdom,";
-		mes "we approve that this place is in";
-		mes "the private possession of ^ff0000" + GetGuildName(.@GID) + "^000000 Guild.";
-		mes " ";
-		mes "2. The guild Master of ^ff0000"+ GetGuildName(.@GID) + "^000000 Guild is";
-		mes "^FF0000" + GetGuildMaster(.@GID) + "^000000";
-		mes "If there is anyone who objects to this,";
-		mes " prove your strength and honor with a steel blade in your hand.";
+		close;
 	}
+	mes "[ Edict of the Divine Rune-Midgarts Kingdom ]";
+	mes " ";
+	mes "1. Follow the ordinance of The Divine Rune-Midgarts Kingdom, ";
+	mes "we approve that this place is in";
+	mes "the private prossession of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild.";
+	mes " ";
+	mes "2. The guild Master of ^ff0000"+GetGuildName(.@GID)+"^000000 Guild is";
+	mes "^ff0000"+GetGuildMaster(.@GID)+"^000000";
+	mes "If there is anyone who objects to this,";
+	mes "prove your strength and honor with a steel blade in your hand.";
 	close;
 
 OnRecvCastleA04:
@@ -73,11 +66,12 @@ OnRecvCastleA04:
 	end;
 }
 
-alde_gld,239,239,2	duplicate(Wuerzburg2)	Wuerzburg#a4-3	722
+alde_gld,239,246,2	duplicate(OutsideFlagsA4)	Wuerzburg#1-2	722
+alde_gld,239,239,2	duplicate(OutsideFlagsA4)	Wuerzburg#2	722
 
 // Guild Flag (Inside Castle)
 //============================================================
-aldeg_cas04,167,61,2	script	Wuerzburg#a4-4::Wuerzburg3	722,{
+-	script	Wuerzburg#3::InsideFlagsA4	722,{
 	end;
 
 OnRecvCastleA04:
@@ -85,58 +79,63 @@ OnRecvCastleA04:
 	end;
 }
 
-aldeg_cas04,164,90,2	duplicate(Wuerzburg3)	Wuerzburg#a4-5	722
-aldeg_cas04,129,193,2	duplicate(Wuerzburg3)	Wuerzburg#a4-6	722
-aldeg_cas04,112,206,2	duplicate(Wuerzburg3)	Wuerzburg#a4-7	722
-aldeg_cas04,113,212,2	duplicate(Wuerzburg3)	Wuerzburg#a4-8	722
-aldeg_cas04,77,117,2	duplicate(Wuerzburg3)	Wuerzburg#a4-9	722
-aldeg_cas04,186,42,2	duplicate(Wuerzburg3)	Wuerzburg#a4-10	722
-aldeg_cas04,30,69,2	duplicate(Wuerzburg3)	Wuerzburg#a4-11	722
-aldeg_cas04,55,97,2	duplicate(Wuerzburg3)	Wuerzburg#a4-12	722
-aldeg_cas04,45,98,2	duplicate(Wuerzburg3)	Wuerzburg#a4-13	722
-aldeg_cas04,33,116,2	duplicate(Wuerzburg3)	Wuerzburg#a4-14	722
-aldeg_cas04,130,180,2	duplicate(Wuerzburg3)	Wuerzburg#a4-15	722
-aldeg_cas04,129,193,2	duplicate(Wuerzburg3)	Wuerzburg#a4-16	722
-aldeg_cas04,33,107,2	duplicate(Wuerzburg3)	Wuerzburg#a4-17	722
-aldeg_cas04,133,220,2	duplicate(Wuerzburg3)	Wuerzburg#a4-18	722
-aldeg_cas04,169,22,2	duplicate(Wuerzburg3)	Wuerzburg#a4-19	722
-aldeg_cas04,169,15,2	duplicate(Wuerzburg3)	Wuerzburg#a4-20	722
+aldeg_cas04,167,61,2	duplicate(InsideFlagsA4)	Wuerzburg#3-2	722
+aldeg_cas04,164,90,2	duplicate(InsideFlagsA4)	Wuerzburg#4	722
+aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#5	722
+aldeg_cas04,112,206,2	duplicate(InsideFlagsA4)	Wuerzburg#6	722
+aldeg_cas04,113,212,2	duplicate(InsideFlagsA4)	Wuerzburg#7	722
+aldeg_cas04,77,117,2	duplicate(InsideFlagsA4)	Wuerzburg#8	722
+aldeg_cas04,186,42,2	duplicate(InsideFlagsA4)	Wuerzburg#9	722
+aldeg_cas04,30,69,2	duplicate(InsideFlagsA4)	Wuerzburg#10	722
+aldeg_cas04,55,97,2	duplicate(InsideFlagsA4)	Wuerzburg#11	722
+aldeg_cas04,45,98,2	duplicate(InsideFlagsA4)	Wuerzburg#12	722
+aldeg_cas04,33,116,2	duplicate(InsideFlagsA4)	Wuerzburg#13	722
+aldeg_cas04,130,180,2	duplicate(InsideFlagsA4)	Wuerzburg#14	722
+aldeg_cas04,129,193,2	duplicate(InsideFlagsA4)	Wuerzburg#15	722
+aldeg_cas04,33,107,2	duplicate(InsideFlagsA4)	Wuerzburg#16	722
+aldeg_cas04,133,220,2	duplicate(InsideFlagsA4)	Wuerzburg#17	722
+aldeg_cas04,169,22,2	duplicate(InsideFlagsA4)	Wuerzburg#18	722
+aldeg_cas04,169,15,2	duplicate(InsideFlagsA4)	Wuerzburg#19	722
 
-// AGIT Manager
+// Guild Flag (Town)
 //============================================================
-aldeg_cas04,36,218,0	duplicate(Gld_Agit_Manager)	Agit#aldeg_cas04	-1
+aldebaran,131,97,4	duplicate(InsideFlagsA4)	Wuerzburg#20	722
 
-// Steward
+// Kafra Employee
 //============================================================
-aldeg_cas04,67,116,0	duplicate(Gld_Mngr_Template)	Brymhensen#aldeg_cas04	55
+aldeg_cas04,45,88,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas04	117
 
-// Guardians
+// Steward
 //============================================================
-aldeg_cas04,67,116,0	duplicate(Gld_Guard_Template)	Guardian#aldeg_cas04	-1
+aldeg_cas04,67,116,0	duplicate(cm)	Brymhensen#aldeg_cas04	55
 
-// Kafra Staff
+// Treasure Room Exit
 //============================================================
-aldeg_cas04,45,88,0	duplicate(Gld_Kafra_Template)	Kafra Staff#aldeg_cas04	117
+aldeg_cas04,83,17,0	script	#lever_A04	111,{
 
-// Master's Room Exit
-//============================================================
-aldeg_cas04,83,17,0	script	#switch_A04	111,{
 	mes " ";
-	mes "There's a small lever. Will you pull it? ";
+	mes "There's a small lever. Will you pull it?";
 	next;
-	if(select("Pull.:Do not.") == 2) close;
-	warp "aldeg_cas04",67,117;
-	end;
+	if(select("Pull.:Do not.") == 1) {
+		close2;
+		warp "aldeg_cas04",67,117;
+		end;
+	}
+	close;
 }
 
-// Guild Treasure Protection
+// Guild Dungeon Switch
 //============================================================
-aldeg_cas04,84,13,0	duplicate(Gld_Trea_Protect)	ban_warp#aldeg_cas04	-1,8,8
+aldeg_cas04,76,64,0	duplicate(gdlever)	#aldeg_cas04	111
 
 // Guild Treasure Spawns
 //============================================================
 aldeg_cas04,84,13,0	duplicate(Gld_Trea_Spawn)	Treasure#aldeg_cas04	-1
 
-// Guild Dungeon Switch
+// AGIT Manager
+//============================================================
+aldeg_cas04,36,218,0	duplicate(Gld_Agit_Manager)	Agit#aldeg_cas04	-1
+
+// Guardians
 //============================================================
-aldeg_cas04,38,76,0	duplicate(Gld_Dun_Template)	#aldeg_cas04	111
+aldeg_cas04,67,116,0	duplicate(Gld_Guard_Template)	Guardian#aldeg_cas04	-1
\ No newline at end of file