diff options
Diffstat (limited to 'npc/other/pvp.txt')
| -rw-r--r-- | npc/other/pvp.txt | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 1820bfc5c..6978d49d2 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -45,7 +45,7 @@ mes "explaining the PVP Modes."; mes "I am the PVP Narrator!"; next; - switch(select("What is PVP?:What are the PVP Modes?:What are the rules for PVP?:Save Position.:End Dialog.")) { + switch(select("What is PVP?", "What are the PVP Modes?", "What are the rules for PVP?", "Save Position.", "End Dialog.")) { case 1: mes "[PVP Narrator]"; mes "In short, PVP means"; @@ -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]"; @@ -201,7 +201,7 @@ geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 4_M_02 mes "modes or rules, Please ask"; mes "the Narrator..."; next; - switch(select("^FF5533' PvP Nightmare Mode'^000000:^3355FF' PvP Yoyo Mode'^000000:^3355FF' PvP Event Mode'^000000:Quit")) { + switch(select("^FF5533' PvP Nightmare Mode'^000000", "^3355FF' PvP Yoyo Mode'^000000", "^3355FF' PvP Event Mode'^000000", "Quit")) { case 1: mes "[Gate Keeper]"; mes "I am sorry, but currently the Nightmare mode service is not available."; @@ -214,7 +214,7 @@ geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 4_M_02 mes "to the Yoyo Mode"; mes "fight square?"; next; - switch(select("Move:Cancel")) { + switch(select("Move", "Cancel")) { case 1: if ((Zeny > 499) && (BaseLevel > 30)) { Zeny -= 500; @@ -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; @@ -345,12 +345,12 @@ pvp_room,54,85,4 script Registration Staff#1 8W_SOLDIER,{ setarray .warp_x,40,59,20,40; setarray .warp_y,59,40,40,20; } - if (select("Combat Square one:Cancel") == 1) { + if (select("Combat Square one", "Cancel") == 1) { mes "[PVP Combat Square Register Staff]"; - mes "'"+ strcharinfo(0) +"'"; + mes "'"+ strcharinfo(PC_NAME) +"'"; mes "Are you ready?!"; next; - if (select("Yes!:No!") == 1) { + if (select("Yes!", "No!") == 1) { mes "[PVP Combat Square Register Staff]"; mes "OK! I will send you inside"; mes "Good luck!"; @@ -381,7 +381,7 @@ OnInit: mes "For details about players entrance please proceed to the Register Staff on your left."; close; } - if (select("Compete Square one:Cancel") == 1) { + if (select("Compete Square one", "Cancel") == 1) { mes "[PVP Combat Square Register Staff]"; mes "You got it, thanks for participating. Have fun!"; close2; @@ -409,7 +409,7 @@ pvp_room,86,85,4 duplicate(PVPSpectator) Spectator's Entrance#4 8W_SOLDIER OnTouch: mes "[Combat Square Staff]"; mes "May I help you?"; - if (select("To the center viewer seat.:Leave Combat Square.") == 1) { + if (select("To the center viewer seat.", "Leave Combat Square.") == 1) { warp "pvp_2vs2",38,38; end; } @@ -424,7 +424,7 @@ pvp_2vs2,74,5,0 duplicate(PVPSpecWarp) Combat Square Staff#4 WARPNPC,1,1 pvp_2vs2,40,40,0 script Combat Square Staff#5 WARPNPC,1,1,{ mes "[Combat Square Staff]"; mes "May I help you?"; - switch(select("To the side viewer seat.:Leave Combat Square.")) { + switch(select("To the side viewer seat.", "Leave Combat Square.")) { case 1: switch(rand(1,4)) { case 1: warp "pvp_2vs2",39,7; end; @@ -445,7 +445,7 @@ OnTouch: mes "Did you have fun in Combat Square?"; mes "May I ask where you want to go?"; next; - switch(select("Prontera.:Morocc.:Geffen.:Payon.:Alberta.:Cancel.")) { + switch(select("Prontera.", "Morocc.", "Geffen.", "Payon.", "Alberta.", "Cancel.")) { case 1: warp "prontera",107,60; end; case 2: warp "morocc",157,96; end; case 3: warp "geffen",120,36; end; |