From 4ac20267b11afff0115cdafe1c25175e5a1fea25 Mon Sep 17 00:00:00 2001 From: j-tkay Date: Sun, 2 Sep 2012 17:42:33 +0000 Subject: - Fixed partially bugreport:6572, where WoE:SE Flag Emblem not showing. (npc/guild2) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16733 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/guild/agit_main.txt | 1 - npc/guild2/arug_cas01.txt | 4 ++-- npc/guild2/arug_cas02.txt | 6 +++--- npc/guild2/arug_cas03.txt | 4 ++-- npc/guild2/arug_cas04.txt | 6 +++--- npc/guild2/arug_cas05.txt | 6 +++--- npc/guild2/guild_flags.txt | 20 ++++++++++---------- npc/guild2/schg_cas01.txt | 4 ++-- npc/guild2/schg_cas02.txt | 2 +- npc/guild2/schg_cas03.txt | 4 ++-- npc/guild2/schg_cas04.txt | 4 ++-- npc/guild2/schg_cas05.txt | 4 ++-- 12 files changed, 32 insertions(+), 33 deletions(-) diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index c57344f82..1175d5a5a 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -279,7 +279,6 @@ 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/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt index 86e46d5f3..1dcffa9c1 100644 --- a/npc/guild2/arug_cas01.txt +++ b/npc/guild2/arug_cas01.txt @@ -46,7 +46,7 @@ arug_cas01,103,186,0 duplicate(LF_ar01_1) Mardol#LF_ar01_2 111 arug_cas01,92,126,4 script Mardol#LF_ar01_3::LF_ar01_2 111,{ callfunc "LinkFlag","Emperium Center",67,193; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastleAr01: FlagEmblem GetCastleData("arug_cas01",1); end; @@ -67,7 +67,7 @@ arug_cas01,233,140,4 duplicate(LF_ar01_2) Mardol#LF_ar01_14 722 aru_gld,164,270,4 script Mardol#flag_Ar01_1::Ar01_Flag 722,{ callfunc "ReturnFlag","arug_cas01",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastleAr01: FlagEmblem GetCastleData("arug_cas01",1); end; diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt index f37e7a7cb..1d786902f 100644 --- a/npc/guild2/arug_cas02.txt +++ b/npc/guild2/arug_cas02.txt @@ -54,7 +54,7 @@ arug_cas02,271,190,0 duplicate(LF_ar02_1) Cyr#LF_ar02_12 111 arug_cas02,129,178,4 script Cyr#LF_ar02_13::LF_ar02_2 722,{ callfunc "LinkFlag","Emperium Center",43,256; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastleAr02: FlagEmblem GetCastleData("arug_cas02",1); end; @@ -66,7 +66,7 @@ arug_cas02,147,38,4 duplicate(LF_ar02_2) Cyr#LF_ar02_16 722 aru_gld,80,41,6 script Cyr#flag_Ar02_1::Ar02_Flag 722,{ callfunc "ReturnFlag","arug_cas02",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastleAr02: FlagEmblem GetCastleData("arug_cas02",1); end; @@ -75,7 +75,7 @@ aru_gld,80,52,6 duplicate(Ar02_Flag) Cyr#flag_Ar02_2 722 aru_gld,120,83,5 script Cyr#flag_Ar02_3 722,{ callfunc "ReturnFlag","arug_cas02",0; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastleAr02: FlagEmblem GetCastleData("arug_cas02",1); end; diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt index 646127138..fa25cffd3 100644 --- a/npc/guild2/arug_cas03.txt +++ b/npc/guild2/arug_cas03.txt @@ -54,7 +54,7 @@ arug_cas03,134,260,0 duplicate(LF_ar03_01) Horn#LF_ar03_08 111 arug_cas03,148,103,4 script Horn#LF_ar03_10::LF_ar03_02 722,{ callfunc "LinkFlag","Emperium Center",121,318; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastleAr03: FlagEmblem GetCastleData("arug_cas03",1); end; @@ -66,7 +66,7 @@ arug_cas03,214,51,1 duplicate(LF_ar03_02) Horn#LF_ar03_13 722 aru_gld,60,174,0 script Horn#flag_Ar03_1::Ar03_Flag 722,{ callfunc "ReturnFlag","arug_cas03",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastleAr03: FlagEmblem GetCastleData("arug_cas03",1); end; diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt index 26359d10a..e26ec613f 100644 --- a/npc/guild2/arug_cas04.txt +++ b/npc/guild2/arug_cas04.txt @@ -54,7 +54,7 @@ arug_cas04,134,260,0 duplicate(LF_ar04_01) Gefn#LF_ar04_08 111 arug_cas04,148,103,4 script Gefn#LF_ar04_10::LF_ar04_02 722,{ callfunc "LinkFlag","Emperium Center",121,318; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear04: FlagEmblem GetCastleData("arug_cas04",1); end; @@ -66,7 +66,7 @@ arug_cas04,214,51,1 duplicate(LF_ar04_02) Gefn#LF_ar04_13 722 aru_gld,306,359,6 script Gefn#flag_ar04_1::ar04_Flag 722,{ callfunc "ReturnFlag","arug_cas04",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear04: FlagEmblem GetCastleData("arug_cas04",1); end; @@ -75,7 +75,7 @@ aru_gld,306,348,6 duplicate(ar04_Flag) Gefn#flag_ar04_2 722 aru_gld,301,318,4 script Gefn#flag_ar04_3::ar04_Flag2 722,{ callfunc "ReturnFlag","arug_cas04",0; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear04: FlagEmblem GetCastleData("arug_cas04",1); end; diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt index 92c5a35e0..621ac8ad9 100644 --- a/npc/guild2/arug_cas05.txt +++ b/npc/guild2/arug_cas05.txt @@ -54,7 +54,7 @@ arug_cas05,134,260,0 duplicate(LF_ar05_01) Banadis#LF_ar05_08 111 arug_cas05,148,103,4 script Banadis#LF_ar05_10::LF_ar05_02 722,{ callfunc "LinkFlag","Emperium Center",121,318; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear05: FlagEmblem GetCastleData("arug_cas05",1); end; @@ -66,7 +66,7 @@ arug_cas05,214,51,1 duplicate(LF_ar05_02) Banadis#LF_ar05_13 722 aru_gld,289,103,6 script Banadis#flag_ar05_1::ar05_Flag 722,{ callfunc "ReturnFlag","arug_cas05",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear05: FlagEmblem GetCastleData("arug_cas05",1); end; @@ -75,7 +75,7 @@ aru_gld,289,112,6 duplicate(ar05_Flag) Banadis#flag_ar05_2 722 aru_gld,350,98,6 script Banadis#flag_ar05_3::ar05_Flag2 722,{ callfunc "ReturnFlag","arug_cas05",0; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear05: FlagEmblem GetCastleData("arug_cas05",1); end; diff --git a/npc/guild2/guild_flags.txt b/npc/guild2/guild_flags.txt index 8d4f6080c..d7652f760 100644 --- a/npc/guild2/guild_flags.txt +++ b/npc/guild2/guild_flags.txt @@ -16,7 +16,7 @@ yuno,109,167,5 script Himinn 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc01: FlagEmblem GetCastleData("schg_cas01",1); end; @@ -25,7 +25,7 @@ OnRecvCastlesc01: yuno,110,171,5 script Andlangr 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc02: FlagEmblem GetCastleData("schg_cas02",1); end; @@ -34,7 +34,7 @@ OnRecvCastlesc02: yuno,111,175,5 script Viblainn 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc03: FlagEmblem GetCastleData("schg_cas03",1); end; @@ -43,7 +43,7 @@ OnRecvCastlesc03: yuno,112,179,5 script Hljod 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc04: FlagEmblem GetCastleData("schg_cas04",1); end; @@ -52,7 +52,7 @@ OnRecvCastlesc04: yuno,114,183,5 script Skidbladnir 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc05: FlagEmblem GetCastleData("schg_cas05",1); end; @@ -62,7 +62,7 @@ OnRecvCastlesc05: rachel,124,120,3 script Mardol 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear01: FlagEmblem GetCastleData("arug_cas01",1); end; @@ -71,7 +71,7 @@ OnRecvCastlear01: rachel,136,120,5 script Cyr 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear02: FlagEmblem GetCastleData("arug_cas02",1); end; @@ -80,7 +80,7 @@ OnRecvCastlear02: rachel,138,126,6 script Horn 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear03: FlagEmblem GetCastleData("arug_cas03",1); end; @@ -89,7 +89,7 @@ OnRecvCastlear03: rachel,135,131,7 script Gefn 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear04: FlagEmblem GetCastleData("arug_cas04",1); end; @@ -98,7 +98,7 @@ OnRecvCastlear04: rachel,124,130,1 script Banadis 722,{ end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlear05: FlagEmblem GetCastleData("arug_cas05",1); end; diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt index a5c5fa50f..bc26fb3d1 100644 --- a/npc/guild2/schg_cas01.txt +++ b/npc/guild2/schg_cas01.txt @@ -46,7 +46,7 @@ schg_cas01,207,95,0 duplicate(LF_sc01_1) Himinn#LF_sc01_2 111 schg_cas01,111,46,4 script Himinn#LF_sc01_3::LF_sc01_2 722,{ callfunc "LinkFlag","Emperium Center",120,290; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastleSc01: FlagEmblem GetCastleData("schg_cas01",1); end; @@ -66,7 +66,7 @@ schg_cas01,144,247,0 duplicate(LF_sc01_1) Himinn#LF_sc01_14 111 sch_gld,290,90,0 script Himinn#flag_sc01_1::Sc01_Flag 722,{ callfunc "ReturnFlag","schg_cas01",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc01: FlagEmblem GetCastleData("schg_cas01",1); end; diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt index 144ead956..e93aa17ad 100644 --- a/npc/guild2/schg_cas02.txt +++ b/npc/guild2/schg_cas02.txt @@ -58,7 +58,7 @@ schg_cas02,235,207,0 duplicate(LF_sc02_1) Andlangr#LF_sc02_15 111 sch_gld,296,247,4 script Andlangr#flag_sc02_1::Sc02_Flag 722,{ callfunc "ReturnFlag","schg_cas02",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc02: FlagEmblem GetCastleData("schg_cas02",1); end; diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt index 188b41229..9adfeeb1b 100644 --- a/npc/guild2/schg_cas03.txt +++ b/npc/guild2/schg_cas03.txt @@ -54,7 +54,7 @@ schg_cas03,266,197,0 duplicate(LF_sc03_1) Vidblainn#LF_sc03_10 111 schg_cas03,283,206,2 script Vidblainn#LF_sc03_11::LF_sc03_2 722,{ callfunc "LinkFlag","Emperium Center",308,202; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc03: FlagEmblem GetCastleData("schg_cas03",1); end; @@ -66,7 +66,7 @@ schg_cas03,343,323,2 duplicate(LF_sc03_2) Vidblainn#LF_sc03_14 722 sch_gld,91,191,0 script Vidblainn#flag_sc03_1::Sc03_Flag 722,{ callfunc "ReturnFlag","schg_cas03",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc03: FlagEmblem GetCastleData("schg_cas03",1); end; diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt index 2a5449761..9f83a5a28 100644 --- a/npc/guild2/schg_cas04.txt +++ b/npc/guild2/schg_cas04.txt @@ -46,7 +46,7 @@ schg_cas04,207,95,0 duplicate(LF_sc04_1) Hljod#LF_sc04_2 111 schg_cas04,111,46,4 script Hljod#LF_sc04_3::LF_sc04_2 722,{ callfunc "LinkFlag","Emperium Center",120,290; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc04: FlagEmblem GetCastleData("schg_cas04",1); end; @@ -66,7 +66,7 @@ schg_cas04,144,247,0 duplicate(LF_sc04_1) Hljod#LF_sc04_14 111 sch_gld,134,97,4 script Hljod#flag_sc04_1::sc04_Flag 722,{ callfunc "ReturnFlag","schg_cas04",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc04: FlagEmblem GetCastleData("schg_cas04",1); end; diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt index e565ee691..09ecc1b7f 100644 --- a/npc/guild2/schg_cas05.txt +++ b/npc/guild2/schg_cas05.txt @@ -46,7 +46,7 @@ schg_cas05,207,95,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_2 111 schg_cas05,111,46,4 script Skidbladnir#LF_sc05_3::LF_sc05_2 722,{ callfunc "LinkFlag","Emperium Center",120,290; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc05: FlagEmblem GetCastleData("schg_cas05",1); end; @@ -66,7 +66,7 @@ schg_cas05,144,247,0 duplicate(LF_sc05_1) Skidbladnir#LF_sc05_14 111 sch_gld,101,284,4 script Skidbladnir#flag_sc05_1::sc05_Flag 722,{ callfunc "ReturnFlag","schg_cas05",1; end; -OnInterIfInitOnce: +OnAgitInit2: OnRecvCastlesc05: FlagEmblem GetCastleData("schg_cas05",1); end; -- cgit v1.2.3-60-g2f50