1 files changed, 42 insertions, 37 deletions
diff --git a/conf-tmpl/help2.txt b/conf-tmpl/help2.txt
index 8d9fd1edb..a79262aeb 100644
--- a/conf-tmpl/help2.txt
+++ b/conf-tmpl/help2.txt
@@ -1,10 +1,8 @@
+  0:To use one command, type it inside the message window where you usually type to chat.
   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> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4> - Gives you the desired item.
  40:@itemreset - Remove all your items.
+ 50:@gstorage - Opens guild storage
  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>
@@ -12,6 +10,9 @@
  60:	Element: 0=None 1=Ice 2=Earth 3=Fire 4=Wind
  60:	You can add up to 3 Star Crumbs and 1 element
  60:@repairall - Repair all items of your inventory
+ 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> <identified_flag> <refine> <broken_flag> <Card1> <Card2> <Card3> <Card4> - Gives you the desired item.
  40: 
  40:--- PVP CMD ---
  40:@pvpon - Turns pvp on on the current map
@@ -29,62 +30,66 @@
  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
+  1:@petrename - Re-enable pet rename
+ 10:@pettalk [Message] - Makes your pet say a message.
  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
+ 60:@hatch - Create a pet from your inventory eggs list.
+ 60:@makeegg <pet_id> - Gives pet egg for monster number in pet DB
  20: 
  20:--- REMOTE CHAR CMD ---
- 60:@kill <char name> - Kills specified character.
+ 20:@kick <char name> - Kicks specified character off the server
  40:@charkillable <char name> - make another character killable
- 60:@nuke <char name> - Kills specified character (nuclear effect).
+ 60:@unjail/@discharge <char name> - Discharges specified character/prisoner
+ 60:@kill <char name> - Kills specified character.
  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:@revive <char name> - Revives target character.
- 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:@charblock/@block <name> - Blocks definitively a account
- 60:@charunblock/@unblock <name> - Unblocks a account
+ 60:@charblock/@block <char name> - Blocks definitively a account
+ 60:@charunblock/@unblock <char 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.
+ 60:@jail <char name> - Sends specified character in jails
+ 60:@trade <char name> - Open a trade window with a another player
+ 80:@recallall - Warps every character online to you.
  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:@shownpc <NPC_name> - Enable a NPC (admin command)
- 80:@hidenpc <NPC_name> - Disable a NPC (admin command)
- 80:@loadnpc <path_to_script> - Load script (admin command)
- 80:@unloadnpc <NPC_name> - Unload script (admin command)
+ 99:@rain - Makes all maps to have the rain weather effect.
+ 99:@snow - Makes all maps to have the snow weather effect.
+ 99:@clouds - Makes all maps to have the cloudy weather effect.
+ 99:@clouds2 - Makes all maps to have another cloudy weather effect.
+ 99:@fog - Makes all maps to have the fog weather effect.
+ 99:@fireworks - Makes all maps to have the fireworks weather effect.
+ 99:@sakura - Makes all maps to have the sakura weather effect.
+ 99:@leaves - Makes all maps to have the leaves weather effect.
  80: 
+ 80:--- ADMIN CMD ---
+ 80:@shownpc <NPC name> - Enable a NPC
+ 80:@hidenpc <NPC name> - Disable a NPC
+ 80:@loadnpc <path to script> - Load script
+ 80:@unloadnpc <NPC name> - Unload script
+ 99:@adjgmlvl <level> <char name> - Do a temporary adjustment of the GM level of a player
+ 99:@adjcmdlvl <level> <command> - Do a temporary adjustment of the GM level of a command
+ 99:@kickall - Kick all characters off the server
+ 99:@mapexit - Kick all players and shut down map-server.
+ 99:@reloaditemdb - Reload item database.
+ 99:@reloadmobdb - Reload monster database.
+ 99:@reloadskilldb - Reload skills definition database.
+ 99:@reloadscript - Reload all scripts.
+ 99:@reloadgmdb - Reload GM levels.
+ 99: 
  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)
-\ No newline at end of file
+100:@nuke <char name> -
+100:@GM <password> - it becomes GM! (password is set in login_athena.conf)
+\ No newline at end of file