-Add some src basic documentation.

-Change some remaining -1 for status ending timer.
-Move some hardcoded msg in msg_athena
-Small optimisation on battle_attr_fix

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16835 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 45 insertions, 8 deletions

diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index 4c4000d14..922614b12 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -6,8 +6,9 @@
 // // English message
 // msg_number: translated message
 
-//   0-499: reserved for GM commands
-// 500-999 reserved for others
+//   0-410: reserved for GM commands
+// 500-900 reserved for others
+// 900-1300 @atcommand
 
 // To disable a string (%s) field, make it's max length 0:
 // eg:
@@ -302,12 +303,13 @@
 284: Leadership transferred.
 285: You've become the party leader.
 286: There's been no change in the setting.
+287: You cannot change party leaders on this map.
 //Missing stuff for @killer related commands.
-287: Killer state reset.
 288: You are no longer killable.
 289: The player is now killable.
 290: The player is no longer killable.
 291: Weather effects will dispell on warp/refresh
+292: Killer state reset.
 // Guild Castles Number
 // --------------------
 //299: ?? Castles
@@ -373,7 +375,8 @@
 361: Duel: The duel invitation has been accepted.
 362: Duel: You can't use @reject without a duel invitation.
 363: Duel: The duel invitation has been rejected.
-364: Duel: You can't invite %s because he/she isn't on the same map. 
+364: Duel: You can't invite %s because he/she isn't on the same map.
+365: Duel: Can't use %s in duel. 
 // @duel (part 2)
 370:  -- Duels: %d/%d, Members: %d/%d, Max players: %d --
 371:  -- Duels: %d/%d, Members: %d/%d --
@@ -412,6 +415,30 @@
 405: War of Emperium SE has been ended.
 406: War of Emperium SE is currently not in progress.
 
+//chrif related
+410: Need disconnection to perform change-sex request...
+411: Your sex has been changed (need disconnection by the server)...
+412: Your account has 'Unregistered'.
+413: Your account has an 'Incorrect Password'...
+414: Your account has expired.
+415: Your account has been rejected from server.
+416: Your account has been blocked by the GM Team.
+417: Your Game's EXE file is not the latest version.
+418: Your account has been prohibited to log in.
+419: Server is jammed due to over populated.
+420: Your account has not more authorised.
+421: Your account has been totally erased.
+423: Your account has been banished until 
+424: Login-server has been asked to %s the player '%.*s'.
+425: The player '%.*s' doesn't exist.
+426: Your GM level don't authorise you to %s the player '%.*s'.
+427: Login-server is offline. Impossible to %s the player '%.*s'.
+428: block
+429: ban
+430: unblock
+431: unban
+432: change the sex of
+
 // Homunculus messages
 450: You already have a homunculus
 
@@ -589,8 +616,18 @@
 667: You're not dead.
 668: Your actual memo positions are:
 669: You broke target's weapon
-
-//670-899 free
+670: You can't leave battleground guilds.
+671: Friend already exists.
+672: Name not found in list.
+673: This action can't be performed at the moment. Please try again later.
+674: Friend removed
+675: Cannot send mails too fast!!.
+676: Alliances cannot be made during Guild Wars!
+677: Alliances cannot be broken during Guild Wars!
+678: You no longer are the Guild Master.
+679: You have become the Guild Master!
+680: You have been recovered!
+//681-899 free
 
 //------------------------------------
 // More atcommands message
@@ -640,8 +677,8 @@
 
 // @jobchange
 922: Please enter a job ID.
-
-//923-979 free (future jobs?)
+923: You can not change to this job by command.
+//924-979 free (future jobs?)
 
 // @kami
 980: Please enter a message (usage: @kami <message>).