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

3 files changed, 15 insertions, 283 deletions

diff --git a/conf-tmpl/GM_account.txt b/conf-tmpl/GM_account.txt
index a7acfa038..ea41ab682 100644
--- a/conf-tmpl/GM_account.txt
+++ b/conf-tmpl/GM_account.txt
@@ -1,35 +1,12 @@
-// GMとして認識するアカウントIDを設定
-// <account ID> <level>
-// <GMのアカウントID> <GMのレベル>
-// GMのレベルは0以下は無視で最大は99
-704554 99
-704555 1
-704556 1
-704557 1
-704558 1
-704559 1
-704560 1
-704561 1
-704562 1
-704563 1
-704564 1
-704565 1
-704566 1
-704567 1
-704568 1
-704569 1
-704570 1
-704571 1
-704572 1
-704573 1
-704574 1
-704575 1
-704576 1
-704577 1
-704578 1
-704579 1
-704580 1
-704581 1
-704582 1
-704583 1
-794584 1
+// eAthena's GM Accounts File
+// Edited by MC Cameri to enable account id ranges
+// Changing this file while login server is running 
+// Usage #1(Standard): <account id> <level>
+// Usage #2(Range): <beginning of range[-:~]end of range> <level>
+// Examples:
+// 2000002 99
+// 2000003-2000005 99
+// 2000003~2000005 99
+// 704585 30
+
+704554-704584 99
diff --git a/conf-tmpl/charcommand_athena.conf b/conf-tmpl/charcommand_athena.conf
index 729215dc5..1d55c0d98 100644
--- a/conf-tmpl/charcommand_athena.conf
+++ b/conf-tmpl/charcommand_athena.conf
@@ -1,10 +1,10 @@
 // Athena charcommand Configuration file.

-// Translated by Peter Kieser <pfak@telus.net>

+// Created by MC Cameri for eAthena

 

 // Set here the symbol that you want to use for your commands

 // Only 1 character is get (default is '#'). You can set any character,

 // except control-character (0x00-0x1f), '%' (party chat speaking) and '/' (standard ragnarok GM commands)

-// With default character, all commands begin by a '#': <example> #revive

+// With default character, all commands begin by a '#', example: #revive

 command_symbol: #

 

 job: 60

diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index a485c4d1f..e9253f20d 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -11,487 +11,246 @@
 // Messages of GM commands
 // -----------------------
 
-//0: Warped.
 0: Warped.
-//1: Map not found.
 1: Map not found.
-//2: Coordinates out of range.
 2: Coordinates out of range.
-//3: Character not found.
 3: Character not found.
-//4: Jump to %s
 4: Jump to %s
-//5: Jump to %d %d
 5: Jump to %d %d
-//6: Character data respawn point saved.
 6: Character data respawn point saved.
-//7: Warping to respawn point.
 7: Warping to respawn point.
-//8: Speed changed.
 8: Speed changed.
-//9: Options changed.
 9: Options changed.
-//10: Invisible: Off
 10: Invisible: Off
-//11: Invisible: On
 11: Invisible: On
-//12: Your job has been changed.
 12: Your job has been changed.
-//13: A pity! You've died.
 13: A pity! You've died.
-//14: Character killed.
 14: Character killed.
-//15: Player warped (message sends to player too).
 15: Player warped (message sends to player too).
-//16: You've been revived! It's a miracle!
 16: You've been revived! It's a miracle!
-//17: HP, SP recovered.
 17: HP, SP recovered.
-//18: Item created.
 18: Item created.
-//19: Invalid item ID or name.
 19: Invalid item ID or name.
-//20: All of your items have been removed.
 20: All of your items have been removed.
-//21: Base level raised.
 21: Base level raised.
-//22: Base level lowered.
 22: Base level lowered.
-//23: Job level can't go any higher.
 23: Job level can't go any higher.
-//24: Job level raised.
 24: Job level raised.
-//25: Job level lowered.
 25: Job level lowered.
-//26: Help commands:
 26: Help commands:
-//27: File help.txt not found.
 27: File help.txt not found.
-//28: No player found.
 28: No player found.
-//29: 1 player found.
 29: 1 player found.
-//30: %d players found.
 30: %d players found.
-//31: PvP: Off.
 31: PvP: Off.
-//32: PvP: On.
 32: PvP: On.
-//33: GvG: Off.
 33: GvG: Off.
-//34: GvG: On.
 34: GvG: On.
-//35: You can't use this command with this class.
 35: You can't use this command with this class.
-//36: Appearence changed.
 36: Appearence changed.
-//37: An invalid number was specified.
 37: An invalid number was specified.
-//38: Invalid location number or name.
 38: Invalid location number or name.
-//39: All monster summoned!
 39: All monster summoned!
-//40: Invalid monster ID or name.
 40: Invalid monster ID or name.
-//41: Impossible to decrease the number/value.
 41: Impossible to decrease the number/value.
-//42: Stat changed.
 42: Stat changed.
-//43: You're not in a guild.
 43: You're not in a guild.
-//44: You're not the master of your guild.
 44: You're not the master of your guild.
-//45: Guild level change failed.
 45: Guild level change failed.
-//46: %s recalled!
 46: %s recalled!
-//47: Base level can't go any higher.
 47: Base level can't go any higher.
-//48: Character's job changed.
 48: Character's job changed.
-//49: Invalid job ID.
 49: Invalid job ID.
-//50: You already have some GM powers.
 50: You already have some GM powers.
-//51: Character revived.
 51: Character revived.
-//52: This option cannot be used in PK Mode.
 52: This option cannot be used in PK Mode.
-//53: '%s' stats:
 53: '%s' stats:
-//54: No player found in map '%s'.
 54: No player found in map '%s'.
-//55: 1 player found in map '%s'.
 55: 1 player found in map '%s'.
-//56: %d players found in map '%s'.
 56: %d players found in map '%s'.
-//57: Character's respawn point changed.
 57: Character's respawn point changed.
-//58: Character's options changed.
 58: Character's options changed.
-//59: Night has fallen.
 59: Night has fallen.
-//60: Day has arrived.
 60: Day has arrived.
-//61: The holy messenger has given judgement.
 61: The holy messenger has given judgement.
-//62: Judgement was made.
 62: Judgement was made.
-//63: Mercy has been shown.
 63: Mercy has been shown.
-//64: Mercy has been granted.
 64: Mercy has been granted.
-//65: Character's base level raised.
 65: Character's base level raised.
-//66: Character's base level lowered.
 66: Character's base level lowered.
-//67: Character's job level can't go any higher.
 67: Character's job level can't go any higher.
-//68: character's job level raised.
 68: character's job level raised.
-//69: Character's job level lowered.
 69: Character's job level lowered.
-//70: You have learned the skill.
 70: You have learned the skill.
-//71: You have forgotten the skill.
 71: You have forgotten the skill.
-//72: Guild siege warfare start!
 72: Guild siege warfare start!
-//73: Already it has started siege warfare.
 73: Already it has started siege warfare.
-//74: Guild siege warfare end!
 74: Guild siege warfare end!
-//75: Siege warfare hasn't started yet.
 75: Siege warfare hasn't started yet.
-//76: You have received all skills.
 76: You have received all skills.
-//77: The reference result of '%s' (name: id):
 77: The reference result of '%s' (name: id):
-//78: %s: %d
 78: %s: %d
-//79: It is %d affair above.
 79: It is %d affair above.
-//80: Give a display name and monster name/id please.
 80: Give a display name and monster name/id please.
-//81: Your GM level don't authorise you to do this action on this player.
 81: Your GM level don't authorise you to do this action on this player.
-//82: Please, use one of this number/name:
 82: Please, use one of this number/name:
-//83: Cannot spawn emperium.
 83: Cannot spawn emperium.
-//84: All stats changed!
 84: All stats changed!
-//85: Invalid time for ban command.
 85: Invalid time for ban command.
-//86: Sorry, but a player name have at least 4 characters.
 86: Sorry, but a player name have at least 4 characters.
-//87: Sorry, but a player name have 23 characters maximum.
 87: Sorry, but a player name have 23 characters maximum.
-//88: Character name sends to char-server to ask it.
 88: Character name sends to char-server to ask it.
-//89: Sorry, it's already the night. Impossible to execute the command.
 89: Sorry, it's already the night. Impossible to execute the command.
-//90: Sorry, it's already the day. Impossible to execute the command.
 90: Sorry, it's already the day. Impossible to execute the command.
-//91: Character's base level can't go any higher.
 91: Character's base level can't go any higher.
-//92: All characters recalled!
 92: All characters recalled!
-//93: All online characters of the %s guild are near you.
 93: All online characters of the %s guild are near you.
-//94: Incorrect name/ID, or no one from the guild is online.
 94: Incorrect name/ID, or no one from the guild is online.
-//95: All online characters of the %s party are near you.
 95: All online characters of the %s party are near you.
-//96: Incorrect name or ID, or no one from the party is online.
 96: Incorrect name or ID, or no one from the party is online.
-//97: Item database reloaded.
 97: Item database reloaded.
-//98: Monster database reloaded.
 98: Monster database reloaded.
-//99: Skill database reloaded.
 99: Skill database reloaded.
-//100: Scripts reloaded.
 100: Scripts reloaded.
-//101: Login-server asked to reload GM accounts and their level.
 101: Login-server asked to reload GM accounts and their level.
-//102: Mounted Peco.
 102: Mounted Peco.
-//103: No longer spying on the %s guild.
 103: No longer spying on the %s guild.
-//104: Spying on the %s guild.
 104: Spying on the %s guild.
-//105: No longer spying on the %s party.
 105: No longer spying on the %s party.
-//106: Spying on the %s party.
 106: Spying on the %s party.
-//107: All items have been repaired.
 107: All items have been repaired.
-//108: No item need to be repaired.
 108: No item need to be repaired.
-//109: Player has been nuked!
 109: Player has been nuked!
-//110: Npc Enabled.
 110: Npc Enabled.
-//111: This NPC doesn't exist.
 111: This NPC doesn't exist.
-//112: Npc Disabled.
 112: Npc Disabled.
-//113: %d item(s) removed by a GM.
 113: %d item(s) removed by a GM.
-//114: %d item(s) removed from the player.
 114: %d item(s) removed from the player.
-//115: %d item(s) removed. Player had only %d on %d items.
 115: %d item(s) removed. Player had only %d on %d items.
-//116: Character does not have the item.
 116: Character does not have the item.
-//117: GM has send you in jails.
 117: GM has send you in jails.
-//118: Player warped in jails.
 118: Player warped in jails.
-//119: This player is not in jails.
 119: This player is not in jails.
-//120: GM has discharge you.
 120: GM has discharge you.
-//121: Player warped to Prontera.
 121: Player warped to Prontera.
-//122: Disguise applied.
 122: Disguise applied.
-//123: Monster/NPC name/id hasn't been found.
 123: Monster/NPC name/id hasn't been found.
-//124: Undisguise applied.
 124: Undisguise applied.
-//125: You're not disguised.
 125: You're not disguised.
-//126: You accept any wisp (no wisper is refused).
 126: You accept any wisp (no wisper is refused).
-//127: You accept any wisp, except thoses from %d player(s):
 127: You accept any wisp, except thoses from %d player(s):
-//128: You refuse all wisps (no specifical wisper is refused).
 128: You refuse all wisps (no specifical wisper is refused).
-//129: You refuse all wisps, AND refuse wisps from %d player(s):
 129: You refuse all wisps, AND refuse wisps from %d player(s):
-//130: '%s' accept any wisp (no wisper is refused).
 130: '%s' accept any wisp (no wisper is refused).
-//131: '%s' accept any wisp, except thoses from %d player(s):
 131: '%s' accept any wisp, except thoses from %d player(s):
-//132: '%s' refuse all wisps (no specifical wisper is refused).
 132: '%s' refuse all wisps (no specifical wisper is refused).
-//133: '%s' refuse all wisps, AND refuse wisps from %d player(s):
 133: '%s' refuse all wisps, AND refuse wisps from %d player(s):
-//134: '%s' already accepts all wispers.
 134: '%s' already accepts all wispers.
-//135: '%s' now accepts all wispers.
 135: '%s' now accepts all wispers.
-//136: A GM has authorised all wispers for you.
 136: A GM has authorised all wispers for you.
-//137: '%s' already blocks all wispers.
 137: '%s' already blocks all wispers.
-//138: '%s' blocks now all wispers.
 138: '%s' blocks now all wispers.
-//139: A GM has blocked all wispers for you.
 139: A GM has blocked all wispers for you.
-//140: Character's disguise applied.
 140: Character's disguise applied.
-//141: Character's undisguise applied.
 141: Character's undisguise applied.
-//142: Character is not disguised.
 142: Character is not disguised.
-//143: Give a monster name/id please.
 143: Give a monster name/id please.
-//144: Invalid actual email. If you have default e-mail, type a@a.com.
 144: Invalid actual email. If you have default e-mail, type a@a.com.
-//145: Invalid new email. Please enter a real e-mail.
 145: Invalid new email. Please enter a real e-mail.
-//146: New email must be a real e-mail.
 146: New email must be a real e-mail.
-//147: New email must be different of the actual e-mail.
 147: New email must be different of the actual e-mail.
-//148: Information sended to login-server via char-server.
 148: Information sended to login-server via char-server.
-//149: Impossible to increase the number/value.
 149: Impossible to increase the number/value.
-//150: No GM found.
 150: No GM found.
-//151: 1 GM found.
 151: 1 GM found.
-//152: %d GMs found.
 152: %d GMs found.
-//153: %s is Unknown Command.
 153: %s is Unknown Command.
-//154: %s failed.
 154: %s failed.
-//155: Impossible to change your job.
 155: Impossible to change your job.
-//156: HP or/and SP modified.
 156: HP or/and SP modified.
-//157: HP and SP are already with the good value.
 157: HP and SP are already with the good value.
-//158: Base level can't go any lower.
 158: Base level can't go any lower.
-//159: Job level can't go any lower.
 159: Job level can't go any lower.
-//160: PvP is already Off.
 160: PvP is already Off.
-//161: PvP is already On.
 161: PvP is already On.
-//162: GvG is already Off.
 162: GvG is already Off.
-//163: GvG is already On.
 163: GvG is already On.
-//164: Your memo point #%d doesn't exist.
 164: Your memo point #%d doesn't exist.
-//165: All monsters killed!
 165: All monsters killed!
-//166: No item has been refined!
 166: No item has been refined!
-//167: 1 item has been refined!
 167: 1 item has been refined!
-//168: %d items have been refined!
 168: %d items have been refined!
-//169: This item (%d: '%s') is not an equipment.
 169: This item (%d: '%s') is not an equipment.
-//170: This item is not an equipment.
 170: This item is not an equipment.
-//171: %d - void
 171: %d - void
-//172: You replace previous memo position %d - %s (%d,%d).
 172: You replace previous memo position %d - %s (%d,%d).
-//173: Note: you don't have the 'Warp' skill level to use it.
 173: Note: you don't have the 'Warp' skill level to use it.
-//174: Number of status points changed!
 174: Number of status points changed!
-//175: Number of skill points changed!
 175: Number of skill points changed!
-//176: Number of zenys changed!
 176: Number of zenys changed!
-//177: Impossible to decrease a stat.
 177: Impossible to decrease a stat.
-//178: Impossible to increase a stat.
 178: Impossible to increase a stat.
-//179: Guild level changed.
 179: Guild level changed.
-//180: The monter/egg name/id doesn't exist.
 180: The monter/egg name/id doesn't exist.
-//181: You already have a pet.
 181: You already have a pet.
-//182: Pet friendly value changed!
 182: Pet friendly value changed!
-//183: Pet friendly is already the good value.
 183: Pet friendly is already the good value.
-//184: Sorry, but you have no pet.
 184: Sorry, but you have no pet.
-//185: Pet hungry value changed!
 185: Pet hungry value changed!
-//186: Pet hungry is already the good value.
 186: Pet hungry is already the good value.
-//187: You can now rename your pet.
 187: You can now rename your pet.
-//188: You can already rename your pet.
 188: You can already rename your pet.
-//189: This player can now rename his/her pet.
 189: This player can now rename his/her pet.
-//190: This player can already rename his/her pet.
 190: This player can already rename his/her pet.
-//191: Sorry, but this player has no pet.
 191: Sorry, but this player has no pet.
-//192: Impossible to change the character's job.
 192: Impossible to change the character's job.
-//193: Character's base level can't go any lower.
 193: Character's base level can't go any lower.
-//194: Character's job level can't go any lower.
 194: Character's job level can't go any lower.
-//195: All players have been kicked!
 195: All players have been kicked!
-//196: You already have this quest skill.
 196: You already have this quest skill.
-//197: This skill number doesn't exist or isn't a quest skill.
 197: This skill number doesn't exist or isn't a quest skill.
-//198: This skill number doesn't exist.
 198: This skill number doesn't exist.
-//199: This player has learned the skill.
 199: This player has learned the skill.
-//200: This player already has this quest skill.
 200: This player already has this quest skill.
-//201: You don't have this quest skill.
 201: You don't have this quest skill.
-//202: This player has forgotten the skill.
 202: This player has forgotten the skill.
-//203: This player doesn't have this quest skill.
 203: This player doesn't have this quest skill.
-//204: WARNING: more than 1000 spiritballs can CRASH your server and/or client!
 204: WARNING: more than 1000 spiritballs can CRASH your server and/or client!
-//205: You already have this number of spiritballs.
 205: You already have this number of spiritballs.
-//206: '%s' skill points reseted!
 206: '%s' skill points reseted!
-//207: '%s' stats points reseted!
 207: '%s' stats points reseted!
-//208: '%s' skill and stats points reseted!
 208: '%s' skill and stats points reseted!
-//209: Character's number of skill points changed!
 209: Character's number of skill points changed!
-//210: Character's number of status points changed!
 210: Character's number of status points changed!
-//211: Character's number of zenys changed!
 211: Character's number of zenys changed!
-//212: Cannot mount a Peco while in disguise.
 212: Cannot mount a Peco while in disguise.
-//213: You can not mount a peco with your job.
 213: You can not mount a peco with your job.
-//214: Unmounted Peco.
 214: Unmounted Peco.
-//215: This player cannot mount a Peco while in disguise.
 215: This player cannot mount a Peco while in disguise.
-//216: Now, this player mounts a peco.
 216: Now, this player mounts a peco.
-//217: This player can not mount a peco with his/her job.
 217: This player can not mount a peco with his/her job.
-//218: Now, this player has not more peco.
 218: Now, this player has not more peco.
-//219: %d day
 219: %d day
-//220: %d days
 220: %d days
-//221: %s %d hour
 221: %s %d hour
-//222: %s %d hours
 222: %s %d hours
-//223: %s %d minute
 223: %s %d minute
-//224: %s %d minutes
 224: %s %d minutes
-//225: %s and %d second
 225: %s and %d second
-//226: %s and %d seconds
 226: %s and %d seconds
-//227: Cannot wear disguise while riding a Peco.
 227: Cannot wear disguise while riding a Peco.
-//228: Character cannot wear disguise while riding a Peco.
 228: Character cannot wear disguise while riding a Peco.
-//229: Your Effect Has Changed.
 229: Your Effect Has Changed.
-//230: Server time (normal time): %A, %B %d %Y %X.
 230: Server time (normal time): %A, %B %d %Y %X.
-//231: Game time: The game is in permanent daylight.
 231: Game time: The game is in permanent daylight.
-//232: Game time: The game is in permanent night.
 232: Game time: The game is in permanent night.
-//233: Game time: The game is actualy in night for %s.
 233: Game time: The game is actualy in night for %s.
-//234: Game time: After, the game will be in permanent daylight.
 234: Game time: After, the game will be in permanent daylight.
-//235: Game time: The game is actualy in daylight for %s.
 235: Game time: The game is actualy in daylight for %s.
-//236: Game time: After, the game will be in permanent night.
 236: Game time: After, the game will be in permanent night.
-//237: Game time: After, the game will be in night for %s.
 237: Game time: After, the game will be in night for %s.
-//238: Game time: A day cycle has a normal duration of %s.
 238: Game time: A day cycle has a normal duration of %s.
-//239: Game time: After, the game will be in daylight for %s.
 239: Game time: After, the game will be in daylight for %s.
-//240: %d monster(s) summoned!
 240: %d monster(s) summoned!
 241: you be a killa..
 242: you gonna be own3d..
@@ -502,11 +261,7 @@
 // Messages of others (not for GM commands)
 // ----------------------------------------
 
-//500: Actually, it's the night...
 500: Actually, it's the night...
-//501: Your account time limit is: %d-%m-%Y %H:%M:%S.
 501: Your account time limit is: %d-%m-%Y %H:%M:%S.
-//502: The day has arrived!
 502: The day has arrived!
-//503: The night has fallen...
-503: The night has fallen...
+503: The night has fallen...
\ No newline at end of file