- 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, 66 insertions, 68 deletions

diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt
index 266597d38..efb104040 100644
--- a/npc/guild/payg_cas01.txt
+++ b/npc/guild/payg_cas01.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.2
+//= 1.3
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -13,28 +13,19 @@
 //= 1.1 Corrected flag-in spawn point. [L0ne_W0lf]
 //= 1.2 Removed dialog from interior flags. [L0ne_W0lf]
 //=     Fixed position of Guild dungeon switch.
+//= 1.3 Partially rewrote Script. [Masao]
 //============================================================
 
-// Guild Flag (Town)
+// Guild Flags (Outside Castle)
 //============================================================
-payon,166,161,3	script	Bright Arbor#f1-1::BrightArbor	722,{
-	end;
-
-OnRecvCastlePy01:
-	FlagEmblem GetCastleData("payg_cas01",1);
-	end;
-}
-
-payon,90,322,4	duplicate(BrightArbor)	Bright Arbor#f1-2	722
+-	script	Bright Arbor#1::OutsideFlagsPA1	722,{
 
-// Guild Flag (Outside Castle)
-//============================================================
-pay_gld,125,236,4	script	Bright Arbor#f1-3::BrightArbor2	722,{
 	set .@GID, GetCastleData("payg_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 " ";
@@ -43,33 +34,33 @@ pay_gld,125,236,4	script	Bright Arbor#f1-3::BrightArbor2	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("payg_cas01",1)) {
-					warp "payg_cas01",212,108;
-					//warp "payg_cas01",54 144;
-					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("payg_cas01",1)) {
+					warp "payg_cas01",54,144;
+				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;
 
 OnRecvCastlePy01:
@@ -77,13 +68,14 @@ OnRecvCastlePy01:
 	end;
 }
 
-pay_gld,110,233,4	duplicate(BrightArbor2)	Bright Arbor#f1-4	722
-pay_gld,116,233,4	duplicate(BrightArbor2)	Bright Arbor#f1-5	722
-pay_gld,91,239,2	duplicate(BrightArbor2)	Bright Arbor#f1-6	722
+pay_gld,125,236,4	duplicate(OutsideFlagsPA1)	Bright Arbor#1-2	722
+pay_gld,110,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#2	722
+pay_gld,116,233,4	duplicate(OutsideFlagsPA1)	Bright Arbor#3	722
+pay_gld,91,239,2	duplicate(OutsideFlagsPA1)	Bright Arbor#4	722
 
-// Guild Flag (Inside Castle)
+// Guild Flags (Inside Castle)
 //============================================================
-payg_cas01,238,67,4	script	Bright Arbor#f1-7::BrightArbor3	722,{
+-	script	Bright Arbor#5::InsideFlagsPA1	722,{
 	end;
 
 OnRecvCastlePy01:
@@ -91,47 +83,53 @@ OnRecvCastlePy01:
 	end;
 }
 
-payg_cas01,233,67,4	duplicate(BrightArbor3)	Bright Arbor#f1-8	722
-payg_cas01,221,123,4	duplicate(BrightArbor3)	Bright Arbor#f1-9	722
-payg_cas01,221,116,4	duplicate(BrightArbor3)	Bright Arbor#f1-10	722
-payg_cas01,206,108,4	duplicate(BrightArbor3)	Bright Arbor#f1-11	722
-payg_cas01,212,108,4	duplicate(BrightArbor3)	Bright Arbor#f1-12	722
+payg_cas01,238,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#5-2	722
+payg_cas01,233,67,4	duplicate(InsideFlagsPA1)	Bright Arbor#6	722
+payg_cas01,221,123,4	duplicate(InsideFlagsPA1)	Bright Arbor#7	722
+payg_cas01,221,116,4	duplicate(InsideFlagsPA1)	Bright Arbor#8	722
+payg_cas01,206,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#9	722
+payg_cas01,212,108,4	duplicate(InsideFlagsPA1)	Bright Arbor#10	722
 
-// AGIT Manager
+// Guild Flag (Town)
 //============================================================
-payg_cas01,139,139,0	duplicate(Gld_Agit_Manager)	Agit#payg_cas01	-1
+payon,90,322,4	duplicate(InsideFlagsPA1)	Bright Arbor#11	722
+payon,166,177,3	duplicate(InsideFlagsPA1)	Bright Arbor#12	722
 
-// Steward
+// Kafra Employee
 //============================================================
-payg_cas01,120,58,4	duplicate(Gld_Mngr_Template)	Kurunnadi#payg_cas01	55
+payg_cas01,128,58,3	duplicate(guildkafra)	Kafra Staff#payg_cas01	117
 
-// Guardians
+// Steward
 //============================================================
-payg_cas01,120,58,4	duplicate(Gld_Guard_Template)	Guardian#payg_cas01	-1
+payg_cas01,120,58,4	duplicate(cm)	Kurunnadi#payg_cas01	55
 
-// Kafra Staff
+// Treasure Room Exit
 //============================================================
-payg_cas01,128,58,3	duplicate(Gld_Kafra_Template)	Kafra Staff#payg_cas01	117
+payg_cas01,295,8,0	script	#lever_PA01	111,{
 
-// Master's Room Exit
-//============================================================
-payg_cas01,295,8,0	script	#switch_Py01	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 "payg_cas01",120,59;
-	end;
+	if(select("Pull.:Do not.") == 1) {
+		close2;
+		warp "payg_cas01",120,59;
+		end;
+	}
+	close;
 }
 
-// Guild Treasure Protection
+// Guild Dungeon Switch
 //============================================================
-payg_cas01,291,8,0	duplicate(Gld_Trea_Protect)	ban_warp#payg_cas01	-1,6,6
+payg_cas01,101,25,0	duplicate(gdlever)	#payg_cas01	111
 
 // Guild Treasure Spawns
 //============================================================
 payg_cas01,291,8,0	duplicate(Gld_Trea_Spawn)	Treasure#payg_cas01	-1
 
-// Guild Dungeon Switch
+// AGIT Manager
+//============================================================
+payg_cas01,139,139,0	duplicate(Gld_Agit_Manager)	Agit#payg_cas01	-1
+
+// Guardians
 //============================================================
-payg_cas01,101,25,0	duplicate(Gld_Dun_Template)	#payg_cas01	111
+payg_cas01,120,58,4	duplicate(Gld_Guard_Template)	Guardian#payg_cas01	-1
\ No newline at end of file