diff options
Diffstat (limited to 'npc/woe-fe/agit_main.txt')
| -rw-r--r-- | npc/woe-fe/agit_main.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt index 3303fc9f2..5ac5b8e9a 100644 --- a/npc/woe-fe/agit_main.txt +++ b/npc/woe-fe/agit_main.txt @@ -101,10 +101,10 @@ OnStartArena: // The Emperium has been broken. OnAgitBreak: - .@GID = getcharid(2); + .@GID = getcharid(CHAR_ID_GUILD); // Show and log error if an unguilded player breaks the Emperium. (Should NEVER happen) if (.@GID <= 0) { - .@notice$ = "Character "+strcharinfo(0)+" ("+getcharid(0)+") broke the Emperium in Castle: "+strnpcinfo(NPC_NAME_HIDDEN)+" while guildless. No data will be saved and Emperium respawned."; + .@notice$ = "Character "+strcharinfo(PC_NAME)+" ("+getcharid(CHAR_ID_CHAR)+") broke the Emperium in Castle: "+strnpcinfo(NPC_NAME_HIDDEN)+" while guildless. No data will be saved and Emperium respawned."; logmes .@notice$; debugmes .@notice$; donpcevent "Agit#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnStartArena"; end; @@ -342,7 +342,7 @@ OnRecvCastle: } cutin "kafra_01",2; - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[Kafra Employee]"; mes "Welcome. ^ff0000" + getguildname(.@GID) + "^000000 Member."; mes "The Kafra Corporation will stay with you wherever you go."; @@ -609,13 +609,13 @@ OnRecvCastle: mes "Brave soul... fate will guide you towards your future..."; close; } - if (getguildmaster(.@GID) != strcharinfo(0)) { + if (getguildmaster(.@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!"; close; } mes "["+strnpcinfo(NPC_NAME_VISIBLE)+"]"; - mes "Welcome. My honorable master, ^ff0000"+strcharinfo(0)+"^000000..."; + mes "Welcome. My honorable master, ^ff0000"+strcharinfo(PC_NAME)+"^000000..."; mes "Your humble servant, "+strnpcinfo(NPC_NAME_VISIBLE)+", is here to serve you."; next; switch (select("Castle briefing", "Invest in commercial growth", "Invest in Castle Defenses", "Summon Guardian", "Hire / Fire a Kafra Employee", "Go into Master's room")) { @@ -969,7 +969,7 @@ OnRecvCastle: mes "There's a small lever. Will you pull it?"; next; if(select("Pull.", "Don't pull.") == 1) { - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { close2; warp .@destination$,.@coordinates[0],.@coordinates[1]; end; |