Merge commit 'mainline/master'

6 files changed, 226 insertions, 365 deletions

diff --git a/conf/atcommand_local.conf.example b/conf/atcommand_local.conf.example
index f2f925df..1f07f962 100644
--- a/conf/atcommand_local.conf.example
+++ b/conf/atcommand_local.conf.example
@@ -9,6 +9,9 @@ command_symbol: @
 
 // 0: normal player commands
 
+// Displays helpfile in Athena base directory.
+help: 0
+
 // Give server time. (6 same commands)
 time: 0
 date: 0
@@ -48,14 +51,8 @@ where: 40
 // Spawns you to set points in major cities.
 go: 40
 
-// Displays helpfile in Athena base directory (2 same commands).
-help: 40
-h: 40
-
-// Warp yourself to a person (3 same commands + /shift).
-jumpto: 40
+// Warp yourself to a person.
 goto: 40
-warpto: 40
 
 // follow a player (including warping to them)
 follow: 40
@@ -122,19 +119,16 @@ inall: 60
 // Disable all wispers for a player
 exall: 60
 
-// Broadcast to the whole server. Using (1 command + /nb, /b).
+// Broadcast to the whole server
 broadcast: 60
 
-// Broadcast to the map you are on (1 command + /lb, /nlb).
+// Broadcast to the map you are on
 local_broadcast: 60
 
 // Broadcast (with or without name).
 kami: 60
 kamib: 60
 
-// Enables you to go to a certain map, at (x,y) coordinates. (@mapmove + /mm or /mapmove)
-mapmove: 60
-
 // Shows Stats Of All Characters Online
 charstatsall: 60
 
@@ -180,32 +174,26 @@ useskill: 60
 // make another player killable
 charkillable: 60
 
-// Spawns a monster, and a certain amount (3 same commands + /monster).
+// Spawns a monster, and a certain amount
 spawn: 60
-monster: 60
-summon: 60
 
-// Spawns a monster with parameters not in same order of @spawn.
-monster2: 60
+//Summons a monster, and a certain amount
+summon: 60
 
 // Resurects yourself.
 alive: 60
 
-// Levels your character to specified level (adds to your level) (3 same commands).
-lvup: 60
-baselvlup: 60
-blevel: 60
+// Levels your character to specified level (adds to your level).
+blvl: 60
 
 // Raises your job level (3 same commands).
-joblvup: 60
-joblvlup: 60
-jlevel: 60
+jlvl: 60
 
 // Unmute a player
 unmute: 60
 
 // Sets another persons base level.
-charbaselvl: 60
+charblvl: 60
 
 // Changes the sex of an online player (all characters on the account)
 charchangesex: 60
@@ -244,20 +232,13 @@ killer: 60
 // Creates weapon of desired element.
 produce: 60
 
-// Warps a character to you (1 command + /recall).
+// Warps a character to you
 recall: 60
 
-// Refines all weapons in your items list.
-refine: 60
-
-// Will repair all broken items in inventory.
-repairall: 60
-
 // Revives a character, and heals them.
 revive: 60
 
-// Warp another person to a certain map, at (x,y) coordinates (2 same commands).
-rura+: 60
+// Warp another person to a certain map, at (x,y) coordinates
 charwarp: 60
 
 // Change Status of your character
@@ -268,17 +249,11 @@ int: 60
 dex: 60
 luk: 60
 
-// Gets all skills (4 same commands)
-allskill: 60
+// Gets all skills
 allskills: 60
-skillall: 60
-skillsall: 60
 
-// sets GM stats to maximum (4 same commands)
-statall: 60
-statsall: 60
+// sets GM stats to maximum
 allstats: 60
-allstat: 60
 
 // Gives you job points.
 stpoint: 60
@@ -286,32 +261,23 @@ stpoint: 60
 // Gives you skill points of desired amount.
 skpoint: 60
 
-// To block definitively a player (only administrator can unblock the account) (2 same commands)
+// To block definitively a player
 block: 60
-charblock: 60
 
-// To unblock a player (2 same commands)
+// To unblock a player
 unblock: 60
-charunblock: 60
 
-// To ban a player for a limited time (only administrator can unban the account) (4 same commands)
+// To ban a player for a limited time
 ban: 60
-banish: 60
-charban: 60
-charbanish: 60
 
-// To unban a player (4 same commands)
+// To unban a player
 unban: 60
-unbanish: 60
-charunban: 60
-charunbanish: 60
 
 // To send specified character in jails
 jail: 60
 
-// To discharge a prisoner (2 same commands)
+// To discharge a prisoner
 unjail: 60
-discharge: 60
 
 // drop a players possessions on the gruond
 chardropall: 60
@@ -337,14 +303,6 @@ zeny: 80
 // Changes another character's zenny
 charzeny: 80
 
-// Changes your job to one you specify (2 same commands).
-job: 80
-jobchange: 80
-
-// Sets the job of another character (2 same commands).
-charjob: 80
-charjobchange: 80
-
 // Set options on another character.
 charoption: 80
 
@@ -396,9 +354,6 @@ idsearch: 80
 // Creates an item of your choosing, either Item ID or Name (1 command + /item).
 item: 80
 
-// Creates a complet item (card, etc...) of your choosing, either Item ID or Name.
-item2: 80
-
 // ??
 itemcheck: 80
 
@@ -429,10 +384,6 @@ gstorage: 99
 // Do some visual effect on your character
 effect: 99
 
-// Instantly kills player whose name is entered and deals insane damage to everything around.
-// Disabled for now
-//nuke: 99
-
 // Changes character's model
 charmodel: 99
 
@@ -442,29 +393,13 @@ agitstart: 99
 // Ends Guild Wars
 agitend: 99
 
-// Levels your guild to specified level (2 same commands).
-guildlvup: 99
-guildlvlup: 99
+// Levels your guild to specified level
+guildlvl: 99
 
 // craete a party/guild
 guild: 99
 party: 99
 
-// Enables spirit sphere balls.
-spiritball: 99
-
-//Makes an egg
-makeegg: 99
-
-//Hatches an egg
-hatch: 99
-
-// Sets the level of intemecy of your pet.
-petfriendly: 99
-
-// Sets hunger level of your pet.
-pethungry: 99
-
 // Warps all online character of a guild to you. (at least one member of that guild must be on.)
 guildrecall: 99
 
@@ -480,15 +415,9 @@ partyspy: 99
 // Saves a warp point.
 memo: 99
 
-// Creates yourself a pet egg, have to use Pet ID.
-makeegg: 99
-
 // To get a peco to (un)ride for another player.
 charmountpeco: 99
 
-// Enables to give possibility to a player to rename his/her pet.
-charpetrename: 99
-
 // Change your appearence to other players to a mob.
 disguise: 99
 
@@ -496,7 +425,7 @@ disguise: 99
 undisguise: 99
 
 // To change disguise of another player/GM
-chardisguise: 99
+chardisguise: 9
 charundisguise: 99
 
 // Enables platinum skills of another player.
@@ -505,19 +434,12 @@ charquestskill: 99
 // Enables lost skills of another player.
 charlostskill: 99
 
-// turn on and off skills on a map
-skillon: 99
-skilloff: 99
-
 // Changes your apperance.
 model: 99
 
 // To get a peco to (un)ride
 mountpeco: 99
 
-// Enables you to rename your pet.
-petrename: 99
-
 // Disconnect all users from the server
 kickall: 99
 
@@ -547,38 +469,3 @@ reloadscript: 99
 
 // Re-load GM level (admin command)
 reloadgmdb: 99
-
-// Refresh only status of players - SQL Only
-refreshonline: 99
-
-
-//---------------------------------------------------------------
-// 0: Mail System - SQL Only commands - Must be enabled
-
-// Check # of messages.
-checkmail: 1
-
-// List all messages.
-listmail: 1
-
-// List only new mail.
-listnewmail: 1
-
-// Read a message.
-readmail: 1
-
-// Send mail.
-sendmail: 1
-
-// Send priority mail (tagged with Priority and cannot be deleted until read)
-sendprioritymail: 80
-
-// Delete a message.
-deletemail: 0
-
-
-
-//---------------------
-// OTHER: not a command
-
-//import: conf/import/atcommand_conf.txt
diff --git a/conf/help.txt b/conf/help.txt
deleted file mode 100644
index fa8de1f6..00000000
--- a/conf/help.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-// put at first, the minimum level to display the line
-  0:To use one command, type it inside the message window where you usually type to chat.
- 20:@h/@help - display this help.
- 40: 
- 40:--- MESSAGE CMD ---
- 40:/b/@broadcast <message> - Broadcasts a GM message with name of the GM (in yellow)
- 40:/nb <message>/@kami <message> - Broadcasts a GM message without name of the GM (in yellow)
- 40:@kamib <message> - Broadcasts a GM message without name of the GM (in blue)
- 40:/lb/@localbroadcast <message> - Broadcasts a GM message with name of the GM (in yellow) ONLY on your map
- 40:/nlb <message> - Broadcasts a GM message without name of the GM (in yellow) ONLY on your map
-  0: 
-  0:--- INFORMATION CMD ---
- 20:@who/@whois [match_text] - Display a listing of who is online and where
- 20:@who2 [match_text] - Display a listing of who is online and their job
- 20:@who3 [match_text] - Display a listing of who is online and their party/guild
- 20:@whomap/@whomap2/@whomap3 [map] - like @who/@who2/@who3 but only for specifical map
- 20:@whogm [match_text] - Like @who+@who2+who3, but only for GM.
-  1:@where [char name] - Tells you the location of a character
- 40:@charstatsall - Displays stats of all characters.
- 40:@charitemlist <char name> - Displays all items of a player.
- 40:@charstoragelist <char name> - Displays all items of a player's storage.
- 40:@charcartlist <char name> - Displays all items of a player's cart.
-  0:@ignorelist - Displays your ignore list
- 99:@mapinfo [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat).
-  0:@time/@date/@server_date/@serverdate/@server_time/@servertime - Display the date/time of the server
- 60: 
- 60:@guildspy <guild_name/id> - You will receive all messages of the guild channel
- 60:@partyspy <party_name/id> - You will receive all messages of the party channel
-  1: 
-  1:--- CHANGE GM STATE CMD ---
- 40:/hide/@hide - Makes you character invisible (GM invisibility). Type @hide again become visible.
- 40:@save - Sets respawn point to current spot
- 40:@load/@return - Warps you to your save point
- 40:/mm//mapmove/@warp/@rura/@mapmove <mapname> <x> <y> - Warps you to the selected position
- 40:@jump [x [y]]- Randomly warps you like a flywing.
- 20:/shift/@jumpto/@warpto/@goto <char name> - Warps you to selected character
- 20:@follow <char_name> - follow a player
- 10:@go <number/city_name> - Warps you to a city.
- 10:  -3: (Memo point 2)  1: morocc   5: izlude         9: yuno     13: niflheim
- 10:  -2: (Memo point 1)  2: geffen   6: aldebaran     10: amatsu   14: louyang
- 10:  -1: (Memo point 0)  3: payon    7: xmas (lutie)  11: gonryun  15: start point
- 10:   0: prontera        4: alberta  8: comodo        12: umbala   16: prison/jail
- 10: 
-  1:@die ---- suicide
- 60:@alive - Revives yourself from death
- 40:@heal [<HP> <SP>] - Heals the desired amount of HP and SP. No value specified will do a full heal.
- 20: 
- 40:@job/@jobchange <job ID> - Changes your job
- 40:   0 Novice          7 Knight          14 Crusader    22 Formal
- 40:   1 Swordman        8 Priest          15 Monk        23 Super Novice
- 40:   2 Mage            9 Wizard          16 Sage
- 40:   3 Archer         10 Blacksmith      17 Rogue
- 40:   4 Acolyte        11 Hunter          18 Alchem
- 40:   5 Merchant       12 Assassin        19 Bard
- 40:   6 Thief          13 Peco-Knight     20 Dancer      21 Peco-Crusader
- 40:  24 Novice High    31 Lord Knight     38 Paladin
- 40:  25 Swordman High  32 High Priest     39 Monk
- 40:  26 Mage High      33 High Wizard     40 Professor
- 40:  27 Archer High    34 Whitesmith      41 Stalker
- 40:  28 Acolyte High   35 Sniper          42 Creator
- 40:  29 Merchant High  36 Assassin Cross  43 Clown
- 40:  30 Thief High     37 Peco Knight     44 Gypsy       45 Peco-Paladin
- 60:@lvup/@blevel/@baselvlup <number of levels> - Raises your base level the desired number of levels. The max is 255 (User Defined).
- 60:@joblvup/@jlevel/@joblvlup <number of levels> -Raises your job level the desired number of levels. The max is 50 For Basic Classes. For Super Novice and Advanced Classes it is 70.
- 60:@allskill/@allskills/@skillall/@skillsall - Give you all skills.
- 40:@option <param1> <param2> <param3> - Adds different visual effects on or around your character
- 40:	<param1>      <param2>      <p3>(stackable)   <param3>               <param3>
- 40:	1 Petrified   (stackable)   01 Sight           32 Peco Peco riding   2048 Orc Head
- 40:	2 Frozen      01 Poison     02 Hide            64 GM Perfect Hide    4096 Wedding Sprites
- 40:	3 Stunned     02 Cursed     04 Cloak          128 Level 2 Cart       8192 Ruwach
- 40:	4 Sleeping    04 Silenced   08 Level 1 Cart   256 Level 3 Cart
- 40:	6 darkness    08 ???        16 Falcon         512 Level 4 Cart
- 40:	              16 darkness                    1024 Level 5 Cart
- 20:@mountpeco - Give/remove you a peco (Class is required, but not skill)
- 20:@disguise <monster_name_or_monster_ID> - Change your appearence to other players to a mob.
- 20:@undisguise - Restore your normal appearance.
- 20:@model <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence.
- 40:@dye/@ccolor <clothes color: 0-4> - Changes your characters appearence (only clothes color).
- 40:@hairstyle/@hstyle <hair ID: 0-17> - Changes your characters appearence (only hair style).
- 40:@haircolor/@hcolor <hair color: 0-8> - Changes your characters appearence (only hair color).
- 40:@speed <1-1000> - Changes you walking speed. 1 being the fastest and 1000 the slowest. Default 150.
- 40:@effect <effect_id> [flag] - Give an efect to your character.
- 40:@dropall - throws all your possession on the ground
- 40:@storeall - puts all your possessions in storage
- 40:@killable - make your character killable
- 60:@stpoint <number of points> - Gives you the desired number of stat points.
- 60:@skpoint <number of points> - Gives you the desired number of skill points.
- 60:@zeny <amount> - Gives you desired amount of Zeny.
- 60:@str,@agi,@vit,@int,@dex,@luk <amount> - Adds desired amount to any stat. For example "@str 10" raises your str by 10
- 60:@statall/@statsall/@allstats/@allstat [value] - Adds value in all stats (maximum if no value).
- 40:@memo [memo_position] - set/change a memo location (no position: display memo points).
- 40:@spiritball <number: 1-1000> - Gives you "spirit spheres" like from the skill "Call Spirits"
- 40:	(If the number you use is > 1000, your server may become instable or crash)
- 40:@questskill <#> - Gives you the specified quest skill
- 40:@lostskill <#> - Takes away the specified quest skill from you
- 40:@skillid <name> - look up a skill by name
- 40:@useskill <skillid> <skillv> <target> - use a skill on target
- 40:  Novice                 Swordsman                  Thief                Merchant
- 40:  142 = Emergency Care   144 = Moving HP Recovery   149 = Throw Sand     153 = Cart Revolution
- 40:  143 = Act dead         145 = Attack Weak Point    150 = Back Sliding   154 = Change Cart
- 40:  Archer                 146 = Auto Berserk         151 = Take Stone     155 = Crazy Uproar/Loud Voice
- 40:  147 = Arrow Creation   Acolyte                    152 = Stone Throw    Magician
- 40:  148 = Charge Arrows    156 = Holy Light                                157 = Energy Coat
- 60: @addwarp <map name> <x coord> <y coord>
- 40: 
- 40:--- MONSTERS CMD ---
- 50:/monster <monster_name> - Spawns 1 of the desired monster.
- 50:@spawn/@monster/@summon <monster_name_or_monster_ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]
- 50:@monster2 <desired_monster_name> <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]
- 50:@spawn/@monster/@summon/@monster2 "desired monster name" <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]
- 50:@spawn/@monster/@summon/@monster2 <monster_name_or_monster_ID> "desired monster name" [<number to spawn> [<x coord> [<y coord>]]]
- 50:	Spawns the desired monster with any desired name.
- 60:@killmonster [map] - kill all monsters of the map (they drop)
- 40:@killmonster2 - kill all monsters of your map (without drops)
-  1: 
-  1:--- ITEMS CMD ---
-  1:@storage - Opens storage
- 50:@gstorage - Opens guild storage
- 60:/item <item_name> - Gives you 1 of the desired item.
- 60:@item <item name or ID> <quantity> - Gives you the desired item.
- 60:@item2 <item name or ID> <quantity> <Identify_flag> <refine> <attribut> <Card1> <Card2> <Card3> <Card4> = Gives you the desired item.
- 40:@itemreset - Remove all your items.
- 60:@itemcheck - Check your items with authorised items.
- 60:@idsearch <part_of_item_name> - Search all items that name have part_of_item_name
- 60:@refine <equip position> <+/- amount>
- 60:@produce <equip name or equip ID> <element> <# of very's>
- 60:	Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind
- 60:	It has separately with fragment 3 of the attribute + stars, you can apply.
- 60:@repairall - Repair all items of your inventory
- 40: 
- 40:--- PVP CMD ---
- 40:@pvpon - Turns pvp on on the current map
- 40:@pvpoff - Turns pvp off on the current map
- 40:@gvgon/@gpvpon - Turns gvg on on the current map
- 40:@gvgoff/@gpvpoff - Turns gvg off on the current map
- 60:@agitstart - Starts War of Emperium
- 60:@agitend - End War of Emperium
-  1: 
-  1:--- GROUPS CMD ---
-  1:@party <party_name> - Create a party.
- 50:@guild <guild_name> - Create a guild.
- 60:@guildlvup/@guildlvlup <# of levels> - Raise Guild by desired number of levels
- 60:@guildrecall <guild_name/id> - Warps all online characters of a guild to you.
- 60:@partyrecall <party_name/id> - Warps all online characters of a party to you.
-  1: 
-  1:--- PETS CMD ---
- 60:@hatch - Create a pet from your inventory eggs list.
- 60:@makeegg <pet_id> - Gives pet egg for monster number in pet DB
- 40:@petfriendly <#> - Set pet friendly amount (0-1000) 1000 = Max
- 40:@pethungry <#> - Set pet hungry amount (0-100) 100 = Max
-  1:@petrename - Re-enable pet rename
- 20: 
- 20:--- REMOTE CHAR CMD ---
- 60:@kill <char name> - Kills specified character.
- 40:@charkillable <char name> - make another character killable
- 60:@nuke <char name> - Kills specified character (nuclear effect).
- 60:@chardropall <char name> - throws all a chars possession on the ground
- 60:@charstoreall <char name> - puts all of anothers charactes possessions in storage
- 60:/recall/@recall <char name> - Warps target character to you.
- 80:@recallall - Warps every character online to you.
- 60:@charwarp/@rura+ <mapname> <x> <y> <char name> - Warps character to location of choice
- 60:@revive <char name> - Revives target character.
- 40:@charstats <char name> - Displays a characters stats.
- 20:@charignorelist <char name> - Displays ignore list of the player
- 20:@inall <char name> - Allows all wispers for the player
- 20:@exall <char name> - Blocks all wispers for the player
- 60:@charoption <param1> <param2> <param3> <charname> - Like @option command but only to target character.
- 50:@charmountpeco <charname> - Give/remove to a player a peco (Class is required, but not skill).
- 50:@charpetrename <charname> - Re-enable pet rename to a player.
- 60:@charsave <map> <x> <y> <charname> - Changes the target players respawn point.
- 60:@charbaselvl <#> <nickname> - Change a characters base level.
- 60:@charjlvl <#> <nickname> - Change a characters job level.
- 60:@charjob/@charjobchange <job ID> <char name> - Changes target characters job.
- 60:@charzeny <amount> <name> - Give/take a players Zeny
- 60:@charstpoint <amount> <name> - Give/take a players stat points
- 60:@charskpoint <amount> <name> - give/take a players skill points
- 60:@charskreset <charname> - Reset skills of a character.
- 60:@charstreset <charname> - Reset stats of a character.
- 60:@charreset <charname> - Reset stats AND skills of a character.
- 60:@charquestskill <#> <charname> - Gives to a player the specified quest skill.
- 60:@charlostskill <#> <charname> - Takes away the specified quest skill from the player.
- 60:@chardelitem <item_name_or_ID> <quantity> <player> - Remove items from a character
- 50:@charmodel <hair type> <hair color> <clothes color> <name> - Changes a player's model
- 60:@chardisguise <monster_name_or_monster_ID> <char name> - Changes disguise of a player
- 60:@charundisguise <char name> - Cancels disguise of a player
- 60:@charchangesex <name> - Changes sex of a player (all characters of the account)
- 60:@charblock/@block <name> - Blocks definitively a account
- 60:@charunblock/@unblock <name> - Unblocks a account
- 60:@charban/@ban/@banish/@charbanish <time> <name> - Ban temporarily a account
- 60:	time usage: adjustement (+/- value) and element (y/a, m, d/j, h, mn, s)
- 60:	Example: @ban +1m-2mn1s-6y testplayer
- 60:@charunban/@unban/@unbanish/@charunbanish <name> - Unban a account
- 60:@jail <char_name> - Sends specified character in jails
- 60:@trade <char_name> - Open a trade window with a another player
- 20:@kick <charname> - Kicks specified character off the server
- 99:@kickall - Kick all characters off the server
- 99:@mapexit - Kick all players and shut down map-server.
- 80:@doom - Kills all NON GM chars on the server.
- 80:@doommap - Kills all non GM characters on the map.
- 80:@raise - Resurrects all characters on the server.
- 80:@raisemap - Resurrects all characters on the map.
- 60:@unjail/@discharge <char_name> - Discharges specified character/prisoner
- 80: 
- 80:--- ENVIRONMENT CMD ---
- 80:@night - Uses @option 00 16 00 on all characters. All characters are in darkness.
- 80:@day - Uses @option 00 00 00 on all characters.
- 80:@skillon - turn skills on for a map
- 80:@skilloff - turn skills on for a map
-  0: 
-  0:--- ADMIN CMD ---
- 99:@reloaditemdb - Reload item database (admin command)
- 99:@reloadmobdb - Reload monster database (admin command)
- 99:@reloadskilldb - Reload skills definition database (admin command)
- 99:@reloadscript - Reload all scripts (admin command)
- 99:@reloadgmdb - Reload GM levels (admin command)
- 99:@adjgmlvl - Do a temporary adjustment of the GM level of a player (admin command)
- 99:@adjcmdlvl - Do a temporary adjustment of the GM level of a command (admin command)
- 80:@enablenpc <NPC_name> - Enable a NPC (admin command)
- 80:@disablenpc <NPC_name> - Disable a NPC (admin command)
- 80: 
- 99:@gat - For debugging (you inspect around gat)
- 99:@packet - For debugging (packet variety)
- 99: 
-100:@GM <password> - it becomes GM!
-  0:@email <actual@email> <new@email> - to change your e-mail (characters protection)
diff --git a/conf/help.txt.example b/conf/help.txt.example
new file mode 100644
index 00000000..3aa1af99
--- /dev/null
+++ b/conf/help.txt.example
@@ -0,0 +1,185 @@
+// put at first, the minimum level to display the line
+  0:To use one command, type it inside the message window where you usually type to chat.
+  0:@help - display this help.
+  0:@email <actual@email> <new@email> - to change your e-mail (characters protection)
+ 80:
+ 80:@setmagic
+ 80:@magicinfo
+  0: 
+  0:--- INFORMATION CMD ---
+  0:@servertime - Display the date/time of the server
+ 99:@ignorelist - Displays your ignore list
+ 40:@where [char name] - Tells you the location of a character
+ 40:@who/@whois [match_text] - Display a listing of who is online and where
+ 40:@whogroup [match_text] - Display a listing of who is online and their party/guild
+ 40:@whomap/@whomapgroup [map] - like @who/@who2/@who3 but only for specifical map
+ 40:@whogm [match_text] - Like @who+@who2+who3, but only for GM.
+ 60:@charstatsall - Displays stats of all characters.
+ 60:@charitemlist <char name> - Displays all items of a player.
+ 60:@charstoragelist <char name> - Displays all items of a player's storage.
+ 60:@charcartlist <char name> - Displays all items of a player's cart.
+ 99:@mapinfo [<0-3> [map]] - Give information about a map (general info +: 0: no more, 1: players, 2: NPC, 3: shops/chat).
+ 99: 
+ 99:@guildspy <guild_name/id> - You will receive all messages of the guild channel
+ 99:@partyspy <party_name/id> - You will receive all messages of the party channel
+ 60: 
+ 60:--- MESSAGE CMD ---
+ 60:@broadcast <message> - Broadcasts a GM message with name of the GM
+ 60:@kami/@kamib <message> - Broadcasts a GM message without name of the GM
+ 60:@localbroadcast <message> - Broadcasts a GM message with name of the GM
+ 40: 
+ 40:--- CHANGE GM STATE CMD ---
+ 40:@die ---- suicide
+ 40:@hide - Makes you character invisible (GM invisibility). Type @hide again become visible.
+ 40:@save - Sets respawn point to current spot
+ 40:@return - Warps you to your save point
+ 40:@warp <mapname> <x> <y> - Warps you to the selected position
+ 40:@jump [x [y]]- Randomly warps you like a flywing.
+ 40:@goto <char name> - Warps you to selected character
+ 40:@follow <char_name> - follow a player
+ 40:@go <number/city_name> - Warps you to a city.
+ 40:  -3: (Memo point 2)  1: morocc   5: izlude         9: yuno     13: niflheim
+ 40:  -2: (Memo point 1)  2: geffen   6: aldebaran     10: amatsu   14: louyang
+ 40:  -1: (Memo point 0)  3: payon    7: xmas (lutie)  11: gonryun  15: start point
+ 40:   0: prontera        4: alberta  8: comodo        12: umbala   16: prison/jail
+ 40: 
+ 60:@alive - Revives yourself from death
+ 40:@heal [<HP> <SP>] - Heals the desired amount of HP and SP. No value specified will do a full heal.
+ 40:
+ 60:@blvl <number of levels> - Raises your base level the desired number of levels. The max is 255 (User Defined).
+ 60:@jlvl <number of levels> -Raises your job level the desired number of levels. The max is 50 For Basic Classes. For Super Novice and Advanced Classes it is 70.
+ 60:@allskills - Give you all skills.
+ 80:@option <param1> <param2> <param3> - Adds different visual effects on or around your character
+ 80:	<param1>      <param2>      <p3>(stackable)   <param3>               <param3>
+ 80:	1 Petrified   (stackable)   01 Sight           32 Peco Peco riding   2048 Orc Head
+ 80:	2 Frozen      01 Poison     02 Hide            64 GM Perfect Hide    4096 Wedding Sprites
+ 80:	3 Stunned     02 Cursed     04 Cloak          128 Level 2 Cart       8192 Ruwach
+ 80:	4 Sleeping    04 Silenced   08 Level 1 Cart   256 Level 3 Cart
+ 80:	6 darkness    08 ???        16 Falcon         512 Level 4 Cart
+ 80:	              16 darkness                    1024 Level 5 Cart
+ 99:@mountpeco - Give/remove you a peco (Class is required, but not skill)
+ 99:@disguise <monster_name_or_monster_ID> - Change your appearence to other players to a mob.
+ 99:@undisguise - Restore your normal appearance.
+ 99:@model <hair ID: 0-17> <hair color: 0-8> <clothes color: 0-4> - Changes your characters appearence.
+ 40:@dye/@ccolor <clothes color: 0-4> - Changes your characters appearence (only clothes color).
+ 40:@hairstyle <hair ID: 0-17> - Changes your characters appearence (only hair style).
+ 40:@haircolor <hair color: 0-8> - Changes your characters appearence (only hair color).
+ 40:@speed <1-1000> - Changes you walking speed. 1 being the fastest and 1000 the slowest. Default 150.
+ 99:@effect <effect_id> [flag] - Give an efect to your character.
+ 60:@dropall - throws all your possession on the ground
+ 60:@storeall - puts all your possessions in storage
+ 60:@killable - make your character killable
+ 60:@stpoint <number of points> - Gives you the desired number of stat points.
+ 60:@skpoint <number of points> - Gives you the desired number of skill points.
+ 80:@zeny <amount> - Gives you desired amount of Zeny.
+ 60:@str,@agi,@vit,@int,@dex,@luk <amount> - Adds desired amount to any stat. For example "@str 10" raises your str by 10
+ 60:@allstats [value] - Adds value in all stats (maximum if no value).
+ 99:@memo [memo_position] - set/change a memo location (no position: display memo points).
+ 99:@questskill <#> - Gives you the specified quest skill
+ 80:@lostskill <#> - Takes away the specified quest skill from you
+ 60:@skillid <name> - look up a skill by name
+ 60:@useskill <skillid> <skillv> <target> - use a skill on target
+ 80:@addwarp <map name> <x coord> <y coord>
+ 60: 
+ 60:--- MONSTERS CMD ---
+ 60:@spawn <monster_name_or_monster_ID> [<number to spawn> [<x coord> [<y coord>]]]
+ 60:@summon <monster_name_or_monster_ID> [<number to spawn> [<desired_monster_name> [<x coord> [<y coord>]]]]
+ 60:@killmonster [map] - kill all monsters of the map (they drop)
+ 60:@killmonster2 - kill all monsters of your map (without drops)
+ 40: 
+ 40:--- ITEMS CMD ---
+ 40:@storage - Opens storage
+ 99:@gstorage - Opens guild storage
+ 80:@item <item name or ID> <quantity> - Gives you the desired item.
+ 40:@itemreset - Remove all your items.
+ 80:@itemcheck - Check your items with authorised items.
+ 80:@idsearch <part_of_item_name> - Search all items that name have part_of_item_name
+ 60:@produce <equip name or equip ID> <element> <# of very's>
+ 60:	Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind
+ 60:	It has separately with fragment 3 of the attribute + stars, you can apply.
+ 60: 
+ 60:--- PVP CMD ---
+ 60:@pvpon - Turns pvp on on the current map
+ 60:@pvpoff - Turns pvp off on the current map
+ 99:@gvgon/@gpvpon - Turns gvg on on the current map
+ 99:@gvgoff/@gpvpoff - Turns gvg off on the current map
+ 99:@agitstart - Starts War of Emperium
+ 99:@agitend - End War of Emperium
+ 99: 
+ 99:--- GROUPS CMD ---
+ 99:@party <party_name> - Create a party.
+ 99:@guild <guild_name> - Create a guild.
+ 99:@guildlvl <# of levels> - Raise Guild by desired number of levels
+ 99:@guildrecall <guild_name/id> - Warps all online characters of a guild to you.
+ 99:@partyrecall <party_name/id> - Warps all online characters of a party to you.
+ 40: 
+ 40:--- REMOTE CHAR CMD ---
+ 60:@kill <char name> - Kills specified character.
+ 60:@charkillable <char name> - make another character killable
+ 60:@chardropall <char name> - throws all a chars possession on the ground
+ 60:@charstoreall <char name> - puts all of anothers charactes possessions in storage
+ 60:@recall <char name> - Warps target character to you.
+ 80:@recallall - Warps every character online to you.
+ 60:@charwarp <mapname> <x> <y> <char name> - Warps character to location of choice
+ 60:@revive <char name> - Revives target character.
+ 40:@charstats <char name> - Displays a characters stats.
+ 99:@charignorelist <char name> - Displays ignore list of the player
+ 60:@inall <char name> - Allows all wispers for the player
+ 60:@exall <char name> - Blocks all wispers for the player
+ 80:@charoption <param1> <param2> <param3> <charname> - Like @option command but only to target character.
+ 99:@charmountpeco <charname> - Give/remove to a player a peco (Class is required, but not skill).
+ 60:@charsave <map> <x> <y> <charname> - Changes the target players respawn point.
+ 60:@charblvl <#> <nickname> - Change a characters base level.
+ 60:@charjlvl <#> <nickname> - Change a characters job level.
+ 80:@charzeny <amount> <name> - Give/take a players Zeny
+ 60:@charstpoint <amount> <name> - Give/take a players stat points
+ 60:@charskpoint <amount> <name> - give/take a players skill points
+ 60:@charskreset <charname> - Reset skills of a character.
+ 60:@charstreset <charname> - Reset stats of a character.
+ 60:@charreset <charname> - Reset stats AND skills of a character.
+ 99:@charquestskill <#> <charname> - Gives to a player the specified quest skill.
+ 99:@charlostskill <#> <charname> - Takes away the specified quest skill from the player.
+ 60:@chardelitem <item_name_or_ID> <quantity> <player> - Remove items from a character
+ 99:@charmodel <hair type> <hair color> <clothes color> <name> - Changes a player's model
+ 99:@chardisguise <monster_name_or_monster_ID> <char name> - Changes disguise of a player
+ 99:@charundisguise <char name> - Cancels disguise of a player
+ 60:@charchangesex <name> - Changes sex of a player (all characters of the account)
+ 60:@block <name> - Blocks definitively a account
+ 60:@unblock <name> - Unblocks a account
+ 60:@ban <time> <name> - Ban temporarily a account
+ 60:	time usage: adjustement (+/- value) and element (y/a, m, d/j, h, mn, s)
+ 60:	Example: @ban +1m-2mn1s-6y testplayer
+ 60:@unban <name> - Unban a account
+ 60:@jail <char_name> - Sends specified character in jails
+ 60:@unjail <char_name> - Discharges specified character/prisoner
+ 60:@trade <char_name> - Open a trade window with a another player
+ 40:@kick <charname> - Kicks specified character off the server
+ 99:@kickall - Kick all characters off the server
+ 99:@mapexit - Kick all players and shut down map-server.
+ 80:@doom - Kills all NON GM chars on the server.
+ 80:@doommap - Kills all non GM characters on the map.
+ 80:@raise - Resurrects all characters on the server.
+ 80:@raisemap - Resurrects all characters on the map.
+ 80: 
+ 80:--- ENVIRONMENT CMD ---
+ 80:@night - Uses @option 00 16 00 on all characters. All characters are in darkness.
+ 80:@day - Uses @option 00 00 00 on all characters.
+ 80:@skillon - turn skills on for a map
+ 80:@skilloff - turn skills on for a map
+ 80: 
+ 80:--- ADMIN CMD ---
+ 99:@reloaditemdb - Reload item database (admin command)
+ 99:@reloadmobdb - Reload monster database (admin command)
+ 99:@reloadskilldb - Reload skills definition database (admin command)
+ 99:@reloadscript - Reload all scripts (admin command)
+ 99:@reloadgmdb - Reload GM levels (admin command)
+ 99:@adjgmlvl - Do a temporary adjustment of the GM level of a player (admin command)
+ 99:@adjcmdlvl - Do a temporary adjustment of the GM level of a command (admin command)
+ 80:@enablenpc <NPC_name> - Enable a NPC (admin command)
+ 80:@disablenpc <NPC_name> - Disable a NPC (admin command)
+ 80:@npcmove
+ 80: 
+ 99:@gat - For debugging (you inspect around gat)
+ 99:@packet - For debugging (packet variety)
+ 99: 
+100:@GM <password> - it becomes GM!
diff --git a/db/mob_db.txt b/db/mob_db.txt
index cc2abb82..4e19fcc7 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -35,4 +35,4 @@
 1035,Silkworm,Silkworm,20,1,0,0,1,1,0,0,2,10,20,11,10,10,40,10,1,1,1,0,20,129,1300,1100,672,480,718,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,40
 // ,Zombie,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 1037,CloverPatch,Clover Patch,1,1,0,0,1,1,0,0,0,5,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,742,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
-1038,Squirrel,Squirrel,15,160,1,0,1,1,15,25,1,6,1,3,1,0,15,40,1,1,1,3,20,129,800,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0
+1038,Squirrel,Squirrel,15,160,1,0,1,1,15,25,1,6,1,3,1,0,15,40,1,1,1,3,20,129,800,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,1,15
diff --git a/npc/001-1_Tulimshar/banker.txt b/npc/001-1_Tulimshar/banker.txt
index 4fc05f62..c428e6e8 100644
--- a/npc/001-1_Tulimshar/banker.txt
+++ b/npc/001-1_Tulimshar/banker.txt
@@ -1,5 +1,13 @@
+//
+
 001-1.gat,57,52,0	script	Tybalt	107,{
 	set @npcName$, "Tybalt";
 	callfunc "Banker";
 	close;
 }
+
+001-1.gat,51,29,0	script	Achar	49,{
+	openstorage;
+	mes "Come again!";
+	close;
+}
diff --git a/npc/009-2_Hurnscald/richard.txt b/npc/009-2_Hurnscald/richard.txt
index 6020569c..1710ca45 100644
--- a/npc/009-2_Hurnscald/richard.txt
+++ b/npc/009-2_Hurnscald/richard.txt
@@ -1,7 +1,13 @@
 //
 
-009-2.gat,20, 99,0	script	Richard	161,{
+009-2.gat,20,99,0	script	Richard	161,{
 	set @npcName$, "Richard";
 	callfunc "Banker";
 	close;
 }
+
+009-2.gat,19,99,0	script	William	48,{
+	openstorage;
+	mes "Come again!";
+	close;
+}