diff options
author | hemagx <ibrahem.h.basyone@gmail.com> | 2016-08-29 01:04:03 +0200 |
---|---|---|
committer | hemagx <ibrahem.h.basyone@gmail.com> | 2016-08-29 01:04:03 +0200 |
commit | b2977e4f71128fa8764ce65ebe942b6806cffa1e (patch) | |
tree | 4f2a9b1f9a3ee6436a0b857d05caa2be7e99a877 /npc/other/pvp.txt | |
parent | 16f998c8a79153ed9f6721c36e129b6080fa59d2 (diff) | |
parent | 86977d79269408a371384e61111c3a9cf6e87b0c (diff) | |
download | hercules-b2977e4f71128fa8764ce65ebe942b6806cffa1e.tar.gz hercules-b2977e4f71128fa8764ce65ebe942b6806cffa1e.tar.bz2 hercules-b2977e4f71128fa8764ce65ebe942b6806cffa1e.tar.xz hercules-b2977e4f71128fa8764ce65ebe942b6806cffa1e.zip |
Merge pull request #1411 from Asheraf/constants
Closes #1411 as merged
Diffstat (limited to 'npc/other/pvp.txt')
-rw-r--r-- | npc/other/pvp.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index e98af4ec9..28a925d14 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -166,11 +166,11 @@ mes "Position successfully saved..."; mes "Thank you very much!"; mes "We will see you again soon."; - if(strnpcinfo(4) == "morocc_in") { savepoint "morocc_in",141,139; } - if(strnpcinfo(4) == "alberta_in") { savepoint "alberta_in",22,148; } - if(strnpcinfo(4) == "prt_in") { savepoint "prt_in",54,137; } - if(strnpcinfo(4) == "geffen_in") { savepoint "geffen_in",70,59; } - if(strnpcinfo(4) == "payon_in01") { savepoint "payon_in01",142,46; } + if(strnpcinfo(NPC_MAP) == "morocc_in") { savepoint "morocc_in",141,139; } + if(strnpcinfo(NPC_MAP) == "alberta_in") { savepoint "alberta_in",22,148; } + if(strnpcinfo(NPC_MAP) == "prt_in") { savepoint "prt_in",54,137; } + if(strnpcinfo(NPC_MAP) == "geffen_in") { savepoint "geffen_in",70,59; } + if(strnpcinfo(NPC_MAP) == "payon_in01") { savepoint "payon_in01",142,46; } break; case 5: mes "[PVP Narrator]"; @@ -307,8 +307,8 @@ function script F_PVP_FSRS { close; } } - if (strnpcinfo(4) == "pvp_y_room") { - .@base$ = "pvp_y_"+strnpcinfo(2); + if (strnpcinfo(NPC_MAP) == "pvp_y_room") { + .@base$ = "pvp_y_"+strnpcinfo(NPC_NAME_HIDDEN); setarray .@maps$[0], .@base$+"-1", .@base$+"-2", .@base$+"-3", .@base$+"-4", .@base$+"-5"; setarray .@name$[0], "Prontera", "Izlude", "Payon", "Alberta", "Morroc"; setarray .@Limit[0], 128, 128, 128, 128, 128; |