diff options
| author | Asheraf <acheraf1998@gmail.com> | 2016-08-29 17:40:13 +0100 |
|---|---|---|
| committer | hemagx <ibrahem.h.basyone@gmail.com> | 2016-09-02 04:56:00 +0200 |
| commit | 0f1d0507eb95cf07ce7eb66d89ad9853938612e6 (patch) | |
| tree | 57780b1ecc7c5ae125be1c89406f8db1e00a581b /npc/woe-fe | |
| parent | 0f1d03f505fdc03533122db8ba19fa55f64f11b7 (diff) | |
| download | hercules-0f1d0507eb95cf07ce7eb66d89ad9853938612e6.tar.gz hercules-0f1d0507eb95cf07ce7eb66d89ad9853938612e6.tar.bz2 hercules-0f1d0507eb95cf07ce7eb66d89ad9853938612e6.tar.xz hercules-0f1d0507eb95cf07ce7eb66d89ad9853938612e6.zip | |
change *strcharinfo to use constants
Diffstat (limited to 'npc/woe-fe')
| -rw-r--r-- | npc/woe-fe/agit_main.txt | 6 | ||||
| -rw-r--r-- | npc/woe-fe/trs_rp.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt index 3303fc9f2..912063b8b 100644 --- a/npc/woe-fe/agit_main.txt +++ b/npc/woe-fe/agit_main.txt @@ -104,7 +104,7 @@ OnAgitBreak: .@GID = getcharid(2); // 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(0)+") 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; @@ -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")) { diff --git a/npc/woe-fe/trs_rp.txt b/npc/woe-fe/trs_rp.txt index 74557e014..7a71c1bbe 100644 --- a/npc/woe-fe/trs_rp.txt +++ b/npc/woe-fe/trs_rp.txt @@ -39,7 +39,7 @@ end; OnTouch: // Store the Guild ID of castle occupant. .@GID = getcastledata(strnpcinfo(NPC_NAME_HIDDEN),1); - if (strcharinfo(0) != getguildmaster(.@GID)) { + if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) { if (compare(strnpcinfo(NPC_NAME_HIDDEN),"aldeg")) warp "aldebaran",143,112; else if (compare(strnpcinfo(NPC_NAME_HIDDEN),"gefg")) |