summaryrefslogtreecommitdiff
path: root/npc/guild2
diff options
context:
space:
mode:
Diffstat (limited to 'npc/guild2')
-rw-r--r--npc/guild2/agit_main_se.txt2
-rw-r--r--npc/guild2/agit_start_se.txt4
-rw-r--r--npc/guild2/arug_cas01.txt6
-rw-r--r--npc/guild2/arug_cas02.txt8
-rw-r--r--npc/guild2/arug_cas03.txt6
-rw-r--r--npc/guild2/arug_cas04.txt8
-rw-r--r--npc/guild2/arug_cas05.txt8
-rw-r--r--npc/guild2/guild_flags.txt20
-rw-r--r--npc/guild2/schg_cas01.txt6
-rw-r--r--npc/guild2/schg_cas02.txt4
-rw-r--r--npc/guild2/schg_cas03.txt6
-rw-r--r--npc/guild2/schg_cas04.txt6
-rw-r--r--npc/guild2/schg_cas05.txt6
13 files changed, 45 insertions, 45 deletions
diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt
index c4c22b165..580fb2944 100644
--- a/npc/guild2/agit_main_se.txt
+++ b/npc/guild2/agit_main_se.txt
@@ -840,7 +840,7 @@ OnInit:
if (getcharid(2) == .@GID && getgdskilllv(.@GID,10001)) {
mes "[Kafra Employee]";
mes "Welcome, proud member";
- mes "of the ^FF0000"+GetGuildName(.@GID)+"^000000 Guild!";
+ mes "of the ^FF0000"+getguildname(.@GID)+"^000000 Guild!";
mes "The Kafra Corporation is ready";
mes "to assist you wherever you go!";
next;
diff --git a/npc/guild2/agit_start_se.txt b/npc/guild2/agit_start_se.txt
index ec9de3d9b..39c3ae1ea 100644
--- a/npc/guild2/agit_start_se.txt
+++ b/npc/guild2/agit_start_se.txt
@@ -31,7 +31,7 @@ OnAgitInit2:
(gettime(4)==4) && (gettime(3)>=18 && gettime(3)<21) ||
(gettime(4)==6) && (gettime(3)>=22 && gettime(3)<23)) {
if (!agitcheck2()) {
- AgitStart2;
+ agitstart2;
}
end;
}
@@ -41,7 +41,7 @@ OnAgitInit2:
(gettime(4)==4) && (gettime(3)==21) ||
(gettime(4)==6) && (gettime(3)==23)) {
if (agitcheck2()) {
- AgitEnd2;
+ agitend2;
}
end;
}
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index 5639c7c6d..be190c77f 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -46,7 +46,7 @@ arug_cas01,92,126,4 script Mardol#LF_ar01_3::LF_ar01_2 HIDDEN_NPC,{
end;
OnAgitInit2:
OnRecvCastleAr01:
- FlagEmblem GetCastleData("arug_cas01",1);
+ flagemblem getcastledata("arug_cas01",1);
end;
}
arug_cas01,127,126,4 duplicate(LF_ar01_2) Mardol#LF_ar01_3 HIDDEN_NPC
@@ -67,9 +67,9 @@ aru_gld,164,270,4 script Mardol#flag_Ar01_1::Ar01_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastleAr01:
- FlagEmblem GetCastleData("arug_cas01",1);
+ flagemblem getcastledata("arug_cas01",1);
end;
}
aru_gld,142,235,4 duplicate(Ar01_Flag) Mardol#flag_Ar01_2 GUILD_FLAG
aru_gld,164,245,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_3 GUILD_FLAG
-aru_gld,182,255,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_4 GUILD_FLAG \ No newline at end of file
+aru_gld,182,255,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_4 GUILD_FLAG
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index 31bd02ad6..bf7f639eb 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -54,7 +54,7 @@ arug_cas02,129,178,4 script Cyr#LF_ar02_13::LF_ar02_2 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastleAr02:
- FlagEmblem GetCastleData("arug_cas02",1);
+ flagemblem getcastledata("arug_cas02",1);
end;
}
arug_cas02,149,178,4 duplicate(LF_ar02_2) Cyr#LF_ar02_14 GUILD_FLAG
@@ -66,7 +66,7 @@ aru_gld,80,41,6 script Cyr#flag_Ar02_1::Ar02_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastleAr02:
- FlagEmblem GetCastleData("arug_cas02",1);
+ flagemblem getcastledata("arug_cas02",1);
end;
}
aru_gld,80,52,6 duplicate(Ar02_Flag) Cyr#flag_Ar02_2 GUILD_FLAG
@@ -75,6 +75,6 @@ aru_gld,120,83,5 script Cyr#flag_Ar02_3 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastleAr02:
- FlagEmblem GetCastleData("arug_cas02",1);
+ flagemblem getcastledata("arug_cas02",1);
end;
-} \ No newline at end of file
+}
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index 415788f54..0a1665566 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -54,7 +54,7 @@ arug_cas03,148,103,4 script Horn#LF_ar03_10::LF_ar03_02 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastleAr03:
- FlagEmblem GetCastleData("arug_cas03",1);
+ flagemblem getcastledata("arug_cas03",1);
end;
}
arug_cas03,135,103,4 duplicate(LF_ar03_02) Horn#LF_ar03_11 GUILD_FLAG
@@ -66,7 +66,7 @@ aru_gld,60,174,0 script Horn#flag_Ar03_1::Ar03_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastleAr03:
- FlagEmblem GetCastleData("arug_cas03",1);
+ flagemblem getcastledata("arug_cas03",1);
end;
}
-aru_gld,74,174,0 duplicate(Ar03_Flag) Horn#flag_Ar03_2 GUILD_FLAG \ No newline at end of file
+aru_gld,74,174,0 duplicate(Ar03_Flag) Horn#flag_Ar03_2 GUILD_FLAG
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index c74ad619f..5ff71a806 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -54,7 +54,7 @@ arug_cas04,148,103,4 script Gefn#LF_ar04_10::LF_ar04_02 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlear04:
- FlagEmblem GetCastleData("arug_cas04",1);
+ flagemblem getcastledata("arug_cas04",1);
end;
}
arug_cas04,135,103,4 duplicate(LF_ar04_02) Gefn#LF_ar04_11 GUILD_FLAG
@@ -66,7 +66,7 @@ aru_gld,306,359,6 script Gefn#flag_ar04_1::ar04_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlear04:
- FlagEmblem GetCastleData("arug_cas04",1);
+ flagemblem getcastledata("arug_cas04",1);
end;
}
aru_gld,306,348,6 duplicate(ar04_Flag) Gefn#flag_ar04_2 GUILD_FLAG
@@ -75,7 +75,7 @@ aru_gld,301,318,4 script Gefn#flag_ar04_3::ar04_Flag2 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlear04:
- FlagEmblem GetCastleData("arug_cas04",1);
+ flagemblem getcastledata("arug_cas04",1);
end;
}
-aru_gld,313,318,4 duplicate(ar04_Flag2) Gefn#flag_ar04_4 GUILD_FLAG \ No newline at end of file
+aru_gld,313,318,4 duplicate(ar04_Flag2) Gefn#flag_ar04_4 GUILD_FLAG
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index 92c9d60bd..e32f4e4db 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -54,7 +54,7 @@ arug_cas05,148,103,4 script Banadis#LF_ar05_10::LF_ar05_02 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlear05:
- FlagEmblem GetCastleData("arug_cas05",1);
+ flagemblem getcastledata("arug_cas05",1);
end;
}
arug_cas05,135,103,4 duplicate(LF_ar05_02) Banadis#LF_ar05_11 GUILD_FLAG
@@ -66,7 +66,7 @@ aru_gld,289,103,6 script Banadis#flag_ar05_1::ar05_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlear05:
- FlagEmblem GetCastleData("arug_cas05",1);
+ flagemblem getcastledata("arug_cas05",1);
end;
}
aru_gld,289,112,6 duplicate(ar05_Flag) Banadis#flag_ar05_2 GUILD_FLAG
@@ -75,7 +75,7 @@ aru_gld,350,98,6 script Banadis#flag_ar05_3::ar05_Flag2 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlear05:
- FlagEmblem GetCastleData("arug_cas05",1);
+ flagemblem getcastledata("arug_cas05",1);
end;
}
-aru_gld,350,88,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 GUILD_FLAG \ No newline at end of file
+aru_gld,350,88,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 GUILD_FLAG
diff --git a/npc/guild2/guild_flags.txt b/npc/guild2/guild_flags.txt
index fac506f32..c5bbd1d08 100644
--- a/npc/guild2/guild_flags.txt
+++ b/npc/guild2/guild_flags.txt
@@ -16,7 +16,7 @@ yuno,109,167,5 script Himinn GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlesc01:
- FlagEmblem GetCastleData("schg_cas01",1);
+ flagemblem getcastledata("schg_cas01",1);
end;
}
@@ -25,7 +25,7 @@ yuno,110,171,5 script Andlangr GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlesc02:
- FlagEmblem GetCastleData("schg_cas02",1);
+ flagemblem getcastledata("schg_cas02",1);
end;
}
@@ -34,7 +34,7 @@ yuno,111,175,5 script Viblainn GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlesc03:
- FlagEmblem GetCastleData("schg_cas03",1);
+ flagemblem getcastledata("schg_cas03",1);
end;
}
@@ -43,7 +43,7 @@ yuno,112,179,5 script Hljod GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlesc04:
- FlagEmblem GetCastleData("schg_cas04",1);
+ flagemblem getcastledata("schg_cas04",1);
end;
}
@@ -52,7 +52,7 @@ yuno,114,183,5 script Skidbladnir GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlesc05:
- FlagEmblem GetCastleData("schg_cas05",1);
+ flagemblem getcastledata("schg_cas05",1);
end;
}
@@ -62,7 +62,7 @@ rachel,124,120,3 script Mardol GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlear01:
- FlagEmblem GetCastleData("arug_cas01",1);
+ flagemblem getcastledata("arug_cas01",1);
end;
}
@@ -71,7 +71,7 @@ rachel,136,120,5 script Cyr GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlear02:
- FlagEmblem GetCastleData("arug_cas02",1);
+ flagemblem getcastledata("arug_cas02",1);
end;
}
@@ -80,7 +80,7 @@ rachel,138,126,6 script Horn GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlear03:
- FlagEmblem GetCastleData("arug_cas03",1);
+ flagemblem getcastledata("arug_cas03",1);
end;
}
@@ -89,7 +89,7 @@ rachel,135,131,7 script Gefn GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlear04:
- FlagEmblem GetCastleData("arug_cas04",1);
+ flagemblem getcastledata("arug_cas04",1);
end;
}
@@ -98,6 +98,6 @@ rachel,124,130,1 script Banadis GUILD_FLAG,{
OnAgitInit2:
OnRecvCastlear05:
- FlagEmblem GetCastleData("arug_cas05",1);
+ flagemblem getcastledata("arug_cas05",1);
end;
}
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index ec15ab61d..b7074c68e 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -46,7 +46,7 @@ schg_cas01,111,46,4 script Himinn#LF_sc01_3::LF_sc01_2 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastleSc01:
- FlagEmblem GetCastleData("schg_cas01",1);
+ flagemblem getcastledata("schg_cas01",1);
end;
}
schg_cas01,129,46,4 duplicate(LF_sc01_2) Himinn#LF_sc01_4 GUILD_FLAG
@@ -66,7 +66,7 @@ sch_gld,290,90,0 script Himinn#flag_sc01_1::Sc01_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlesc01:
- FlagEmblem GetCastleData("schg_cas01",1);
+ flagemblem getcastledata("schg_cas01",1);
end;
}
-sch_gld,297,90,0 duplicate(Sc01_Flag) Himinn#flag_sc01_2 GUILD_FLAG \ No newline at end of file
+sch_gld,297,90,0 duplicate(Sc01_Flag) Himinn#flag_sc01_2 GUILD_FLAG
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index a9c8858cd..4d6a73ef1 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -58,7 +58,7 @@ sch_gld,296,247,4 script Andlangr#flag_sc02_1::Sc02_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlesc02:
- FlagEmblem GetCastleData("schg_cas02",1);
+ flagemblem getcastledata("schg_cas02",1);
end;
}
-sch_gld,280,247,4 duplicate(Sc02_Flag) Andlangr#flag_sc02_2 GUILD_FLAG \ No newline at end of file
+sch_gld,280,247,4 duplicate(Sc02_Flag) Andlangr#flag_sc02_2 GUILD_FLAG
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 803fe1a59..2a5581df3 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -54,7 +54,7 @@ schg_cas03,283,206,2 script Vidblainn#LF_sc03_11::LF_sc03_2 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlesc03:
- FlagEmblem GetCastleData("schg_cas03",1);
+ flagemblem getcastledata("schg_cas03",1);
end;
}
schg_cas03,283,197,2 duplicate(LF_sc03_2) Vidblainn#LF_sc03_12 GUILD_FLAG
@@ -66,7 +66,7 @@ sch_gld,91,191,0 script Vidblainn#flag_sc03_1::Sc03_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlesc03:
- FlagEmblem GetCastleData("schg_cas03",1);
+ flagemblem getcastledata("schg_cas03",1);
end;
}
-sch_gld,104,191,0 duplicate(Sc03_Flag) Bidblind#flag_sc03_2 GUILD_FLAG \ No newline at end of file
+sch_gld,104,191,0 duplicate(Sc03_Flag) Bidblind#flag_sc03_2 GUILD_FLAG
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index b4228d6ce..9905a0f17 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -46,7 +46,7 @@ schg_cas04,111,46,4 script Hljod#LF_sc04_3::LF_sc04_2 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlesc04:
- FlagEmblem GetCastleData("schg_cas04",1);
+ flagemblem getcastledata("schg_cas04",1);
end;
}
schg_cas04,129,46,4 duplicate(LF_sc04_2) Hljod#LF_sc04_4 GUILD_FLAG
@@ -66,7 +66,7 @@ sch_gld,134,97,4 script Hljod#flag_sc04_1::sc04_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlesc04:
- FlagEmblem GetCastleData("schg_cas04",1);
+ flagemblem getcastledata("schg_cas04",1);
end;
}
-sch_gld,141,97,4 duplicate(sc04_Flag) Hljod#flag_sc04_2 GUILD_FLAG \ No newline at end of file
+sch_gld,141,97,4 duplicate(sc04_Flag) Hljod#flag_sc04_2 GUILD_FLAG
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index d3a2a0aac..6ecdff972 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -46,7 +46,7 @@ schg_cas05,111,46,4 script Skidbladnir#LF_sc05_3::LF_sc05_2 GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlesc05:
- FlagEmblem GetCastleData("schg_cas05",1);
+ flagemblem getcastledata("schg_cas05",1);
end;
}
schg_cas05,129,46,4 duplicate(LF_sc05_2) Skidbladnir#LF_sc05_4 GUILD_FLAG
@@ -66,9 +66,9 @@ sch_gld,101,284,4 script Skidbladnir#flag_sc05_1::sc05_Flag GUILD_FLAG,{
end;
OnAgitInit2:
OnRecvCastlesc05:
- FlagEmblem GetCastleData("schg_cas05",1);
+ flagemblem getcastledata("schg_cas05",1);
end;
}
sch_gld,91,284,4 duplicate(sc05_Flag) Skidbladnir#flag_sc05_2 GUILD_FLAG
sch_gld,66,320,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_3 GUILD_FLAG
-sch_gld,66,310,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_4 GUILD_FLAG \ No newline at end of file
+sch_gld,66,310,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_4 GUILD_FLAG