diff options
| author | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-11-03 08:15:05 -0200 |
| commit | bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678 (patch) | |
| tree | 79f9aec5171e8aed2d701bf67167f260e05f41db /npc/other/pvp.txt | |
| parent | 239d480487e24294975f35ed55f210837ad1088e (diff) | |
| parent | ce3f4bfbe016ea69c855146667ba9bd9e0e2e221 (diff) | |
| download | hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.gz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.bz2 hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.tar.xz hercules-bee4c9d36f4a27e39cc76dc5d6c5f876ed44a678.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Signed-off-by: shennetsind <ind@henn.et>
Conflicts:
src/map/battle.c
Diffstat (limited to 'npc/other/pvp.txt')
| -rw-r--r-- | npc/other/pvp.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 779f332ae..383c67d22 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -253,7 +253,7 @@ geffen_in,67,63,4 duplicate(pvpe) PVP Narrator#pe6 4_M_02 close; L_Warp: - set .@map$,getarg(0); + .@map$ = getarg(0); if (checkre(0)) { switch(rand(1,10)) { case 1: warp .@map$,34,38; break; @@ -291,7 +291,7 @@ function script F_PVP_FSRS { } } if (strnpcinfo(4) == "pvp_y_room") { - set .@base$, "pvp_y_"+strnpcinfo(2); + .@base$ = "pvp_y_"+strnpcinfo(2); 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; @@ -300,10 +300,10 @@ function script F_PVP_FSRS { setarray .@name$[0], "Sandwich", "Lock on", "Four Room", "Under cross", "Compass Room"; setarray .@Limit[0], 64, 32, 32, 32, 32; } - for(set .@i,0; .@i<5; set .@i,.@i+1) - set .@menu$, .@menu$+.@name$[.@i]+" ["+getmapusers(.@maps$[.@i])+" / "+.@Limit[.@i]+"]:"; - set .@menu$, .@menu$+"Cancel."; - set .@i, select(.@menu$)-1; + for (.@i = 0; .@i<5; ++.@i) + .@menu$ += .@name$[.@i]+" ["+getmapusers(.@maps$[.@i])+" / "+.@Limit[.@i]+"]:"; + .@menu$ += "Cancel."; + .@i = select(.@menu$)-1; if (.@i == 5) close; if (getmapusers(.@maps$[.@i]) >= .@Limit[.@i]) { mes "[PVP Fight Square Reception Staff]"; @@ -326,7 +326,7 @@ pvp_room,54,85,4 script Registration Staff#1 8W_SOLDIER,{ mes "For details about viewers please proceed to the Register Staff on your right."; close; } - set .@size, getarraysize(.warp_x); + .@size = getarraysize(.warp_x); if (.@size == 0) { setarray .warp_x,40,59,20,40; setarray .warp_y,59,40,40,20; @@ -342,7 +342,7 @@ pvp_room,54,85,4 script Registration Staff#1 8W_SOLDIER,{ mes "Good luck!"; close2; delitem 7028,1; //Invite_For_Duel - set .@rand, rand(.@size); + .@rand = rand(.@size); warp "pvp_2vs2", .warp_x[.@rand], .warp_y[.@rand]; deletearray .warp_x[.@rand],1; deletearray .warp_y[.@rand],1; |