diff options
Diffstat (limited to 'npc/woe-fe/agit_main.txt')
| -rw-r--r-- | npc/woe-fe/agit_main.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt index a0db6402b..05789a286 100644 --- a/npc/woe-fe/agit_main.txt +++ b/npc/woe-fe/agit_main.txt @@ -143,7 +143,7 @@ OnAgitBreak: if( agitcheck() ) donpcevent "Agit#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnStartArena"; sleep 7000; - announce "The [" + getcastlename(strnpcinfo(NPC_NAME_HIDDEN)) + "] castle has been conquered by the [" + getguildname(.@GID) + "] guild.",bc_all|bc_woe; + announce "The [" + getcastlename(strnpcinfo(NPC_NAME_HIDDEN)) + "] castle has been conquered by the [" + getguildinfo(GUILDINFO_NAME, .@GID) + "] guild.",bc_all|bc_woe; end; // War of Emperium has ended. @@ -345,7 +345,7 @@ OnRecvCastle: cutin "kafra_01",2; if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[Kafra Employee]"; - mes "Welcome. ^ff0000" + getguildname(.@GID) + "^000000 Member."; + mes "Welcome. ^ff0000" + getguildinfo(GUILDINFO_NAME, .@GID) + "^000000 Member."; mes "The Kafra Corporation will stay with you wherever you go."; next; switch (select("Use Storage", "Use Teleport Service", "Rent a Pushcart", "Cancel")) { @@ -458,7 +458,7 @@ OnRecvCastle: } } mes "[Kafra Employee]"; - mes "I am instructed to only offer my services to the ^ff0000"+getguildname(.@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience."; + mes "I am instructed to only offer my services to the ^ff0000"+getguildinfo(GUILDINFO_NAME, .@GID)+"^000000 Guild. Please try another Kafra Employee around here. Sorry for the inconvenience."; close2; cutin "",255; end; @@ -610,9 +610,9 @@ OnRecvCastle: mes "Brave soul... fate will guide you towards your future..."; close; } - if (getguildmaster(.@GID) != strcharinfo(PC_NAME)) { + if (getguildinfo(GUILDINFO_MASTER_NAME, .@GID) != strcharinfo(PC_NAME)) { mes "["+strnpcinfo(NPC_NAME_VISIBLE)+"]"; - mes "No matter how much you pester me, I'll still follow my master ^ff0000"+getguildmaster(.@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!"; + mes "No matter how much you pester me, I'll still follow my master ^ff0000"+getguildinfo(GUILDINFO_MASTER_NAME, .@GID)+"^000000. Where are the Guardians?! Send these ruffians away right now!"; close; } mes "["+strnpcinfo(NPC_NAME_VISIBLE)+"]"; |