- 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, 78 insertions, 76 deletions

diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt
index 9f3c86212..ba519522a 100644
--- a/npc/guild/aldeg_cas01.txt
+++ b/npc/guild/aldeg_cas01.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)
+// Guild Flags (Outside Castle)
 //============================================================
-aldebaran,152,97,4	script	Neuschwanstein#a1-1::Neuschwanstein	722,{
-	end;
-
-OnRecvCastleA01:
-	FlagEmblem GetCastleData("aldeg_cas01",1);
-	end;
-}
+-	script	Neuschwanstein#1::OutsideFlagsA1	722,{
 
-// Guild Flag (Outside Castle)
-//============================================================
-alde_gld,61,87,6	script	Neuschwanstein#a1-2::Neuschwanstein2	722,{
 	set .@GID, GetCastleData("aldeg_cas01",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,32 +32,33 @@ alde_gld,61,87,6	script	Neuschwanstein#a1-2::Neuschwanstein2	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_cas01",1)) {
-					warp "aldeg_cas01",218,170;
-					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_cas01",1)) {
+				warp "aldeg_cas01",218,170;
+				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;
 
 OnRecvCastleA01:
@@ -72,13 +66,14 @@ OnRecvCastleA01:
 	end;
 }
 
-alde_gld,61,79,6	duplicate(Neuschwanstein2)	Neuschwanstein#a1-3	722
-alde_gld,45,87,8	duplicate(Neuschwanstein2)	Neuschwanstein#a1-4	722
-alde_gld,51,87,8	duplicate(Neuschwanstein2)	Neuschwanstein#a1-5	722
+alde_gld,61,87,6	duplicate(OutsideFlagsA1)	Neuschwanstein#1-2	722
+alde_gld,61,79,6	duplicate(OutsideFlagsA1)	Neuschwanstein#2	722
+alde_gld,45,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#3	722
+alde_gld,51,87,8	duplicate(OutsideFlagsA1)	Neuschwanstein#4	722
 
-// Guild Flag (Inside Castle)
+// Guild Flags (Inside Castle)
 //============================================================
-aldeg_cas01,30,248,4	script	Neuschwanstein#a1-6::Neuschwanstein3	722,{
+-	script	Neuschwanstein#5::InsideFlagsA1	722,{
 	end;
 
 OnRecvCastleA01:
@@ -86,57 +81,64 @@ OnRecvCastleA01:
 	end;
 }
 
-aldeg_cas01,30,246,4	duplicate(Neuschwanstein3)	Neuschwanstein#a1-7	722
-aldeg_cas01,37,248,4	duplicate(Neuschwanstein3)	Neuschwanstein#a1-8	722
-aldeg_cas01,37,246,4	duplicate(Neuschwanstein3)	Neuschwanstein#a1-9	722
-aldeg_cas01,95,80,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-10	722
-aldeg_cas01,95,59,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-11	722
-aldeg_cas01,62,75,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-12	722
-aldeg_cas01,70,75,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-13	722
-aldeg_cas01,74,75,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-14	722
-aldeg_cas01,62,64,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-15	722
-aldeg_cas01,66,64,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-16	722
-aldeg_cas01,70,64,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-17	722
-aldeg_cas01,74,64,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-18	722
-aldeg_cas01,203,150,4	duplicate(Neuschwanstein3)	Neuschwanstein#a1-19	722
-aldeg_cas01,210,150,4	duplicate(Neuschwanstein3)	Neuschwanstein#a1-20	722
-aldeg_cas01,66,75,2	duplicate(Neuschwanstein3)	Neuschwanstein#a1-21	722
+aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#5-2	722
+aldeg_cas01,30,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#6	722
+aldeg_cas01,37,248,4	duplicate(InsideFlagsA1)	Neuschwanstein#7	722
+aldeg_cas01,37,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#8	722
+aldeg_cas01,30,246,4	duplicate(InsideFlagsA1)	Neuschwanstein#9	722
+aldeg_cas01,95,80,2	duplicate(InsideFlagsA1)	Neuschwanstein#10	722
+aldeg_cas01,95,59,2	duplicate(InsideFlagsA1)	Neuschwanstein#11	722
+aldeg_cas01,62,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#12	722
+aldeg_cas01,66,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#13	722
+aldeg_cas01,70,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#14	722
+aldeg_cas01,74,75,2	duplicate(InsideFlagsA1)	Neuschwanstein#15	722
+aldeg_cas01,62,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#16	722
+aldeg_cas01,66,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#17	722
+aldeg_cas01,70,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#18	722
+aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#19	722
+aldeg_cas01,74,64,2	duplicate(InsideFlagsA1)	Neuschwanstein#20	722
+aldeg_cas01,203,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#21	722
+aldeg_cas01,210,150,4	duplicate(InsideFlagsA1)	Neuschwanstein#22	722
 
-// AGIT Manager
+// Guild Flag (Town)
 //============================================================
-aldeg_cas01,216,24,0	duplicate(Gld_Agit_Manager)	Agit#aldeg_cas01	-1
+aldebaran,152,97,4	duplicate(InsideFlagsA1)	Neuschwanstein#23	722
 
-// Steward
+// Kafra Employee
 //============================================================
-aldeg_cas01,218,175,0	duplicate(Gld_Mngr_Template)	Alfredo#aldeg_cas01	55
+aldeg_cas01,218,170,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas01	117
 
-// Guardians
+// Steward
 //============================================================
-aldeg_cas01,218,175,0	duplicate(Gld_Guard_Template)	Guardian#aldeg_cas01	-1
+aldeg_cas01,218,175,0	duplicate(cm)	Alfredo#aldeg_cas01	55
 
-// Kafra Staff
+// Treasure Room Exit
 //============================================================
-aldeg_cas01,218,170,0	duplicate(Gld_Kafra_Template)	Kafra Staff#aldeg_cas01	117
+aldeg_cas01,123,223,0	script	#lever_A01	111,{
 
-// Master's Room Exit
-//============================================================
-aldeg_cas01,123,223,0	script	#switch_A01	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_cas01",218,176;
-	end;
+	if(select("Pull.:Do not.") == 1) {
+		close2;
+		warp "aldeg_cas01",218,176;
+		end;
+	}
+	close;
 }
 
-// Guild Treasure Protection
+// Guild Dungeon Switch
 //============================================================
-aldeg_cas01,118,223,0	duplicate(Gld_Trea_Protect)	ban_warp#aldeg_cas01	-1,8,8
+aldeg_cas01,211,181,0	duplicate(gdlever)	#aldeg_cas01	111
 
 // Guild Treasure Spawns
 //============================================================
 aldeg_cas01,118,223,0	duplicate(Gld_Trea_Spawn)	Treasure#aldeg_cas01	-1
 
-// Guild Dungeon Switch
+// AGIT Manager
+//============================================================
+aldeg_cas01,216,24,0	duplicate(Gld_Agit_Manager)	Agit#aldeg_cas01	-1
+
+// Guardians
 //============================================================
-aldeg_cas01,211,181,0	duplicate(Gld_Dun_Template)	#aldeg_cas01	111
+aldeg_cas01,218,175,0	duplicate(Gld_Guard_Template)	Guardian#aldeg_cas01	-1
\ No newline at end of file