Merge pull request #2162 from mekolat/setzone

add atcommand_setzone, and fix #2133

1 files changed, 22 insertions, 16 deletions

diff --git a/doc/atcommands.txt b/doc/atcommands.txt
index 18d3de4e4..fb3628e00 100644
--- a/doc/atcommands.txt
+++ b/doc/atcommands.txt
@@ -50,7 +50,7 @@ Other Drop Rates: MvP 1.00x / Card-Based 1.00x / Treasure 1.00x
 @time
 
 Displays the local server time, along with day/night information.
- 
+
 ---------------------------------------
 
 @uptime
@@ -192,6 +192,12 @@ Sets a mapflag for the current map (1 = On, 0 = Off).
 
 ---------------------------------------
 
+@setzone <new zone>
+
+Changes the zone of the current map.
+
+---------------------------------------
+
 @addwarp <map> <x> <y> <npc name>
 
 Creates a warp portal on the character's current coordinates that lasts until the next reboot.
@@ -256,13 +262,13 @@ Map Name: prontera | Players In Map: 1 | NPCs In Map: 127 | Chats In Map: 0
 ------ Map Flags ------
 Town Map
 Autotrade Enabled
-PvP Flags: 
-GvG Flags: 
-Teleport Flags: 
+PvP Flags:
+GvG Flags:
+Teleport Flags:
 No Exp Penalty: On | No Zeny Penalty: On
-Weather Flags: Displays Night | 
-Other Flags: NoBranch | Reset | 
-Other Flags: 
+Weather Flags: Displays Night |
+Other Flags: NoBranch | Reset |
+Other Flags:
 
 ---------------------------------------
 
@@ -270,7 +276,7 @@ Other Flags:
 
 Gives information about terrain/area (debug function).
 
-Output Example: 
+Output Example:
 prontera (x= 165, y= 202) 00 00 00 00 00
 prontera (x= 165, y= 201) 01 00 00 00 00
 prontera (x= 165, y= 200) 01 00 00 00 00
@@ -297,7 +303,7 @@ DEF:2 MDEF:5 STR:6 AGI:1 VIT:1 INT:1 DEX:6 LUK:5
 ATK:8~9 Range:1~10~12 Size:Medium Race:Plant Element:Water (Lv:1)
 Drops:
  - Jellopy 70.00% - Knife[4] 1.00% etc...
- 
+
 ---------------------------------------
 
 @iteminfo <item name/ID>
@@ -317,7 +323,7 @@ NPC Buy:6z, Sell:3z | Weight: 1.0
 @whodrops <item name/ID>
 
 Displays a list of mobs which drop the specified item.
-Only the highest drop rates are shown. 
+Only the highest drop rates are shown.
 
 ---------------------------------------
 
@@ -557,7 +563,7 @@ Using the command without a message will enable or disable main chat.
 @storage
 
 Opens your Kafra storage.
- 
+
 ---------------------------------------
 
 @mail
@@ -636,7 +642,7 @@ identify_flag: 0 = unidentified, 1 = identified
 attribute: 0 = not broken, 1 = broken
 
 ---------------------------------------
- 
+
 @itembound <item name/ID> <amount> <bound_type>
 
 Creates the specified item and bounds it to the account.
@@ -951,7 +957,7 @@ Some options can be found in 'conf/map/battle/misc.conf'.
 
 @heal
 
-Fully heals HP and SP. 
+Fully heals HP and SP.
 
 ---------------------------------------
 
@@ -1247,7 +1253,7 @@ Example:
 @party <party_name>
 
 Organizes a new party, with the attached character as leader.
- 
+
 ---------------------------------------
 
 @partyoption <pickup share: yes/no> <item distribution: yes/no>
@@ -1317,7 +1323,7 @@ Changes guild level by the specified amount.
 @undisguiseguild
 
 Disguises or undisguises all online characters of a guild.
- 
+
 ---------------------------------------
 
 @sizeguild <size> <guild name>
@@ -1334,7 +1340,7 @@ Warps all online characters of a guild to your location.
 
 @guildspy <guild name>
 
-Allows you to spy on any guild's Guild Chat. 
+Allows you to spy on any guild's Guild Chat.
 At least one member of that guild must be online.
 NOTE: map server needs to be configured to enable spying to use this command (enable_spy: true)