- 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, 72 insertions, 75 deletions

diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt
index 135da1f14..d9ba54a32 100644
--- a/npc/guild/aldeg_cas02.txt
+++ b/npc/guild/aldeg_cas02.txt
@@ -1,5 +1,5 @@
 //===== rAthena Script =======================================
-//= War of Emperium (Al De baran)
+//= War of Emperium (Al De Baran)
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
@@ -10,28 +10,20 @@
 //= NPCs that relate to Al De Baran Guild Castle 2
 //===== Additional Comments: =================================
 //= 1.0 First Version. No longer uses functions. [L0ne_W0lf]
-//= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
-//= 1.2 Removed dialog from interior flags. [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,149,97,4	script	Hohenschwangau#a2-1::Hohenschwangau	722,{
-	end;
-
-OnRecvCastleA02:
-	FlagEmblem GetCastleData("aldeg_cas02",1);
-	end;
-}
+-	script	Hohenschwangau#1::OutsideFlagsA2	722,{
 
-// Guild Flag (Outside Castle)
-//============================================================
-alde_gld,99,251,4	script	Hohenschwangau#a2-2::Hohenschwangau2	722,{
 	set .@GID, GetCastleData("aldeg_cas02",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 " ";
@@ -40,33 +32,33 @@ alde_gld,99,251,4	script	Hohenschwangau#a2-2::Hohenschwangau2	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_cas02",1)) {
-					warp "aldeg_cas02",84,74;
-					//warp "aldeg_cas02",220,190;
-					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_cas02",1)) {
+				warp "aldeg_cas02",220,190;
+				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;
 
 OnRecvCastleA02:
@@ -74,11 +66,12 @@ OnRecvCastleA02:
 	end;
 }
 
-alde_gld,99,244,4	duplicate(Hohenschwangau2)	Hohenschwangau#a2-3	722
+alde_gld,99,251,4	duplicate(OutsideFlagsA2)	Hohenschwangau#1-2	722
+alde_gld,99,244,4	duplicate(OutsideFlagsA2)	Hohenschwangau#2	722
 
-// Guild Flag (Inside Castle)
+// Guild Flags (Inside Castle)
 //============================================================
-aldeg_cas02,82,71,2	script	Hohenschwangau#a2-4::Hohenschwangau3	722,{
+-	script	Hohenschwangau#3::InsideFlagsA2	722,{
 	end;
 
 OnRecvCastleA02:
@@ -86,56 +79,60 @@ OnRecvCastleA02:
 	end;
 }
 
-aldeg_cas02,67,30,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-5	722
-aldeg_cas02,183,140,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-6	722
-aldeg_cas02,212,152,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-7	722
-aldeg_cas02,108,39,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-8	722
-aldeg_cas02,57,213,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-9	722
-aldeg_cas02,91,181,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-10	722
-aldeg_cas02,103,53,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-11	722
-aldeg_cas02,73,53,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-12	722
-aldeg_cas02,63,41,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-13	722
-aldeg_cas02,229,6,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-14	722
-aldeg_cas02,230,40,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-15	722
-aldeg_cas02,197,40,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-16	722
-aldeg_cas02,32,213,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-17	722
-aldeg_cas02,121,29,2	duplicate(Hohenschwangau3)	Hohenschwangau#a2-18	722
+aldeg_cas02,82,71,2	duplicate(InsideFlagsA2)	Hohenschwangau#3-2	722
+aldeg_cas02,67,30,2	duplicate(InsideFlagsA2)	Hohenschwangau#4	722
+aldeg_cas02,183,140,2	duplicate(InsideFlagsA2)	Hohenschwangau#5	722
+aldeg_cas02,212,152,2	duplicate(InsideFlagsA2)	Hohenschwangau#6	722
+aldeg_cas02,108,39,2	duplicate(InsideFlagsA2)	Hohenschwangau#7	722
+aldeg_cas02,57,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#8	722
+aldeg_cas02,103,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#9	722
+aldeg_cas02,73,53,2	duplicate(InsideFlagsA2)	Hohenschwangau#10	722
+aldeg_cas02,63,41,2	duplicate(InsideFlagsA2)	Hohenschwangau#11	722
+aldeg_cas02,229,6,2	duplicate(InsideFlagsA2)	Hohenschwangau#12	722
+aldeg_cas02,230,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#13	722
+aldeg_cas02,197,40,2	duplicate(InsideFlagsA2)	Hohenschwangau#14	722
+aldeg_cas02,32,213,2	duplicate(InsideFlagsA2)	Hohenschwangau#15	722
+aldeg_cas02,121,29,2	duplicate(InsideFlagsA2)	Hohenschwangau#16	722
 
-// AGIT Manager
+// Guild Flag (Town)
 //============================================================
-aldeg_cas02,214,24,0	duplicate(Gld_Agit_Manager)	Agit#aldeg_cas02	-1
+aldebaran,149,97,4	duplicate(InsideFlagsA2)	Hohenschwangau#17	722
 
-// Steward
+// Kafra Employee
 //============================================================
-aldeg_cas02,78,74,0	duplicate(Gld_Mngr_Template)	Chenchenlie#aldeg_cas02	55
+aldeg_cas02,84,74,0	duplicate(guildkafra)	Kafra Staff#aldeg_cas02	117
 
-// Guardians
+// Steward
 //============================================================
-aldeg_cas02,78,74,0	duplicate(Gld_Guard_Template)	Guardian#aldeg_cas02	-1
+aldeg_cas02,78,74,0	duplicate(cm)	Chenchenlie#aldeg_cas02	55
 
-// Kafra Staff
+// Treasure Room Lever
 //============================================================
-aldeg_cas02,84,74,0	duplicate(Gld_Kafra_Template)	Kafra Staff#aldeg_cas02	117
+aldeg_cas02,139,234,0	script	#lever_A02	111,{
 
-// Master's Room Exit
-//============================================================
-aldeg_cas02,139,235,0	script	#switch_A02	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_cas02",78,75;
-	end;
+	if(select("Pull.:Do not.") == 1) {
+		close2;
+		warp "aldeg_cas02",78,75;
+		end;
+	}
+	close;
 }
 
-// Guild Treasure Protection
+// Guild Dungeon Lever
 //============================================================
-aldeg_cas02,135,230,0	duplicate(Gld_Trea_Protect)	ban_warp#aldeg_cas02	-1,8,8
+aldeg_cas02,194,136,0	duplicate(gdlever)	#aldeg_cas02	111
 
 // Guild Treasure Spawns
 //============================================================
 aldeg_cas02,135,230,0	duplicate(Gld_Trea_Spawn)	Treasure#aldeg_cas02	-1
 
-// Guild Dungeon Switch
+// AGIT Manager
+//============================================================
+aldeg_cas02,214,24,0	duplicate(Gld_Agit_Manager)	Agit#aldeg_cas02	-1
+
+// Guardians
 //============================================================
-aldeg_cas02,194,136,0	duplicate(Gld_Dun_Template)	#aldeg_cas02	111
+aldeg_cas02,78,74,0	duplicate(Gld_Guard_Template)	Guardian#aldeg_cas02	-1
\ No newline at end of file