* Guild flag update.

- Guild flags in town by default will no longer show dialog. (changeable)
- Updated several guild flag positions and rotations, and removed some others all together.
- Added the second set of Payon town guild flags in the northern section
- Updated novice WoE flags with the new argument.

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

1 files changed, 123 insertions, 73 deletions

diff --git a/npc/guild/payg/payg_flags.txt b/npc/guild/payg/payg_flags.txt
index 693a91e8c..31c8e895a 100644
--- a/npc/guild/payg/payg_flags.txt
+++ b/npc/guild/payg/payg_flags.txt
@@ -4,7 +4,7 @@
 //= jAthena (1.0)
 //= 1.1 by Akaru and ho|yAnge|
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -13,14 +13,15 @@
 //= v1.2 Optimized with functions.[kobra_k88]
 //= v1.3 Changed to iRO castle names [DracoRPG]
 //= v1.4 Can now only flag in from outside the castle [Kayla]
+//= V1.5 Town flags no longer show dialog, and fixed various flags. [L0ne__W0lf]
 //============================================================
 
 
 //============================================================================//
 // 					Castle 1
 //============================================================================//
-payon,165,177,3	script	BrightArbor#f1-1::BrightArbor	722,{
-	callfunc "F_Flags","Payon","payg_cas01",87,29,0;
+payon,166,161,3	script	Bright Arbor#f1-1::BrightArbor	722,{
+	callfunc "F_Flags","Payon","payg_cas01",87,29,0,0;
 	close;
 
 OnRecvCastlePy01:
@@ -28,8 +29,8 @@ OnRecvCastlePy01:
 	end;
 }
 
-pay_gld,125,236,4	script	BrightArbor#f1-2::BrightArbor2	722,{
-	callfunc "F_Flags","Payon","payg_cas01",87,29,1;
+pay_gld,125,236,4	script	Bright Arbor#f1-2::BrightArbor2	722,{
+	callfunc "F_Flags","Payon","payg_cas01",87,29,1,1;
 	close;
 
 OnRecvCastlePy01:
@@ -37,25 +38,43 @@ OnRecvCastlePy01:
 	end;
 }
 
+payg_cas01,238,67,4	script	Bright Arbor#f1-3::BrightArbor3	722,{
+	callfunc "F_Flags","Payon","payg_cas01",87,29,0,1;
+	close;
+
+OnRecvCastlePy01:
+	FlagEmblem GetCastleData("payg_cas01",1);
+	end;
+}
+// Additiona Town Flag ====================================
+payon,90,322,4	duplicate(BrightArbor)	Bright Arbor#f1-4	722
 // In Guild ===============================================
-pay_gld,110,233,4	duplicate(BrightArbor2)	Bright Arbor#f1-3	722
-pay_gld,116,233,4	duplicate(BrightArbor2)	Bright Arbor#f1-4	722
-pay_gld,91,239,2	duplicate(BrightArbor2)	Bright Arbor#f1-5	722
-// In Castle ===============================================
-payg_cas01,238,67,4	duplicate(BrightArbor)	Bright Arbor#f1-6	722
-payg_cas01,233,67,4	duplicate(BrightArbor)	Bright Arbor#f1-7	722
-payg_cas01,221,123,4	duplicate(BrightArbor)	Bright Arbor#f1-8	722
-payg_cas01,221,116,4	duplicate(BrightArbor)	Bright Arbor#f1-9	722
-payg_cas01,206,108,4	duplicate(BrightArbor)	Bright Arbor#f1-10	722
-payg_cas01,212,108,4	duplicate(BrightArbor)	Bright Arbor#f1-11	722
+pay_gld,110,233,4	duplicate(BrightArbor2)	Bright Arbor#f1-5	722
+pay_gld,116,233,4	duplicate(BrightArbor2)	Bright Arbor#f1-6	722
+pay_gld,91,239,2	duplicate(BrightArbor2)	Bright Arbor#f1-7	722
+// In Castle ==============================================
+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
 
 
 
 //===========================================================================//
 // 					Castle 2
-//============================================================================//
-payon,165,173,3	script	ScarletPalace#f2-1::ScarletPalace	722,{
-	callfunc "F_Flags","Payon","payg_cas02",25,266,0;
+//===========================================================================//
+payon,166,173,3	script	Scarlet Palace#f2-1::ScarletPalace	722,{
+	callfunc "F_Flags","Payon","payg_cas02",25,266,0,0;
+	close;
+
+OnRecvCastlePy02:
+	FlagEmblem GetCastleData("payg_cas02",1);
+	end;
+}
+
+pay_gld,292,112,6	script	Scarlet Palace#f2-2::ScarletPalace2	722,{
+	callfunc "F_Flags","Payon","payg_cas02",25,266,1,1;
 	close;
 
 OnRecvCastlePy02:
@@ -63,33 +82,34 @@ OnRecvCastlePy02:
 	end;
 }
 
-pay_gld,292,112,6	script	ScarletPalace#f2-2::ScarletPalace2	722,{
-	callfunc "F_Flags","Payon","payg_cas02",25,266,1;
+payg_cas02,254,40,6	script	Scarlet Palace#f2-3::ScarletPalace3	722,{
+	callfunc "F_Flags","Payon","payg_cas02",25,266,0,1;
 	close;
 
 OnRecvCastlePy02:
 	FlagEmblem GetCastleData("payg_cas02",1);
 	end;
 }
-// In Guild  ===============================================
-pay_gld,292,120,6	duplicate(ScarletPalace2)	Scarlet Palace#f2-3	722
-pay_gld,291,135,6	duplicate(ScarletPalace2)	Scarlet Palace#f2-4	722
-pay_gld,271,163,0	duplicate(ScarletPalace2)	Scarlet Palace#f2-5	722
-// In Castle ===============================================
-payg_cas02,254,40,6	duplicate(ScarletPalace)	Scarlet Palace#f2-6	722
-payg_cas02,254,48,6	duplicate(ScarletPalace)	Scarlet Palace#f2-7	722
-payg_cas02,202,49,0	duplicate(ScarletPalace)	Scarlet Palace#f2-8	722
-payg_cas02,209,49,0	duplicate(ScarletPalace)	Scarlet Palace#f2-9	722
-payg_cas02,59,282,4	duplicate(ScarletPalace)	Scarlet Palace#f2-10	722
-payg_cas02,70,282,4	duplicate(ScarletPalace)	Scarlet Palace#f2-11	722
+// Additiona Town Flag ====================================
+payon,97,322,4	duplicate(ScarletPalace)	Scarlet Palace#f2-4	722
+// In Guild  ==============================================
+pay_gld,292,120,6	duplicate(ScarletPalace2)	Scarlet Palace#f2-5	722
+pay_gld,291,135,6	duplicate(ScarletPalace2)	Scarlet Palace#f2-6	722
+pay_gld,271,163,0	duplicate(ScarletPalace2)	Scarlet Palace#f2-7	722
+// In Castle ==============================================
+payg_cas02,254,48,6	duplicate(ScarletPalace3)	Scarlet Palace#f2-8	722
+payg_cas02,202,49,0	duplicate(ScarletPalace3)	Scarlet Palace#f2-9	722
+payg_cas02,209,49,0	duplicate(ScarletPalace3)	Scarlet Palace#f2-10	722
+payg_cas02,59,282,4	duplicate(ScarletPalace3)	Scarlet Palace#f2-11	722
+payg_cas02,70,282,4	duplicate(ScarletPalace3)	Scarlet Palace#f2-12	722
 
 
 
 //============================================================================//
 // 					Castle 3
 //============================================================================//
-payon,165,169,3	script	HolyShadow#f3-1::HolyShadow	722,{
-	callfunc "F_Flags","Payon","payg_cas03",9,263,0;
+payon,166,177,3	script	Holy Shadow#f3-1::HolyShadow	722,{
+	callfunc "F_Flags","Payon","payg_cas03",9,263,0,0;
 	close;
 
 OnRecvCastlePy03:
@@ -97,8 +117,8 @@ OnRecvCastlePy03:
 	end;
 }
 
-pay_gld,321,298,2	script	HolyShadow#f3-2::HolyShadow2	722,{
-	callfunc "F_Flags","Payon","payg_cas03",9,263,1;
+pay_gld,321,298,2	script	Holy Shadow#f3-2::HolyShadow2	722,{
+	callfunc "F_Flags","Payon","payg_cas03",9,263,1,1;
 	close;
 
 OnRecvCastlePy03:
@@ -106,25 +126,34 @@ OnRecvCastlePy03:
 	end;
 }
 
+payg_cas03,236,54,2	script	Holy Shadow#f3-3::HolyShadow3	722,{
+	callfunc "F_Flags","Payon","payg_cas03",9,263,0,1;
+	close;
+
+OnRecvCastlePy03:
+	FlagEmblem GetCastleData("payg_cas03",1);
+	end;
+}
+// Additiona Town Flag ====================================
+payon,113,322,4	duplicate(HolyShadow)	Holy Shadow#f3-4	722
 // In Guild ===============================================
-pay_gld,321,289,2	duplicate(HolyShadow2)	Holy Shadow#f3-3	722
-pay_gld,327,304,1	duplicate(HolyShadow2)	Holy Shadow#f3-4	722
-pay_gld,333,254,4	duplicate(HolyShadow2)	Holy Shadow#f3-5	722
-// In Castle ===============================================
-payg_cas03,236,54,2	duplicate(HolyShadow)	Holy Shadow#f3-6	722
-payg_cas03,236,45,2	duplicate(HolyShadow)	Holy Shadow#f3-7	722
-payg_cas03,259,66,4	duplicate(HolyShadow)	Holy Shadow#f3-8	722
-payg_cas03,266,66,4	duplicate(HolyShadow)	Holy Shadow#f3-9	722
-payg_cas03,34,31,4	duplicate(HolyShadow)	Holy Shadow#f3-10	722
-payg_cas03,43,31,4	duplicate(HolyShadow)	Holy Shadow#f3-11	722
+pay_gld,321,289,2	duplicate(HolyShadow2)	Holy Shadow#f3-5	722
+pay_gld,327,304,1	duplicate(HolyShadow2)	Holy Shadow#f3-6	722
+pay_gld,333,254,4	duplicate(HolyShadow2)	Holy Shadow#f3-7	722
+// In Castle ==============================================
+payg_cas03,236,45,2	duplicate(HolyShadow3)	Holy Shadow#f3-8	722
+payg_cas03,259,66,4	duplicate(HolyShadow3)	Holy Shadow#f3-9	722
+payg_cas03,266,66,4	duplicate(HolyShadow3)	Holy Shadow#f3-10	722
+payg_cas03,34,31,4	duplicate(HolyShadow3)	Holy Shadow#f3-11	722
+payg_cas03,43,31,4	duplicate(HolyShadow3)	Holy Shadow#f3-12	722
 
 
 
 //============================================================================//
 // 					Castle 4
 //============================================================================//
-payon,165,165,3	script	SacredAltar#f4-1::SacredAltar	722,{
-	callfunc "F_Flags","Payon","payg_cas04",40,235,0;
+payon,166,169,3	script	Sacred Altar#f4-1::SacredAltar	722,{
+	callfunc "F_Flags","Payon","payg_cas04",40,235,0,0;
 	close;
 
 OnRecvCastlePy04:
@@ -132,32 +161,52 @@ OnRecvCastlePy04:
 	end;
 }
 
-pay_gld,143,160,0	script	SacredAltar#f4-2::SacredAltar2	722,{
-	callfunc "F_Flags","Payon","payg_cas04",40,235,1;
+pay_gld,137,160,0	script	Sacred Altar#f4-2::SacredAltar2	722,{
+	callfunc "F_Flags","Payon","payg_cas04",40,235,1,1;
 	close;
 
 OnRecvCastlePy04:
 	FlagEmblem GetCastleData("payg_cas04",1);
 	end;
 }
+
+payg_cas04,255,259,0	script	Sacred Altar#f4-3::SacredAltar3	722,{
+	callfunc "F_Flags","Payon","payg_cas04",40,235,0,1;
+	close;
+
+OnRecvCastlePy04:
+	FlagEmblem GetCastleData("payg_cas04",1);
+	end;
+}
+// Additiona Town Flag ====================================
+payon,118,322,4	duplicate(SacredAltar)	Sacred Altar#f4-4	722
 // In Guild ===============================================
-pay_gld,133,151,2	duplicate(SacredAltar2)	Sacred Altar#f4-4	722
-pay_gld,153,166,1	duplicate(SacredAltar2)	Sacred Altar#f4-5	722
-// In Castle ===============================================
-payg_cas04,255,259,0	duplicate(SacredAltar)	Sacred Altar#f4-6	722
-payg_cas04,248,259,0	duplicate(SacredAltar)	Sacred Altar#f4-7	722
-payg_cas04,248,168,6	duplicate(SacredAltar)	Sacred Altar#f4-8	722
-payg_cas04,248,160,6	duplicate(SacredAltar)	Sacred Altar#f4-9	722
-payg_cas04,232,181,4	duplicate(SacredAltar)	Sacred Altar#f4-10	722
-payg_cas04,239,181,4	duplicate(SacredAltar)	Sacred Altar#f4-11	722
+pay_gld,143,160,0	duplicate(SacredAltar2)	Sacred Altar#f4-5	722
+pay_gld,133,151,2	duplicate(SacredAltar2)	Sacred Altar#f4-6	722
+pay_gld,153,166,1	duplicate(SacredAltar2)	Sacred Altar#f4-7	722
+// In Castle ==============================================
+payg_cas04,248,259,0	duplicate(SacredAltar3)	Sacred Altar#f4-8	722
+payg_cas04,248,168,6	duplicate(SacredAltar3)	Sacred Altar#f4-9	722
+payg_cas04,248,160,6	duplicate(SacredAltar3)	Sacred Altar#f4-10	722
+payg_cas04,232,181,4	duplicate(SacredAltar3)	Sacred Altar#f4-11	722
+payg_cas04,239,181,4	duplicate(SacredAltar3)	Sacred Altar#f4-12	722
 
 
 
 //============================================================================//
 // 					Castle 5
 //============================================================================//
-payon,165,161,3	script	BambooGrove Hill#f5-1::BambooGroveHill	722,{
-	callfunc "F_Flags","Payon","payg_cas05",276,227,0;
+payon,166,165,3	script	Bamboo Grove Hill#f5-1::BambooGroveHill	722,{
+	callfunc "F_Flags","Payon","payg_cas05",276,227,0,0;
+	close;
+
+OnRecvCastlePy05:
+	FlagEmblem GetCastleData("payg_cas05",1);
+	end;
+}
+
+pay_gld,208,268,4	script	Bamboo Grove Hill#f5-2::BambooGroveHill2	722,{
+	callfunc "F_Flags","Payon","payg_cas05",276,227,1,1;
 	close;
 
 OnRecvCastlePy05:
@@ -165,22 +214,23 @@ OnRecvCastlePy05:
 	end;
 }
 
-pay_gld,208,268,4	script	BambooGrove Hill#f5-2::BambooGroveHill2	722,{
-	callfunc "F_Flags","Payon","payg_cas05",276,227,1;
+payg_cas05,32,249,4	script	Bamboo Grove Hill#f5-3::BambooGroveHill3	722,{
+	callfunc "F_Flags","Payon","payg_cas05",276,227,0,1;
 	close;
 
 OnRecvCastlePy05:
 	FlagEmblem GetCastleData("payg_cas05",1);
 	end;
 }
-// In Guild  ===============================================
-pay_gld,199,268,4	duplicate(BambooGroveHill2)	Bamboo Grove Hill#f5-3	722
-pay_gld,190,277,3	duplicate(BambooGroveHill2)	Bamboo Grove Hill#f5-4	722
-pay_gld,187,294,2	duplicate(BambooGroveHill2)	Bamboo Grove Hill#f5-5	722
-// In Castle  ===============================================
-payg_cas05,32,249,4	duplicate(BambooGroveHill)	Bamboo Grove Hill#f5-6	722
-payg_cas05,24,249,4	duplicate(BambooGroveHill)	Bamboo Grove Hill#f5-7	722
-payg_cas05,62,271,0	duplicate(BambooGroveHill)	Bamboo Grove Hill#f5-8	722
-payg_cas05,57,271,0	duplicate(BambooGroveHill)	Bamboo Grove Hill#f5-9	722
-payg_cas05,55,252,2	duplicate(BambooGroveHill)	Bamboo Grove Hill#f5-10	722
-payg_cas05,55,260,2	duplicate(BambooGroveHill)	Bamboo Grove Hill#f5-11	722
+// Additiona Town Flag ====================================
+payon,123,322,4	duplicate(BambooGroveHill)	Bamboo Grove Hill#f5-4	722
+// In Guild  ==============================================
+pay_gld,199,268,4	duplicate(BambooGroveHill2)	Bamboo Grove Hill#f5-5	722
+pay_gld,190,277,3	duplicate(BambooGroveHill2)	Bamboo Grove Hill#f5-6	722
+pay_gld,187,294,2	duplicate(BambooGroveHill2)	Bamboo Grove Hill#f5-7	722
+// In Castle  =============================================
+payg_cas05,24,249,4	duplicate(BambooGroveHill3)	Bamboo Grove Hill#f5-8	722
+payg_cas05,62,271,0	duplicate(BambooGroveHill3)	Bamboo Grove Hill#f5-9	722
+payg_cas05,57,271,0	duplicate(BambooGroveHill3)	Bamboo Grove Hill#f5-10	722
+payg_cas05,55,252,2	duplicate(BambooGroveHill3)	Bamboo Grove Hill#f5-11	722
+payg_cas05,55,260,2	duplicate(BambooGroveHill3)	Bamboo Grove Hill#f5-12	722