summaryrefslogtreecommitdiff
path: root/npc/guild
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-24 17:32:14 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-24 17:32:14 +0000
commit4b01558cea5a03dc39503030f5469a33aa2d7b1f (patch)
tree8a50889e584a5c58a8201ef622e6aaba963902f7 /npc/guild
parent86566b76415cda705383b504c54cecc3c4fa3139 (diff)
downloadhercules-4b01558cea5a03dc39503030f5469a33aa2d7b1f.tar.gz
hercules-4b01558cea5a03dc39503030f5469a33aa2d7b1f.tar.bz2
hercules-4b01558cea5a03dc39503030f5469a33aa2d7b1f.tar.xz
hercules-4b01558cea5a03dc39503030f5469a33aa2d7b1f.zip
- Fixed guild emblems not showing on flags at server start. (bugreport:5796, since r15657)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16144 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/guild')
-rw-r--r--npc/guild/agit_main.txt1
-rw-r--r--npc/guild/aldeg_cas01.txt2
-rw-r--r--npc/guild/aldeg_cas02.txt2
-rw-r--r--npc/guild/aldeg_cas03.txt2
-rw-r--r--npc/guild/aldeg_cas04.txt2
-rw-r--r--npc/guild/aldeg_cas05.txt2
-rw-r--r--npc/guild/gefg_cas01.txt2
-rw-r--r--npc/guild/gefg_cas02.txt2
-rw-r--r--npc/guild/gefg_cas03.txt2
-rw-r--r--npc/guild/gefg_cas04.txt2
-rw-r--r--npc/guild/gefg_cas05.txt2
-rw-r--r--npc/guild/payg_cas01.txt2
-rw-r--r--npc/guild/payg_cas02.txt2
-rw-r--r--npc/guild/payg_cas03.txt2
-rw-r--r--npc/guild/payg_cas04.txt2
-rw-r--r--npc/guild/payg_cas05.txt2
-rw-r--r--npc/guild/prtg_cas01.txt2
-rw-r--r--npc/guild/prtg_cas02.txt2
-rw-r--r--npc/guild/prtg_cas03.txt2
-rw-r--r--npc/guild/prtg_cas04.txt2
-rw-r--r--npc/guild/prtg_cas05.txt2
21 files changed, 21 insertions, 20 deletions
diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt
index 1175d5a5a..c57344f82 100644
--- a/npc/guild/agit_main.txt
+++ b/npc/guild/agit_main.txt
@@ -279,6 +279,7 @@ OnRecvCastle:
end;
}
else {
+OnInterIfInitOnce:
// Otherwise place the guild emblem on flags.
if (strnpcinfo(2) == "aldeg_cas01") { donpcevent "::OnRecvCastleA01"; }
else if (strnpcinfo(2) == "aldeg_cas02") { donpcevent "::OnRecvCastleA02"; }
diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt
index ba519522a..e194e9433 100644
--- a/npc/guild/aldeg_cas01.txt
+++ b/npc/guild/aldeg_cas01.txt
@@ -141,4 +141,4 @@ aldeg_cas01,216,24,0 duplicate(Gld_Agit_Manager) Agit#aldeg_cas01 -1
// Guardians
//============================================================
-aldeg_cas01,218,175,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas01 -1 \ No newline at end of file
+aldeg_cas01,218,175,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas01 -1
diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt
index d9ba54a32..3aae1b699 100644
--- a/npc/guild/aldeg_cas02.txt
+++ b/npc/guild/aldeg_cas02.txt
@@ -135,4 +135,4 @@ aldeg_cas02,214,24,0 duplicate(Gld_Agit_Manager) Agit#aldeg_cas02 -1
// Guardians
//============================================================
-aldeg_cas02,78,74,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas02 -1 \ No newline at end of file
+aldeg_cas02,78,74,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas02 -1
diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt
index 2f4e7dff3..751e404ac 100644
--- a/npc/guild/aldeg_cas03.txt
+++ b/npc/guild/aldeg_cas03.txt
@@ -138,4 +138,4 @@ aldeg_cas03,206,32,0 duplicate(Gld_Agit_Manager) Agit#aldeg_cas03 -1
// Guardians
//============================================================
-aldeg_cas03,110,118,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas03 -1 \ No newline at end of file
+aldeg_cas03,110,118,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas03 -1
diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt
index 944648b89..0afba08bd 100644
--- a/npc/guild/aldeg_cas04.txt
+++ b/npc/guild/aldeg_cas04.txt
@@ -138,4 +138,4 @@ aldeg_cas04,36,218,0 duplicate(Gld_Agit_Manager) Agit#aldeg_cas04 -1
// Guardians
//============================================================
-aldeg_cas04,67,116,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas04 -1 \ No newline at end of file
+aldeg_cas04,67,116,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas04 -1
diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt
index 7e5d088f2..2f43685b5 100644
--- a/npc/guild/aldeg_cas05.txt
+++ b/npc/guild/aldeg_cas05.txt
@@ -137,4 +137,4 @@ aldeg_cas05,28,102,0 duplicate(Gld_Agit_Manager) Agit#aldeg_cas05 -1
// Guardians
//============================================================
-aldeg_cas05,52,179,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas05 -1 \ No newline at end of file
+aldeg_cas05,52,179,0 duplicate(Gld_Guard_Template) Guardian#aldeg_cas05 -1
diff --git a/npc/guild/gefg_cas01.txt b/npc/guild/gefg_cas01.txt
index 231ce2805..1b4c2946f 100644
--- a/npc/guild/gefg_cas01.txt
+++ b/npc/guild/gefg_cas01.txt
@@ -129,4 +129,4 @@ gefg_cas01,198,182,0 duplicate(Gld_Agit_Manager) Agit#gefg_cas01 -1
// Guardians
//============================================================
-gefg_cas01,40,48,5 duplicate(Gld_Guard_Template) Guardian#gefg_cas01 -1 \ No newline at end of file
+gefg_cas01,40,48,5 duplicate(Gld_Guard_Template) Guardian#gefg_cas01 -1
diff --git a/npc/guild/gefg_cas02.txt b/npc/guild/gefg_cas02.txt
index 9758a71ff..e988f6b93 100644
--- a/npc/guild/gefg_cas02.txt
+++ b/npc/guild/gefg_cas02.txt
@@ -130,4 +130,4 @@ gefg_cas02,176,178,0 duplicate(Gld_Agit_Manager) Agit#gefg_cas02 -1
// Guardians
//============================================================
-gefg_cas02,12,66,5 duplicate(Gld_Guard_Template) Guardian#gefg_cas02 -1 \ No newline at end of file
+gefg_cas02,12,66,5 duplicate(Gld_Guard_Template) Guardian#gefg_cas02 -1
diff --git a/npc/guild/gefg_cas03.txt b/npc/guild/gefg_cas03.txt
index d24392c79..65358b274 100644
--- a/npc/guild/gefg_cas03.txt
+++ b/npc/guild/gefg_cas03.txt
@@ -133,4 +133,4 @@ gefg_cas03,245,167,0 duplicate(Gld_Agit_Manager) Agit#gefg_cas03 -1
// Guardians
//============================================================
-gefg_cas03,106,23,5 duplicate(Gld_Guard_Template) Guardian#gefg_cas03 -1 \ No newline at end of file
+gefg_cas03,106,23,5 duplicate(Gld_Guard_Template) Guardian#gefg_cas03 -1
diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt
index 21157c9ae..9cd9c760b 100644
--- a/npc/guild/gefg_cas04.txt
+++ b/npc/guild/gefg_cas04.txt
@@ -129,4 +129,4 @@ gefg_cas04,174,178,0 duplicate(Gld_Agit_Manager) Agit#gefg_cas04 -1
// Guardians
//============================================================
-gefg_cas04,73,46,3 duplicate(Gld_Guard_Template) Guardian#gefg_cas04 -1 \ No newline at end of file
+gefg_cas04,73,46,3 duplicate(Gld_Guard_Template) Guardian#gefg_cas04 -1
diff --git a/npc/guild/gefg_cas05.txt b/npc/guild/gefg_cas05.txt
index e79ae46f4..907429241 100644
--- a/npc/guild/gefg_cas05.txt
+++ b/npc/guild/gefg_cas05.txt
@@ -129,4 +129,4 @@ gefg_cas05,194,184,0 duplicate(Gld_Agit_Manager) Agit#gefg_cas05 -1
// Guardians
//============================================================
-gefg_cas05,70,52,3 duplicate(Gld_Guard_Template) Guardian#gefg_cas05 -1 \ No newline at end of file
+gefg_cas05,70,52,3 duplicate(Gld_Guard_Template) Guardian#gefg_cas05 -1
diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt
index efb104040..9f8ff665a 100644
--- a/npc/guild/payg_cas01.txt
+++ b/npc/guild/payg_cas01.txt
@@ -132,4 +132,4 @@ payg_cas01,139,139,0 duplicate(Gld_Agit_Manager) Agit#payg_cas01 -1
// Guardians
//============================================================
-payg_cas01,120,58,4 duplicate(Gld_Guard_Template) Guardian#payg_cas01 -1 \ No newline at end of file
+payg_cas01,120,58,4 duplicate(Gld_Guard_Template) Guardian#payg_cas01 -1
diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt
index eaf6fa1be..eb20d67af 100644
--- a/npc/guild/payg_cas02.txt
+++ b/npc/guild/payg_cas02.txt
@@ -132,4 +132,4 @@ payg_cas02,39,25,0 duplicate(Gld_Agit_Manager) Agit#payg_cas02 -1
// Guardians
//============================================================
-payg_cas02,22,260,7 duplicate(Gld_Guard_Template) Guardian#payg_cas02 -1 \ No newline at end of file
+payg_cas02,22,260,7 duplicate(Gld_Guard_Template) Guardian#payg_cas02 -1
diff --git a/npc/guild/payg_cas03.txt b/npc/guild/payg_cas03.txt
index ff21e1200..a395f9d3b 100644
--- a/npc/guild/payg_cas03.txt
+++ b/npc/guild/payg_cas03.txt
@@ -132,4 +132,4 @@ payg_cas03,269,265,0 duplicate(Gld_Agit_Manager) Agit#payg_cas03 -1
// Guardians
//============================================================
-payg_cas03,10,277,0 duplicate(Gld_Guard_Template) Guardian#payg_cas03 -1 \ No newline at end of file
+payg_cas03,10,277,0 duplicate(Gld_Guard_Template) Guardian#payg_cas03 -1
diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt
index 9deb148ea..5ae0997a8 100644
--- a/npc/guild/payg_cas04.txt
+++ b/npc/guild/payg_cas04.txt
@@ -132,4 +132,4 @@ payg_cas04,271,29,0 duplicate(Gld_Agit_Manager) Agit#payg_cas04 -1
// Guardians
//============================================================
-payg_cas04,38,284,3 duplicate(Gld_Guard_Template) Guardian#payg_cas04 -1 \ No newline at end of file
+payg_cas04,38,284,3 duplicate(Gld_Guard_Template) Guardian#payg_cas04 -1
diff --git a/npc/guild/payg_cas05.txt b/npc/guild/payg_cas05.txt
index f7916dc2b..0c1f833fe 100644
--- a/npc/guild/payg_cas05.txt
+++ b/npc/guild/payg_cas05.txt
@@ -132,4 +132,4 @@ payg_cas05,30,30,0 duplicate(Gld_Agit_Manager) Agit#payg_cas05 -1
// Guardians
//============================================================
-payg_cas05,277,249,3 duplicate(Gld_Guard_Template) Guardian#payg_cas05 -1 \ No newline at end of file
+payg_cas05,277,249,3 duplicate(Gld_Guard_Template) Guardian#payg_cas05 -1
diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt
index e6085f83a..119658263 100644
--- a/npc/guild/prtg_cas01.txt
+++ b/npc/guild/prtg_cas01.txt
@@ -135,4 +135,4 @@ prtg_cas01,197,197,0 duplicate(Gld_Agit_Manager) Agit#prtg_cas01 -1
// Guardians
//============================================================
-prtg_cas01,112,181,0 duplicate(Gld_Guard_Template) Guardian#prtg_cas01 -1 \ No newline at end of file
+prtg_cas01,112,181,0 duplicate(Gld_Guard_Template) Guardian#prtg_cas01 -1
diff --git a/npc/guild/prtg_cas02.txt b/npc/guild/prtg_cas02.txt
index 1fe55faa1..2ddc7268e 100644
--- a/npc/guild/prtg_cas02.txt
+++ b/npc/guild/prtg_cas02.txt
@@ -137,4 +137,4 @@ prtg_cas02,158,174,0 duplicate(Gld_Agit_Manager) Agit#prtg_cas02 -1
// Guardians
//============================================================
-prtg_cas02,94,61,4 duplicate(Gld_Guard_Template) Guardian#prtg_cas02 -1 \ No newline at end of file
+prtg_cas02,94,61,4 duplicate(Gld_Guard_Template) Guardian#prtg_cas02 -1
diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt
index 0f6df8c2b..bf55583e7 100644
--- a/npc/guild/prtg_cas03.txt
+++ b/npc/guild/prtg_cas03.txt
@@ -135,4 +135,4 @@ prtg_cas03,17,221,0 duplicate(Gld_Agit_Manager) Agit#prtg_cas03 -1
// Guardians
//============================================================
-prtg_cas03,51,100,4 duplicate(Gld_Guard_Template) Guardian#prtg_cas03 -1 \ No newline at end of file
+prtg_cas03,51,100,4 duplicate(Gld_Guard_Template) Guardian#prtg_cas03 -1
diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt
index 1ef4ad918..5e1a050ff 100644
--- a/npc/guild/prtg_cas04.txt
+++ b/npc/guild/prtg_cas04.txt
@@ -135,4 +135,4 @@ prtg_cas04,292,14,0 duplicate(Gld_Agit_Manager) Agit#prtg_cas04 -1
// Guardians
//============================================================
-prtg_cas04,259,265,4 duplicate(Gld_Guard_Template) Guardian#prtg_cas04 -1 \ No newline at end of file
+prtg_cas04,259,265,4 duplicate(Gld_Guard_Template) Guardian#prtg_cas04 -1
diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt
index fde4cc7d0..4dc70c639 100644
--- a/npc/guild/prtg_cas05.txt
+++ b/npc/guild/prtg_cas05.txt
@@ -133,4 +133,4 @@ prtg_cas05,266,266,0 duplicate(Gld_Agit_Manager) Agit#prtg_cas05 -1
// Guardians
//============================================================
-prtg_cas05,36,37,4 duplicate(Gld_Guard_Template) Guardian#prtg_cas05 -1 \ No newline at end of file
+prtg_cas05,36,37,4 duplicate(Gld_Guard_Template) Guardian#prtg_cas05 -1
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-02 07:13:27 +0000