diff options
author | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2015-12-31 23:40:48 +0100 |
commit | 0e990045fc308ca58421eda25838d3b9e7a10afa (patch) | |
tree | 7966898e283b6759f226bd8222de161fb64772c2 /npc/other/pvp.txt | |
parent | e95c473c694f4fccb40584f3e6a00323f91e36ee (diff) | |
parent | 32a42eeee18b16d9f904a409974dda575f3966c2 (diff) | |
download | hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.gz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.bz2 hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.tar.xz hercules-0e990045fc308ca58421eda25838d3b9e7a10afa.zip |
Merge branch 'AnnieRuru-request_29' into hercules
Closes #1000 as merged
Diffstat (limited to 'npc/other/pvp.txt')
-rw-r--r-- | npc/other/pvp.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 4632a0c4b..1820bfc5c 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -38,7 +38,7 @@ //========================================================================= //== Information =========================================== -- script PVP Narrator::pvpe -1,{ +- script PVP Narrator::pvpe FAKE_NPC,{ mes "[PVP Narrator]"; mes "Hello and welcome!"; mes "I am in charge of"; @@ -192,7 +192,7 @@ payon_in01,142,50,4 duplicate(pvpe) PVP Narrator#pe5 4_M_02 geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 4_M_02 //== Mode Select =========================================== -- script Gate Keeper::gkut -1,{ +- script Gate Keeper::gkut FAKE_NPC,{ mes "[Gate Keeper]"; mes "Glad to be of service."; mes "I will open the PVP fight"; @@ -374,7 +374,7 @@ OnInit: } //== Spectator Entrance ==================================== -- script Spectator's Entrance#dum::PVPSpectator -1,{ +- script Spectator's Entrance#dum::PVPSpectator FAKE_NPC,{ if (countitem(Admission_For_Duel) == 0) { mes "[PVP Compete Square Register Staff]"; mes "This is the entrance for viewers."; @@ -405,7 +405,7 @@ pvp_room,78,85,4 duplicate(PVPSpectator) Spectator's Entrance#3 8W_SOLDIER pvp_room,86,85,4 duplicate(PVPSpectator) Spectator's Entrance#4 8W_SOLDIER //== Spectator Warps ======================================= -- script Combat Square Staff#dum::PVPSpecWarp -1,{ +- script Combat Square Staff#dum::PVPSpecWarp FAKE_NPC,{ OnTouch: mes "[Combat Square Staff]"; mes "May I help you?"; |