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/guildpvp.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/guildpvp.txt')
| -rw-r--r-- | npc/other/guildpvp.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/other/guildpvp.txt b/npc/other/guildpvp.txt index debb96de9..b33fffeee 100644 --- a/npc/other/guildpvp.txt +++ b/npc/other/guildpvp.txt @@ -25,14 +25,14 @@ pvp_y_room,77,85,4 script Guild Battle Guide 8W_SOLDIER,{ mes "Let me know to which map"; mes "you want me to move you."; next; - set .@i, select("Map 1:Map 2:Map 3:Map 4:Map 5"); + .@i = select("Map 1:Map 2:Map 3:Map 4:Map 5"); mes "[Guild Battle Guide]"; mes "You've chosen Map "+.@i+"."; mes "Now, which team are"; mes "you on? You can choose"; mes "either Team 1 or Team 2."; next; - set .@j, select("Team 1:Team 2"); + .@j = select("Team 1:Team 2"); mes "[Guild Battle Guide]"; mes "Alright, I'll move you"; mes "to Map "+.@i+" as a member"; |