summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt6
-rw-r--r--npc/guild/aldeg/aldeg_flags.txt253
-rw-r--r--npc/guild/gefg/gefg_flags.txt163
-rw-r--r--npc/guild/gldfunc_flag.txt26
-rw-r--r--npc/guild/nguild/nguild_flags.txt19
-rw-r--r--npc/guild/payg/payg_flags.txt196
-rw-r--r--npc/guild/prtg/prtg_flags.txt195
7 files changed, 516 insertions, 342 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 1dfd80055..dd5bda3da 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,12 @@
Date Added
======
2007/05/26
+ * Rev. 10632 Guild flag update. [L0ne_W0lf]
+ - Guild flags in town by default will no longer show dialog.
+ - 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.
+2007/05/26
* Fixed a little bug on "Bard Quest" (Not Job). [Samuray22]
- Maybe will be a good idea change the variables, for something more original.
2007/05/25
diff --git a/npc/guild/aldeg/aldeg_flags.txt b/npc/guild/aldeg/aldeg_flags.txt
index 72df3964b..5f0eafe26 100644
--- a/npc/guild/aldeg/aldeg_flags.txt
+++ b/npc/guild/aldeg/aldeg_flags.txt
@@ -4,7 +4,7 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 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]
//============================================================
@@ -20,7 +21,7 @@
// Castle 1
//================================================================================//
aldebaran,152,97,4 script Neuschwanstein#a1-1::Neuschwanstein 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas01",218,170,0;
+ callfunc "F_Flags","Al De Baran","aldeg_cas01",218,170,0,0;
close;
OnRecvCastleA01:
@@ -29,7 +30,16 @@ OnRecvCastleA01:
}
alde_gld,61,87,6 script Neuschwanstein#a1-2::Neuschwanstein2 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas01",218,170,1;
+ callfunc "F_Flags","Al De Baran","aldeg_cas01",218,170,1,1;
+ close;
+
+OnRecvCastleA01:
+ FlagEmblem GetCastleData("aldeg_cas01",1);
+ end;
+}
+
+aldeg_cas01,30,248,4 script Neuschwanstein#a1-3::Neuschwanstein3 722,{
+ callfunc "F_Flags","Al De Baran","aldeg_cas01",218,170,0,1;
close;
OnRecvCastleA01:
@@ -38,25 +48,25 @@ OnRecvCastleA01:
}
// In Guild =============================================
-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,79,6 duplicate(Neuschwanstein2) Neuschwanstein#a1-4 722
+alde_gld,45,87,8 duplicate(Neuschwanstein2) Neuschwanstein#a1-5 722
+alde_gld,51,87,8 duplicate(Neuschwanstein2) Neuschwanstein#a1-6 722
// In Castle ============================================
-aldeg_cas01,30,248,4 duplicate(Neuschwanstein) Neuschwanstein#a1-6 722
-aldeg_cas01,30,246,4 duplicate(Neuschwanstein) Neuschwanstein#a1-7 722
-aldeg_cas01,37,248,4 duplicate(Neuschwanstein) Neuschwanstein#a1-8 722
-aldeg_cas01,37,246,4 duplicate(Neuschwanstein) Neuschwanstein#a1-9 722
-aldeg_cas01,95,80,2 duplicate(Neuschwanstein) Neuschwanstein#a1-10 722
-aldeg_cas01,95,59,2 duplicate(Neuschwanstein) Neuschwanstein#a1-11 722
-aldeg_cas01,62,75,2 duplicate(Neuschwanstein) Neuschwanstein#a1-12 722
-aldeg_cas01,70,75,2 duplicate(Neuschwanstein) Neuschwanstein#a1-13 722
-aldeg_cas01,74,75,2 duplicate(Neuschwanstein) Neuschwanstein#a1-14 722
-aldeg_cas01,62,64,2 duplicate(Neuschwanstein) Neuschwanstein#a1-15 722
-aldeg_cas01,66,64,2 duplicate(Neuschwanstein) Neuschwanstein#a1-16 722
-aldeg_cas01,70,64,2 duplicate(Neuschwanstein) Neuschwanstein#a1-17 722
-aldeg_cas01,74,64,2 duplicate(Neuschwanstein) Neuschwanstein#a1-18 722
-aldeg_cas01,203,150,4 duplicate(Neuschwanstein) Neuschwanstein#a1-19 722
-aldeg_cas01,210,150,4 duplicate(Neuschwanstein) Neuschwanstein#a1-20 722
+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
@@ -65,7 +75,16 @@ aldeg_cas01,210,150,4 duplicate(Neuschwanstein) Neuschwanstein#a1-20 722
// Castle 2
//================================================================================//
aldebaran,149,97,4 script Hohenschwangau#a2-1::Hohenschwangau 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas02",85,72,0;
+ callfunc "F_Flags","Al De Baran","aldeg_cas02",85,72,0,0;
+ close;
+
+OnRecvCastleA02:
+ FlagEmblem GetCastleData("aldeg_cas02",1);
+ end;
+}
+
+alde_gld,99,251,4 script Hohenschwangau#a2-2::Hohenschwangau2 722,{
+ callfunc "F_Flags","Al De Baran","aldeg_cas02",85,72,1,1;
close;
OnRecvCastleA02:
@@ -73,8 +92,8 @@ OnRecvCastleA02:
end;
}
-alde_gld,93,250,5 script Hohenschwangau#a2-2::Hohenschwangau2 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas02",85,72,1;
+aldeg_cas02,82,71,2 script Hohenschwangau#a2-3::Hohenschwangau3 722,{
+ callfunc "F_Flags","Al De Baran","aldeg_cas02",85,72,0,1;
close;
OnRecvCastleA02:
@@ -83,24 +102,22 @@ OnRecvCastleA02:
}
// In Guild =================================================
-alde_gld,98,250,5 duplicate(Hohenschwangau2) Hohenschwangau#a2-3 722
+alde_gld,99,244,4 duplicate(Hohenschwangau2) Hohenschwangau#a2-4 722
// In Castle =============================================
-aldeg_cas02,82,71,2 duplicate(Hohenschwangau) Hohenschwangau#a2-4 722
-aldeg_cas02,67,30,2 duplicate(Hohenschwangau) Hohenschwangau#a2-5 722
-aldeg_cas02,183,140,2 duplicate(Hohenschwangau) Hohenschwangau#a2-6 722
-aldeg_cas02,212,152,2 duplicate(Hohenschwangau) Hohenschwangau#a2-7 722
-aldeg_cas02,108,39,2 duplicate(Hohenschwangau) Hohenschwangau#a2-8 722
-aldeg_cas02,57,213,2 duplicate(Hohenschwangau) Hohenschwangau#a2-9 722
-aldeg_cas02,91,181,2 duplicate(Hohenschwangau) Hohenschwangau#a2-10 722
-aldeg_cas02,103,53,2 duplicate(Hohenschwangau) Hohenschwangau#a2-11 722
-aldeg_cas02,73,53,2 duplicate(Hohenschwangau) Hohenschwangau#a2-12 722
-aldeg_cas02,63,41,2 duplicate(Hohenschwangau) Hohenschwangau#a2-13 722
-aldeg_cas02,229,6,2 duplicate(Hohenschwangau) Hohenschwangau#a2-14 722
-aldeg_cas02,230,40,2 duplicate(Hohenschwangau) Hohenschwangau#a2-15 722
-aldeg_cas02,197,40,2 duplicate(Hohenschwangau) Hohenschwangau#a2-16 722
-aldeg_cas02,32,213,2 duplicate(Hohenschwangau) Hohenschwangau#a2-17 722
-aldeg_cas02,88,180,2 duplicate(Hohenschwangau) Hohenschwangau#a2-18 722
-aldeg_cas02,121,29,2 duplicate(Hohenschwangau) Hohenschwangau#a2-19 722
+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
@@ -109,7 +126,7 @@ aldeg_cas02,121,29,2 duplicate(Hohenschwangau) Hohenschwangau#a2-19 722
// Castle 3
//================================================================================//
aldebaran,134,97,4 script Nuenberg#a3-1::Nuenberg 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas03",118,76,0;
+ callfunc "F_Flags","Al De Baran","aldeg_cas03",118,76,0,0;
close;
OnRecvCastleA03:
@@ -117,8 +134,17 @@ OnRecvCastleA03:
end;
}
-alde_gld,139,83,1 script Nuenberg#a3-2::Nuenberg2 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas03",118,76,1;
+alde_gld,138,82,0 script Nuenberg#a3-2::Nuenberg2 722,{
+ callfunc "F_Flags","Al De Baran","aldeg_cas03",118,76,1,1;
+ close;
+
+OnRecvCastleA03:
+ FlagEmblem GetCastleData("aldeg_cas03",1);
+ end;
+}
+
+aldeg_cas03,176,175,2 script Nuenberg#a3-3::Nuenberg3 722,{
+ callfunc "F_Flags","Al De Baran","aldeg_cas03",118,76,0,1;
close;
OnRecvCastleA03:
@@ -127,27 +153,24 @@ OnRecvCastleA03:
}
// In Guild ===============================================
-alde_gld,145,83,1 duplicate(Nuenberg2) Nuenberg#a3-3 722
+alde_gld,146,82,0 duplicate(Nuenberg2) Nuenberg#a3-4 722
// In Castle =============================================
-aldeg_cas03,176,175,2 duplicate(Nuenberg) Nuenberg#a3-4 722
-aldeg_cas03,85,103,2 duplicate(Nuenberg) Nuenberg#a3-5 722
-aldeg_cas03,77,115,2 duplicate(Nuenberg) Nuenberg#a3-6 722
-aldeg_cas03,77,215,2 duplicate(Nuenberg) Nuenberg#a3-7 722
-aldeg_cas03,112,107,2 duplicate(Nuenberg) Nuenberg#a3-8 722
-aldeg_cas03,112,117,2 duplicate(Nuenberg) Nuenberg#a3-9 722
-aldeg_cas03,69,71,2 duplicate(Nuenberg) Nuenberg#a3-10 722
-aldeg_cas03,91,69,2 duplicate(Nuenberg) Nuenberg#a3-11 722
-aldeg_cas03,108,60,2 duplicate(Nuenberg) Nuenberg#a3-12 722
-aldeg_cas03,121,73,2 duplicate(Nuenberg) Nuenberg#a3-13 722
-aldeg_cas03,121,73,2 duplicate(Nuenberg) Nuenberg#a3-14 722
-aldeg_cas03,75,102,2 duplicate(Nuenberg) Nuenberg#a3-15 722
-aldeg_cas03,199,169,2 duplicate(Nuenberg) Nuenberg#a3-16 722
-aldeg_cas03,181,179,2 duplicate(Nuenberg) Nuenberg#a3-17 722
-aldeg_cas03,192,44,2 duplicate(Nuenberg) Nuenberg#a3-18 722
-aldeg_cas03,88,108,2 duplicate(Nuenberg) Nuenberg#a3-19 722
-aldeg_cas03,208,145,2 duplicate(Nuenberg) Nuenberg#a3-20 722
-aldeg_cas03,207,75,2 duplicate(Nuenberg) Nuenberg#a3-21 722
-aldeg_cas03,96,62,2 duplicate(Nuenberg) Nuenberg#a3-22 722
+aldeg_cas03,77,115,2 duplicate(Nuenberg3) Nuenberg#a3-5 722
+aldeg_cas03,77,215,2 duplicate(Nuenberg3) Nuenberg#a3-6 722
+aldeg_cas03,112,107,2 duplicate(Nuenberg3) Nuenberg#a3-7 722
+aldeg_cas03,112,117,2 duplicate(Nuenberg3) Nuenberg#a3-8 722
+aldeg_cas03,69,71,2 duplicate(Nuenberg3) Nuenberg#a3-9 722
+aldeg_cas03,91,69,2 duplicate(Nuenberg3) Nuenberg#a3-10 722
+aldeg_cas03,108,60,2 duplicate(Nuenberg3) Nuenberg#a3-11 722
+aldeg_cas03,121,73,2 duplicate(Nuenberg3) Nuenberg#a3-12 722
+aldeg_cas03,121,73,2 duplicate(Nuenberg3) Nuenberg#a3-13 722
+aldeg_cas03,75,102,2 duplicate(Nuenberg3) Nuenberg#a3-14 722
+aldeg_cas03,199,169,2 duplicate(Nuenberg3) Nuenberg#a3-15 722
+aldeg_cas03,181,179,2 duplicate(Nuenberg3) Nuenberg#a3-16 722
+aldeg_cas03,192,44,2 duplicate(Nuenberg3) Nuenberg#a3-17 722
+aldeg_cas03,208,145,2 duplicate(Nuenberg3) Nuenberg#a3-18 722
+aldeg_cas03,207,75,2 duplicate(Nuenberg3) Nuenberg#a3-19 722
+aldeg_cas03,96,62,2 duplicate(Nuenberg3) Nuenberg#a3-20 722
@@ -156,7 +179,7 @@ aldeg_cas03,96,62,2 duplicate(Nuenberg) Nuenberg#a3-22 722
// Castle 4
//================================================================================//
aldebaran,131,97,4 script Wuerzburg#a4-1::Wuerzburg 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas04",45,88,0;
+ callfunc "F_Flags","Al De Baran","aldeg_cas04",45,88,0,0;
close;
OnRecvCastleA04:
@@ -164,8 +187,17 @@ OnRecvCastleA04:
end;
}
-alde_gld,239,247,1 script Wuerzburg#a4-2::Wuerzburg2 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas04",45,88,1;
+alde_gld,239,246,2 script Wuerzburg#a4-2::Wuerzburg2 722,{
+ callfunc "F_Flags","Al De Baran","aldeg_cas04",45,88,1,1;
+ close;
+
+OnRecvCastleA04:
+ FlagEmblem GetCastleData("aldeg_cas04",1);
+ end;
+}
+
+aldeg_cas04,167,61,2 script Wuerzburg#a4-3::Wuerzburg3 722,{
+ callfunc "F_Flags","Al De Baran","aldeg_cas04",45,88,0,1;
close;
OnRecvCastleA04:
@@ -173,29 +205,24 @@ OnRecvCastleA04:
end;
}
// In Guild ===============================================
-alde_gld,234,247,1 duplicate(Wuerzburg2) Wuerzburg#a4-3 722
-alde_gld,241,239,7 duplicate(Wuerzburg2) Wuerzburg#a4-4 722
-alde_gld,241,234,7 duplicate(Wuerzburg2) Wuerzburg#a4-5 722
+alde_gld,239,239,2 duplicate(Wuerzburg2) Wuerzburg#a4-4 722
// In Castle =============================================
-aldeg_cas04,167,61,2 duplicate(Wuerzburg) Wuerzburg#a4-6 722
-aldeg_cas04,164,90,2 duplicate(Wuerzburg) Wuerzburg#a4-7 722
-aldeg_cas04,143,209,2 duplicate(Wuerzburg) Wuerzburg#a4-8 722
-aldeg_cas04,129,193,2 duplicate(Wuerzburg) Wuerzburg#a4-9 722
-aldeg_cas04,112,206,2 duplicate(Wuerzburg) Wuerzburg#a4-10 722
-aldeg_cas04,113,212,2 duplicate(Wuerzburg) Wuerzburg#a4-11 722
-aldeg_cas04,77,117,2 duplicate(Wuerzburg) Wuerzburg#a4-12 722
-aldeg_cas04,186,42,2 duplicate(Wuerzburg) Wuerzburg#a4-13 722
-aldeg_cas04,30,69,2 duplicate(Wuerzburg) Wuerzburg#a4-14 722
-aldeg_cas04,55,97,2 duplicate(Wuerzburg) Wuerzburg#a4-15 722
-aldeg_cas04,45,98,2 duplicate(Wuerzburg) Wuerzburg#a4-16 722
-aldeg_cas04,33,116,2 duplicate(Wuerzburg) Wuerzburg#a4-17 722
-aldeg_cas04,130,180,2 duplicate(Wuerzburg) Wuerzburg#a4-18 722
-aldeg_cas04,129,193,2 duplicate(Wuerzburg) Wuerzburg#a4-19 722
-aldeg_cas04,142,209,2 duplicate(Wuerzburg) Wuerzburg#a4-20 722
-aldeg_cas04,33,107,2 duplicate(Wuerzburg) Wuerzburg#a4-21 722
-aldeg_cas04,133,220,2 duplicate(Wuerzburg) Wuerzburg#a4-22 722
-aldeg_cas04,169,22,2 duplicate(Wuerzburg) Wuerzburg#a4-23 722
-aldeg_cas04,169,15,2 duplicate(Wuerzburg) Wuerzburg#a4-24 722
+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
@@ -204,7 +231,16 @@ aldeg_cas04,169,15,2 duplicate(Wuerzburg) Wuerzburg#a4-24 722
// Castle 5
//================================================================================//
aldebaran,128,97,4 script Rothenburg#a5-1::Rothenburg 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas05",31,190,0;
+ callfunc "F_Flags","Al De Baran","aldeg_cas05",31,190,0,0;
+ close;
+
+OnRecvCastleA05:
+ FlagEmblem GetCastleData("aldeg_cas05",1);
+ end;
+}
+
+alde_gld,265,93,6 script Rothenburg#a5-2::Rothenburg2 722,{
+ callfunc "F_Flags","Al De Baran","aldeg_cas05",31,190,1,1;
close;
OnRecvCastleA05:
@@ -212,8 +248,8 @@ OnRecvCastleA05:
end;
}
-alde_gld,266,92,7 script Rothenburg#a5-2::Rothenburg2 722,{
- callfunc "F_Flags","Al De Baran","aldeg_cas05",31,190,1;
+aldeg_cas05,170,85,2 script Rothenburg#a5-3::Rothenburg3 722,{
+ callfunc "F_Flags","Al De Baran","aldeg_cas05",31,190,0,1;
close;
OnRecvCastleA05:
@@ -222,22 +258,19 @@ OnRecvCastleA05:
}
// In Guild ===============================================
-alde_gld,266,88,7 duplicate(Rothenburg2) Rothenburg#a5-3 722
+alde_gld,265,87,6 duplicate(Rothenburg2) Rothenburg#a5-4 722
// In Castle =============================================
-aldeg_cas05,170,85,2 duplicate(Rothenburg) Rothenburg#a5-4 722
-aldeg_cas05,142,212,2 duplicate(Rothenburg) Rothenburg#a5-5 722
-aldeg_cas05,149,196,2 duplicate(Rothenburg) Rothenburg#a5-6 722
-aldeg_cas05,41,180,2 duplicate(Rothenburg) Rothenburg#a5-7 722
-aldeg_cas05,38,201,2 duplicate(Rothenburg) Rothenburg#a5-8 722
-aldeg_cas05,65,182,2 duplicate(Rothenburg) Rothenburg#a5-9 722
-aldeg_cas05,65,205,2 duplicate(Rothenburg) Rothenburg#a5-10 722
-aldeg_cas05,10,218,2 duplicate(Rothenburg) Rothenburg#a5-11 722
-aldeg_cas05,164,201,2 duplicate(Rothenburg) Rothenburg#a5-12 722
-aldeg_cas05,216,96,2 duplicate(Rothenburg) Rothenburg#a5-13 722
-aldeg_cas05,217,80,2 duplicate(Rothenburg) Rothenburg#a5-14 722
-aldeg_cas05,14,117,2 duplicate(Rothenburg) Rothenburg#a5-15 722
-aldeg_cas05,10,225,2 duplicate(Rothenburg) Rothenburg#a5-16 722
-aldeg_cas05,187,59,2 duplicate(Rothenburg) Rothenburg#a5-17 722
-aldeg_cas05,154,51,2 duplicate(Rothenburg) Rothenburg#a5-18 722
-aldeg_cas05,22,211,2 duplicate(Rothenburg) Rothenburg#a5-19 722
-aldeg_cas05,150,202,2 duplicate(Rothenburg) Rothenburg#a5-20 722
+aldeg_cas05,142,212,2 duplicate(Rothenburg3) Rothenburg#a5-5 722
+aldeg_cas05,149,196,2 duplicate(Rothenburg3) Rothenburg#a5-6 722
+aldeg_cas05,41,180,2 duplicate(Rothenburg3) Rothenburg#a5-7 722
+aldeg_cas05,38,201,2 duplicate(Rothenburg3) Rothenburg#a5-8 722
+aldeg_cas05,65,182,2 duplicate(Rothenburg3) Rothenburg#a5-9 722
+aldeg_cas05,65,205,2 duplicate(Rothenburg3) Rothenburg#a5-10 722
+aldeg_cas05,10,218,2 duplicate(Rothenburg3) Rothenburg#a5-11 722
+aldeg_cas05,164,201,2 duplicate(Rothenburg3) Rothenburg#a5-12 722
+aldeg_cas05,14,117,2 duplicate(Rothenburg3) Rothenburg#a5-14 722
+aldeg_cas05,10,225,2 duplicate(Rothenburg3) Rothenburg#a5-15 722
+aldeg_cas05,187,59,2 duplicate(Rothenburg3) Rothenburg#a5-16 722
+aldeg_cas05,154,51,2 duplicate(Rothenburg3) Rothenburg#a5-17 722
+aldeg_cas05,22,211,2 duplicate(Rothenburg3) Rothenburg#a5-18 722
+aldeg_cas05,150,202,2 duplicate(Rothenburg3) Rothenburg#a5-19 722
diff --git a/npc/guild/gefg/gefg_flags.txt b/npc/guild/gefg/gefg_flags.txt
index 62012caf5..afb339c16 100644
--- a/npc/guild/gefg/gefg_flags.txt
+++ b/npc/guild/gefg/gefg_flags.txt
@@ -4,7 +4,7 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 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]
//============================================================
@@ -20,7 +21,7 @@
// Castle 1
//================================================================================//
geffen,109,123,2 script Repherion#g1-1::Repherion 722,{
- callfunc "F_Flags","Geffen","gefg_cas01",83,47,0;
+ callfunc "F_Flags","Geffen","gefg_cas01",83,47,0,0;
close;
OnRecvCastleG01:
@@ -29,7 +30,7 @@ OnRecvCastleG01:
}
gef_fild13,148,51,5 script Repherion#g1-2::Repherion2 722,{
- callfunc "F_Flags","Geffen","gefg_cas01",83,47,1;
+ callfunc "F_Flags","Geffen","gefg_cas01",83,47,1,1;
close;
OnRecvCastleG01:
@@ -37,18 +38,24 @@ OnRecvCastleG01:
end;
}
+gefg_cas01,28,157,4 script Repherion#g1-3::Repherion3 722,{
+ callfunc "F_Flags","Geffen","gefg_cas01",83,47,0,1;
+ close;
+
+OnRecvCastleG01:
+ FlagEmblem GetCastleData("gefg_cas01",1);
+ end;
+}
// In Guild ===============================================
-gef_fild13,155,54,5 duplicate(Repherion2) Repherion#g1-3 722
-gef_fild13,212,79,6 duplicate(Repherion2) Repherion#g1-4 722
-gef_fild13,211,71,6 duplicate(Repherion2) Repherion#g1-5 722
+gef_fild13,155,54,5 duplicate(Repherion2) Repherion#g1-4 722
+gef_fild13,212,79,6 duplicate(Repherion2) Repherion#g1-5 722
+gef_fild13,211,71,6 duplicate(Repherion2) Repherion#g1-6 722
// In Castle =============================================
-gefg_cas01,28,157,4 duplicate(Repherion) Repherion#g1-6 722
-gefg_cas01,32,157,4 duplicate(Repherion) Repherion#g1-7 722
-gefg_cas01,22,156,5 duplicate(Repherion) Repherion#g1-8 722
-gefg_cas01,68,185,3 duplicate(Repherion) Repherion#g1-9 722
-gefg_cas01,17,171,5 duplicate(Repherion) Repherion#g1-10 722
-gefg_cas01,59,16,4 duplicate(Repherion) Repherion#g1-11 722
-gefg_cas01,64,16,4 duplicate(Repherion) Repherion#g1-12 722
+gefg_cas01,22,156,5 duplicate(Repherion3) Repherion#g1-7 722
+gefg_cas01,68,185,3 duplicate(Repherion3) Repherion#g1-8 722
+gefg_cas01,17,171,5 duplicate(Repherion3) Repherion#g1-9 722
+gefg_cas01,59,16,4 duplicate(Repherion3) Repherion#g1-10 722
+gefg_cas01,64,16,4 duplicate(Repherion3) Repherion#g1-11 722
@@ -56,7 +63,7 @@ gefg_cas01,64,16,4 duplicate(Repherion) Repherion#g1-12 722
// Castle 2
//===================================================================================//
geffen,113,130,1 script Eeyolbriggar#g2-1::Eeyolbriggar 722,{
- callfunc "F_Flags","Geffen","gefg_cas02",23,66,0;
+ callfunc "F_Flags","Geffen","gefg_cas02",23,66,0,0;
close;
OnRecvCastleG02:
@@ -65,7 +72,16 @@ OnRecvCastleG02:
}
gef_fild13,303,243,4 script Eeyolbriggar#g2-2::Eeyolbriggar2 722,{
- callfunc "F_Flags","Geffen","gefg_cas02",23,66,1;
+ callfunc "F_Flags","Geffen","gefg_cas02",23,66,1,1;
+ close;
+
+OnRecvCastleG02:
+ FlagEmblem GetCastleData("gefg_cas02",1);
+ end;
+}
+
+gefg_cas02,65,130,5 script Eeyolbriggar#g2-3::Eeyolbriggar3 722,{
+ callfunc "F_Flags","Geffen","gefg_cas02",23,66,0,1;
close;
OnRecvCastleG02:
@@ -73,17 +89,16 @@ OnRecvCastleG02:
end;
}
// In Guild ==============================================
-gef_fild13,312,243,4 duplicate(Eeyolbriggar2) Eeyolbriggar#g2-3 722
-gef_fild13,290,243,4 duplicate(Eeyolbriggar2) Eeyolbriggar#g2-4 722
-gef_fild13,324,243,4 duplicate(Eeyolbriggar2) Eeyolbriggar#g2-5 722
+gef_fild13,312,243,4 duplicate(Eeyolbriggar2) Eeyolbriggar#g2-4 722
+gef_fild13,290,243,4 duplicate(Eeyolbriggar2) Eeyolbriggar#g2-5 722
+gef_fild13,324,243,4 duplicate(Eeyolbriggar2) Eeyolbriggar#g2-6 722
// In Castle ============================================
-gefg_cas02,65,130,5 duplicate(Eeyolbriggar) Eeyolbriggar#g2-6 722
-gefg_cas02,30,123,5 duplicate(Eeyolbriggar) Eeyolbriggar#g2-7 722
-gefg_cas02,65,139,6 duplicate(Eeyolbriggar) Eeyolbriggar#g2-8 722
-gefg_cas02,37,177,6 duplicate(Eeyolbriggar) Eeyolbriggar#g2-9 722
-gefg_cas02,37,168,6 duplicate(Eeyolbriggar) Eeyolbriggar#g2-10 722
-gefg_cas02,68,47,2 duplicate(Eeyolbriggar) Eeyolbriggar#g2-11 722
-gefg_cas02,68,36,2 duplicate(Eeyolbriggar) Eeyolbriggar#g2-12 722
+gefg_cas02,30,123,5 duplicate(Eeyolbriggar3) Eeyolbriggar#g2-7 722
+gefg_cas02,65,139,6 duplicate(Eeyolbriggar3) Eeyolbriggar#g2-8 722
+gefg_cas02,37,177,6 duplicate(Eeyolbriggar3) Eeyolbriggar#g2-9 722
+gefg_cas02,37,168,6 duplicate(Eeyolbriggar3) Eeyolbriggar#g2-10 722
+gefg_cas02,68,47,2 duplicate(Eeyolbriggar3) Eeyolbriggar#g2-11 722
+gefg_cas02,68,36,2 duplicate(Eeyolbriggar3) Eeyolbriggar#g2-12 722
@@ -91,7 +106,7 @@ gefg_cas02,68,36,2 duplicate(Eeyolbriggar) Eeyolbriggar#g2-12 722
// Castle 3
//================================================================================//
geffen,120,132,8 script Yesnelph#g3-1::Yesnelph 722,{
- callfunc "F_Flags","Geffen","gefg_cas03",116,89,0;
+ callfunc "F_Flags","Geffen","gefg_cas03",116,89,0,0;
close;
OnRecvCastleG03:
@@ -100,7 +115,16 @@ OnRecvCastleG03:
}
gef_fild13,78,182,4 script Yesnelph#g3-2::Yesnelph2 722,{
- callfunc "F_Flags","Geffen","gefg_cas03",116,89,1;
+ callfunc "F_Flags","Geffen","gefg_cas03",116,89,1,1;
+ close;
+
+OnRecvCastleG03:
+ FlagEmblem GetCastleData("gefg_cas03",1);
+ end;
+}
+
+gefg_cas03,122,220,6 script Yesnelph#g3-3::Yesnelph3 722,{
+ callfunc "F_Flags","Geffen","gefg_cas03",116,89,0,1;
close;
OnRecvCastleG03:
@@ -108,20 +132,19 @@ OnRecvCastleG03:
end;
}
// In Guild ===============================================
-gef_fild13,87,182,4 duplicate(Yesnelph2) Yesnelph#g3-3 722
-gef_fild13,73,295,7 duplicate(Yesnelph2) Yesnelph#g3-4 722
-gef_fild13,113,274,7 duplicate(Yesnelph2) Yesnelph#g3-5 722
-gef_fild13,144,235,6 duplicate(Yesnelph2) Yesnelph#g3-6 722
-gef_fild13,144,244,6 duplicate(Yesnelph2) Yesnelph#g3-7 722
+gef_fild13,87,182,4 duplicate(Yesnelph2) Yesnelph#g3-4 722
+gef_fild13,73,295,7 duplicate(Yesnelph2) Yesnelph#g3-5 722
+gef_fild13,113,274,7 duplicate(Yesnelph2) Yesnelph#g3-6 722
+gef_fild13,144,235,6 duplicate(Yesnelph2) Yesnelph#g3-7 722
+gef_fild13,144,244,4 duplicate(Yesnelph2) Yesnelph#g3-8 722
// In Castle =============================================
-gefg_cas03,122,220,6 duplicate(Yesnelph) Yesnelph#g3-8 722
-gefg_cas03,122,229,6 duplicate(Yesnelph) Yesnelph#g3-9 722
-gefg_cas03,91,257,7 duplicate(Yesnelph) Yesnelph#g3-10 722
-gefg_cas03,52,276,7 duplicate(Yesnelph) Yesnelph#g3-11 722
-gefg_cas03,56,164,4 duplicate(Yesnelph) Yesnelph#g3-12 722
-gefg_cas03,65,164,4 duplicate(Yesnelph) Yesnelph#g3-13 722
-gefg_cas03,37,214,1 duplicate(Yesnelph) Yesnelph#g3-14 722
-gefg_cas03,34,208,1 duplicate(Yesnelph) Yesnelph#g3-15 722
+gefg_cas03,122,229,6 duplicate(Yesnelph3) Yesnelph#g3-9 722
+gefg_cas03,91,257,7 duplicate(Yesnelph3) Yesnelph#g3-10 722
+gefg_cas03,52,276,7 duplicate(Yesnelph3) Yesnelph#g3-11 722
+gefg_cas03,56,164,4 duplicate(Yesnelph3) Yesnelph#g3-12 722
+gefg_cas03,65,164,4 duplicate(Yesnelph3) Yesnelph#g3-13 722
+gefg_cas03,37,214,1 duplicate(Yesnelph3) Yesnelph#g3-14 722
+gefg_cas03,34,208,1 duplicate(Yesnelph3) Yesnelph#g3-15 722
@@ -129,7 +152,7 @@ gefg_cas03,34,208,1 duplicate(Yesnelph) Yesnelph#g3-15 722
// Castle 4
//================================================================================//
geffen,127,130,7 script Bergel#g4-1::Bergel 722,{
- callfunc "F_Flags","Geffen","gefg_cas04",59,70,0;
+ callfunc "F_Flags","Geffen","gefg_cas04",59,70,0,0;
close;
OnRecvCastleG04:
@@ -138,7 +161,16 @@ OnRecvCastleG04:
}
gef_fild13,190,283,3 script Bergel#g4-2::Bergel2 722,{
- callfunc "F_Flags","Geffen","gefg_cas04",59,70,1;
+ callfunc "F_Flags","Geffen","gefg_cas04",59,70,1,1;
+ close;
+
+OnRecvCastleG04:
+ FlagEmblem GetCastleData("gefg_cas04",1);
+ end;
+}
+
+gefg_cas04,24,157,4 script Bergel#g4-3::Bergel3 722,{
+ callfunc "F_Flags","Geffen","gefg_cas04",59,70,0,1;
close;
OnRecvCastleG04:
@@ -146,16 +178,15 @@ OnRecvCastleG04:
end;
}
// In Guild ===============================================
-gef_fild13,199,274,3 duplicate(Bergel2) Bergel#g4-3 722
+gef_fild13,199,274,3 duplicate(Bergel2) Bergel#g4-4 722
// In Castle =============================================
-gefg_cas04,24,157,4 duplicate(Bergel) Bergel#g4-4 722
-gefg_cas04,35,158,4 duplicate(Bergel) Bergel#g4-5 722
-gefg_cas04,44,184,4 duplicate(Bergel) Bergel#g4-6 722
-gefg_cas04,51,184,4 duplicate(Bergel) Bergel#g4-7 722
-gefg_cas04,39,212,7 duplicate(Bergel) Bergel#g4-8 722
-gefg_cas04,29,212,1 duplicate(Bergel) Bergel#g4-9 722
-gefg_cas04,24,73,1 duplicate(Bergel) Bergel#g4-10 722
-gefg_cas04,35,73,4 duplicate(Bergel) Bergel#g4-11 722
+gefg_cas04,35,158,4 duplicate(Bergel3) Bergel#g4-5 722
+gefg_cas04,44,184,4 duplicate(Bergel3) Bergel#g4-6 722
+gefg_cas04,51,184,4 duplicate(Bergel3) Bergel#g4-7 722
+gefg_cas04,39,212,7 duplicate(Bergel3) Bergel#g4-8 722
+gefg_cas04,29,212,1 duplicate(Bergel3) Bergel#g4-9 722
+gefg_cas04,24,73,1 duplicate(Bergel3) Bergel#g4-10 722
+gefg_cas04,35,73,4 duplicate(Bergel3) Bergel#g4-11 722
@@ -163,7 +194,7 @@ gefg_cas04,35,73,4 duplicate(Bergel) Bergel#g4-11 722
// Castle 5
//================================================================================//
geffen,131,123,6 script Mersetzdeitz#g5-1::Mersetzdeitz 722,{
- callfunc "F_Flags","Geffen","gefg_cas05",61,52,0;
+ callfunc "F_Flags","Geffen","gefg_cas05",61,52,0,0;
close;
OnRecvCastleG05:
@@ -172,7 +203,16 @@ OnRecvCastleG05:
}
gef_fild13,302,87,7 script Mersetzdeitz#g5-2::Mersetzdeitz2 722,{
- callfunc "F_Flags","Geffen","gefg_cas05",61,52,1;
+ callfunc "F_Flags","Geffen","gefg_cas05",61,52,1,1;
+ close;
+
+OnRecvCastleG05:
+ FlagEmblem GetCastleData("gefg_cas05",1);
+ end;
+}
+
+gefg_cas05,77,185,7 script Mersetzdeitz#g5-3::Mersetzdeitz3 722,{
+ callfunc "F_Flags","Geffen","gefg_cas05",61,52,0,1;
close;
OnRecvCastleG05:
@@ -180,13 +220,12 @@ OnRecvCastleG05:
end;
}
// In Guild ===============================================
-gef_fild13,313,83,0 duplicate(Mersetzdeitz2) Mersetzdeitz#g5-3 722
-gef_fild13,252,51,2 duplicate(Mersetzdeitz2) Mersetzdeitz#g5-4 722
-gef_fild13,26,147,2 duplicate(Mersetzdeitz2) Mersetzdeitz#g5-5 722
+gef_fild13,313,83,0 duplicate(Mersetzdeitz2) Mersetzdeitz#g5-4 722
+gef_fild13,252,51,2 duplicate(Mersetzdeitz2) Mersetzdeitz#g5-5 722
+gef_fild13,26,147,2 duplicate(Mersetzdeitz2) Mersetzdeitz#g5-6 722
// In Castle =============================================
-gefg_cas05,77,185,7 duplicate(Mersetzdeitz) Mersetzdeitz#g5-6 722
-gefg_cas05,92,181,0 duplicate(Mersetzdeitz) Mersetzdeitz#g5-7 722
-gefg_cas05,83,158,1 duplicate(Mersetzdeitz) Mersetzdeitz#g5-8 722
-gefg_cas05,62,144,7 duplicate(Mersetzdeitz) Mersetzdeitz#g5-9 722
-gefg_cas05,62,66,4 duplicate(Mersetzdeitz) Mersetzdeitz#g5-10 722
-gefg_cas05,69,66,4 duplicate(Mersetzdeitz) Mersetzdeitz#g5-11 722
+gefg_cas05,92,181,0 duplicate(Mersetzdeitz3) Mersetzdeitz#g5-7 722
+gefg_cas05,83,158,1 duplicate(Mersetzdeitz3) Mersetzdeitz#g5-8 722
+gefg_cas05,62,144,7 duplicate(Mersetzdeitz3) Mersetzdeitz#g5-9 722
+gefg_cas05,62,66,4 duplicate(Mersetzdeitz3) Mersetzdeitz#g5-10 722
+gefg_cas05,69,66,4 duplicate(Mersetzdeitz3) Mersetzdeitz#g5-11 722
diff --git a/npc/guild/gldfunc_flag.txt b/npc/guild/gldfunc_flag.txt
index 785c318e5..fb7050c9c 100644
--- a/npc/guild/gldfunc_flag.txt
+++ b/npc/guild/gldfunc_flag.txt
@@ -4,7 +4,7 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.3a
+//= 1.4
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -17,18 +17,22 @@
//= arg(2): x1 coordinate for warp
//= arg(3): y1 coordinate for warp
//= arg(4): Teleportable (0/1)
+//= arg(5): Display Flag Dialog (0/1)
//===== Additional Comments: =================================
//= v1.2: All Guild flags scripts use this function. [kobra_k88]
//= v1.3: Can now only flag in from outside the castle [Kayla]
//= v1.3a: Implemented k3dt's exploit fix [Vicious]
+//= v1.4: By default town flags are set to no longer show text. [L0ne_W0lf]
//============================================================
function script F_Flags {
+ if (getarg(5) == 0) return;
+
set @GID, GetCastleData(getarg(1),1);
if (@GID != 0) goto L_Startg;
- mes "[ Edict of the Divine Rune Midgard Kingdom of " + getarg(0) + " ]";
+ mes "[ Edict of the Divine Rune Midgard Kingdom of ]";
mes " ";
mes "1. Honoring the ordinance of the Divine Rune Midgard Kingdom of " + getarg(0) + ", this guild base has not been taken by any guild yet";
mes " ";
@@ -36,17 +40,17 @@ function script F_Flags {
return;
L_Startg:
if ((getcharid(2) == @GID) && (getarg(4) == 1)) goto L_Startg2;
- mes "[ Edict of the Divine Rune Midgard Kingdom of "+ getarg(0) +" ]";
+ mes "[ Edict of the Divine Rune Midgard Kingdom ]";
mes " ";
- mes "1. Honoring the ordinance of the";
- mes "Divine Rune Midgard Kingdom of ";
- mes getarg(0) +", we approve that this";
- mes "base is in the private possession";
- mes "of the ^ff0000" + GetGuildName(@GID) + "^000000 guild.";
+ mes "1. Following the ordinance of the";
+ mes "Divine Rune Midgard Kingdom,";
+ mes "we approve that this place is in";
+ mes "private possession of ^ff0000" + GetGuildName(@GID) + "^000000 Guild.";
mes " ";
- mes "2. The guild master of the";
- mes "^ff0000"+ GetGuildName(@GID) + "^000000 guild, is ^0000FF" + GetGuildMaster(@GID) + "^000000.";
- mes "If anyone objects to that, raise your sword to honor yourself.";
+ mes "2. The guild Master of ^ff0000"+ GetGuildName(@GID) + "^000000 Guild is";
+ mes "^0000FF" + 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.";
return;
L_Startg2:
mes "[ Ringing Voice ]";
diff --git a/npc/guild/nguild/nguild_flags.txt b/npc/guild/nguild/nguild_flags.txt
index c103cf7a3..bc8c6b3cd 100644
--- a/npc/guild/nguild/nguild_flags.txt
+++ b/npc/guild/nguild/nguild_flags.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -11,6 +11,7 @@
//===== Additional Comments: =================================
// Based off existing guild scripts. Do not know if it is accurate.[kobra_k88]
// 1.1 Inner Flags don't teleport you to your HQ anymore [Lupus]
+// 1.2 updated flags to use the new arguments. [L0ne__W0lf]
//============================================================
@@ -18,7 +19,7 @@
// Castle 1
//============================================================================//
n_castle,110,96,1 script NGuild Aldebaran#a1-1 722,{
- callfunc "F_Flags","Al De Baran","nguild_alde",218,170,1;
+ callfunc "F_Flags","Al De Baran","nguild_alde",218,170,1,1;
close;
OnRecvCastleN01:
@@ -27,7 +28,7 @@ OnRecvCastleN01:
}
nguild_alde,30,248,4 script NGuild Aldebaran#a1-6::NGuildAlde 722,{
- callfunc "F_Flags","Al De Baran","nguild_alde",218,170,0;
+ callfunc "F_Flags","Al De Baran","nguild_alde",218,170,0,1;
close;
OnRecvCastleN01:
@@ -57,7 +58,7 @@ nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 722
// Castle 2
//============================================================================//
n_castle,110,109,3 script NGuild Geffen#g1-1 722,{
- callfunc "F_Flags","Geffen","nguild_gef",83,47,1;
+ callfunc "F_Flags","Geffen","nguild_gef",83,47,1,1;
close;
OnRecvCastleN02:
@@ -66,7 +67,7 @@ OnRecvCastleN02:
}
nguild_gef,28,157,4 script NGuild Geffen#g1-6::NGuildGef 722,{
- callfunc "F_Flags","Geffen","nguild_gef",83,47,0;
+ callfunc "F_Flags","Geffen","nguild_gef",83,47,0,1;
close;
OnRecvCastleN02:
@@ -87,7 +88,7 @@ nguild_gef,64,16,4 duplicate(NGuildGef) NGuild Geffen#g1-12 722
// Castle 3
//============================================================================//
n_castle,94,109,5 script NGuild Payon#f1-1 722,{
- callfunc "F_Flags","Payon","nguild_pay",87,29,1;
+ callfunc "F_Flags","Payon","nguild_pay",87,29,1,1;
close;
OnRecvCastleN03:
@@ -96,7 +97,7 @@ OnRecvCastleN03:
}
nguild_pay,238,67,4 script NGuild Payon#f1-6::NGuildPay 722,{
- callfunc "F_Flags","Payon","nguild_pay",87,29,0;
+ callfunc "F_Flags","Payon","nguild_pay",87,29,0,1;
close;
OnRecvCastleN03:
@@ -118,7 +119,7 @@ nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 722
// Castle 4
//=============================================================================//
n_castle,94,96,7 script NGuild Prontera#p1-1 722,{
- callfunc "F_Flags","Prontera","nguild_prt",97,174,1;
+ callfunc "F_Flags","Prontera","nguild_prt",97,174,1,1;
close;
OnRecvCastleN04:
@@ -127,7 +128,7 @@ OnRecvCastleN04:
}
nguild_prt,58,56,4 script NGuild Prontera#p1-7::NGuildPrt 722,{
- callfunc "F_Flags","Prontera","nguild_prt",97,174,0;
+ callfunc "F_Flags","Prontera","nguild_prt",97,174,0,1;
close;
OnRecvCastleN04:
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
diff --git a/npc/guild/prtg/prtg_flags.txt b/npc/guild/prtg/prtg_flags.txt
index f3268bbf0..a46762f54 100644
--- a/npc/guild/prtg/prtg_flags.txt
+++ b/npc/guild/prtg/prtg_flags.txt
@@ -4,7 +4,7 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 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]
//============================================================
@@ -20,7 +21,7 @@
// Castle 1
//================================================================================//
prontera,155,190,4 script Kriemhild#p1-1::Kriemhild 722,{
- callfunc "F_Flags","Prontera","prtg_cas01",97,174,0;
+ callfunc "F_Flags","Prontera","prtg_cas01",97,174,0,0;
close;
OnRecvCastlePt01:
@@ -29,7 +30,16 @@ OnRecvCastlePt01:
}
prt_gld,131,60,6 script Kriemhild#p1-2::Kriemhild2 722,{
- callfunc "F_Flags","Prontera","prtg_cas01",97,174,1;
+ callfunc "F_Flags","Prontera","prtg_cas01",97,174,1,1;
+ close;
+
+OnRecvCastlePt01:
+ FlagEmblem GetCastleData("prtg_cas01",1);
+ end;
+}
+
+prtg_cas01,58,56,4 script Kriemhild#p1-3::Kriemhild3 722,{
+ callfunc "F_Flags","Prontera","prtg_cas01",97,174,0,1;
close;
OnRecvCastlePt01:
@@ -37,20 +47,19 @@ OnRecvCastlePt01:
end;
}
// In Guild ===========================================
-prt_gld,138,68,6 duplicate(Kriemhild2) Kriemhild#p1-3 722
-prt_gld,138,60,6 duplicate(Kriemhild2) Kriemhild#p1-4 722
-prt_gld,135,60,6 duplicate(Kriemhild2) Kriemhild#p1-5 722
+prt_gld,138,68,6 duplicate(Kriemhild2) Kriemhild#p1-4 722
+prt_gld,138,60,6 duplicate(Kriemhild2) Kriemhild#p1-5 722
+prt_gld,135,60,6 duplicate(Kriemhild2) Kriemhild#p1-6 722
// In Castle =============================================
-prtg_cas01,58,56,4 duplicate(Kriemhild) Kriemhild#p1-6 722
-prtg_cas01,64,56,4 duplicate(Kriemhild) Kriemhild#p1-7 722
-prtg_cas01,76,32,4 duplicate(Kriemhild) Kriemhild#p1-8 722
-prtg_cas01,84,32,4 duplicate(Kriemhild) Kriemhild#p1-9 722
-prtg_cas01,94,39,4 duplicate(Kriemhild) Kriemhild#p1-10 722
-prtg_cas01,94,24,4 duplicate(Kriemhild) Kriemhild#p1-11 722
-prtg_cas01,73,14,4 duplicate(Kriemhild) Kriemhild#p1-12 722
-prtg_cas01,73,6,4 duplicate(Kriemhild) Kriemhild#p1-13 722
-prtg_cas01,55,46,4 duplicate(Kriemhild) Kriemhild#p1-14 722
-prtg_cas01,45,46,4 duplicate(Kriemhild) Kriemhild#p1-15 722
+prtg_cas01,64,56,4 duplicate(Kriemhild3) Kriemhild#p1-7 722
+prtg_cas01,76,32,4 duplicate(Kriemhild3) Kriemhild#p1-8 722
+prtg_cas01,84,32,4 duplicate(Kriemhild3) Kriemhild#p1-9 722
+prtg_cas01,94,39,4 duplicate(Kriemhild3) Kriemhild#p1-10 722
+prtg_cas01,94,24,4 duplicate(Kriemhild3) Kriemhild#p1-11 722
+prtg_cas01,73,14,4 duplicate(Kriemhild3) Kriemhild#p1-12 722
+prtg_cas01,73,6,4 duplicate(Kriemhild3) Kriemhild#p1-13 722
+prtg_cas01,55,46,4 duplicate(Kriemhild3) Kriemhild#p1-14 722
+prtg_cas01,45,46,4 duplicate(Kriemhild3) Kriemhild#p1-15 722
@@ -58,7 +67,7 @@ prtg_cas01,45,46,4 duplicate(Kriemhild) Kriemhild#p1-15 722
// Castle 2
//================================================================================//
prontera,146,194,3 script Swanhild#p2-1::Swanhild 722,{
- callfunc "F_Flags","Prontera","prtg_cas02",71,36,0;
+ callfunc "F_Flags","Prontera","prtg_cas02",71,36,0,0;
close;
OnRecvCastlePt02:
@@ -67,7 +76,16 @@ OnRecvCastlePt02:
}
prt_gld,244,126,8 script Swanhild#p2-2::Swanhild2 722,{
- callfunc "F_Flags","Prontera","prtg_cas02",71,36,1;
+ callfunc "F_Flags","Prontera","prtg_cas02",71,36,1,1;
+ close;
+
+OnRecvCastlePt02:
+ FlagEmblem GetCastleData("prtg_cas02",1);
+ end;
+}
+
+prtg_cas02,40,227,4 script Swanhild#p2-3::Swanhild3 722,{
+ callfunc "F_Flags","Prontera","prtg_cas02",71,36,0,1;
close;
OnRecvCastlePt02:
@@ -75,22 +93,21 @@ OnRecvCastlePt02:
end;
}
// In Guild ===========================================
-prt_gld,244,128,8 duplicate(Swanhild2) Swanhild#p2-3 722
-prt_gld,236,126,8 duplicate(Swanhild2) Swanhild#p2-4 722
-prt_gld,236,128,8 duplicate(Swanhild2) Swanhild#p2-5 722
+prt_gld,244,128,8 duplicate(Swanhild2) Swanhild#p2-4 722
+prt_gld,236,126,8 duplicate(Swanhild2) Swanhild#p2-5 722
+prt_gld,236,128,8 duplicate(Swanhild2) Swanhild#p2-6 722
// In Castle =============================================
-prtg_cas02,40,227,4 duplicate(Swanhild) Swanhild#p2-6 722
-prtg_cas02,46,227,4 duplicate(Swanhild) Swanhild#p2-7 722
-prtg_cas02,11,219,4 duplicate(Swanhild) Swanhild#p2-8 722
-prtg_cas02,11,214,4 duplicate(Swanhild) Swanhild#p2-9 722
-prtg_cas02,20,219,4 duplicate(Swanhild) Swanhild#p2-10 722
-prtg_cas02,20,214,4 duplicate(Swanhild) Swanhild#p2-11 722
-prtg_cas02,79,227,8 duplicate(Swanhild) Swanhild#p2-12 722
-prtg_cas02,70,227,8 duplicate(Swanhild) Swanhild#p2-13 722
-prtg_cas02,38,189,8 duplicate(Swanhild) Swanhild#p2-14 722
-prtg_cas02,34,189,8 duplicate(Swanhild) Swanhild#p2-15 722
-prtg_cas02,153,161,4 duplicate(Swanhild) Swanhild#p2-16 722
-prtg_cas02,162,161,4 duplicate(Swanhild) Swanhild#p2-17 722
+prtg_cas02,46,227,4 duplicate(Swanhild3) Swanhild#p2-7 722
+prtg_cas02,11,219,4 duplicate(Swanhild3) Swanhild#p2-8 722
+prtg_cas02,11,214,4 duplicate(Swanhild3) Swanhild#p2-9 722
+prtg_cas02,20,219,4 duplicate(Swanhild3) Swanhild#p2-10 722
+prtg_cas02,20,214,4 duplicate(Swanhild3) Swanhild#p2-11 722
+prtg_cas02,79,227,8 duplicate(Swanhild3) Swanhild#p2-12 722
+prtg_cas02,70,227,8 duplicate(Swanhild3) Swanhild#p2-13 722
+prtg_cas02,38,189,8 duplicate(Swanhild3) Swanhild#p2-14 722
+prtg_cas02,34,189,8 duplicate(Swanhild3) Swanhild#p2-15 722
+prtg_cas02,153,161,4 duplicate(Swanhild3) Swanhild#p2-16 722
+prtg_cas02,162,161,4 duplicate(Swanhild3) Swanhild#p2-17 722
@@ -99,7 +116,7 @@ prtg_cas02,162,161,4 duplicate(Swanhild) Swanhild#p2-17 722
// Castle 3
//================================================================================//
prontera,143,203,2 script Fadhgridh#p3-1::Fadhgridh 722,{
- callfunc "F_Flags","Prontera","prtg_cas03",45,99,0;
+ callfunc "F_Flags","Prontera","prtg_cas03",45,99,0,0;
close;
OnRecvCastlePt03:
@@ -108,7 +125,16 @@ OnRecvCastlePt03:
}
prt_gld,147,140,4 script Fadhgridh#p3-2::Fadhgridh2 722,{
- callfunc "F_Flags","Prontera","prtg_cas03",45,99,1;
+ callfunc "F_Flags","Prontera","prtg_cas03",45,99,1,1;
+ close;
+
+OnRecvCastlePt03:
+ FlagEmblem GetCastleData("prtg_cas03",1);
+ end;
+}
+
+prtg_cas03,168,28,4 script Fadhgridh#p3-3::Fadhgridh3 722,{
+ callfunc "F_Flags","Prontera","prtg_cas03",45,99,0,1;
close;
OnRecvCastlePt03:
@@ -116,20 +142,19 @@ OnRecvCastlePt03:
end;
}
// In Guild ===========================================
-prt_gld,147,136,4 duplicate(Fadhgridh2) Fadhgridh#p3-3 722
-prt_gld,158,140,4 duplicate(Fadhgridh2) Fadhgridh#p3-4 722
-prt_gld,158,136,4 duplicate(Fadhgridh2) Fadhgridh#p3-5 722
+prt_gld,147,136,4 duplicate(Fadhgridh2) Fadhgridh#p3-4 722
+prt_gld,158,140,4 duplicate(Fadhgridh2) Fadhgridh#p3-5 722
+prt_gld,158,136,4 duplicate(Fadhgridh2) Fadhgridh#p3-6 722
// In Castle ============================================
-prtg_cas03,168,28,4 duplicate(Fadhgridh) Fadhgridh#p3-6 722
-prtg_cas03,182,28,4 duplicate(Fadhgridh) Fadhgridh#p3-7 722
-prtg_cas03,43,50,4 duplicate(Fadhgridh) Fadhgridh#p3-8 722
-prtg_cas03,48,50,4 duplicate(Fadhgridh) Fadhgridh#p3-9 722
-prtg_cas03,43,58,4 duplicate(Fadhgridh) Fadhgridh#p3-10 722
-prtg_cas03,48,58,4 duplicate(Fadhgridh) Fadhgridh#p3-11 722
-prtg_cas03,158,210,4 duplicate(Fadhgridh) Fadhgridh#p3-12 722
-prtg_cas03,169,210,4 duplicate(Fadhgridh) Fadhgridh#p3-13 722
-prtg_cas03,162,201,4 duplicate(Fadhgridh) Fadhgridh#p3-14 722
-prtg_cas03,165,201,4 duplicate(Fadhgridh) Fadhgridh#p3-15 722
+prtg_cas03,182,28,4 duplicate(Fadhgridh3) Fadhgridh#p3-7 722
+prtg_cas03,43,50,4 duplicate(Fadhgridh3) Fadhgridh#p3-8 722
+prtg_cas03,48,50,4 duplicate(Fadhgridh3) Fadhgridh#p3-9 722
+prtg_cas03,43,58,4 duplicate(Fadhgridh3) Fadhgridh#p3-10 722
+prtg_cas03,48,58,4 duplicate(Fadhgridh3) Fadhgridh#p3-11 722
+prtg_cas03,158,210,4 duplicate(Fadhgridh3) Fadhgridh#p3-12 722
+prtg_cas03,169,210,4 duplicate(Fadhgridh3) Fadhgridh#p3-13 722
+prtg_cas03,162,201,4 duplicate(Fadhgridh3) Fadhgridh#p3-14 722
+prtg_cas03,165,201,4 duplicate(Fadhgridh3) Fadhgridh#p3-15 722
@@ -137,7 +162,7 @@ prtg_cas03,165,201,4 duplicate(Fadhgridh) Fadhgridh#p3-15 722
// Castle 4
//================================================================================//
prontera,167,203,6 script Skoegul#p4-1::Skoegul 722,{
- callfunc "F_Flags","Prontera","prtg_cas04",259,265,0;
+ callfunc "F_Flags","Prontera","prtg_cas04",259,265,0,0;
close;
OnRecvCastlePt04:
@@ -146,7 +171,16 @@ OnRecvCastlePt04:
}
prt_gld,120,243,6 script Skoegul#p4-2::Skoegul2 722,{
- callfunc "F_Flags","Prontera","prtg_cas04",259,265,1;
+ callfunc "F_Flags","Prontera","prtg_cas04",259,265,1,1;
+ close;
+
+OnRecvCastlePt04:
+ FlagEmblem GetCastleData("prtg_cas04",1);
+ end;
+}
+
+prtg_cas04,82,29,4 script Skoegul#p4-3::Skoegul3 722,{
+ callfunc "F_Flags","Prontera","prtg_cas04",259,265,0,1;
close;
OnRecvCastlePt04:
@@ -154,20 +188,19 @@ OnRecvCastlePt04:
end;
}
// In Guild ===========================================
-prt_gld,120,236,6 duplicate(Skoegul2) Skoegul#p4-3 722
-prt_gld,122,243,6 duplicate(Skoegul2) Skoegul#p4-4 722
-prt_gld,122,246,6 duplicate(Skoegul2) Skoegul#p4-5 722
-// In Castle =============================================
-prtg_cas04,82,29,4 duplicate(Skoegul) Skoegul#p4-6 722
-prtg_cas04,75,29,4 duplicate(Skoegul) Skoegul#p4-7 722
-prtg_cas04,75,27,4 duplicate(Skoegul) Skoegul#p4-8 722
-prtg_cas04,82,27,4 duplicate(Skoegul) Skoegul#p4-9 722
-prtg_cas04,59,29,4 duplicate(Skoegul) Skoegul#p4-10 722
-prtg_cas04,67,29,4 duplicate(Skoegul) Skoegul#p4-11 722
-prtg_cas04,258,25,4 duplicate(Skoegul) Skoegul#p4-12 722
-prtg_cas04,258,20,4 duplicate(Skoegul) Skoegul#p4-13 722
-prtg_cas04,263,20,4 duplicate(Skoegul) Skoegul#p4-14 722
-prtg_cas04,263,27,4 duplicate(Skoegul) Skoegul#p4-15 722
+prt_gld,120,236,6 duplicate(Skoegul2) Skoegul#p4-4 722
+prt_gld,122,243,6 duplicate(Skoegul2) Skoegul#p4-5 722
+prt_gld,122,236,6 duplicate(Skoegul2) Skoegul#p4-6 722
+// In Castle ==========================================
+prtg_cas04,75,29,4 duplicate(Skoegul3) Skoegul#p4-7 722
+prtg_cas04,75,27,4 duplicate(Skoegul3) Skoegul#p4-8 722
+prtg_cas04,82,27,4 duplicate(Skoegul3) Skoegul#p4-9 722
+prtg_cas04,59,29,4 duplicate(Skoegul3) Skoegul#p4-10 722
+prtg_cas04,67,29,4 duplicate(Skoegul3) Skoegul#p4-11 722
+prtg_cas04,258,25,4 duplicate(Skoegul3) Skoegul#p4-12 722
+prtg_cas04,258,20,4 duplicate(Skoegul3) Skoegul#p4-13 722
+prtg_cas04,263,20,4 duplicate(Skoegul3) Skoegul#p4-14 722
+prtg_cas04,263,27,4 duplicate(Skoegul3) Skoegul#p4-15 722
@@ -176,7 +209,7 @@ prtg_cas04,263,27,4 duplicate(Skoegul) Skoegul#p4-15 722
// Castle 5
//================================================================================//
prontera,165,194,5 script Gondul#p5-1::Gondul 722,{
- callfunc "F_Flags","Prontera","prtg_cas05",34,30,0;
+ callfunc "F_Flags","Prontera","prtg_cas05",34,30,0,0;
close;
OnRecvCastlePt05:
@@ -185,7 +218,16 @@ OnRecvCastlePt05:
}
prt_gld,199,243,2 script Gondul#p5-2::Gondul2 722,{
- callfunc "F_Flags","Prontera","prtg_cas05",34,30,1;
+ callfunc "F_Flags","Prontera","prtg_cas05",34,30,1,1;
+ close;
+
+OnRecvCastlePt05:
+ FlagEmblem GetCastleData("prtg_cas05",1);
+ end;
+}
+
+prtg_cas05,19,247,4 script Gondul#p5-3::Gondul3 722,{
+ callfunc "F_Flags","Prontera","prtg_cas05",34,30,0,1;
close;
OnRecvCastlePt05:
@@ -193,15 +235,14 @@ OnRecvCastlePt05:
end;
}
// In Guild ===========================================
-prt_gld,199,236,2 duplicate(Gondul2) Gondul#p5-3 722
-prt_gld,197,243,2 duplicate(Gondul2) Gondul#p5-4 722
-prt_gld,197,236,2 duplicate(Gondul2) Gondul#p5-5 722
+prt_gld,199,236,2 duplicate(Gondul2) Gondul#p5-4 722
+prt_gld,197,243,2 duplicate(Gondul2) Gondul#p5-5 722
+prt_gld,197,236,2 duplicate(Gondul2) Gondul#p5-6 722
// In Castle =============================================
-prtg_cas05,19,247,4 duplicate(Gondul) Gondul#p5-6 722
-prtg_cas05,19,243,4 duplicate(Gondul) Gondul#p5-7 722
-prtg_cas05,26,247,4 duplicate(Gondul) Gondul#p5-8 722
-prtg_cas05,26,243,4 duplicate(Gondul) Gondul#p5-9 722
-prtg_cas05,249,289,4 duplicate(Gondul) Gondul#p5-10 722
-prtg_cas05,256,289,4 duplicate(Gondul) Gondul#p5-11 722
-prtg_cas05,253,271,4 duplicate(Gondul) Gondul#p5-12 722
-prtg_cas05,273,257,4 duplicate(Gondul) Gondul#p5-13 722
+prtg_cas05,19,243,4 duplicate(Gondul3) Gondul#p5-7 722
+prtg_cas05,26,247,4 duplicate(Gondul3) Gondul#p5-8 722
+prtg_cas05,26,243,4 duplicate(Gondul3) Gondul#p5-9 722
+prtg_cas05,249,289,4 duplicate(Gondul3) Gondul#p5-10 722
+prtg_cas05,256,289,4 duplicate(Gondul3) Gondul#p5-11 722
+prtg_cas05,253,271,4 duplicate(Gondul3) Gondul#p5-12 722
+prtg_cas05,273,257,4 duplicate(Gondul3) Gondul#p5-13 722
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 07:21:16 +0000