summaryrefslogtreecommitdiff
path: root/conf-tmpl
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-07 18:00:13 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-04-07 18:00:13 +0000
commit1a348ede4934a1ba78f337ee1dffe11a699f4bef (patch)
tree883d4c1ae282fb67e1720f81c20f564499298ff4 /conf-tmpl
parent7cb0d361f1b4260b47ab1da99224332947320553 (diff)
parenta6cd6538e4271ea08dc86803e8b7e8c8f235960b (diff)
downloadhercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.tar.gz
hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.tar.bz2
hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.tar.xz
hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.zip
branch for major stability breakage
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@1440 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'conf-tmpl')
-rw-r--r--conf-tmpl/atcommand_athena.conf100
-rw-r--r--conf-tmpl/atcommand_athena.conf.orig569
-rw-r--r--conf-tmpl/battle_athena.conf216
-rw-r--r--conf-tmpl/char_athena.conf24
-rw-r--r--conf-tmpl/charcommand_athena.conf17
-rw-r--r--conf-tmpl/help.txt4
-rwxr-xr-xconf-tmpl/import/charcommand_conf.txt0
-rwxr-xr-xconf-tmpl/import/log_conf.txt0
-rw-r--r--conf-tmpl/inter_athena.conf17
-rw-r--r--conf-tmpl/ladmin_athena.conf3
-rw-r--r--conf-tmpl/log_athena.conf76
-rw-r--r--conf-tmpl/login_athena.conf41
-rw-r--r--conf-tmpl/map_athena.conf1129
-rw-r--r--conf-tmpl/mapflag/gvg.txt6
-rw-r--r--conf-tmpl/mapflag/indoors.txt8
-rw-r--r--conf-tmpl/mapflag/jail.txt4
-rw-r--r--conf-tmpl/mapflag/nobranch.txt12
-rw-r--r--conf-tmpl/mapflag/noicewall.txt10
-rw-r--r--conf-tmpl/mapflag/nomemo.txt47
-rw-r--r--conf-tmpl/mapflag/nopenalty.txt4
-rw-r--r--conf-tmpl/mapflag/nopvp.txt3
-rw-r--r--conf-tmpl/mapflag/noreturn.txt198
-rw-r--r--conf-tmpl/mapflag/nosave.txt6
-rw-r--r--conf-tmpl/mapflag/noteleport.txt22
-rw-r--r--conf-tmpl/mapflag/water.txt54
-rw-r--r--conf-tmpl/mapflag/water_height.txt5
-rw-r--r--conf-tmpl/maps_athena.conf628
-rw-r--r--conf-tmpl/msg_athena.conf50
-rw-r--r--conf-tmpl/packet_athena.conf55
-rw-r--r--conf-tmpl/readme.txt33
-rw-r--r--conf-tmpl/script_athena.conf52
-rw-r--r--conf-tmpl/water.txt54
-rw-r--r--conf-tmpl/water_height.txt68
33 files changed, 1510 insertions, 2005 deletions
diff --git a/conf-tmpl/atcommand_athena.conf b/conf-tmpl/atcommand_athena.conf
index f215d2db2..4ba317603 100644
--- a/conf-tmpl/atcommand_athena.conf
+++ b/conf-tmpl/atcommand_athena.conf
@@ -34,6 +34,8 @@ command_symbol: @
// -> can do anything, except administration commands
// 99: Administrator
// -> can do anything!
+// 100: Disabled
+// -> Commands that aren't used
//--------------------------
@@ -41,7 +43,6 @@ command_symbol: @
// Give server time. (6 same commands)
uptime: 0
-changesex: 0
time: 0
date: 0
server_date: 0
@@ -49,6 +50,11 @@ serverdate: 0
server_time: 0
servertime: 0
+// Show Monster info (rates, stats, drops, MVP stuff)
+mobinfo: 0
+monsterinfo: 0
+mi: 0
+
// Display your ignore list (people from which you ignore wisps)
ignorelist: 0
@@ -57,17 +63,6 @@ ignorelist: 0
// if you want be sure of each e-mail disable this option (value: 100)
email: 0
-// To become GM (need password; password is set in login_athena.conf).
-// special!: only a non-GM (player with gm level 0) need to have this command.
-// if you change the value, be sure of what you do!
-// To be able to create a gm with @gm, you must:
-// - give a level to level_new_gm (parameter of login_athena.conf) (not 0)
-// - enable to level 0 the @gm command (atcommand_athena.conf) (default 100) - Only level 0 can give access to this command
-// - enable gm commands to normal player (battle_athena.conf, atcommand_gm_only parameter)
-// - and normal player must give correct password when he use the @gm command (gm_pass paramter in login_athena.conf)
-gm: 100
-
-
//-------------------------
// 1: Super player commands
@@ -91,6 +86,7 @@ where: 1
// Spawns you to set points in major cities.
go: 10
+autoloot: 10
//----------------------
@@ -105,12 +101,24 @@ jumpto: 20
goto: 20
warpto: 20
+// Warp yourself to a person by PID (similar to above, cept you us the PID)
+jumptoid: 20
+jumptoid2: 20
+gotoid: 20
+gotoid2: 20
+warptoid: 20
+warptoid2: 20
+
// follow a player (including warping to them)
follow: 20
// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
kick: 20
+// Disconnects a user from the server using their PID.
+kickid: 20
+kickid2: 20
+
// Changes your apperance.
model: 20
@@ -162,7 +170,7 @@ exall: 20
broadcast: 40
// Broadcast to the map you are on (1 command + /lb, /nlb).
-local_broadcast: 40
+localbroadcast: 40
// Broadcast (with or without name).
kami: 40
@@ -260,12 +268,6 @@ save: 40
// Do some visual effect on your character
effect: 40
-// Display all items of a player
-charitemlist: 40
-
-// Display all items of a player's storage
-charstoragelist: 40
-
// Display all items of a player's cart
charcartlist: 40
@@ -287,9 +289,21 @@ useskill: 40
// What skills are required to get this skill
skilltree: 40
+// Marriage skills
+marry: 40
+divorce: 40
+rings: 40
+
// make another player killable
charkillable: 40
+// Same as above, cept uses PID.
+charkillableid: 40
+charkillableid2: 40
+
+// Play a Sound!
+sound: 40
+
//---------------------
// 50: Sub-GM+ commands
@@ -312,6 +326,11 @@ monster2: 50
// To get a peco to (un)ride for another player.
charmountpeco: 50
+// ??
+monstersmall: 50
+
+// ??
+monsterbig: 50
//----------------
// 60: GM commands
@@ -340,6 +359,7 @@ charbaselvl: 60
// Changes the sex of an online player (all characters on the account)
charchangesex: 60
+changesex: 60
// Remove items from a character
chardelitem: 60
@@ -364,9 +384,6 @@ charskreset: 60
// Saves the respawn point of another character.
charsave: 60
-// Changes another character's zenny
-charzeny: 60
-
// Levels your guild to specified level (2 same commands).
guildlvup: 60
guildlvlup: 60
@@ -385,6 +402,10 @@ itemcheck: 60
// Kill another character without hitting them.
kill: 60
+// Same as above, cept uses PID.
+killid: 60
+killid2: 60
+
// Kill all monsters in map (with drops)
killmonster: 60
@@ -404,6 +425,10 @@ produce: 60
// Warps a character to you (1 command + /recall).
recall: 60
+// Warps a character to you using their PID.
+recallid: 60
+recallid2: 60
+
// Refines all weapons in your items list.
refine: 60
@@ -413,6 +438,10 @@ repairall: 60
// Revives a character, and heals them.
revive: 60
+// Same as above, cept uses PID.
+reviveid: 60
+reviveid2: 60
+
// Warp another person to a certain map, at (x,y) coordinates (2 same commands).
rura+: 60
charwarp: 60
@@ -538,6 +567,9 @@ enablenpc: 80
// Disables a NPC.
disablenpc: 80
+// Hides a NPC.
+hidenpc: 80
+
// Move a NPC
npcmove: 80
@@ -589,6 +621,22 @@ setbattleflag: 99
// Refresh only status of players - SQL Only
refreshonline: 99
+// Re-load gm command config (admin command)
+reloadatcommand: 99
+
+// Re-load battle config (admin command)
+reloadbattleconf: 99
+
+// Re-load status database (admin command)
+reloadstatusdb: 99
+
+// Re-load player info database (admin command)
+reloadpcdb: 99
+
+// [Un]Disguise All Players
+disguiseall: 99
+undisguiseall: 99
+
//---------------------------------------------------------------
// 99: Weather effects
@@ -602,6 +650,9 @@ sakura: 99
leaves:99
+// Stop all weather effects
+clearweather: 99
+
//---------------------------------------------------------------
// 0: Mail System - SQL Only commands - Must be enabled
@@ -626,9 +677,12 @@ sendprioritymail: 80
// Delete a message.
deletemail: 0
+//---------------------------------------------------------------
+// 100: Disabled commands
+gm: 100
//---------------------
// OTHER: not a command
-//import: conf/import/atcommand_conf.txt
+import: conf/import/atcommand_conf.txt
diff --git a/conf-tmpl/atcommand_athena.conf.orig b/conf-tmpl/atcommand_athena.conf.orig
deleted file mode 100644
index 3a3e359ae..000000000
--- a/conf-tmpl/atcommand_athena.conf.orig
+++ /dev/null
@@ -1,569 +0,0 @@
-// Athena atcommand Configuration file.
-// Translated by Peter Kieser <pfak@telus.net>
-
-// 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
-command_symbol: @
-
-
-// Sets the level of the users that can use the GM commands.
-// <command name>: level
-// When battle_athena.conf has atcommand_gm_only set to no,
-// normal players (gm level 0) can use GM commands if you set 0 to the command level.
-// Max GM level is 99. If you want forbid a command to all people, set it with level 100.
-
-// Default values are set to define different GM levels like follow:
-// 0: normal player
-// -> no special advantage (only @time to know time and if at_command_gm_only is disabled)
-// 1: Super player
-// -> some (very) little advantages: storage, petrename, etc...
-// 10: Super player+
-// -> same of Super player with !go (very super player)
-// 20: Mediator
-// -> it's a GM that only need to know people, and move to their to speak with them (they can access to any command about wisps)
-// 40: Sub-GM
-// -> This GM can help a GM, and can not create item or zeny or modify a character (can have some information commands)
-// 50: Sub-GM+
-// -> This GM can change some non-important things on a character
-// 60: GM
-// -> can do almost anything (excep administration, and mass commands)
-// GM is the first level where we can modify a character with important value, create items or create zenys
-// 80: GM Chief
-// -> can do anything, except administration commands
-// 99: Administrator
-// -> can do anything!
-
-
-//--------------------------
-// 0: normal player commands
-
-// Give server time. (6 same commands)
-time: 0
-date: 0
-server_date: 0
-serverdate: 0
-server_time: 0
-servertime: 0
-
-// Display your ignore list (people from which you ignore wisps)
-ignorelist: 0
-
-// To change your (own) email (characters protection)
-// note: this command doesn't check email itself, but check structure of the email (xxx@xxx)
-// if you want be sure of each e-mail disable this option (value: 100)
-email: 0
-
-// To become GM (need password; password is set in login_athena.conf).
-// special!: only a non-GM (player with gm level 0) need to have this command.
-// if you change the value, be sure of what you do!
-// To be able to create a gm with @gm, you must:
-// - give a level to level_new_gm (parameter of login_athena.conf) (not 0)
-// - enable to level 0 the @gm command (atcommand_athena.conf) (default 100) - Only level 0 can give access to this command
-// - enable gm commands to normal player (battle_athena.conf, atcommand_gm_only parameter)
-// - and normal player must give correct password when he use the @gm command (gm_pass paramter in login_athena.conf)
-gm: 100
-
-
-//-------------------------
-// 1: Super player commands
-
-// Suicide your character.
-die: 1
-
-// Enables you to rename your pet.
-petrename: 1
-
-party: 1
-
-// Brings up your personal storage wherever you are.
-storage: 1
-
-// Locate someone on a map, returns your coordinates if the person isn't on.
-where: 1
-
-
-//---------------------------
-// 10: Super player+ commands
-
-// Spawns you to set points in major cities.
-go: 10
-
-
-//----------------------
-// 20: Mediator commands
-
-// Displays helpfile in Athena base directory (2 same commands).
-help: 20
-h: 20
-
-// Warp yourself to a person (3 same commands + /shift).
-jumpto: 20
-goto: 20
-warpto: 20
-
-// follow a player (including warping to them)
-follow: 20
-
-// Disconnects a user from the server (1 command + right click menu for GM "(name) force to quit").
-kick: 20
-
-// Changes your apperance.
-model: 20
-
-// To get a peco to (un)ride
-mountpeco: 20
-
-// Returns list of logged in characters with their position (2 same commands).
-who: 20
-whois: 20
-
-// Returns list of logged in characters with their job.
-who2: 20
-
-// Returns list of logged in characters with their party/guild.
-who3: 20
-
-// Returns list of logged in characters with their position in a specifical map.
-whomap: 20
-
-// Returns list of logged in characters with their job in a specifical map.
-whomap2: 20
-
-// Returns list of logged in characters with their party/guild in a specifical map.
-whomap3: 20
-
-// Like @who+@who2+who3, but only for GM.
-whogm: 20
-
-// Change your appearence to other players to a mob.
-disguise: 20
-
-//Restore your normal appearance.
-undisguise: 20
-
-// Display ignore list of a player (people from which the player ignore wisps)
-charignorelist: 20
-
-// Enable all wispers for a player
-inall: 20
-
-// Disable all wispers for a player
-exall: 20
-
-
-//--------------------
-// 40: Sub-GM commands
-
-// Broadcast to the whole server. Using (1 command + /nb, /b).
-broadcast: 40
-
-// Broadcast to the map you are on (1 command + /lb, /nlb).
-local_broadcast: 40
-
-// Broadcast (with or without name).
-kami: 40
-kamib: 40
-
-// Enables you to go to a certain map, at (x,y) coordinates. (@mapmove + /mm or /mapmove)
-mapmove: 40
-
-// Enables you to view other characters stats.
-charstats: 40
-
-// Shows Stats Of All Characters Online
-charstatsall: 40
-
-// Enables GVG on a map (2 same commands).
-gvgon: 40
-gpvpon: 40
-
-// Turns GVG (Guild v. Guild) off on a map (2 same commands).
-gvgoff: 40
-gpvpoff: 40
-
-// Heals a person to full HP/SP.
-heal: 40
-
-// GM Hide (enables you to be invisible to characters, and most monsters) (1 command + /hide).
-hide: 40
-
-// Changes your job to one you specify (2 same commands).
-job: 40
-jobchange: 40
-
-// Enables you to to jump randomly on a map (that you are already on).
-jump: 40
-
-// Warps you to your last save point (2 same commands).
-return: 40
-load: 40
-
-// Enables lost skills.
-lostskill: 40
-
-// Saves a warp point.
-memo: 40
-
-// Set your character display options. (Visual effects of your character)
-option: 40
-
-//Makes an egg
-makeegg: 40
-
-//Hatches an egg
-hatch: 40
-
-// Sets the level of intemecy of your pet.
-petfriendly: 40
-
-// Sets hunger level of your pet.
-pethungry: 40
-
-// Turns PVP (Person v. Person) off on a map.
-pvpoff: 40
-
-// Enables PVP on a map.
-pvpon: 40
-
-// Enables platinum skills.
-questskill: 40
-
-// Sets the speed you can walk/attack at. Default is 150.
-speed: 40
-
-// Enables spirit sphere balls.
-spiritball: 40
-
-// Warp yourself to a certain map, at (x,y) coordinates (2 same commands).
-rura: 40
-warp: 40
-
-// Changes GM clothes color (2 same commands)
-dye: 40
-ccolor: 40
-
-// Changes GM hair style (2 same commands)
-hairstyle: 40
-hstyle: 40
-
-// Changes GM hair color (2 same commands)
-haircolor: 40
-hcolor: 40
-
-// Deletes all your items.
-itemreset: 40
-
-// Kill all monsters in map (without drops)
-killmonster2: 40
-
-// Sets your spawn point (aka save point).
-save: 40
-
-// Do some visual effect on your character
-effect: 40
-
-// Display all items of a player
-charitemlist: 40
-
-// Display all items of a player's storage
-charstoragelist: 40
-
-// Display all items of a player's cart
-charcartlist: 40
-
-
-//---------------------
-// 50: Sub-GM+ commands
-
-// Changes character's model
-charmodel: 50
-
-guild: 50
-
-// Brings up your guild storage wherever you are.
-gstorage: 50
-
-// Spawns a monster, and a certain amount (3 same commands + /monster).
-spawn: 50
-monster: 50
-summon: 50
-
-// Spawns a monster with parameters not in same order of @spawn.
-monster2: 50
-
-// To get a peco to (un)ride for another player.
-charmountpeco: 50
-
-// Enables to give possibility to a player to rename his/her pet.
-charpetrename: 50
-
-
-//----------------
-// 60: GM commands
-
-// Starts Guild Wars
-agitstart: 60
-
-// Ends Guild Wars
-agitend: 60
-
-// Resurects yourself.
-alive: 60
-
-// Levels your character to specified level (adds to your level) (3 same commands).
-lvup: 60
-baselvlup: 60
-blevel: 60
-
-// Raises your job level (3 same commands).
-joblvup: 60
-joblvlup: 60
-jlevel: 60
-
-// Sets another persons base level.
-charbaselvl: 60
-
-// Changes the sex of an online player (all characters on the account)
-charchangesex: 60
-
-// Remove items from a character
-chardelitem: 60
-
-// Sets another persons job level.
-charjlvl: 60
-
-// Sets the job of another character (2 same commands).
-charjob: 60
-charjobchange: 60
-
-// Set options on another character.
-charoption: 60
-
-// Gives another character status points
-charstpoint: 60
-
-// Gives another character skill points
-charskpoint: 60
-
-// Resets another character's stats
-charreset: 60
-
-// Resets another character's status, skills
-charstreset: 60
-charskreset: 60
-
-// Saves the respawn point of another character.
-charsave: 60
-
-// Changes another character's zenny
-charzeny: 60
-
-// Levels your guild to specified level (2 same commands).
-guildlvup: 60
-guildlvlup: 60
-
-idsearch: 60
-
-// Creates an item of your choosing, either Item ID or Name (1 command + /item).
-item: 60
-
-// Creates a complet item (card, etc...) of your choosing, either Item ID or Name.
-item2: 60
-
-// ??
-itemcheck: 60
-
-// Kill another character without hitting them.
-kill: 60
-
-// Kill all monsters in map (with drops)
-killmonster: 60
-
-// Creates yourself a pet egg, have to use Pet ID.
-makeegg: 60
-
-// Instantly kills player whose name is entered and deals insane damage to everything around.
-nuke: 60
-
-// Enable hitting a player even when not in pvp
-killer: 60
-
-// Creates weapon of desired element.
-produce: 60
-
-// Warps a character to you (1 command + /recall).
-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
-charwarp: 60
-
-// Change Status of your character
-str: 60
-agi: 60
-vit: 60
-int: 60
-dex: 60
-luk: 60
-
-// Gets all skills (4 same commands)
-allskill: 60
-allskills: 60
-skillall: 60
-skillsall: 60
-
-// sets GM stats to maximum (4 same commands)
-statall: 60
-statsall: 60
-allstats: 60
-allstat: 60
-
-// Gives you job points.
-stpoint: 60
-
-// Gives you skill points of desired amount.
-skpoint: 60
-
-// Warps all online character of a guild to you. (at least one member of that guild must be on.)
-guildrecall: 60
-
-// Warps all online character of a party to you. (at least one party member must be online.)
-partyrecall: 60
-
-// Allows you to spy on any Guilds Guild chat. (at least one member of that guild must be on.)
-guildspy: 60
-
-//Allows you to spy on any party's party chat. (at least one party member must be online.)
-partyspy: 60
-
-// Gives you money (zeny) of desired amount.
-zeny: 60
-
-// To block definitively a player (only administrator can unblock the account) (2 same commands)
-block: 60
-charblock: 60
-
-// To unblock a player (2 same commands)
-unblock: 60
-charunblock: 60
-
-// To ban a player for a limited time (only administrator can unban the account) (4 same commands)
-ban: 60
-banish: 60
-charban: 60
-charbanish: 60
-
-// To unban a player (4 same commands)
-unban: 60
-unbanish: 60
-charunban: 60
-charunbanish: 60
-
-// To send specified character in jails
-jail: 60
-
-// To discharge a prisoner (2 same commands)
-unjail: 60
-discharge: 60
-
-// To change disguise of another player/GM
-chardisguise: 60
-charundisguise: 60
-
-// Enables platinum skills of another player.
-charquestskill: 60
-
-// Enables lost skills of another player.
-charlostskill: 60
-
-// turn on and off skills on a map
-skillon: 60
-skilloff: 60
-
-// Create a static warp portal that lasts until the next reboot
-addwarp: 60
-
-
-//----------------------
-// 80: GM Chief commands
-
-// Set the map you are on to day.
-day: 80
-
-// Kills everyone on the server.
-doom: 80
-
-// Kills everyone on the map you are on.
-doommap: 80
-
-// Set the map you are currently on to night.
-night: 80
-
-// Recalls Everyone To Your Coordinates
-recallall: 80
-
-// Revives all players on the map.
-raisemap: 80
-
-// Revives all players on the server.
-raise: 80
-
-// Enables a NPC.
-enablenpc: 80
-
-// Disables a NPC.
-disablenpc: 80
-
-// Move a NPC
-npcmove: 80
-
-
-//---------------------------
-// 99: Administrator commands
-
-// Disconnect all users from the server
-kickall: 99
-
-// Closes Map-Server
-mapexit: 99
-
-// Give information about terrain/area (debug function)
-gat: 99
-
-// Enables debugging
-packet: 99
-
-// Shows information about the map
-mapinfo: 99
-
-// Re-load item database (admin command)
-reloaditemdb: 99
-
-// Re-load monsters database (admin command)
-reloadmobdb: 99
-
-// Re-load skills database (admin command)
-reloadskilldb: 99
-
-// Re-load scripts (admin command)
-reloadscript: 99
-
-// Re-load GM level (admin command)
-reloadgmdb: 99
-
-
-//---------------------
-// OTHER: not a command
-
-//import: conf/import/atcommand_conf.txt
diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf
index d9b39dfc1..789346b59 100644
--- a/conf-tmpl/battle_athena.conf
+++ b/conf-tmpl/battle_athena.conf
@@ -11,7 +11,7 @@
// \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
//
//--------------------------------------------------------------
-//eAthena Battle Configuration File
+// eAthena Battle Configuration File
// Made in to plainer english by Ancyker
//--------------------------------------------------------------
//Note 1: Directives can be set using on/off, yes/no or 1/0.
@@ -43,7 +43,12 @@ casting_rate: 100
delay_rate: 100
// Is the delay time is dependent on the caster's DEX? (Note 1)
-delay_dependon_dex: yes
+// Note: On Official servers Dex does NOT affect delay time
+delay_dependon_dex: no
+
+// Minimum allowed delay for ANY skills after casting (in miliseconds) (Note 1)
+// Note: Setting this to anything above 0 can stop speedhacks.
+min_skill_delay_limit: 100
// At what dex does the cast time become zero (instacast)
castrate_dex_scale: 150
@@ -145,7 +150,7 @@ item_drop_mvp_min: 1
item_drop_mvp_max: 10000
// Can the monster's drop rate become 0? (Note 1)
-drop_rate0item: no
+drop_rate0item: yes
// Rate at which exp. is given. (Note 2)
base_exp_rate: 100
@@ -153,7 +158,14 @@ base_exp_rate: 100
// Rate at which job exp. is given. (Note 2)
job_exp_rate: 100
-// PVP exp. Do players get exp during pvp
+// Players' maximum HP rate? (Default is 100)
+hp_rate: 100
+
+// Players' maximum SP rate? (Default is 100)
+sp_rate: 100
+
+// PVP exp. Do players get exp in PvP maps
+// (Note: NOT exp from players, but from normal leveling)
pvp_exp: yes
// When a player dies, how should we penalize them?
@@ -208,24 +220,29 @@ gm_all_skill_add_abra: no
// [GM] Can equip anything? (No or minimum GM level, can cause client errors.)
gm_all_equipment: no
-// [GM] Raise skills unconditionally, that is, put points in to a skill not in thier jobs skill tree? (no or minimum gm level)
+// [GM] Can use skills without meeting the required conditions (no
+// blue gems? no problem
gm_skill_unconditional: no
// Can a normal player by-pass the skill tree? (Note 1)
player_skillfree: no
-// When doing a skill reset, whether the skill's restriction is to be ignored or not. (Note 1)
-player_skillup_limit: yes
+// When set to yes, forces skill points gained from 1st class to be put into 1st class
+// sklls, and forces novice skill points to be put into the basic skill. (Note 1)
+player_skillup_limit: no
// Forging success rate. (Note 2)
weapon_produce_rate: 100
-// Prepare Potion succsss rate. (Note 2)
+// Prepare Potion success rate. (Note 2)
potion_produce_rate: 100
// Allow monsters to be aggresive and attack first? (Note 1)
monster_active_enable: yes
+// If a monster is attacked, will they have a delay in being able to move? (Note 1)
+monster_damage_delay: yes
+
// Monster damage delay rate (Note 1)
monster_damage_delay_rate: 100
@@ -322,8 +339,9 @@ heal_exp: 0
// Experience calculations for the experience value * level difference of the person revived / 100 * resurrection_exp/10000 which the revived player has can be got.
resurrection_exp: 0
-// The rate of job exp. when using discount and overcharge on an NPC (100 is normal, 200 is double.)
-// The way it is calculated is (money recieved * skill lv) * shop_exp / 100.
+// The rate of job exp. when using discount and overcharge on an NPC
+// (in 0.01% increments - 100 is 1%, 10000 is normal, 20000 is double.)
+// The way it is calculated is (money recieved * skill lv) * shop_exp / 10000.
shop_exp: 0
// The delay rate of monk's combo (Note 2)
@@ -348,8 +366,27 @@ natural_heal_skill_interval: 10000
// The maximum weight for a character to carry when the character stops healing naturally. (in %)
natural_heal_weight_rate: 50
+// You can turn the following 5 settings off if you don't need them,
+// or if you're experiencing problems with GRF loading
+//
// Override item names from GRF file? (Note 1)
-item_name_override_grffile: yes
+item_name_override_grffile: no
+//
+// Override item equip positions from GRF file? (Note 1)
+item_equip_override_grffile: no
+//
+// Override item slots from GRF file? (Note 1)
+item_slots_override_grffile: no
+//
+// Override 'indoors' mapflags from GRF file? (Note 1)
+indoors_override_grffile: no
+//
+// Override SP used per level from GRF file? (Note 1)
+// Turn this off if you have a customised skill_require_db.txt
+skill_sp_override_grffile: no
+//
+// Read card illustrations from GRF file? (Note 1)
+cardillust_read_grffile: yes
// Are arrows are consumed when used on a bow? (Note 1)
arrow_decrement: yes
@@ -401,38 +438,40 @@ save_clothcolor: yes
// 0 = element undead
// 1 = race undead
// 2 = both
-undead_detect_type: 2
+undead_detect_type: 0
-// Operational mode of automatic counter.
-// 0 = disregard DEF and HIT+20 . CRI*2, 1 = 100% critical
+// Counter Attack Skill Type
+// 0 = 100% critical
+// 1 = disregard DEF and HIT+20, CRI*2
+// 2 = Same as 0, but can counter skills (?)
// Players
player_auto_counter_type: 0
// Monsters
monster_auto_counter_type: 0
-// Type of penalty that is applied to FLEE when more than agi_penaly_count monsters are targetting player
+// Type of penalty that is applied to FLEE when more than agi_penalty_count monsters are targetting player
// 0 = no penalty is applied
-// 1 = agi_penaly_num is reduced from FLEE as a %
-// 2 = agi_penaly_num is reduced from FLEE as an exact amount
-agi_penaly_type: 1
+// 1 = agi_penalty_num is reduced from FLEE as a %
+// 2 = agi_penalty_num is reduced from FLEE as an exact amount
+agi_penalty_type: 1
// Amount of enemies required to be targetting player before FLEE begins to be penalized
-agi_penaly_count: 3
+agi_penalty_count: 3
-// Amount of FLEE penalized per each attacking monster more than agi_penaly_count
-agi_penaly_num: 10
+// Amount of FLEE penalized per each attacking monster more than agi_penalty_count
+agi_penalty_num: 10
-// Type of penalty that is applied to VIT defense when more than vit_penaly_count monsters are targetting player
+// Type of penalty that is applied to VIT defense when more than vit_penalty_count monsters are targetting player
// 0 = no penalty is applied
-// 1 = vit_penaly_num is reduced from FLEE as a %
-// 2 = vit_penaly_num is reduced from FLEE as an exact amount
-vit_penaly_type: 1
+// 1 = vit_penalty_num is reduced from FLEE as a %
+// 2 = vit_penalty_num is reduced from FLEE as an exact amount
+vit_penalty_type: 1
// Amount of enemies required to be targetting player before VIT defense begins to be penalized
-vit_penaly_count: 3
+vit_penalty_count: 3
-// Amount of VIT defense penalized per each attacking monster more than vit_penaly_count
-vit_penaly_num: 5
+// Amount of VIT defense penalized per each attacking monster more than vit_penalty_count
+vit_penalty_num: 5
// When the player attacks an object, the calculation method of DEF.
// With 0 this will be ignored specification, at 1 or more def = subtraction of (DEF* value).
@@ -455,33 +494,42 @@ player_skill_reiteration: no
//Whether or not, ground skills of the monsters' will pile up. (Note 1)
monster_skill_reiteration: no
-//Whether or not ground based skills of a certain type such as traps can be cast straight onto other players. (Note 1)
+// Whether players are not allowed to cast ground based skills of a certain type such
+// as traps straight onto or nearby other players/monsters. (Note 1)
player_skill_nofootset: yes
-//Whether or not ground based skills of a certain type such as traps can be cast straight onto monsters. (Note 1)
+// Whether monsters are not allowed to cast ground based skills of a certain type such
+// as traps straight onto or nearby other players. (Note 1)
monster_skill_nofootset: yes
// When a player is cloaking, Whether the wall is checked or not. (Note 1)
-// Note: When set to yes players can still cloak away from walls, but cannot move
-// as well as receive movement penalties if the skill level is below 3.
+// Note: When set to no players can always cloak away from walls and move around
+// freely even if the skill level is below 3.
+// no or 0 = doesn't check for walls (you can cloacking without walls)
+// 1 = it checks for walls
+// 2 = it doesn't checks for walls + your cloaking lasts forever
+// 3 = it checks for walls, but your cloaking lasts forever
player_cloak_check_type: yes
// When a monster is cloaking, Whether the wall is checked or not. (Note 1)
monster_cloak_check_type: no
+// Damage adjustments for WOE battles against defending Guild monsters (Note 2)
+castle_defense_rate: 100
+
// Melee damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
gvg_short_attack_damage_rate: 100
// Ranged damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_long_attack_damage_rate: 100
+gvg_long_attack_damage_rate: 60
// Magic damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_magic_attack_damage_rate: 100
+gvg_magic_attack_damage_rate: 50
// Misc damage adjustments for WoE battles (Guild Vs Guild) (Note 2)
-gvg_misc_attack_damage_rate: 100
+gvg_misc_attack_damage_rate: 60
-// When the empelium is broken with WoE mode on, How Long Before The Declaration Of Castle Owner
+// When the emperium is broken with WoE mode on, How Long Before The Declaration Of Castle Owner
// and Removal of Monsters/Players from Castle. (in milliseconds)
gvg_eliminate_time: 7000
@@ -495,9 +543,6 @@ player_attack_direction_change: yes
// Monsters's Direction Changed When Attacking? (Note 1)
monster_attack_direction_change: yes
-// If the player has Undead Elemental Equipment, should they be frozen or not. (Note 1)
-player_undead_nofreeze: no
-
// Will Player Skills Stay Within Land Limit or not? (Note 1)
player_land_skill_limit: yes
@@ -505,22 +550,22 @@ player_land_skill_limit: yes
monster_land_skill_limit: yes
// If a party uses a skill with penalties do they apply? (Note 1)
-party_skill_penaly: yes
+party_skill_penalty: yes
// If monster's class is changed will it fully recover HP and SP and Ailments? (Note 1)
monster_class_change_full_recover: no
// Do produced items have the maker's name on them? (Note 1)
-produce_item_name_input: yes
+produce_item_name_input: no
// Do produced potions have the maker's name on them? (Note 1)
-produce_potion_name_input: yes
+produce_potion_name_input: no
// Do crafted arrows have the maker's name on them? (Note 1)
-making_arrow_name_input: yes
+making_arrow_name_input: no
// Does created holy water have the maker's name on it? (Note 1)
-holywater_name_input: yes
+holywater_name_input: no
// Stop logout for 10 seconds after a hit? (Note 1)
prevent_logout: yes
@@ -560,7 +605,7 @@ pc_attack_attr_none: no
mob_attack_attr_none: no
// mob attacks againsts players wearing ghostring armor do full damage
-mob_ghostring_fix: no
+mob_ghostring_fix: yes
// Does the Golden Thief Bug card only work during pvp?
// no or 0 - gtb works all the time
@@ -572,14 +617,14 @@ gtb_pvp_only: no
// 2: Full evasion exclusion
// 3: Full evasion and evasion exclusion
// 4 or more: Except all.
-agi_penaly_count_lv: 2
+agi_penalty_count_lv: 2
// How to count the number of the enemies who do a vit penalty
// 1 or less: It is a count altogether.
// 2: Full evasion exclusion
// 3: Full evasion and evasion exclusion
// Four or more: Except all.
-vit_penaly_count_lv: 3
+vit_penalty_count_lv: 3
// Grandcross Settings (Dont mess with these)
// Even if MOB (PC) has overlapped, it HIT(s) compulsion 3. (Default no)
@@ -602,22 +647,19 @@ player_skill_partner_check: yes
// Is the character of a GM account set as the object of a display by @ command etc. or not?
hide_GM_session: no
-// ユニット移動処-摯?@。0で-{鯖仕-l(回線負荷→重、鯖処-掾ィ軽)、1でAthena仕-l(回線負荷→軽、鯖処-掾ィ重)
-// translation (babelfish):
-// Unit portable place - ? @.
-// With 0 - {mackerel SI -l (circuit load -> heavily, the mackerel place - the ? ? lightly),
-// With 1 - Athena SI -l (circuit load -> lightly, the mackerel place - the ? ? it is heavy)
+
+// Skill unit movement processing method
+// 0 - Aegis system : Network load -> Heavier, Server load -> Lighter
+// 1 - Athena system : Network load -> Lighter, Server load -> Heavier
unit_movement_type: 0
// Are other requests accepted during [various things[party,guild]] a request or not?
// It does not accept by no accepted by yes.
invite_request_check: yes
-// リ??ブトラップの仕-l 0:-{鯖仕-l、罠1個 1:Athena仕-l、使ったアイテ?を使った個数
-// translation (babelfish):
-// SI of ???????? -l
-// 0: - {Mackerel SI -l, trap 1
-// 1:Athena SI -l, the quantity which used the item which was used
+// Remove trap type
+// 0 - Aegis system : Returns 1 'Trap' item
+// 1 - Athena system : Allows the returned item and amount to be defined
skill_removetrap_type: 0
// Will display experience gained from killing a monster. (Note 1)
@@ -708,21 +750,25 @@ hack_info_GM_level: 60
any_warp_GM_min_level: 20
// Set here which client version do you accept. Add all values of clients:
-// 1: Clients before 2004-07-06 (old clients)
-// 2: 2004-07-06 kRO client
-// 4: 2004-07-13 kRO client
-// 8: 2004-07-26 kRO client
-// 16: 2004-08-09 kRO / 2004-08-16aSakray / 2004-08-17aSakray client
-// 32: 2004-09-06aSakray client
-// 64: 2004-09-21aSakray Client
-// 128: 2004-10-18bSakexe Client
-// 256: 2004-10-25aSakexe Client
-// default value: 511 (all clients)
-packet_ver_flag: 511
+// Clients older than accepted versions, and versions not set to 'accepted'
+// here will be rejected when logging in
+// 1: Clients older than 2004-09-06aSakray
+// 2: 2004-09-06aSakray client
+// 4: 2004-09-21aSakray Client
+// 8: 2004-10-18bSakexe Client
+// 16: 2004-10-25aSakexe Client
+// 32: 2004-11-01aSakexe Client
+// 64: 2004-12-06aSakexe Client
+// 128: 2005-01-10aSakexe Client
+// default value: 255 (all clients)
+packet_ver_flag: 255
// Allow GMs to mute players or not?
muting_players: no
+// Allow GM commands to be used when muted?
+allow_atcommand_when_mute: yes
+
// Mail system - Only function in sql version
mail_system: no
@@ -746,5 +792,39 @@ mobs_level_up: no
// Use kRO new steal formula?
skill_steal_type: yes
+// Set this to 1 if your clients have langtype problems and can't display motd properly
+motd_type: 0
+
+// The minimum level for GMs' to drop items on the ground, use the Storage or
+// trade Items/Zeny?
+gm_can_drop_lv: 0
+
+// Allow GMs' to see the hp of every player?
+disp_hpmeter: no
+
+// Players' will drop a 'Bone' when killed?
+// 1 - Dropped only in PvP maps
+// 2 - Dropped in all situations
+// 0 - Disabled
+bone_drop: 0
+
+// The rate of monsters dropping ores by the skill Ore Discovery (Default is 100)
+finding_ore_rate: 100
+
+//Method of calculating earned experience when defeating a monster:
+//0 - jAthena's
+//1 - eAthena's, using damage given / max_hp as damage ratio
+//2 - eAthena's, using damage given / total damage as damage ratio
+exp_calc_type: 1
+
+// Can the 'Glory of Guild' skill be learnt in the Guild window,
+// and does changing emblems require it? (Note 1)
+// P.S: This new guild skill only appears for 2004-10-25aSakexe or newer
+// P.S 2: This skill is not implemented on official servers, so its only optional
+require_glory_guild: no
+
+// Is exp sharing disabled for idle members in the party?
+idle_no_share: no
+
import: conf/import/battle_conf.txt
diff --git a/conf-tmpl/char_athena.conf b/conf-tmpl/char_athena.conf
index 4783f0446..06c1f4218 100644
--- a/conf-tmpl/char_athena.conf
+++ b/conf-tmpl/char_athena.conf
@@ -18,6 +18,10 @@ wisp_server_name: Server
//
// login_ip:127.0.0.1
+// What interface should we bind to.. if you have multiple IP's on one
+// machine, this lets you put multiple servers on the same ports
+// bind_ip:127.0.0.1
+
// Login Server Port
login_port: 6900
@@ -59,6 +63,9 @@ char_new: 0
// Maximum users able to connect to the server. Set to 0 for unlimited.
max_connect_user: 0
+// Minimum GM level that is allowed to bypass the server limit of users.
+gm_allow_level: 99
+
// It's to check IP of a player between char-server and other servers (part of anti-hacking system)
// If player doesn't have same IP, connection is refused.
// Set to 0/off/no to not check IP of player.
@@ -77,7 +84,7 @@ char_txt: save/athena.txt
// default is 'no', because backup file take time for nothing. Actually, there is no problem on characters file creation and save.
backup_txt_flag: no
-// Character server flatfile database (backup)
+// Character server flatfile database (backup, TXT only)
backup_txt: save/athena_backup.txt
// Friends list flatfile database
@@ -153,19 +160,16 @@ online_refresh_html: 20
// To log the character server?
log_char: 1
+// How many Characters are allowed per Account ? (0 = disabled) [SQL Only!]
+chars_per_account: 0
+
// What folder the DB files are in (item_db.txt, etc.)
db_path: db
-// Anti-freeze system enable
-anti_freeze_enable: 0
-// Anti-freeze system interval (in seconds)
-anti_freeze_interval: 6
-
-// If you want use an additional configuration file, uncomment and use this parameter
-//import: path/additional_configuration_file
-
// Mugendai's GUI Support
imalive_on: 0
imalive_time: 30
flush_on: 0
-flush_time: 30 \ No newline at end of file
+flush_time: 30
+
+import: conf/import/char_conf.txt
diff --git a/conf-tmpl/charcommand_athena.conf b/conf-tmpl/charcommand_athena.conf
index 17329c997..f48b7235e 100644
--- a/conf-tmpl/charcommand_athena.conf
+++ b/conf-tmpl/charcommand_athena.conf
@@ -8,11 +8,20 @@
// With default character, all commands begin by a '#', example: #save SomePlayer
command_symbol: #
-job: 60
-jobchange: 60
+stats: 40
+statsall: 40
+itemlist: 40
+effect: 40
+storagelist: 40
petrename: 50
petfriendly: 50
-stats: 40
option: 60
save: 60
-statsall: 40
+reset: 60
+spiritball: 60
+item: 60
+job: 60
+jobchange: 60
+zeny: 60
+
+import: conf/import/charcommand_conf.txt
diff --git a/conf-tmpl/help.txt b/conf-tmpl/help.txt
index fa8de1f69..62c5f5b22 100644
--- a/conf-tmpl/help.txt
+++ b/conf-tmpl/help.txt
@@ -101,6 +101,10 @@
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
+ 40: @skilltree <
+ 40: @marry <player1> <player2> - marry two players
+ 40: @divorce <player> - divorces the two players
+ 40: @rings - gives you the two wedding rings
60: @addwarp <map name> <x coord> <y coord>
40:
40:--- MONSTERS CMD ---
diff --git a/conf-tmpl/import/charcommand_conf.txt b/conf-tmpl/import/charcommand_conf.txt
new file mode 100755
index 000000000..e69de29bb
--- /dev/null
+++ b/conf-tmpl/import/charcommand_conf.txt
diff --git a/conf-tmpl/import/log_conf.txt b/conf-tmpl/import/log_conf.txt
new file mode 100755
index 000000000..e69de29bb
--- /dev/null
+++ b/conf-tmpl/import/log_conf.txt
diff --git a/conf-tmpl/inter_athena.conf b/conf-tmpl/inter_athena.conf
index 475969f2b..a2155a5ac 100644
--- a/conf-tmpl/inter_athena.conf
+++ b/conf-tmpl/inter_athena.conf
@@ -23,6 +23,9 @@ castle_txt: save/castle.txt
// Options for both versions
+// Log Inter Connections, etc.?
+log_inter: 1
+
// Inter Log Filename
inter_log_filename: log/inter.log
@@ -30,15 +33,20 @@ inter_log_filename: log/inter.log
party_share_level: 10
+
+// SQL version options only
+
// The lowest GM level on your server
lowest_gm_level: 1
// How often the GM accounts will be reloaded by the map-server in minutes
read_gm_interval: 10
-
-
-// SQL version options only
+// Ideally under linux, you want to use localhost instead of 127.0.0.1.
+//
+// Under windows, you want to use 127.0.0.1. If you see a message like
+// "Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)"
+// and you have localhost, switch it to 127.0.0.1
// MySQL Login SQL Server
login_server_ip: 127.0.0.1
@@ -124,5 +132,4 @@ mob_db_db: mob_db
//Use SQL item_db and mob_db for the map server
use_sql_db: no
-// Log Inter Connections, etc.?
-log_inter: 1
+import: conf/import/inter_conf.txt
diff --git a/conf-tmpl/ladmin_athena.conf b/conf-tmpl/ladmin_athena.conf
index e6f589863..dafd72388 100644
--- a/conf-tmpl/ladmin_athena.conf
+++ b/conf-tmpl/ladmin_athena.conf
@@ -30,5 +30,4 @@ ladmin_log_filename: log/ladmin.log
// 3: 2004-12-31 23:59:59 (default)
date_format: 3
-// If you want use an additional configuration file, uncomment and use this parameter
-//import: path/additional_configuration_file
+import: conf/import/ladmin_conf.txt
diff --git a/conf-tmpl/log_athena.conf b/conf-tmpl/log_athena.conf
index 1f7cd5e0e..f6337aa80 100644
--- a/conf-tmpl/log_athena.conf
+++ b/conf-tmpl/log_athena.conf
@@ -6,29 +6,64 @@ enable_logs: 1
// Use MySQL Logs? (SQL Version Only)
sql_logs: 0
+// LOGGING FILTERS [Lupus]
+//=============================================================
+//if any condition is true then the item will be logged
+//0 = Don't log at all
+//1 = Log any item
+//Advanced Filter Bits: ||
+//2 - Healing items (0)
+//3 - Etc Items(3) + Arrows (10)
+//4 - Usable Items(2)
+//5 - Weapon(4)
+//6 - Shields,Armor,Headgears,Accessories,etc(5)
+//7 - Cards(6)
+//8 - Pet Accessories(8) + Eggs(7) (well, monsters don't drop 'em but we'll use the same system for ALL logs)
+//9 - Log expensive items ( >= price_log)
+//10 - Log big amount of items ( >= amount_log)
+//11 - Log refined items (if their refine >= refine_log )
+//12 - Log rare items (if their drop chance <= rare_log )
+
+//Example: (drops log)
+//log_drop: 1 = logs ANY items
+//log_drop: 2 = logs only HEALING items
+//log_drop: 4 = logs only Etc Items and Arrows
+//log_drop: 64 = logs only Cards
+//log_drop: 332 = logs only Healing items, Cards and those items which price is >= price_items_log
+//etc
+
+//not implemented yet
+refine_items_log: 7
+//not implemented yet
+rare_items_log: 100
+//don't log it if the current item price < price_items_log
+price_items_log: 1000
+//don't log it if the current item amount < amount_items_log
+amount_items_log: 100
+//=============================================================
// Log Dead Branch Usage
log_branch: 0
-// Log Monster Drops
+// Log Monster Drops (You can use a filter)
log_drop: 0
// Log MVP Monster Drops
log_mvpdrop: 0
-// Log Present Items (Old Blue Box, etc.)
+// Log Present Items (Old Blue Box, etc.) (You can use a filter)
log_present: 0
-// Log Produced Items
+// Log Produced Items (You can use a filter)
log_produce: 0
-// Log Refining
+// Log Refining (You can use a filter)
log_refine: 0
-// Log Trading
+// Log Trading (You can use a filter)
log_trade: 0
-// Log Vending
+// Log Vending (You can use a filter)
log_vend: 0
// Log Zeny Trades
@@ -37,6 +72,9 @@ log_zeny: 0
// Log GM Commands (set to minimum level of Logged Commands)
log_gm: 40
+// Log NPC 'logmes' commands
+log_npc: 0
+
// Dead Branch Log Table
log_branch_db: branchlog
@@ -65,30 +103,38 @@ log_vend_db: vendlog
// GM Log Table
log_gm_db: atcommandlog
+// NPC Log Table
+log_npc_db: npclog
+
// Dead Branch Log File
-log_branch: log/branchlog.log
+log_branch_file: log/branchlog.log
// Drop Log File
-log_drop: log/droplog.log
+log_drop_file: log/droplog.log
// MVP Drop File
-log_mvpdrop: log/mvplog.log
+log_mvpdrop_file: log/mvplog.log
// Present Drop File
-log_present: log/presentlog.log
+log_present_file: log/presentlog.log
// Produce Log File
-log_produce: log/producelog.log
+log_produce_file: log/producelog.log
// Refine Log File
-log_refine: log/refinelog.log
+log_refine_file: log/refinelog.log
// Trade Log File
-log_trade: log/tradelog.log
+log_trade_file: log/tradelog.log
// Vend Log File
-log_vend: log/vendlog.log
+log_vend_file: log/vendlog.log
// GM Log File
-log_gm: log/atcommandlog.log \ No newline at end of file
+log_gm_file: log/atcommandlog.log
+
+// NPC Log File
+log_npc_file: log/npclog.log
+
+import: conf/import/log_conf.txt \ No newline at end of file
diff --git a/conf-tmpl/login_athena.conf b/conf-tmpl/login_athena.conf
index 4b25b6674..03de39051 100644
--- a/conf-tmpl/login_athena.conf
+++ b/conf-tmpl/login_athena.conf
@@ -1,7 +1,19 @@
// Athena Login Server configuration file.
// Translated by Peter Kieser <pfak@telus.net>
+
+// Login Server IP
+//
+// You should only need to set this if you are running behind a
+// firewall or on a machine with multiple interfaces. In that case,
+// you need to specify the IP address you wish to export to the entire world.
+//
+//login_ip:127.0.0.1
+
+// What interface should we bind to.. if you have multiple IP's on one
+// machine, this lets you put multiple servers on the same ports
+// bind_ip:127.0.0.1
-// Port to bind Login Server to (always binds to all IP addresses)
+// Login Server Port
login_port: 6900
// Whether remote administration is enabled or disabled (1 for enabled, 0 for disabled)
@@ -23,6 +35,9 @@ ladminallowip: all
// This prevents usage of >& log.file
console: off
+// Are login's case sensitive?
+case_sensitive: on
+
// Gamemaster password, used with the @gm command to obtain GM commands (level of gm set with level_new_gm parameter).
// NOTICE: You should also change this one.
gm_pass: gm
@@ -37,6 +52,7 @@ gm_pass: gm
level_new_gm: 60
// Can you make new accounts on the server? (1 for Yes, 0 for no)
+// (1 = _M/_F enabled, 0 = not enabled)
new_account: 1
// Account flatfile database, stores account information.
@@ -52,6 +68,9 @@ gm_account_filename_check_timer: 15
// Log Filename. All operations received by the server are logged in this file.
login_log_filename: log/login.log
+// To log the login server?
+log_login: 1
+
// Name of the file of that logs the unknown packets (for debug or hack check)
login_log_unknown_packets_filename: log/login_unknown_packets.log
@@ -119,12 +138,18 @@ check_ip_flag: yes
//deny: 123.123.123.123
//deny: 234.234.234.234
-// If you want use an additional configuration file, uncomment and use this parameter
-//import: path/additional_configuration_file
+//Check The clientversion set in the clientinfo ?
+check_client_version: no
+
+//What version we would allow to connect? (if the options above is enabled..)
+client_version_to_connect: 20
//Passwords in Login DB are MD5 - <passwordencrypt> cannot b used on client with this on
use_MD5_passwords: no
+// Use the 'online' column to set users online and offline [MySQL only]
+register_users_online: 0
+
//Ban features: read readme for more info if you dont know this.
ipban: 1
dynamic_pass_failure_ban: 1
@@ -134,11 +159,6 @@ dynamic_pass_failure_ban_how_long: 60
dynamic_account_ban: 1
dynamic_account_ban_class: 0
-// Anti-freeze system enable
-anti_freeze_enable: 0
-// Anti-freeze system interval (in seconds)
-anti_freeze_interval: 15
-
// Enable I'm Alive?
imalive_on: 0
// How often to display I'm Alive
@@ -146,4 +166,7 @@ imalive_time: 60
// Enable GUI flushing for Mugendai's GUI?
flush_on: 0
// How often to flush the buffer in Mugendai's GUI
-flush_time: 60 \ No newline at end of file
+flush_time: 60
+
+
+import: conf/import/login_conf.txt
diff --git a/conf-tmpl/map_athena.conf b/conf-tmpl/map_athena.conf
index 93bffe2e4..405af5d80 100644
--- a/conf-tmpl/map_athena.conf
+++ b/conf-tmpl/map_athena.conf
@@ -30,6 +30,10 @@ passwd: p1
//
//char_ip:127.0.0.1
+// What interface should we bind to.. if you have multiple IP's on one
+// machine, this lets you put multiple servers on the same ports
+// bind_ip:127.0.0.1
+
// Character Server Port
char_port: 6121
@@ -44,6 +48,20 @@ char_port: 6121
// Map Server Port
map_port: 5121
+//Preferred map loading method
+// 0: Read directly from grf
+// 1: Read from cache (without compression)
+// 2: Read from cache (with compression)
+// If the cache was not found it will read the maps from the GRF and copy
+// any necessary data into a newly created cache.
+// It is possible to reduce the map cache to 1MB for 400+ maps with compression
+// enabled. If all maps are already loaded in the cache, Athena can boot without
+// reading the grf files.
+read_map_from_cache: 2
+//
+//Where is the bitmap file stored?
+map_cache_file: db/mapinfo.txt
+
// Console Commands
// Allow for console commands to be used on/off
// This prevents usage of >& log.file
@@ -60,1115 +78,16 @@ help_txt: conf/help.txt
mapreg_txt: save/mapreg.txt
+// NPCs
+import: npc/npcs_athena.conf
-//--------------------------------------------------------------
-// Map Flags
-//--------------------------------------------------------------
-// Files to set options in maps such as PVP, etc.
-//=======================================
-
-npc: conf/mapflag/gvg.txt
-npc: conf/mapflag/indoors.txt
-npc: conf/mapflag/jail.txt
-npc: conf/mapflag/nightmare.txt
-npc: conf/mapflag/nobranch.txt
-npc: conf/mapflag/noicewall.txt
-npc: conf/mapflag/nomemo.txt
-npc: conf/mapflag/nopenalty.txt
-npc: conf/mapflag/nopvp.txt
-npc: conf/mapflag/nosave.txt
-npc: conf/mapflag/noteleport.txt
-npc: conf/mapflag/nowarp.txt
-npc: conf/mapflag/nowarpto.txt
-npc: conf/mapflag/pvp.txt
-npc: conf/mapflag/pvp_noparty.txt
-// Water Flag
-npc: conf/mapflag/water.txt
-// How high is the water in maps?
-water_height: conf/mapflag/water_height.txt
-
-//--------------------------------------------------------------
-// Special
-//--------------------------------------------------------------
-
-// PCLoginEvent NPC. NPC which is activated for every player who logs in.
-npc: npc/sample/PCLoginEvent.txt
-
-
-//--------------------------------------------------------------
-// NPCs
-//--------------------------------------------------------------
-
-// ---------------- Your Own Npcs -----------------------
-//Add Them Here ;)
-
-
-//------------------------ Cities ----------------------------
-npc: npc/cities/alberta.txt
-npc: npc/cities/aldebaran.txt
-npc: npc/cities/amatsu.txt
-npc: npc/cities/comodo.txt
-npc: npc/cities/geffen.txt
-npc: npc/cities/izlude.txt
-npc: npc/cities/louyang.txt
-npc: npc/cities/lutie.txt
-npc: npc/cities/morocc.txt
-npc: npc/cities/payon.txt
-npc: npc/cities/prontera.txt
-npc: npc/cities/yuno.txt
-npc: npc/cities/gonryun.txt
-npc: npc/cities/umbala.txt
-npc: npc/cities/niflheim.txt
-npc: npc/cities/valkyrie.txt
-
-
-//-------------------------- Jobs -------------------------------
-//Novice
-npc: npc/jobs/novice/novice.txt
-npc: npc/jobs/novice/supernovice.txt
-
-//1-1
-npc: npc/jobs/1-1/thief.txt
-npc: npc/jobs/1-1/archer.txt
-npc: npc/jobs/1-1/mage.txt
-npc: npc/jobs/1-1/merchant.txt
-npc: npc/jobs/1-1/acolyte.txt
-npc: npc/jobs/1-1/swordsman.txt
-
-//2-1 With Quest
-npc: npc/jobs/2-1/blacksmith.txt
-npc: npc/jobs/2-1/knight.txt
-npc: npc/jobs/2-1/hunter.txt
-npc: npc/jobs/2-1/priest.txt
-npc: npc/jobs/2-1/wizard.txt
-npc: npc/jobs/2-1/assassin.txt
-
-//2-2 With Quest
-npc: npc/jobs/2-2/rogue.txt
-npc: npc/jobs/2-2/alchemist.txt
-npc: npc/jobs/2-2/sage.txt
-
-//2-2 Without Quest
-npc: npc/jobs/2-2/noquest/crusader.txt
-npc: npc/jobs/2-2/noquest/dancer-bard.txt
-npc: npc/jobs/2-2/noquest/monk.txt
-
-//2-1-1 Without Quest
-npc: npc/jobs/2-1-1/AssassinCross.txt
-npc: npc/jobs/2-1-1/LordKnight.txt
-npc: npc/jobs/2-1-1/HighPriest.txt
-npc: npc/jobs/2-1-1/HighWizard.txt
-npc: npc/jobs/2-1-1/WhiteSmith.txt
-npc: npc/jobs/2-1-1/Sniper.txt
-
-//2-2-1 Without Quest
-npc: npc/jobs/2-2-1/Champion.txt
-npc: npc/jobs/2-2-1/Clown.txt
-npc: npc/jobs/2-2-1/Creator.txt
-npc: npc/jobs/2-2-1/Gypsy.txt
-npc: npc/jobs/2-2-1/Paladin.txt
-npc: npc/jobs/2-2-1/Professor.txt
-npc: npc/jobs/2-2-1/Stalker.txt
-
-
-//------------------------- Merchants ----------------------------
-npc: npc/merchants/shops.txt
-npc: npc/merchants/refine.txt
-npc: npc/merchants/dye_maker.txt
-npc: npc/merchants/clothes_dyer.txt
-npc: npc/merchants/hair_dyer.txt
-npc: npc/merchants/grandpa_pharmacist.txt
-npc: npc/merchants/inn.txt
-npc: npc/merchants/milk_trader.txt
-npc: npc/merchants/renters.txt
-npc: npc/merchants/alchemist.txt
-
-// Custom
-//npc: npc/merchants/custom/2-2shop.txt
-// Free Falcon & Peco breeder, Free Carts
-//npc: npc/merchants/custom/breeder.txt
-
-
-//--------------------------- Quests ------------------------------
-// Item Quests
-npc: npc/quests/quests_alberta.txt
-npc: npc/quests/quests_aldebaran.txt
-npc: npc/quests/quests_comodo.txt
-npc: npc/quests/quests_geffen.txt
-npc: npc/quests/quests_lutie.txt
-npc: npc/quests/quests_morocc.txt
-npc: npc/quests/quests_payon.txt
-npc: npc/quests/quests_prontera.txt
-npc: npc/quests/quests_umbala.txt
-npc: npc/quests/quests_yuno.txt
-
-// Extra Item Making
-npc: npc/quests/mrsmile.txt
-npc: npc/quests/bunnyband.txt
-npc: npc/quests/juice_maker.txt
-npc: npc/quests/counteragent_mixture.txt
-npc: npc/quests/doomed_swords.txt
-npc: npc/quests/bongun.txt
-npc: npc/quests/munak.txt
-npc: npc/quests/bongunsword.txt
-npc: npc/quests/monstertamers.txt
-
-// Custom Quests, might be balance breaking (Enable if you want)
-//npc: npc/quests/all_quest.txt
-//npc: npc/quests/magicalhatquest.txt
-//npc: npc/quests/fashion.txt
-//npc: npc/quests/custom/excalibur.txt
-//npc: npc/quests/custom/elvenear.txt
-//npc: npc/quests/custom/ironcane.txt
-//npc: npc/quests/custom/sunglasses.txt
-//npc: npc/quests/custom/berzebub.txt
-npc: npc/quests/custom/new_hats.txt
-// Above Npcs are better ^_^
-//npc: npc/quests/custom/event_32_new_hats.txt
-npc: npc/quests/custom/valhallen.txt
-//both Lord Kaho, but different and quest.txt has balmung to:
-//npc: npc/quests/custom/kaho_balmung.txt
-//npc: npc/quests/custom/kahohorn.txt
-
-//----------------------- Skill Quests -----------------------------
-npc: npc/quests/skills/acolyte_skills.txt
-npc: npc/quests/skills/archer_skills.txt
-npc: npc/quests/skills/mage_skills.txt
-npc: npc/quests/skills/merchant_skills.txt
-npc: npc/quests/skills/novice_skills.txt
-npc: npc/quests/skills/swordsman_skills.txt
-npc: npc/quests/skills/thief_skills.txt
-
-//npc: npc/other/platinum_skills.txt
-
-
-// -------------------------- Guides -------------------------------
-npc: npc/guides/guides_alb.txt
-npc: npc/guides/guides_alde.txt
-npc: npc/guides/guides_com.txt
-npc: npc/guides/guides_gef.txt
-npc: npc/guides/guides_izl.txt
-npc: npc/guides/guides_mor.txt
-npc: npc/guides/guides_pay.txt
-npc: npc/guides/guides_pron.txt
-npc: npc/guides/guides_yun.txt
-npc: npc/guides/guides_umb.txt
-npc: npc/guides/guides_nif.txt
-//more to come
-
-
-// -------------------------- Kafras --------------------------------
-npc: npc/kafras/functions_kafras.txt
-npc: npc/kafras/kafras_alb.txt
-npc: npc/kafras/kafras_alde.txt
-npc: npc/kafras/kafras_com.txt
-npc: npc/kafras/kafras_dungeons.txt
-npc: npc/kafras/kafras_gef.txt
-npc: npc/kafras/kafras_izl.txt
-npc: npc/kafras/kafras_mor.txt
-npc: npc/kafras/kafras_pay.txt
-npc: npc/kafras/kafras_pron.txt
-npc: npc/kafras/kafras_yun.txt
-npc: npc/kafras/kafras_new.txt
-//more to come
-
-
-//---------------------------- Events --------------------------------
-//npc: npc/events/easter.txt
-//npc: npc/events/valentinesday.txt
-//npc: npc/events/xmas.txt
-//npc: npc/events/alchemist.txt
-//npc: npc/events/twintowers.txt
-npc: npc/events/custom/uneasy_cemetery.txt
-//npc: npc/events/custom/draculax.txt
-
-
-//---------------------------- Others --------------------------------
-npc: npc/other/books.txt
-npc: npc/other/msg_boards.txt
-npc: npc/other/pvp.txt
-npc: npc/other/IceCream.txt
-npc: npc/other/card_remover.txt
-//npc: npc/other/wedding.txt
-//npc: npc/other/gefenia.txt
-//npc: npc/other/momotaro.txt
-//npc: npc/other/tougijou.txt
-//npc: npc/other/arena_mvp.txt
-
-// Global Scripts Functions ------------------
-npc: npc/other/Global_Functions.txt
-
-
-//------------------------- Unofficial NPCs --------------------------
-npc: npc/other/kafra_bank.txt
-//npc: npc/other/bank.txt
-//npc: npc/jobs/custom/reset.txt
-//npc: npc/jobs/custom/jobchange.txt
-//npc: npc/other/heal.txt
-//npc: npc/other/heal_payment.txt
-npc: npc/other/blackjack.txt
-
-// Warper NPC (Enable for free warp service)
-// 1st is Warper with only option for cities and dungeons
-//npc: npc/other/warper.txt
-// 2nd you can choose which lvl of the dungeon (you have to disabled 1 if you use 2!)
-//npc: npc/other/warper2.txt
-
-// Free Stylist NPC - Cloths/Hair Dye - (Requires 77 dye palletes)
-//npc: npc/merchants/custom/dye.txt
-
-// Dev NPCs
-npc: npc/other/devnpc.txt
-npc: npc/other/poetry/ayothaya.txt
-
-//= MC Cameri's Bank NPC
-//npc: npc/other/mc_cameri/bank.txt
-
-
-//-------------------------- Guild Wars ---------------------------------
-//Guild Wars: General
-npc: npc/guild/gldfunc_manager.txt
-npc: npc/guild/gldfunc_dunsw.txt
-npc: npc/guild/gldfunc_flag.txt
-npc: npc/guild/gldfunc_treasure.txt
-npc: npc/guild/gldfunc_kafra.txt
-npc: npc/guild/gldfunc_ev_agit.txt
-npc: npc/guild/ev_agit_event.txt
-
-// Guild Wars: Al De Baran
-npc: npc/guild/aldeg/aldeg_ev_agit.txt
-npc: npc/guild/aldeg/aldeg_flags.txt
-npc: npc/guild/aldeg/aldeg_managers.txt
-npc: npc/guild/aldeg/aldeg_kafras.txt
-npc: npc/guild/aldeg/aldeg_treas.txt
-npc: npc/guild/aldeg/aldeg_dunsw.txt
-npc: npc/guild/aldeg/aldeg_guardians.txt
-
-// Guild Wars: Geffen
-npc: npc/guild/gefg/gefg_ev_agit.txt
-npc: npc/guild/gefg/gefg_flags.txt
-npc: npc/guild/gefg/gefg_managers.txt
-npc: npc/guild/gefg/gefg_kafras.txt
-npc: npc/guild/gefg/gefg_treas.txt
-npc: npc/guild/gefg/gefg_dunsw.txt
-npc: npc/guild/gefg/gefg_guardians.txt
-
-// Guild Wars: Payon
-npc: npc/guild/payg/payg_ev_agit.txt
-npc: npc/guild/payg/payg_flags.txt
-npc: npc/guild/payg/payg_managers.txt
-npc: npc/guild/payg/payg_kafras.txt
-npc: npc/guild/payg/payg_dunsw.txt
-npc: npc/guild/payg/payg_treas.txt
-npc: npc/guild/payg/payg_guardians.txt
-
-// Guild Wars: Prontera
-npc: npc/guild/prtg/prtg_ev_agit.txt
-npc: npc/guild/prtg/prtg_flags.txt
-npc: npc/guild/prtg/prtg_managers.txt
-npc: npc/guild/prtg/prtg_kafras.txt
-npc: npc/guild/prtg/prtg_dunsw.txt
-npc: npc/guild/prtg/prtg_treas.txt
-npc: npc/guild/prtg/prtg_guardians.txt
-
-// Guild Wars: NGuild
-npc: npc/guild/nguild/nguild_ev_agit.txt
-npc: npc/guild/nguild/nguild_flags.txt
-npc: npc/guild/nguild/nguild_managers.txt
-npc: npc/guild/nguild/nguild_kafras.txt
-//npc: npc/guild/nguild/nguild_dunsw.txt
-npc: npc/guild/nguild/nguild_treas.txt
-npc: npc/guild/nguild/nguild_guardians.txt
-
-//Guild Wars: Extras
-//npc: npc/guild/Extras/woe_gflag.txt
-npc: npc/guild/Extras/woe_warper.txt
-
-//------------------ Guild Wars(Non-optimized) -----------------------
-//Guild Wars: General
-//npc: npc/guild/old/ev_agit_event.txt
-
-//Guild Wars: Al de Baran
-//npc: npc/guild/old/aldeg_flag.txt
-//npc: npc/guild/old/ev_agit_aldeg.txt
-//npc: npc/guild/old/aldeg_cas01.txt
-//npc: npc/guild/old/guardian/aldeg_cas01_guardian.txt
-//npc: npc/guild/old/treasure/aldeg_cas01_treasure.txt
-//npc: npc/guild/old/aldeg_cas02.txt
-//npc: npc/guild/old/guardian/aldeg_cas02_guardian.txt
-//npc: npc/guild/old/treasure/aldeg_cas02_treasure.txt
-//npc: npc/guild/old/aldeg_cas03.txt
-//npc: npc/guild/old/guardian/aldeg_cas03_guardian.txt
-//npc: npc/guild/old/treasure/aldeg_cas03_treasure.txt
-//npc: npc/guild/old/aldeg_cas04.txt
-//npc: npc/guild/old/guardian/aldeg_cas04_guardian.txt
-//npc: npc/guild/old/treasure/aldeg_cas04_treasure.txt
-//npc: npc/guild/old/aldeg_cas05.txt
-//npc: npc/guild/old/guardian/aldeg_cas05_guardian.txt
-//npc: npc/guild/old/treasure/aldeg_cas05_treasure.txt
-
-//Guild Wars: Geffen
-//npc: npc/guild/old/gefg_flag.txt
-//npc: npc/guild/old/ev_agit_gefg.txt
-//npc: npc/guild/old/gefg_cas01.txt
-//npc: npc/guild/old/guardian/gefg_cas01_guardian.txt
-//npc: npc/guild/old/treasure/gefg_cas01_treasure.txt
-//npc: npc/guild/old/gefg_cas02.txt
-//npc: npc/guild/old/guardian/gefg_cas02_guardian.txt
-//npc: npc/guild/old/treasure/gefg_cas02_treasure.txt
-//npc: npc/guild/old/gefg_cas03.txt
-//npc: npc/guild/old/guardian/gefg_cas03_guardian.txt
-//npc: npc/guild/old/treasure/gefg_cas03_treasure.txt
-//npc: npc/guild/old/gefg_cas04.txt
-//npc: npc/guild/old/guardian/gefg_cas04_guardian.txt
-//npc: npc/guild/old/treasure/gefg_cas04_treasure.txt
-//npc: npc/guild/old/gefg_cas05.txt
-//npc: npc/guild/old/guardian/gefg_cas05_guardian.txt
-//npc: npc/guild/old/treasure/gefg_cas05_treasure.txt
-
-//Guild Wars: Payon
-//npc: npc/guild/old/payg_flag.txt
-//npc: npc/guild/old/ev_agit_payg.txt
-//npc: npc/guild/old/payg_cas01.txt
-//npc: npc/guild/old/guardian/payg_cas01_guardian.txt
-//npc: npc/guild/old/treasure/payg_cas01_treasure.txt
-//npc: npc/guild/old/payg_cas02.txt
-//npc: npc/guild/old/guardian/payg_cas02_guardian.txt
-//npc: npc/guild/old/treasure/payg_cas02_treasure.txt
-//npc: npc/guild/old/payg_cas03.txt
-//npc: npc/guild/old/guardian/payg_cas03_guardian.txt
-//npc: npc/guild/old/treasure/payg_cas03_treasure.txt
-//npc: npc/guild/old/payg_cas04.txt
-//npc: npc/guild/old/guardian/payg_cas04_guardian.txt
-//npc: npc/guild/old/treasure/payg_cas04_treasure.txt
-//npc: npc/guild/old/payg_cas05.txt
-//npc: npc/guild/old/guardian/payg_cas05_guardian.txt
-//npc: npc/guild/old/treasure/payg_cas05_treasure.txt
-
-//Guild Wars: Prontera
-//npc: npc/guild/old/prtg_flag.txt
-//npc: npc/guild/old/ev_agit_prtg.txt
-//npc: npc/guild/old/prtg_cas01.txt
-//npc: npc/guild/old/guardian/prtg_cas01_guardian.txt
-//npc: npc/guild/old/treasure/prtg_cas01_treasure.txt
-//npc: npc/guild/old/prtg_cas02.txt
-//npc: npc/guild/old/guardian/prtg_cas02_guardian.txt
-//npc: npc/guild/old/treasure/prtg_cas02_treasure.txt
-//npc: npc/guild/old/prtg_cas03.txt
-//npc: npc/guild/old/guardian/prtg_cas03_guardian.txt
-//npc: npc/guild/old/treasure/prtg_cas03_treasure.txt
-//npc: npc/guild/old/prtg_cas04.txt
-//npc: npc/guild/old/guardian/prtg_cas04_guardian.txt
-//npc: npc/guild/old/treasure/prtg_cas04_treasure.txt
-//npc: npc/guild/old/prtg_cas05.txt
-//npc: npc/guild/old/guardian/prtg_cas05_guardian.txt
-//npc: npc/guild/old/treasure/prtg_cas05_treasure.txt
-
-
-//--------------------- Warps ---------------------------
-//= Cities ============================
-npc: npc/warps/cities/alberta.txt
-npc: npc/warps/cities/aldebaran.txt
-npc: npc/warps/cities/amatsu.txt
-npc: npc/warps/ayothaya.txt
-npc: npc/warps/cities/comodo.txt
-npc: npc/warps/cities/geffen.txt
-npc: npc/warps/cities/gonryun.txt
-npc: npc/warps/cities/izlude.txt
-npc: npc/warps/cities/louyang.txt
-npc: npc/warps/cities/lutie.txt
-npc: npc/warps/cities/morroc.txt
-npc: npc/warps/cities/niflheim.txt
-npc: npc/warps/cities/payon.txt
-npc: npc/warps/cities/prontera.txt
-npc: npc/warps/cities/umbala.txt
-npc: npc/warps/cities/yggdrasil.txt
-npc: npc/warps/cities/yuno.txt
-//= Dungeons =============================
-npc: npc/warps/dungeons/alberta_duns.txt
-npc: npc/warps/dungeons/alde_ct.txt
-npc: npc/warps/dungeons/amatsu_dun.txt
-npc: npc/warps/dungeons/ant_hell.txt
-npc: npc/warps/dungeons/coal_mine.txt
-npc: npc/warps/dungeons/com_dun.txt
-npc: npc/warps/dungeons/geffen_dun.txt
-npc: npc/warps/dungeons/gon_dun.txt
-npc: npc/warps/dungeons/izlude_dun.txt
-npc: npc/warps/dungeons/louyang_dun.txt
-npc: npc/warps/dungeons/lutie_dun.txt
-npc: npc/warps/dungeons/morroc_duns.txt
-npc: npc/warps/dungeons/orc_dun.txt
-npc: npc/warps/dungeons/payon_dun.txt
-npc: npc/warps/dungeons/prt_dun.txt
-npc: npc/warps/dungeons/umbala_dun.txt
-npc: npc/warps/dungeons/yuno_dun.txt
-//= Fields ===============================
-npc: npc/warps/fields/amatsu_fild.txt
-npc: npc/warps/fields/com_fild.txt
-npc: npc/warps/fields/gefenia.txt
-npc: npc/warps/fields/geffen_fild.txt
-npc: npc/warps/fields/glastheim.txt
-npc: npc/warps/fields/jawaii.txt
-npc: npc/warps/fields/lutie_fild.txt
-npc: npc/warps/fields/morroc_fild.txt
-npc: npc/warps/fields/mtmjolnir.txt
-npc: npc/warps/fields/payon_fild.txt
-npc: npc/warps/fields/prontera_fild.txt
-npc: npc/warps/fields/umbala_fild.txt
-npc: npc/warps/fields/yuno_fild.txt
-//= Guilds ==============================
-npc: npc/warps/guild/guildcastles.txt
-//= Other ================================
-npc: npc/warps/other/jobquests.txt
-npc: npc/warps/other/other.txt
-//= PVP ==================================
-npc: npc/warps/pvp/pvp.txt
-
-
-//--------------------- Mobs ---------------------------
-npc: npc/mobs/pvp.txt
-npc: npc/mobs/fields/amatsu.txt
-npc: npc/mobs/fields/ayothaya.txt
-npc: npc/mobs/fields/comodo.txt
-npc: npc/mobs/fields/gefenia.txt
-npc: npc/mobs/fields/geffen.txt
-npc: npc/mobs/fields/gonryun.txt
-npc: npc/mobs/fields/louyang.txt
-npc: npc/mobs/fields/lutie.txt
-npc: npc/mobs/fields/mjolnir.txt
-npc: npc/mobs/fields/morocc.txt
-npc: npc/mobs/fields/niflheim.txt
-npc: npc/mobs/fields/payon.txt
-npc: npc/mobs/fields/prontera.txt
-npc: npc/mobs/fields/umbala.txt
-npc: npc/mobs/fields/yuno.txt
-npc: npc/mobs/dungeons/amatdun.txt
-npc: npc/mobs/dungeons/anthell.txt
-npc: npc/mobs/dungeons/ayodun.txt
-npc: npc/mobs/dungeons/beachdun.txt
-npc: npc/mobs/dungeons/byalan.txt
-npc: npc/mobs/dungeons/clocktower.txt
-npc: npc/mobs/dungeons/coalmine.txt
-npc: npc/mobs/dungeons/geftower.txt
-npc: npc/mobs/dungeons/glastheim.txt
-npc: npc/mobs/dungeons/gondun.txt
-npc: npc/mobs/dungeons/guilddun.txt
-npc: npc/mobs/dungeons/louydun.txt
-npc: npc/mobs/dungeons/magmadun.txt
-npc: npc/mobs/dungeons/moc_pyramid.txt
-npc: npc/mobs/dungeons/moc_sphinx.txt
-npc: npc/mobs/dungeons/orcdun.txt
-npc: npc/mobs/dungeons/payoncave.txt
-npc: npc/mobs/dungeons/pront_maze.txt
-npc: npc/mobs/dungeons/pront_sewers.txt
-npc: npc/mobs/dungeons/sunkenship.txt
-npc: npc/mobs/dungeons/toyfactory.txt
-npc: npc/mobs/dungeons/turtleisland.txt
-npc: npc/mobs/dungeons/umbaladun.txt
-
-//------------------------- Maps ---------------------------
-map: alb_ship.gat
-map: alb2trea.gat
-map: alberta.gat
-map: alberta_in.gat
-map: alde_dun01.gat
-map: alde_dun02.gat
-map: alde_dun03.gat
-map: alde_dun04.gat
-map: aldeba_in.gat
-map: aldebaran.gat
-map: anthell01.gat
-map: anthell02.gat
-map: arena_room.gat
-map: c_tower1.gat
-map: c_tower2.gat
-map: c_tower3.gat
-map: c_tower4.gat
-map: force_1-1.gat
-map: force_1-2.gat
-map: force_1-3.gat
-map: force_2-1.gat
-map: force_2-2.gat
-map: force_2-3.gat
-map: force_3-1.gat
-map: force_3-2.gat
-map: force_3-3.gat
-map: gef_dun00.gat
-map: gef_dun01.gat
-map: gef_dun02.gat
-map: gef_dun03.gat
-map: gef_fild00.gat
-map: gef_fild01.gat
-map: gef_fild02.gat
-map: gef_fild03.gat
-map: gef_fild04.gat
-map: gef_fild05.gat
-map: gef_fild06.gat
-map: gef_fild07.gat
-map: gef_fild08.gat
-map: gef_fild09.gat
-map: gef_fild10.gat
-map: gef_fild11.gat
-map: gef_tower.gat
-map: geffen.gat
-map: geffen_in.gat
-map: gl_cas01.gat
-map: gl_cas02.gat
-map: gl_church.gat
-map: gl_chyard.gat
-map: gl_dun01.gat
-map: gl_dun02.gat
-map: gl_in01.gat
-map: gl_knt01.gat
-map: gl_knt02.gat
-map: gl_prison.gat
-map: gl_prison1.gat
-map: gl_sew01.gat
-map: gl_sew02.gat
-map: gl_sew03.gat
-map: gl_sew04.gat
-map: gl_step.gat
-map: glast_01.gat
-map: hunter_1-1.gat
-map: hunter_2-1.gat
-map: hunter_3-1.gat
-map: in_hunter.gat
-map: in_moc_16.gat
-map: in_orcs01.gat
-map: in_sphinx1.gat
-map: in_sphinx2.gat
-map: in_sphinx3.gat
-map: in_sphinx4.gat
-map: in_sphinx5.gat
-map: iz_dun00.gat
-map: iz_dun01.gat
-map: iz_dun02.gat
-map: iz_dun03.gat
-map: iz_dun04.gat
-//map: iz_dun05.gat
-map: izlu2dun.gat
-map: izlude.gat
-map: izlude_in.gat
-map: job_thief1.gat
-map: knight_1-1.gat
-map: knight_2-1.gat
-map: knight_3-1.gat
-map: mjo_dun01.gat
-map: mjo_dun02.gat
-map: mjo_dun03.gat
-map: mjolnir_01.gat
-map: mjolnir_02.gat
-map: mjolnir_03.gat
-map: mjolnir_04.gat
-map: mjolnir_05.gat
-map: mjolnir_06.gat
-map: mjolnir_07.gat
-map: mjolnir_08.gat
-map: mjolnir_09.gat
-map: mjolnir_10.gat
-map: mjolnir_11.gat
-map: mjolnir_12.gat
-map: moc_castle.gat
-map: moc_fild01.gat
-map: moc_fild02.gat
-map: moc_fild03.gat
-map: moc_fild04.gat
-map: moc_fild05.gat
-map: moc_fild06.gat
-map: moc_fild07.gat
-map: moc_fild08.gat
-map: moc_fild09.gat
-map: moc_fild10.gat
-map: moc_fild11.gat
-map: moc_fild12.gat
-map: moc_fild13.gat
-map: moc_fild14.gat
-map: moc_fild15.gat
-map: moc_fild16.gat
-map: moc_fild17.gat
-map: moc_fild18.gat
-map: moc_fild19.gat
-map: moc_pryd01.gat
-map: moc_pryd02.gat
-map: moc_pryd03.gat
-map: moc_pryd04.gat
-map: moc_pryd05.gat
-map: moc_pryd06.gat
-map: moc_prydb1.gat
-map: moc_ruins.gat
-map: monk_in.gat
-map: morocc.gat
-map: morocc_in.gat
-map: new_1-1.gat
-map: new_1-2.gat
-map: new_1-3.gat
-map: new_1-4.gat
-//map: new_2-1.gat
-//map: new_2-2.gat
-//map: new_2-3.gat
-//map: new_2-4.gat
-//map: new_3-1.gat
-//map: new_3-2.gat
-//map: new_3-3.gat
-//map: new_3-4.gat
-//map: new_4-1.gat
-//map: new_4-2.gat
-//map: new_4-3.gat
-//map: new_4-4.gat
-//map: new_5-1.gat
-//map: new_5-2.gat
-//map: new_5-3.gat
-//map: new_5-4.gat
-map: orcsdun01.gat
-map: orcsdun02.gat
-map: ordeal_1-1.gat
-map: ordeal_1-2.gat
-//map: ordeal_1-3.gat
-//map: ordeal_1-4.gat
-map: ordeal_2-1.gat
-map: ordeal_2-2.gat
-//map: ordeal_2-3.gat
-//map: ordeal_2-4.gat
-map: ordeal_3-1.gat
-map: ordeal_3-2.gat
-//map: ordeal_3-3.gat
-//map: ordeal_3-4.gat
-map: pay_arche.gat
-map: pay_dun00.gat
-map: pay_dun01.gat
-map: pay_dun02.gat
-map: pay_dun03.gat
-map: pay_dun04.gat
-map: pay_fild01.gat
-map: pay_fild02.gat
-map: pay_fild03.gat
-map: pay_fild04.gat
-map: pay_fild05.gat
-map: pay_fild06.gat
-map: pay_fild07.gat
-map: pay_fild08.gat
-map: pay_fild09.gat
-map: pay_fild10.gat
-map: pay_fild11.gat
-//map: payon.gat //moved down to new maps
-//map: payon_in01.gat //moved down to new maps
-//map: payon_in02.gat //moved down to new maps
-map: priest_1-1.gat
-map: priest_2-1.gat
-map: priest_3-1.gat
-map: prontera.gat
-map: prt_are_in.gat
-map: prt_are01.gat
-//map: prt_arena01.gat
-map: prt_castle.gat
-map: prt_church.gat
-map: prt_fild00.gat
-map: prt_fild01.gat
-map: prt_fild02.gat
-map: prt_fild03.gat
-map: prt_fild04.gat
-map: prt_fild05.gat
-map: prt_fild06.gat
-map: prt_fild07.gat
-map: prt_fild08.gat
-map: prt_fild09.gat
-map: prt_fild10.gat
-map: prt_fild11.gat
-map: prt_in.gat
-map: prt_maze01.gat
-map: prt_maze02.gat
-map: prt_maze03.gat
-map: prt_monk.gat
-map: prt_sewb1.gat
-map: prt_sewb2.gat
-map: prt_sewb3.gat
-map: prt_sewb4.gat
-map: pvp_2vs2.gat
-//map: pvp_c_room.gat
-map: pvp_n_1-1.gat
-map: pvp_n_1-2.gat
-map: pvp_n_1-3.gat
-map: pvp_n_1-4.gat
-map: pvp_n_1-5.gat
-map: pvp_n_2-1.gat
-map: pvp_n_2-2.gat
-map: pvp_n_2-3.gat
-map: pvp_n_2-4.gat
-map: pvp_n_2-5.gat
-map: pvp_n_3-1.gat
-map: pvp_n_3-2.gat
-map: pvp_n_3-3.gat
-map: pvp_n_3-4.gat
-map: pvp_n_3-5.gat
-map: pvp_n_4-1.gat
-map: pvp_n_4-2.gat
-map: pvp_n_4-3.gat
-map: pvp_n_4-4.gat
-map: pvp_n_4-5.gat
-map: pvp_n_5-1.gat
-map: pvp_n_5-2.gat
-map: pvp_n_5-3.gat
-map: pvp_n_5-4.gat
-map: pvp_n_5-5.gat
-map: pvp_n_6-1.gat
-map: pvp_n_6-2.gat
-map: pvp_n_6-3.gat
-map: pvp_n_6-4.gat
-map: pvp_n_6-5.gat
-map: pvp_n_7-1.gat
-map: pvp_n_7-2.gat
-map: pvp_n_7-3.gat
-map: pvp_n_7-4.gat
-map: pvp_n_7-5.gat
-map: pvp_n_8-1.gat
-map: pvp_n_8-2.gat
-map: pvp_n_8-3.gat
-map: pvp_n_8-4.gat
-map: pvp_n_8-5.gat
-map: pvp_n_room.gat
-map: pvp_y_1-1.gat
-map: pvp_y_1-2.gat
-map: pvp_y_1-3.gat
-map: pvp_y_1-4.gat
-map: pvp_y_1-5.gat
-map: pvp_y_2-1.gat
-map: pvp_y_2-2.gat
-map: pvp_y_2-3.gat
-map: pvp_y_2-4.gat
-map: pvp_y_2-5.gat
-map: pvp_y_3-1.gat
-map: pvp_y_3-2.gat
-map: pvp_y_3-3.gat
-map: pvp_y_3-4.gat
-map: pvp_y_3-5.gat
-map: pvp_y_4-1.gat
-map: pvp_y_4-2.gat
-map: pvp_y_4-3.gat
-map: pvp_y_4-4.gat
-map: pvp_y_4-5.gat
-map: pvp_y_5-1.gat
-map: pvp_y_5-2.gat
-map: pvp_y_5-3.gat
-map: pvp_y_5-4.gat
-map: pvp_y_5-5.gat
-map: pvp_y_6-1.gat
-map: pvp_y_6-2.gat
-map: pvp_y_6-3.gat
-map: pvp_y_6-4.gat
-map: pvp_y_6-5.gat
-map: pvp_y_7-1.gat
-map: pvp_y_7-2.gat
-map: pvp_y_7-3.gat
-map: pvp_y_7-4.gat
-map: pvp_y_7-5.gat
-map: pvp_y_8-1.gat
-map: pvp_y_8-2.gat
-map: pvp_y_8-3.gat
-map: pvp_y_8-4.gat
-map: pvp_y_8-5.gat
-map: pvp_y_room.gat
-map: sword_1-1.gat
-map: sword_2-1.gat
-map: sword_3-1.gat
-map: treasure01.gat
-map: treasure02.gat
-map: wizard_1-1.gat
-map: wizard_2-1.gat
-map: wizard_3-1.gat
-map: xmas.gat
-map: xmas_dun01.gat
-map: xmas_dun02.gat
-map: xmas_fild01.gat
-map: xmas_in.gat
-
-//---Ep3.0 Comodo ---
-
-map: beach_dun.gat
-map: beach_dun2.gat
-map: beach_dun3.gat
-map: cmd_fild01.gat
-map: cmd_fild02.gat
-map: cmd_fild03.gat
-map: cmd_fild04.gat
-map: cmd_fild05.gat
-map: cmd_fild06.gat
-map: cmd_fild07.gat
-map: cmd_fild08.gat
-map: cmd_fild09.gat
-map: cmd_in01.gat
-map: cmd_in02.gat
-map: comodo.gat
-map: gef_fild12.gat
-map: gef_fild13.gat
-map: gef_fild14.gat
-
-//---EP3.1 Quiz Revolution ---
-
-map: quiz_00.gat
-map: quiz_01.gat
-
-//--- Ep4.0 Turtle Island ---
-
-map: tur_dun01.gat
-map: tur_dun02.gat
-map: tur_dun03.gat
-map: tur_dun04.gat
-map: tur_dun05.gat
-map: tur_dun06.gat
-
-//--- Ep4.1 The War of Emperium ---
-
-map: alde_gld.gat
-map: aldeg_cas01.gat
-map: aldeg_cas02.gat
-map: aldeg_cas03.gat
-map: aldeg_cas04.gat
-map: aldeg_cas05.gat
-map: gefg_cas01.gat
-map: gefg_cas02.gat
-map: gefg_cas03.gat
-map: gefg_cas04.gat
-map: gefg_cas05.gat
-map: gld_dun01.gat
-map: gld_dun02.gat
-map: gld_dun03.gat
-map: gld_dun04.gat
-//map: guild_room.gat
-map: guild_vs1.gat
-map: guild_vs2.gat
-map: guild_vs3.gat
-map: guild_vs4.gat
-map: guild_vs5.gat
-map: job_hunte.gat
-map: job_knt.gat
-map: job_prist.gat
-map: job_wiz.gat
-map: pay_gld.gat
-map: payg_cas01.gat
-map: payg_cas02.gat
-map: payg_cas03.gat
-map: payg_cas04.gat
-map: payg_cas05.gat
-map: prt_gld.gat
-map: prtg_cas01.gat
-map: prtg_cas02.gat
-map: prtg_cas03.gat
-map: prtg_cas04.gat
-map: prtg_cas05.gat
-
-
-//--- Ep5.0 Yuno ---
-
-map: alde_alche.gat
-map: in_rogue.gat
-map: job_cru.gat
-map: job_duncer.gat
-map: job_monk.gat
-map: job_sage.gat
-map: mag_dun01.gat
-map: mag_dun02.gat
-map: monk_test.gat
-map: yuno.gat
-map: yuno_fild01.gat
-map: yuno_fild02.gat
-map: yuno_fild03.gat
-map: yuno_fild04.gat
-map: yuno_in01.gat
-map: yuno_in02.gat
-map: yuno_in03.gat
-map: yuno_in04.gat
-map: yuno_in05.gat
-
-//--- Ep6.0 - Amatsu ---
-// Requires: kRO 08-10-03 or newer
-// or kRO Sakray 09-09-03 or newer
-
-map: ama_dun01.gat
-map: ama_dun02.gat
-map: ama_dun03.gat
-map: ama_fild01.gat
-map: ama_in01.gat
-map: ama_in02.gat
-map: ama_test.gat
-map: amatsu.gat
-
-//--- Ep6.1 - Gon Ryun ---
-
-map: gon_dun01.gat
-map: gon_dun02.gat
-map: gon_dun03.gat
-map: gon_fild01.gat
-map: gon_in.gat
-map: gon_test.gat
-map: gonryun.gat
-map: sec_in01.gat
-map: sec_in02.gat
-map: sec_pri.gat
-
-//--- Ep6.2 - Umbala ---
-// Requires: kRO 01-27-04 or newer
-// or kRO Sakray 12-02-03 or newer
-// or Akaru's SuperGRF 1.22 or newer
-map: umbala.gat
-map: um_dun01.gat
-map: um_dun02.gat
-map: um_fild01.gat
-map: um_fild02.gat
-map: um_fild03.gat
-map: um_fild04.gat
-map: um_in.gat
-
-//--- Ep6.3 - Niflheim ---
-// Requires: kRO 02-23-04 or newer
-// or kRO Sakray 01-09-04 or newer
-// or Akaru's SuperGRF 1.32 or newer
-map: niflheim.gat
-map: nif_fild01.gat
-map: nif_fild02.gat
-map: nif_in.gat
-map: yggdrasil01.gat
-
-//--- Ep6.4 - Valkyrie ---
-// Requires: kRO ??-??-04 or newer
-// or kRO Sakray 02-03-04 or newer
-// or Akaru's SuperGRF 1.34 or newer
-map: valkyrie.gat
-
-//--- Ep6.5 - Castle of Dragon (LouYang) ---
-// Requires kRO Sakray 03-30 or newer
-//(Akaru's SuperGRF required version: 1.52)
-map: lou_in01.gat
-map: lou_in02.gat
-map: lou_dun03.gat
-map: lou_dun02.gat
-map: lou_dun01.gat
-map: lou_fild01.gat
-map: louyang.gat
-
-//--- Ep6.6 - Novice Guild Siege ---
-//Requires kRO Sakray 04-07 or newer
-//(Akaru's SuperGRF required version: 1.53)
-//map: siege_test.gat
-map: n_castle.gat
-map: nguild_gef.gat
-map: nguild_prt.gat
-map: nguild_pay.gat
-map: nguild_alde.gat
-
-//--- Ep6.7 - Jawaii ---
-//Requires kRO Sakray 06-22 or newer
-//(Akaru's SuperGRF required version: 1.63)
-map: jawaii.gat
-map: jawaii_in.gat
-
-// --- Ep6.8 - Geffenia ---
-// Requires kRO Sakray 07-13 or newer
-// (Akaru's SuperGRF required version: 1.64)
-map: gefenia01.gat
-map: gefenia02.gat
-map: gefenia03.gat
-map: gefenia04.gat
-
-// --- Ep6.x - Some Maps ---
-//map: new_zone01.gat
-//map: new_zone02.gat
-//map: new_zone03.gat
-//map: new_zone04.gat
-
-// --- Ep6.9 - New Payon ---
-// Requires kRO Sakray 09-03
-// -- dunno --
-map: payon.gat
-map: payon_in01.gat
-map: payon_in02.gat
-map: payon_in03.gat
-//same names as old maps except that payon_in03.gat got added
-
-// --- Ep? - Ayothaya ---
-// Requires kRO Sakray 09-21
-// -- 2004-10-19sdata_k.gpf --
-map: ayothaya.gat
-map: ayo_in01.gat
-map: ayo_in02.gat
-map: ayo_fild01.gat
-map: ayo_fild02.gat
-map: ayo_dun01.gat
-map: ayo_dun02.gat
-
-// --- God item quests maps ---
-// -- 2004-10-12sdata_k3.gpf --
-map: que_god01.gat
-map: que_god02.gat
-
-// Ragnarok World Championship 2004
-// Requires: RWC 2004 Client
-// or Akaru's SuperGRF 1.64 or newer
-//map: rwc01.gat
-//map: rwc02.gat
-//map: rwc03.gat
-
-//Christmas & Sakura Special
-//Requires Akaru's SuperGRF 1.1 or newer
-//map: prontera_x.gat
-//map: alberta_x.gat
-//map: aldebaran_x.gat
-//map: geffen_x.gat
-//map: izlude_x.gat
-//map: prt_church_x.gat
-//map: prontera_s.gat
-//map: pay_arche_s.gat
-
-//Fenced Lutie
-//Requires Akaru's SuperGRF 1.23 or newer
-//map: xmas_old.gat
-
-//Maps that were not in the list but exist in Data.grf
-//map: ordeal_a00.gat
-//map: ordeal_a02.gat
-
-//Alpha Maps
-//Requires adata.grf containing alpha maps and data
-//map: fay_vilg00.gat
-//map: fay_vilg01.gat
-//map: gef_vilg00.gat
-//map: gef_vilg01.gat
-//map: moc_dugn01.gat
-//map: moc_dugn02.gat
-//map: moc_fild01.gat
-//map: moc_fild02.gat
-//map: moc_fild03.gat
-//map: moc_fild04.gat
-//map: moc_intr00.gat
-//map: moc_intr01.gat
-//map: moc_intr02.gat
-//map: moc_intr04.gat
-//map: moc_vilg00.gat
-//map: moc_vilg01.gat
-//map: moc_vilg02.gat
-//map: probemap.gat
-//map: probemap02.gat
-//map: prt_cstl01.gat
-//map: prt_dugn00.gat
-//map: prt_dugn01.gat
-//map: prt_fild00.gat
-//map: prt_fild01.gat
-//map: prt_fild03.gat
-//map: prt_fild04.gat
-//map: prt_fild05.gat
-//map: prt_intr01.gat
-//map: prt_intr01_a.gat
-//map: prt_intr02.gat
-//map: prt_vilg00.gat
-//map: prt_vilg01.gat
-//map: prt_vilg02.gat
-//map: tank_test.gat
-//map: tank_test2.gat
-//map: test.gat
-
-import: conf/import/map_conf.txt
+// Maps:
+import: conf/maps_athena.conf
// Mugendai's GUI Support
imalive_on: 0
imalive_time: 30
flush_on: 0
flush_time: 30
+
+import: conf/import/map_conf.txt
diff --git a/conf-tmpl/mapflag/gvg.txt b/conf-tmpl/mapflag/gvg.txt
index 1df18fada..b754612b1 100644
--- a/conf-tmpl/mapflag/gvg.txt
+++ b/conf-tmpl/mapflag/gvg.txt
@@ -38,3 +38,9 @@ prtg_cas02.gat mapflag gvg
prtg_cas03.gat mapflag gvg
prtg_cas04.gat mapflag gvg
prtg_cas05.gat mapflag gvg
+
+// Guild Dungeons ==========
+gld_dun01.gat mapflag gvg
+gld_dun02.gat mapflag gvg
+gld_dun03.gat mapflag gvg
+gld_dun04.gat mapflag gvg \ No newline at end of file
diff --git a/conf-tmpl/mapflag/indoors.txt b/conf-tmpl/mapflag/indoors.txt
index 56c5060da..80f95790a 100644
--- a/conf-tmpl/mapflag/indoors.txt
+++ b/conf-tmpl/mapflag/indoors.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena Dev Team
//===== Current Version: =====================================
-//= 1.0
+//= 1.1 [Lupus]
//===== Compatible With: =====================================
//=
//===== Description: =========================================
@@ -50,4 +50,8 @@ jawaii_in.gat mapflag indoors
que_god01.gat mapflag indoors
que_god02.gat mapflag indoors
ayo_in01.gat mapflag indoors
-ayo_in02.gat mapflag indoors \ No newline at end of file
+ayo_in02.gat mapflag indoors
+que_sign01.gat mapflag indoors
+ein_in01.gat mapflag indoors
+airport.gat mapflag indoors
+airplane.gat mapflag indoors \ No newline at end of file
diff --git a/conf-tmpl/mapflag/jail.txt b/conf-tmpl/mapflag/jail.txt
index 5e497b911..4ccf63e8c 100644
--- a/conf-tmpl/mapflag/jail.txt
+++ b/conf-tmpl/mapflag/jail.txt
@@ -36,10 +36,10 @@ sec_pri.gat mapflag nowarp
//Uncomment following maps to let your prisoners fight with other prisoners
// PvP ===================================
-//sec_pri.gat mapflag pvp
+sec_pri.gat mapflag pvp
// No Party ==============================
-//sec_pri.gat mapflag pvp_noparty
+sec_pri.gat mapflag pvp_noparty
//Nightmare Equipment Drops PVP ==========
sec_pri.gat mapflag pvp_nightmaredrop random,equip,300
diff --git a/conf-tmpl/mapflag/nobranch.txt b/conf-tmpl/mapflag/nobranch.txt
index d37e055f5..5fe581734 100644
--- a/conf-tmpl/mapflag/nobranch.txt
+++ b/conf-tmpl/mapflag/nobranch.txt
@@ -2,9 +2,12 @@
//= Map flags that disable dead branching
//===== By: ==================================================
//= eAthena Dev Team
+//= 1.2 [Lupus]
//===== Current Version: =====================================
// Cities ================>\\
+ayo_in01.gat mapflag nobranch
+ayo_in02.gat mapflag nobranch
alb_ship.gat mapflag nobranch
alberta_in.gat mapflag nobranch
aldeba_in.gat mapflag nobranch
@@ -30,6 +33,7 @@ new_1-4.gat mapflag nobranch
nif_in.gat mapflag nobranch
payon_in01.gat mapflag nobranch
payon_in02.gat mapflag nobranch
+payon_in03.gat mapflag nobranch
prt_castle.gat mapflag nobranch
prt_church.gat mapflag nobranch
prt_in.gat mapflag nobranch
@@ -39,6 +43,10 @@ yuno_in01.gat mapflag nobranch
yuno_in03.gat mapflag nobranch
yuno_in04.gat mapflag nobranch
yuno_in05.gat mapflag nobranch
+que_sign01.gat mapflag nobranch
+ein_in01.gat mapflag nobranch
+airport.gat mapflag nobranch
+airplane.gat mapflag nobranch
// Job Quests ====================
sword_1-1.gat mapflag nobranch
@@ -62,6 +70,10 @@ monk_in.gat mapflag nobranch
in_rogue.gat mapflag nobranch
job_sage.gat mapflag nobranch
+// Special Quests Places =========
+que_god01.gat mapflag noteleport
+que_god02.gat mapflag noteleport
+
// Guild Castles ==================
//alde_gld.gat mapflag nobranch
aldeg_cas01.gat mapflag nobranch
diff --git a/conf-tmpl/mapflag/noicewall.txt b/conf-tmpl/mapflag/noicewall.txt
index 08f46877d..7960c905c 100644
--- a/conf-tmpl/mapflag/noicewall.txt
+++ b/conf-tmpl/mapflag/noicewall.txt
@@ -5,8 +5,11 @@
//=============================================================
//= noicewall: Disables Icewall skill.
//= To disable Icewall on a specific map add the mapname here.
+//= 1.2 [Lupus]
//============================================================
+ayo_in01.gat mapflag noicewall
+ayo_in02.gat mapflag noicewall
alberta_in.gat mapflag noicewall
alberta.gat mapflag noicewall
alde_alche.gat mapflag noicewall
@@ -34,6 +37,7 @@ morocc_in.gat mapflag noicewall
morocc.gat mapflag noicewall
payon_in01.gat mapflag noicewall
payon_in02.gat mapflag noicewall
+payon_in03.gat mapflag noicewall
payon.gat mapflag noicewall
pay_arche.gat mapflag noicewall
prt_are_in.gat mapflag noicewall
@@ -57,4 +61,8 @@ yuno_in05.gat mapflag noicewall
yuno.gat mapflag noicewall
gon_test.gat mapflag noicewall
nif_in.gat mapflag noicewall
-louyang.gat mapflag noicewall \ No newline at end of file
+louyang.gat mapflag noicewall
+que_sign01.gat mapflag noicewall
+ein_in01.gat mapflag noicewall
+airport.gat mapflag noicewall
+airplane.gat mapflag noicewall
diff --git a/conf-tmpl/mapflag/nomemo.txt b/conf-tmpl/mapflag/nomemo.txt
index 4bd5e9c36..97679fe0e 100644
--- a/conf-tmpl/mapflag/nomemo.txt
+++ b/conf-tmpl/mapflag/nomemo.txt
@@ -2,10 +2,15 @@
//= Map flags that disable warp portal memory
//===== By: ==================================================
//= eAthena Dev Team
+//= 1.2 [Lupus]
//===== Current Version: =====================================
-// Towns ==================>\\
+// Towns ====================
+ayo_in01.gat mapflag nomemo
+ayo_in02.gat mapflag nomemo
+ayo_fild02.gat mapflag nomemo
+alb2trea.gat mapflag nomemo
alb_ship.gat mapflag nomemo
alberta_in.gat mapflag nomemo
aldeba_in.gat mapflag nomemo
@@ -13,6 +18,9 @@ ama_in01.gat mapflag nomemo
ama_in02.gat mapflag nomemo
cmd_in01.gat mapflag nomemo
cmd_in02.gat mapflag nomemo
+gef_fild06.gat mapflag nomemo
+gef_fild08.gat mapflag nomemo
+gef_fild12.gat mapflag nomemo
gef_tower.gat mapflag nomemo
geffen_in.gat mapflag nomemo
gon_test.gat mapflag nomemo
@@ -24,23 +32,38 @@ lou_in01.gat mapflag nomemo
lou_in02.gat mapflag nomemo
moc_castle.gat mapflag nomemo
morocc_in.gat mapflag nomemo
+mjolnir_01.gat mapflag nomemo
+mjolnir_07.gat mapflag nomemo
+mjolnir_10.gat mapflag nomemo
+niflheim.gat mapflag nomemo
nif_in.gat mapflag nomemo
new_1-1.gat mapflag nomemo
new_1-2.gat mapflag nomemo
new_1-3.gat mapflag nomemo
new_1-4.gat mapflag nomemo
+pay_fild05.gat mapflag nomemo
payon_in01.gat mapflag nomemo
payon_in02.gat mapflag nomemo
+payon_in03.gat mapflag nomemo
prt_castle.gat mapflag nomemo
prt_church.gat mapflag nomemo
prt_in.gat mapflag nomemo
um_in.gat mapflag nomemo
+um_fild01.gat mapflag nomemo
+um_fild02.gat mapflag nomemo
+um_fild03.gat mapflag nomemo
xmas_in.gat mapflag nomemo
+yuno_fild02.gat mapflag nomemo
yuno_in01.gat mapflag nomemo
yuno_in02.gat mapflag nomemo
yuno_in03.gat mapflag nomemo
+que_sign01.gat mapflag nomemo
+ein_in01.gat mapflag nomemo
+airport.gat mapflag nomemo
+airplane.gat mapflag nomemo
-// Job quests ===================
+
+// Job quests ================
sword_1-1.gat mapflag nomemo
sword_2-1.gat mapflag nomemo
sword_3-1.gat mapflag nomemo
@@ -62,6 +85,11 @@ monk_in.gat mapflag nomemo
in_rogue.gat mapflag nomemo
job_sage.gat mapflag nomemo
+// Special Quests Places =====
+que_god01.gat mapflag nomemo
+que_god02.gat mapflag nomemo
+
+
// Dungeons =================
alde_dun01.gat mapflag nomemo
alde_dun02.gat mapflag nomemo
@@ -187,10 +215,15 @@ um_dun02.gat mapflag nomemo
// Toy Factory ---------------
xmas_dun01.gat mapflag nomemo
xmas_dun02.gat mapflag nomemo
-// Yggdrasil Tree Dun -------
+// Yggdrasil Tree Dun --------
yggdrasil01.gat mapflag nomemo
+// Old Geffenia --------------
+gefenia01.gat mapflag nomemo
+gefenia02.gat mapflag nomemo
+gefenia03.gat mapflag nomemo
+gefenia04.gat mapflag nomemo
-// Guild Castles ===============
+// Guild Castles =============
//alde_gld.gat mapflag nomemo
aldeg_cas01.gat mapflag nomemo
aldeg_cas02.gat mapflag nomemo
@@ -220,14 +253,14 @@ gefg_cas03.gat mapflag nomemo
gefg_cas04.gat mapflag nomemo
gefg_cas05.gat mapflag nomemo
-// GvG Arenas =================
+// GvG Arenas ================
guild_vs1.gat mapflag nomemo
guild_vs2.gat mapflag nomemo
guild_vs3.gat mapflag nomemo
guild_vs4.gat mapflag nomemo
guild_vs5.gat mapflag nomemo
-// Arenas ====================>\\
+// Arenas ====================
arena_room.gat mapflag nomemo
force_1-1.gat mapflag nomemo
force_1-2.gat mapflag nomemo
@@ -267,7 +300,7 @@ wizard_1-1.gat mapflag nomemo
wizard_2-1.gat mapflag nomemo
wizard_3-1.gat mapflag nomemo
-// PvP Arenas ===================
+// PvP Arenas ================
pvp_y_room.gat mapflag nomemo
pvp_y_1-1.gat mapflag nomemo
pvp_y_1-2.gat mapflag nomemo
diff --git a/conf-tmpl/mapflag/nopenalty.txt b/conf-tmpl/mapflag/nopenalty.txt
index 604653527..f0f1df1bd 100644
--- a/conf-tmpl/mapflag/nopenalty.txt
+++ b/conf-tmpl/mapflag/nopenalty.txt
@@ -2,10 +2,13 @@
//= Map flags that disable exp. penalty on death.
//===== By: ==================================================
//= eAthena Dev Team
+//= 1.1 [Lupus]
//===== Current Version: =====================================
// Towns ====================>\\
+ayo_in01.gat mapflag nopenalty
+ayo_in02.gat mapflag nopenalty
alb_ship.gat mapflag nopenalty
alberta.gat mapflag nopenalty
alberta_in.gat mapflag nopenalty
@@ -44,6 +47,7 @@ nif_in.gat mapflag nopenalty
payon.gat mapflag nopenalty
payon_in01.gat mapflag nopenalty
payon_in02.gat mapflag nopenalty
+payon_in03.gat mapflag nopenalty
prontera.gat mapflag nopenalty
prt_are_in.gat mapflag nopenalty
prt_are01.gat mapflag nopenalty
diff --git a/conf-tmpl/mapflag/nopvp.txt b/conf-tmpl/mapflag/nopvp.txt
index ecddb854a..34f9a75c0 100644
--- a/conf-tmpl/mapflag/nopvp.txt
+++ b/conf-tmpl/mapflag/nopvp.txt
@@ -3,6 +3,8 @@
//= To disable PvP mode on a specific map add the mapname here.
//============================================================
+ayo_in01.gat mapflag nopvp
+ayo_in02.gat mapflag nopvp
alberta_in.gat mapflag nopvp
alberta.gat mapflag nopvp
alde_alche.gat mapflag nopvp
@@ -55,4 +57,3 @@ yuno_in04.gat mapflag nopvp
yuno_in05.gat mapflag nopvp
yuno.gat mapflag nopvp
gon_test.gat mapflag nopvp
-
diff --git a/conf-tmpl/mapflag/noreturn.txt b/conf-tmpl/mapflag/noreturn.txt
new file mode 100644
index 000000000..91bcf46ab
--- /dev/null
+++ b/conf-tmpl/mapflag/noreturn.txt
@@ -0,0 +1,198 @@
+//===== eAthena Script =======================================
+//= Map flags that disable use of Butterfly wings
+//===== By: ==================================================
+//= eAthena Dev Team
+//= 1.1 [Lupus]
+//===== Notes: ===============================================
+//= For disabling Fly wings use noteleport
+//===== Current Version: =====================================
+
+// Cities ========================
+ayo_in01.gat mapflag noreturn
+ayo_in02.gat mapflag noreturn
+alb_ship.gat mapflag noreturn
+alberta_in.gat mapflag noreturn
+aldeba_in.gat mapflag noreturn
+ama_in01.gat mapflag noreturn
+ama_in02.gat mapflag noreturn
+cmd_in01.gat mapflag noreturn
+cmd_in02.gat mapflag noreturn
+gef_tower.gat mapflag noreturn
+geffen_in.gat mapflag noreturn
+gon_test.gat mapflag noreturn
+gon_in.gat mapflag noreturn
+in_orcs01.gat mapflag noreturn
+izlude_in.gat mapflag noreturn
+jawaii_in.gat mapflag noreturn
+lou_in01.gat mapflag noreturn
+lou_in02.gat mapflag noreturn
+moc_castle.gat mapflag noreturn
+morocc_in.gat mapflag noreturn
+new_1-1.gat mapflag noreturn
+new_1-2.gat mapflag noreturn
+new_1-3.gat mapflag noreturn
+new_1-4.gat mapflag noreturn
+nif_in.gat mapflag noreturn
+payon_in01.gat mapflag noreturn
+payon_in02.gat mapflag noreturn
+payon_in03.gat mapflag noreturn
+prt_are_in.gat mapflag noreturn
+prt_are01.gat mapflag noreturn
+prt_castle.gat mapflag noreturn
+prt_church.gat mapflag noreturn
+prt_in.gat mapflag noreturn
+um_in.gat mapflag noreturn
+xmas_in.gat mapflag noreturn
+yuno_in01.gat mapflag noreturn
+yuno_in03.gat mapflag noreturn
+yuno_in04.gat mapflag noreturn
+yuno_in05.gat mapflag noreturn
+que_sign01.gat mapflag noreturn
+ein_in01.gat mapflag noreturn
+airport.gat mapflag noreturn
+airplane.gat mapflag noreturn
+
+// Job Quests ====================
+sword_1-1.gat mapflag noreturn
+sword_2-1.gat mapflag noreturn
+sword_3-1.gat mapflag noreturn
+job_thief1.gat mapflag noreturn
+// 2-1 -----------------------
+job_hunte.gat mapflag noreturn
+job_knight.gat mapflag noreturn
+job_prist.gat mapflag noreturn
+job_wiz.gat mapflag noreturn
+in_hunter.gat mapflag noreturn
+in_moc_16.gat mapflag noreturn
+// 2-2 --------------------
+alde_alche.gat mapflag noreturn
+job_cru.gat mapflag noreturn
+job_duncer.gat mapflag noreturn
+job_monk.gat mapflag noreturn
+monk_test.gat mapflag noreturn
+monk_in.gat mapflag noreturn
+in_rogue.gat mapflag noreturn
+job_sage.gat mapflag noreturn
+
+// Special Quests Places =========
+que_god01.gat mapflag noreturn
+que_god02.gat mapflag noreturn
+
+// Guild Castles =================
+aldeg_cas01.gat mapflag noreturn
+aldeg_cas02.gat mapflag noreturn
+aldeg_cas03.gat mapflag noreturn
+aldeg_cas04.gat mapflag noreturn
+aldeg_cas05.gat mapflag noreturn
+gefg_cas01.gat mapflag noreturn
+gefg_cas02.gat mapflag noreturn
+gefg_cas03.gat mapflag noreturn
+gefg_cas04.gat mapflag noreturn
+gefg_cas05.gat mapflag noreturn
+payg_cas01.gat mapflag noreturn
+payg_cas02.gat mapflag noreturn
+payg_cas03.gat mapflag noreturn
+payg_cas04.gat mapflag noreturn
+payg_cas05.gat mapflag noreturn
+prtg_cas01.gat mapflag noreturn
+prtg_cas02.gat mapflag noreturn
+prtg_cas03.gat mapflag noreturn
+prtg_cas04.gat mapflag noreturn
+prtg_cas05.gat mapflag noreturn
+
+// GvG Arenas ===================
+guild_vs1.gat mapflag noreturn
+guild_vs2.gat mapflag noreturn
+guild_vs3.gat mapflag noreturn
+guild_vs4.gat mapflag noreturn
+guild_vs5.gat mapflag noreturn
+
+// Arenas =====================>\\
+arena_room.gat mapflag noreturn
+sec_in01.gat mapflag noreturn
+sec_in02.gat mapflag noreturn
+
+// PvP Arenas=======================
+pvp_y_room.gat mapflag noreturn
+pvp_y_1-1.gat mapflag noreturn
+pvp_y_1-2.gat mapflag noreturn
+pvp_y_1-3.gat mapflag noreturn
+pvp_y_1-4.gat mapflag noreturn
+pvp_y_1-5.gat mapflag noreturn
+pvp_y_2-1.gat mapflag noreturn
+pvp_y_2-2.gat mapflag noreturn
+pvp_y_2-3.gat mapflag noreturn
+pvp_y_2-4.gat mapflag noreturn
+pvp_y_2-5.gat mapflag noreturn
+pvp_y_3-1.gat mapflag noreturn
+pvp_y_3-2.gat mapflag noreturn
+pvp_y_3-3.gat mapflag noreturn
+pvp_y_3-4.gat mapflag noreturn
+pvp_y_3-5.gat mapflag noreturn
+pvp_y_4-1.gat mapflag noreturn
+pvp_y_4-2.gat mapflag noreturn
+pvp_y_4-3.gat mapflag noreturn
+pvp_y_4-4.gat mapflag noreturn
+pvp_y_4-5.gat mapflag noreturn
+pvp_y_5-1.gat mapflag noreturn
+pvp_y_5-2.gat mapflag noreturn
+pvp_y_5-3.gat mapflag noreturn
+pvp_y_5-4.gat mapflag noreturn
+pvp_y_5-5.gat mapflag noreturn
+pvp_y_6-1.gat mapflag noreturn
+pvp_y_6-2.gat mapflag noreturn
+pvp_y_6-3.gat mapflag noreturn
+pvp_y_6-4.gat mapflag noreturn
+pvp_y_6-5.gat mapflag noreturn
+pvp_y_7-1.gat mapflag noreturn
+pvp_y_7-2.gat mapflag noreturn
+pvp_y_7-3.gat mapflag noreturn
+pvp_y_7-4.gat mapflag noreturn
+pvp_y_7-5.gat mapflag noreturn
+pvp_y_8-1.gat mapflag noreturn
+pvp_y_8-2.gat mapflag noreturn
+pvp_y_8-3.gat mapflag noreturn
+pvp_y_8-4.gat mapflag noreturn
+pvp_y_8-5.gat mapflag noreturn
+pvp_n_room.gat mapflag noreturn
+pvp_n_1-1.gat mapflag noreturn
+pvp_n_1-2.gat mapflag noreturn
+pvp_n_1-3.gat mapflag noreturn
+pvp_n_1-4.gat mapflag noreturn
+pvp_n_1-5.gat mapflag noreturn
+pvp_n_2-1.gat mapflag noreturn
+pvp_n_2-2.gat mapflag noreturn
+pvp_n_2-3.gat mapflag noreturn
+pvp_n_2-4.gat mapflag noreturn
+pvp_n_2-5.gat mapflag noreturn
+pvp_n_3-1.gat mapflag noreturn
+pvp_n_3-2.gat mapflag noreturn
+pvp_n_3-3.gat mapflag noreturn
+pvp_n_3-4.gat mapflag noreturn
+pvp_n_3-5.gat mapflag noreturn
+pvp_n_4-1.gat mapflag noreturn
+pvp_n_4-2.gat mapflag noreturn
+pvp_n_4-3.gat mapflag noreturn
+pvp_n_4-4.gat mapflag noreturn
+pvp_n_4-5.gat mapflag noreturn
+pvp_n_5-1.gat mapflag noreturn
+pvp_n_5-2.gat mapflag noreturn
+pvp_n_5-3.gat mapflag noreturn
+pvp_n_5-4.gat mapflag noreturn
+pvp_n_5-5.gat mapflag noreturn
+pvp_n_6-1.gat mapflag noreturn
+pvp_n_6-2.gat mapflag noreturn
+pvp_n_6-3.gat mapflag noreturn
+pvp_n_6-4.gat mapflag noreturn
+pvp_n_6-5.gat mapflag noreturn
+pvp_n_7-1.gat mapflag noreturn
+pvp_n_7-2.gat mapflag noreturn
+pvp_n_7-3.gat mapflag noreturn
+pvp_n_7-4.gat mapflag noreturn
+pvp_n_7-5.gat mapflag noreturn
+pvp_n_8-1.gat mapflag noreturn
+pvp_n_8-2.gat mapflag noreturn
+pvp_n_8-3.gat mapflag noreturn
+pvp_n_8-4.gat mapflag noreturn
+pvp_n_8-5.gat mapflag noreturn
+pvp_2vs2.gat mapflag noreturn \ No newline at end of file
diff --git a/conf-tmpl/mapflag/nosave.txt b/conf-tmpl/mapflag/nosave.txt
index c12a2df2e..a767ece14 100644
--- a/conf-tmpl/mapflag/nosave.txt
+++ b/conf-tmpl/mapflag/nosave.txt
@@ -2,6 +2,7 @@
//= Map flags that disable auto saving
//===== By: ==================================================
//= eAthena Dev Team
+//= 1.2 [Lupus]
//===== Current Version: =====================================
// Job Quests ====================
@@ -26,6 +27,11 @@ monk_in.gat mapflag nosave SavePoint
in_rogue.gat mapflag nosave SavePoint
job_sage.gat mapflag nosave SavePoint
+// Special Quests Places =====
+que_god01.gat mapflag nosave SavePoint
+que_god02.gat mapflag nosave SavePoint
+que_sign01.gat mapflag nosave SavePoint
+
// GvG Arenas ==========================
guild_vs1.gat mapflag nosave SavePoint
guild_vs2.gat mapflag nosave SavePoint
diff --git a/conf-tmpl/mapflag/noteleport.txt b/conf-tmpl/mapflag/noteleport.txt
index bd6f6d8fa..78458c574 100644
--- a/conf-tmpl/mapflag/noteleport.txt
+++ b/conf-tmpl/mapflag/noteleport.txt
@@ -1,10 +1,15 @@
//===== eAthena Script =======================================
-//= Map flags that disable use of fly/butterfly wings
+//= Map flags that disable use of fly wings
//===== By: ==================================================
//= eAthena Dev Team
+//= 1.2 [Lupus]
+//===== Notes: ===============================================
+//= For disabling Butterfly wings use noreturn
//===== Current Version: =====================================
-// Cities ===============>\\
+// Cities ========================
+ayo_in01.gat mapflag noteleport
+ayo_in02.gat mapflag noteleport
alb_ship.gat mapflag noteleport
alberta_in.gat mapflag noteleport
aldeba_in.gat mapflag noteleport
@@ -30,6 +35,7 @@ new_1-4.gat mapflag noteleport
nif_in.gat mapflag noteleport
payon_in01.gat mapflag noteleport
payon_in02.gat mapflag noteleport
+payon_in03.gat mapflag noteleport
prt_are_in.gat mapflag noteleport
prt_are01.gat mapflag noteleport
prt_castle.gat mapflag noteleport
@@ -41,8 +47,12 @@ yuno_in01.gat mapflag noteleport
yuno_in03.gat mapflag noteleport
yuno_in04.gat mapflag noteleport
yuno_in05.gat mapflag noteleport
+que_sign01.gat mapflag noteleport
+ein_in01.gat mapflag noteleport
+airport.gat mapflag noteleport
+airplane.gat mapflag noteleport
-// Job Quests =========================
+// Job Quests ====================
sword_1-1.gat mapflag noteleport
sword_2-1.gat mapflag noteleport
sword_3-1.gat mapflag noteleport
@@ -64,7 +74,11 @@ monk_in.gat mapflag noteleport
in_rogue.gat mapflag noteleport
job_sage.gat mapflag noteleport
-// Guild Castles ====================
+// Special Quests Places =========
+que_god01.gat mapflag noteleport
+que_god02.gat mapflag noteleport
+
+// Guild Castles =================
aldeg_cas01.gat mapflag noteleport
aldeg_cas02.gat mapflag noteleport
aldeg_cas03.gat mapflag noteleport
diff --git a/conf-tmpl/mapflag/water.txt b/conf-tmpl/mapflag/water.txt
deleted file mode 100644
index 71f98470d..000000000
--- a/conf-tmpl/mapflag/water.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-// 水の設定。
-// waterは水ありでall_waterは全て水だと判断するマップ。
-
-mjolnir_12.gat mapflag water
-mjolnir_02.gat mapflag water
-glast_01.gat mapflag water
-gef_fild04.gat mapflag water
-prt_fild02.gat mapflag water
-prt_fild01.gat mapflag water
-prt_fild00.gat mapflag water
-gef_fild00.gat mapflag water
-gef_fild07.gat mapflag water
-gef_fild13.gat mapflag water
-gef_fild09.gat mapflag water
-gef_fild01.gat mapflag water
-prt_fild05.gat mapflag water
-gef_fild03.gat mapflag water
-gef_fild10.gat mapflag water
-prt_fild10.gat mapflag water
-pay_arche.gat mapflag water
-moc_ruins.gat mapflag water
-comodo.gat mapflag water
-cmd_fild01.gat mapflag water
-cmd_fild02.gat mapflag water
-cmd_fild03.gat mapflag water
-cmd_fild04.gat mapflag water
-cmd_fild05.gat mapflag water
-moc_fild11.gat mapflag water
-ama_fild01.gat mapflag water
-
-iz_dun00.gat mapflag water
-iz_dun01.gat mapflag water
-iz_dun02.gat mapflag water
-//iz_dun03.gat mapflag all_water
-//iz_dun04.gat mapflag all_water
-treasure01.gat mapflag water
-treasure02.gat mapflag water
-mjo_dun01.gat mapflag water
-orcsdun02.gat mapflag water
-pay_dun01.gat mapflag water
-pay_dun02.gat mapflag water
-pay_dun03.gat mapflag water
-prt_sewb2.gat mapflag water
-prt_sewb3.gat mapflag water
-gl_prison1.gat mapflag water
-alde_dun03.gat mapflag water
-alde_dun04.gat mapflag water
-beach_dun.gat mapflag water
-beach_dun2.gat mapflag water
-beach_dun3.gat mapflag water
-tur_dun01.gat mapflag water
-gld_dun02.gat mapflag water
-gld_dun03.gat mapflag water
-gld_dun04.gat mapflag water
diff --git a/conf-tmpl/mapflag/water_height.txt b/conf-tmpl/mapflag/water_height.txt
index 9a89e29c0..979495abc 100644
--- a/conf-tmpl/mapflag/water_height.txt
+++ b/conf-tmpl/mapflag/water_height.txt
@@ -1,5 +1,5 @@
// 水場の高さを設定
-//water_height.txt@AthenaDB計画 2004/03/31 18:52:09 +0900 (JST)
+//water_height.txt eAthenaDB 2005/03/25 18:52:09 +0900 (JST)
xmas.gat 3
mjolnir_01.gat 0
@@ -66,3 +66,6 @@ gefg_cas05.gat 5
prtg_cas05.gat 13
tur_dun01.gat -65
ama_fild01.gat 5
+yuno_fild09.gat 10
+yuno_fild11.gat -19
+//sec_in02.gat 5 dunno what value \ No newline at end of file
diff --git a/conf-tmpl/maps_athena.conf b/conf-tmpl/maps_athena.conf
new file mode 100644
index 000000000..a82fc1305
--- /dev/null
+++ b/conf-tmpl/maps_athena.conf
@@ -0,0 +1,628 @@
+//------------------------- Maps ---------------------------
+map: alb_ship.gat
+map: alb2trea.gat
+map: alberta.gat
+map: alberta_in.gat
+map: alde_dun01.gat
+map: alde_dun02.gat
+map: alde_dun03.gat
+map: alde_dun04.gat
+map: aldeba_in.gat
+map: aldebaran.gat
+map: anthell01.gat
+map: anthell02.gat
+map: arena_room.gat
+map: c_tower1.gat
+map: c_tower2.gat
+map: c_tower3.gat
+map: c_tower4.gat
+map: force_1-1.gat
+map: force_1-2.gat
+map: force_1-3.gat
+map: force_2-1.gat
+map: force_2-2.gat
+map: force_2-3.gat
+map: force_3-1.gat
+map: force_3-2.gat
+map: force_3-3.gat
+map: gef_dun00.gat
+map: gef_dun01.gat
+map: gef_dun02.gat
+map: gef_dun03.gat
+map: gef_fild00.gat
+map: gef_fild01.gat
+map: gef_fild02.gat
+map: gef_fild03.gat
+map: gef_fild04.gat
+map: gef_fild05.gat
+map: gef_fild06.gat
+map: gef_fild07.gat
+map: gef_fild08.gat
+map: gef_fild09.gat
+map: gef_fild10.gat
+map: gef_fild11.gat
+map: gef_tower.gat
+map: geffen.gat
+map: geffen_in.gat
+map: gl_cas01.gat
+map: gl_cas02.gat
+map: gl_church.gat
+map: gl_chyard.gat
+map: gl_dun01.gat
+map: gl_dun02.gat
+map: gl_in01.gat
+map: gl_knt01.gat
+map: gl_knt02.gat
+map: gl_prison.gat
+map: gl_prison1.gat
+map: gl_sew01.gat
+map: gl_sew02.gat
+map: gl_sew03.gat
+map: gl_sew04.gat
+map: gl_step.gat
+map: glast_01.gat
+map: hunter_1-1.gat
+map: hunter_2-1.gat
+map: hunter_3-1.gat
+map: in_hunter.gat
+map: in_moc_16.gat
+map: in_orcs01.gat
+map: in_sphinx1.gat
+map: in_sphinx2.gat
+map: in_sphinx3.gat
+map: in_sphinx4.gat
+map: in_sphinx5.gat
+map: iz_dun00.gat
+map: iz_dun01.gat
+map: iz_dun02.gat
+map: iz_dun03.gat
+map: iz_dun04.gat
+//map: iz_dun05.gat
+map: izlu2dun.gat
+map: izlude.gat
+map: izlude_in.gat
+map: job_thief1.gat
+map: knight_1-1.gat
+map: knight_2-1.gat
+map: knight_3-1.gat
+map: mjo_dun01.gat
+map: mjo_dun02.gat
+map: mjo_dun03.gat
+map: mjolnir_01.gat
+map: mjolnir_02.gat
+map: mjolnir_03.gat
+map: mjolnir_04.gat
+map: mjolnir_05.gat
+map: mjolnir_06.gat
+map: mjolnir_07.gat
+map: mjolnir_08.gat
+map: mjolnir_09.gat
+map: mjolnir_10.gat
+map: mjolnir_11.gat
+map: mjolnir_12.gat
+map: moc_castle.gat
+map: moc_fild01.gat
+map: moc_fild02.gat
+map: moc_fild03.gat
+map: moc_fild04.gat
+map: moc_fild05.gat
+map: moc_fild06.gat
+map: moc_fild07.gat
+map: moc_fild08.gat
+map: moc_fild09.gat
+map: moc_fild10.gat
+map: moc_fild11.gat
+map: moc_fild12.gat
+map: moc_fild13.gat
+map: moc_fild14.gat
+map: moc_fild15.gat
+map: moc_fild16.gat
+map: moc_fild17.gat
+map: moc_fild18.gat
+map: moc_fild19.gat
+map: moc_pryd01.gat
+map: moc_pryd02.gat
+map: moc_pryd03.gat
+map: moc_pryd04.gat
+map: moc_pryd05.gat
+map: moc_pryd06.gat
+map: moc_prydb1.gat
+map: moc_ruins.gat
+map: monk_in.gat
+map: morocc.gat
+map: morocc_in.gat
+map: new_1-1.gat
+map: new_1-2.gat
+map: new_1-3.gat
+map: new_1-4.gat
+//map: new_2-1.gat
+//map: new_2-2.gat
+//map: new_2-3.gat
+//map: new_2-4.gat
+//map: new_3-1.gat
+//map: new_3-2.gat
+//map: new_3-3.gat
+//map: new_3-4.gat
+//map: new_4-1.gat
+//map: new_4-2.gat
+//map: new_4-3.gat
+//map: new_4-4.gat
+//map: new_5-1.gat
+//map: new_5-2.gat
+//map: new_5-3.gat
+//map: new_5-4.gat
+map: orcsdun01.gat
+map: orcsdun02.gat
+map: ordeal_1-1.gat
+map: ordeal_1-2.gat
+//map: ordeal_1-3.gat
+//map: ordeal_1-4.gat
+map: ordeal_2-1.gat
+map: ordeal_2-2.gat
+//map: ordeal_2-3.gat
+//map: ordeal_2-4.gat
+map: ordeal_3-1.gat
+map: ordeal_3-2.gat
+//map: ordeal_3-3.gat
+//map: ordeal_3-4.gat
+map: pay_arche.gat
+map: pay_dun00.gat
+map: pay_dun01.gat
+map: pay_dun02.gat
+map: pay_dun03.gat
+map: pay_dun04.gat
+map: pay_fild01.gat
+map: pay_fild02.gat
+map: pay_fild03.gat
+map: pay_fild04.gat
+map: pay_fild05.gat
+map: pay_fild06.gat
+map: pay_fild07.gat
+map: pay_fild08.gat
+map: pay_fild09.gat
+map: pay_fild10.gat
+map: pay_fild11.gat
+//map: payon.gat //moved down to new maps
+//map: payon_in01.gat //moved down to new maps
+//map: payon_in02.gat //moved down to new maps
+map: priest_1-1.gat
+map: priest_2-1.gat
+map: priest_3-1.gat
+map: prontera.gat
+map: prt_are_in.gat
+map: prt_are01.gat
+//map: prt_arena01.gat
+map: prt_castle.gat
+map: prt_church.gat
+map: prt_fild00.gat
+map: prt_fild01.gat
+map: prt_fild02.gat
+map: prt_fild03.gat
+map: prt_fild04.gat
+map: prt_fild05.gat
+map: prt_fild06.gat
+map: prt_fild07.gat
+map: prt_fild08.gat
+map: prt_fild09.gat
+map: prt_fild10.gat
+map: prt_fild11.gat
+map: prt_in.gat
+map: prt_maze01.gat
+map: prt_maze02.gat
+map: prt_maze03.gat
+map: prt_monk.gat
+map: prt_sewb1.gat
+map: prt_sewb2.gat
+map: prt_sewb3.gat
+map: prt_sewb4.gat
+map: pvp_2vs2.gat
+//map: pvp_c_room.gat
+map: pvp_n_1-1.gat
+map: pvp_n_1-2.gat
+map: pvp_n_1-3.gat
+map: pvp_n_1-4.gat
+map: pvp_n_1-5.gat
+map: pvp_n_2-1.gat
+map: pvp_n_2-2.gat
+map: pvp_n_2-3.gat
+map: pvp_n_2-4.gat
+map: pvp_n_2-5.gat
+map: pvp_n_3-1.gat
+map: pvp_n_3-2.gat
+map: pvp_n_3-3.gat
+map: pvp_n_3-4.gat
+map: pvp_n_3-5.gat
+map: pvp_n_4-1.gat
+map: pvp_n_4-2.gat
+map: pvp_n_4-3.gat
+map: pvp_n_4-4.gat
+map: pvp_n_4-5.gat
+map: pvp_n_5-1.gat
+map: pvp_n_5-2.gat
+map: pvp_n_5-3.gat
+map: pvp_n_5-4.gat
+map: pvp_n_5-5.gat
+map: pvp_n_6-1.gat
+map: pvp_n_6-2.gat
+map: pvp_n_6-3.gat
+map: pvp_n_6-4.gat
+map: pvp_n_6-5.gat
+map: pvp_n_7-1.gat
+map: pvp_n_7-2.gat
+map: pvp_n_7-3.gat
+map: pvp_n_7-4.gat
+map: pvp_n_7-5.gat
+map: pvp_n_8-1.gat
+map: pvp_n_8-2.gat
+map: pvp_n_8-3.gat
+map: pvp_n_8-4.gat
+map: pvp_n_8-5.gat
+map: pvp_n_room.gat
+map: pvp_y_1-1.gat
+map: pvp_y_1-2.gat
+map: pvp_y_1-3.gat
+map: pvp_y_1-4.gat
+map: pvp_y_1-5.gat
+map: pvp_y_2-1.gat
+map: pvp_y_2-2.gat
+map: pvp_y_2-3.gat
+map: pvp_y_2-4.gat
+map: pvp_y_2-5.gat
+map: pvp_y_3-1.gat
+map: pvp_y_3-2.gat
+map: pvp_y_3-3.gat
+map: pvp_y_3-4.gat
+map: pvp_y_3-5.gat
+map: pvp_y_4-1.gat
+map: pvp_y_4-2.gat
+map: pvp_y_4-3.gat
+map: pvp_y_4-4.gat
+map: pvp_y_4-5.gat
+map: pvp_y_5-1.gat
+map: pvp_y_5-2.gat
+map: pvp_y_5-3.gat
+map: pvp_y_5-4.gat
+map: pvp_y_5-5.gat
+map: pvp_y_6-1.gat
+map: pvp_y_6-2.gat
+map: pvp_y_6-3.gat
+map: pvp_y_6-4.gat
+map: pvp_y_6-5.gat
+map: pvp_y_7-1.gat
+map: pvp_y_7-2.gat
+map: pvp_y_7-3.gat
+map: pvp_y_7-4.gat
+map: pvp_y_7-5.gat
+map: pvp_y_8-1.gat
+map: pvp_y_8-2.gat
+map: pvp_y_8-3.gat
+map: pvp_y_8-4.gat
+map: pvp_y_8-5.gat
+map: pvp_y_room.gat
+map: sword_1-1.gat
+map: sword_2-1.gat
+map: sword_3-1.gat
+map: treasure01.gat
+map: treasure02.gat
+map: wizard_1-1.gat
+map: wizard_2-1.gat
+map: wizard_3-1.gat
+map: xmas.gat
+map: xmas_dun01.gat
+map: xmas_dun02.gat
+map: xmas_fild01.gat
+map: xmas_in.gat
+
+//---Ep3.0 Comodo ---
+
+map: beach_dun.gat
+map: beach_dun2.gat
+map: beach_dun3.gat
+map: cmd_fild01.gat
+map: cmd_fild02.gat
+map: cmd_fild03.gat
+map: cmd_fild04.gat
+map: cmd_fild05.gat
+map: cmd_fild06.gat
+map: cmd_fild07.gat
+map: cmd_fild08.gat
+map: cmd_fild09.gat
+map: cmd_in01.gat
+map: cmd_in02.gat
+map: comodo.gat
+map: gef_fild12.gat
+map: gef_fild13.gat
+map: gef_fild14.gat
+
+//---EP3.1 Quiz Revolution ---
+
+map: quiz_00.gat
+map: quiz_01.gat
+
+//--- Ep4.0 Turtle Island ---
+
+map: tur_dun01.gat
+map: tur_dun02.gat
+map: tur_dun03.gat
+map: tur_dun04.gat
+map: tur_dun05.gat
+map: tur_dun06.gat
+
+//--- Ep4.1 The War of Emperium ---
+
+map: alde_gld.gat
+map: aldeg_cas01.gat
+map: aldeg_cas02.gat
+map: aldeg_cas03.gat
+map: aldeg_cas04.gat
+map: aldeg_cas05.gat
+map: gefg_cas01.gat
+map: gefg_cas02.gat
+map: gefg_cas03.gat
+map: gefg_cas04.gat
+map: gefg_cas05.gat
+map: gld_dun01.gat
+map: gld_dun02.gat
+map: gld_dun03.gat
+map: gld_dun04.gat
+//map: guild_room.gat
+map: guild_vs1.gat
+map: guild_vs2.gat
+map: guild_vs3.gat
+map: guild_vs4.gat
+map: guild_vs5.gat
+map: job_hunte.gat
+map: job_knt.gat
+map: job_prist.gat
+map: job_wiz.gat
+map: pay_gld.gat
+map: payg_cas01.gat
+map: payg_cas02.gat
+map: payg_cas03.gat
+map: payg_cas04.gat
+map: payg_cas05.gat
+map: prt_gld.gat
+map: prtg_cas01.gat
+map: prtg_cas02.gat
+map: prtg_cas03.gat
+map: prtg_cas04.gat
+map: prtg_cas05.gat
+
+
+//--- Ep5.0 Yuno ---
+
+map: alde_alche.gat
+map: in_rogue.gat
+map: job_cru.gat
+map: job_duncer.gat
+map: job_monk.gat
+map: job_sage.gat
+map: mag_dun01.gat
+map: mag_dun02.gat
+map: monk_test.gat
+map: yuno.gat
+map: yuno_fild01.gat
+map: yuno_fild02.gat
+map: yuno_fild03.gat
+map: yuno_fild04.gat
+map: yuno_in01.gat
+map: yuno_in02.gat
+map: yuno_in03.gat
+map: yuno_in04.gat
+map: yuno_in05.gat
+
+//--- Ep6.0 - Amatsu ---
+// Requires: kRO 08-10-03 or newer
+// or kRO Sakray 09-09-03 or newer
+
+map: ama_dun01.gat
+map: ama_dun02.gat
+map: ama_dun03.gat
+map: ama_fild01.gat
+map: ama_in01.gat
+map: ama_in02.gat
+map: ama_test.gat
+map: amatsu.gat
+
+//--- Ep6.1 - Gon Ryun ---
+
+map: gon_dun01.gat
+map: gon_dun02.gat
+map: gon_dun03.gat
+map: gon_fild01.gat
+map: gon_in.gat
+map: gon_test.gat
+map: gonryun.gat
+map: sec_in01.gat
+map: sec_in02.gat
+map: sec_pri.gat
+
+//--- Ep6.2 - Umbala ---
+// Requires: kRO 01-27-04 or newer
+// or kRO Sakray 12-02-03 or newer
+// or Akaru's SuperGRF 1.22 or newer
+map: umbala.gat
+map: um_dun01.gat
+map: um_dun02.gat
+map: um_fild01.gat
+map: um_fild02.gat
+map: um_fild03.gat
+map: um_fild04.gat
+map: um_in.gat
+
+//--- Ep6.3 - Niflheim ---
+// Requires: kRO 02-23-04 or newer
+// or kRO Sakray 01-09-04 or newer
+// or Akaru's SuperGRF 1.32 or newer
+map: niflheim.gat
+map: nif_fild01.gat
+map: nif_fild02.gat
+map: nif_in.gat
+map: yggdrasil01.gat
+
+//--- Ep6.4 - Valkyrie ---
+// Requires: kRO ??-??-04 or newer
+// or kRO Sakray 02-03-04 or newer
+// or Akaru's SuperGRF 1.34 or newer
+map: valkyrie.gat
+
+//--- Ep6.5 - Castle of Dragon (LouYang) ---
+// Requires kRO Sakray 03-30 or newer
+//(Akaru's SuperGRF required version: 1.52)
+map: lou_in01.gat
+map: lou_in02.gat
+map: lou_dun03.gat
+map: lou_dun02.gat
+map: lou_dun01.gat
+map: lou_fild01.gat
+map: louyang.gat
+
+//--- Ep6.6 - Novice Guild Siege ---
+//Requires kRO Sakray 04-07 or newer
+//(Akaru's SuperGRF required version: 1.53)
+//map: siege_test.gat
+map: n_castle.gat
+map: nguild_gef.gat
+map: nguild_prt.gat
+map: nguild_pay.gat
+map: nguild_alde.gat
+
+//--- Ep6.7 - Jawaii ---
+//Requires kRO Sakray 06-22 or newer
+//(Akaru's SuperGRF required version: 1.63)
+map: jawaii.gat
+map: jawaii_in.gat
+
+// --- Ep6.8 - Geffenia ---
+// Requires kRO Sakray 07-13 or newer
+// (Akaru's SuperGRF required version: 1.64)
+map: gefenia01.gat
+map: gefenia02.gat
+map: gefenia03.gat
+map: gefenia04.gat
+
+// --- Ep6.x - Some Maps ---
+//map: new_zone01.gat
+//map: new_zone02.gat
+//map: new_zone03.gat
+//map: new_zone04.gat
+
+// --- Ep6.9 - New Payon ---
+// Requires kRO Sakray 09-03
+// -- dunno --
+map: payon.gat
+map: payon_in01.gat
+map: payon_in02.gat
+map: payon_in03.gat
+//same names as old maps except that payon_in03.gat got added
+
+// --- Ep? - Ayothaya ---
+// Requires kRO Sakray 09-21
+// -- 2004-10-19sdata_k.gpf --
+map: ayothaya.gat
+map: ayo_in01.gat
+map: ayo_in02.gat
+map: ayo_fild01.gat
+map: ayo_fild02.gat
+map: ayo_dun01.gat
+map: ayo_dun02.gat
+
+// --- God item quests maps ---
+// -- 2004-10-12sdata_k3.gpf --
+map: que_god01.gat
+map: que_god02.gat
+
+// --- Ep? - Schwarzwald Republic ---
+// -- 2004-12-28sdata_k.gpf --
+map: yuno_fild05.gat
+map: yuno_fild07.gat
+map: yuno_fild08.gat
+map: yuno_fild09.gat
+map: yuno_fild11.gat
+map: yuno_fild12.gat
+
+// --- Race Arena ---
+// -- 2005-03-08sdata_k.gpf --
+map: alde_tt02.gat
+map: turbo_room.gat
+
+// --- Einbroch/Einbech ---
+// -- 2005-03-15sdata_k.gpf --
+map: airplane.gat
+map: airport.gat
+map: einbech.gat
+map: einbroch.gat
+map: ein_dun01.gat
+map: ein_dun02.gat
+map: ein_fild06.gat
+map: ein_fild07.gat
+map: ein_fild08.gat
+map: ein_fild09.gat
+map: ein_fild10.gat
+map: ein_in01.gat
+map: que_sign01.gat
+
+// Ragnarok World Championship 2004
+// Requires: RWC 2004 Client
+// or Akaru's SuperGRF 1.64 or newer
+//map: rwc01.gat
+//map: rwc02.gat
+//map: rwc03.gat
+
+//Christmas & Sakura Special
+//Requires Akaru's SuperGRF 1.1 or newer
+//map: prontera_x.gat
+//map: alberta_x.gat
+//map: aldebaran_x.gat
+//map: geffen_x.gat
+//map: izlude_x.gat
+//map: prt_church_x.gat
+//map: prontera_s.gat
+//map: pay_arche_s.gat
+
+//Fenced Lutie
+//Requires Akaru's SuperGRF 1.23 or newer
+//map: xmas_old.gat
+
+//Maps that were not in the list but exist in Data.grf
+//map: ordeal_a00.gat
+//map: ordeal_a02.gat
+
+//Alpha Maps
+//Requires adata.grf containing alpha maps and data
+//map: fay_vilg00.gat
+//map: fay_vilg01.gat
+//map: gef_vilg00.gat
+//map: gef_vilg01.gat
+//map: moc_dugn01.gat
+//map: moc_dugn02.gat
+//map: moc_fild01.gat
+//map: moc_fild02.gat
+//map: moc_fild03.gat
+//map: moc_fild04.gat
+//map: moc_intr00.gat
+//map: moc_intr01.gat
+//map: moc_intr02.gat
+//map: moc_intr04.gat
+//map: moc_vilg00.gat
+//map: moc_vilg01.gat
+//map: moc_vilg02.gat
+//map: probemap.gat
+//map: probemap02.gat
+//map: prt_cstl01.gat
+//map: prt_dugn00.gat
+//map: prt_dugn01.gat
+//map: prt_fild00.gat
+//map: prt_fild01.gat
+//map: prt_fild03.gat
+//map: prt_fild04.gat
+//map: prt_fild05.gat
+//map: prt_intr01.gat
+//map: prt_intr01_a.gat
+//map: prt_intr02.gat
+//map: prt_vilg00.gat
+//map: prt_vilg01.gat
+//map: prt_vilg02.gat
+//map: tank_test.gat
+//map: tank_test2.gat
+//map: test.gat \ No newline at end of file
diff --git a/conf-tmpl/msg_athena.conf b/conf-tmpl/msg_athena.conf
index e9253f20d..c1121780b 100644
--- a/conf-tmpl/msg_athena.conf
+++ b/conf-tmpl/msg_athena.conf
@@ -257,6 +257,18 @@
243: Map skills are off
244: Map skills are on
245: Server Uptime: %ld days, %ld hours, %ld minutes, %ld seconds.
+246: Your GM level don't authorise you to do this action.
+247: You are not authorised to warp to this map.
+248: You are not authorised to warp from your current map.
+249: You are not authorised to warp to your save map.
+250: You have already opened your storage. Close it first.
+251: You have already opened your guild storage. Close it first.
+252: You are not in a guild.
+253: You are not authorised to memo this map.
+254: GM commands configuration reloaded.
+255: Battle configuration reloaded.
+256: Status database reloaded.
+257: Player database reloaded.
// Messages of others (not for GM commands)
// ----------------------------------------
@@ -264,4 +276,40 @@
500: Actually, it's the night...
501: Your account time limit is: %d-%m-%Y %H:%M:%S.
502: The day has arrived!
-503: The night has fallen... \ No newline at end of file
+503: The night has fallen...
+
+//Supernovice's Guardian Angel
+//actually.. new client msgtxt file contains these 3 lines... [Lupus]
+//----------------------------
+504: Guardian Angel, can you hear my voice? ^^;
+505: My name is %s, and I'm a Super Novice~
+506: Please help me~ t.t
+
+//Guilds Default Ranks/Positions [Not implemented yet]
+507: GuildMaster
+508: Newbie
+509: Position %d
+
+//mail system
+//----------------------
+510: You have no messages.
+511: %d - From : %s (New - Priority)
+512: %d - From : %s (New)
+513: %d - From : %s
+514: You have %d new messages.
+515: You have %d unread priority messages.
+516: You have no new messages.
+517: Message not found.
+518: Reading message from %s.
+519: Cannot delete unread priority mail.
+520: You have recieved new mail, use @listmail before deleting.
+521: Message deleted.
+522: You must wait 10 minutes before sending another message.
+523: Access Denied.
+524: Character does not exist.
+525: Mail has been sent.
+526: You have new mail.
+
+538: Hack on trade: character '%s' (account: %d) try to trade more items that he has.
+539: This player has %d of a kind of item (id: %d), and try to trade %d of them.
+540: This player has been definitivly blocked.
diff --git a/conf-tmpl/packet_athena.conf b/conf-tmpl/packet_athena.conf
new file mode 100644
index 000000000..1c6d78560
--- /dev/null
+++ b/conf-tmpl/packet_athena.conf
@@ -0,0 +1,55 @@
+// Athena sockets Configuration file
+// (Untranslated yet)
+
+
+// デバッグ情報の表示(バグ報告の際にコピペして頂けると助かります)
+debug: no
+
+// How long can a socket stall before closing the connection (in seconds)
+stall_time: 60
+
+
+//----- IP Rules Settings -----
+
+// Do we check IP's before allowing incoming connections?
+enable_ip_rules: yes
+
+// アクセス制限の判定順序(Apacheと同じ)
+// deny,allow が標準になっています。
+
+order: deny,allow
+// order: allow,deny
+// order: mutual-failture
+
+// アクセスコントロールするIPリスト
+// allow : ddosチェックの結果に関係なく許可
+// deny : 不許可
+// 指定無し : ddosチェックの結果で許可 / 不許可を決定
+// ただし、mutual-failture の場合は不許可になります。
+
+// allow: 127.0.0.1
+// allow: 192.168.0.0/16
+// allow: 10.0.0.0/255.0.0.0
+allow: all
+
+// deny: 127.0.0.1
+
+
+//---- Ddos Protection Settings ----
+
+// ddos攻撃と判断する為のルール設定
+// ddos_interval msec以内の接続要求がddos_count回続いた場合に、
+// ddos攻撃されたと判定します。
+
+// 接続間隔(msec)
+ddos_interval: 3000
+
+// 接続回数
+ddos_count: 5
+
+// ddos制限を解除する間隔(msec)
+// この時間経過すると、接続制限が解除されます。
+ddos_autoreset: 600000
+
+
+//import: conf/import/packet_conf.txt \ No newline at end of file
diff --git a/conf-tmpl/readme.txt b/conf-tmpl/readme.txt
new file mode 100644
index 000000000..db8777680
--- /dev/null
+++ b/conf-tmpl/readme.txt
@@ -0,0 +1,33 @@
+What is the import folder for?
+
+Most people don't know the real use of the import folder. After you do, you will wonder
+what you ever did without it.
+
+The main thing it does, is provide a way for you to change your config settings without
+having to update the files every time you update your server. You store your changes, and
+the rest are updated with eA (usually though SVN).
+
+How does this work?
+
+Well, you place only the settings you have changed in the import files. I'll use
+battle_athena.conf and battle_conf.txt for my example. Everytime you update you conf
+folder, using the normal method, you have to go and edit the configs again. So, you have to
+redo your rates, redo your ip addresses, you have to redo it all. Well, not with the import
+system.
+
+Say you want to change your base experience rate from the default (100)to 7x (700). Well
+then you would place this in your import/battle_conf.txt:
+
+// Rate at which exp. is given. (Note 2)
+base_exp_rate: 700
+
+You don't need the comment (duh, it's a commnet), but I usually leave them for clarity
+sake.
+
+So, now this new setting take place over the setting in battle_athena.conf. You just keep
+this file everytime you update, and your setting will always be there. Neat, isn't it?
+
+So, yeah, that's what the import folder is for. I hope to see a lot more people use it, to
+make my life as a managed server runer better.
+
+Semi-guide by Ajarn \ No newline at end of file
diff --git a/conf-tmpl/script_athena.conf b/conf-tmpl/script_athena.conf
index 21d4a6f45..3e420744b 100644
--- a/conf-tmpl/script_athena.conf
+++ b/conf-tmpl/script_athena.conf
@@ -1,2 +1,54 @@
+// ______ __ __
+// /\ _ \/\ \__/\ \
+// __\ \ \L\ \ \ ,_\ \ \___ __ ___ __
+// /'__`\ \ __ \ \ \/\ \ _ `\ /'__`\/' _ `\ /'__`\
+///\ __/\ \ \/\ \ \ \_\ \ \ \ \/\ __//\ \/\ \/\ \L\.\_
+//\ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\
+// \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/
+// _ _ _ _ _ _ _ _ _ _ _ _ _
+// / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \ / \
+//( e | n | g | l | i | s | h ) ( A | t | h | e | n | a )
+// \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
+//
+//--------------------------------------------------------
+// eAthena Script Configuration File
+//--------------------------------------------------------
+
+
// When choosing those which it refines setting the letter which is indicated. (Those for word use other than Japanese?)
refine_posword: Head,Body,Left hand,Right hand,Robe,Shoes,Accessory 1,Accessory 2,Head 2,Head 3,Not Equipped
+
+warn_func_no_comma: yes
+
+warn_cmd_no_comma: yes
+
+warn_func_mismatch_paramnum: yes
+
+warn_cmd_mismatch_paramnum: yes
+
+check_cmdcount: 65536
+
+check_gotocount: 2048
+
+
+//---- Custom script functions ----
+
+// 0 - Event script is defined as an NPC by itself
+// 1 - Event script can be called by script label
+event_script_type: 0
+
+// Name of event when a player has died
+die_event_name: PCDieEvent
+
+// Name of event when a player kills something
+kill_event_name: PCKillEvent
+
+// Name of event when a player logs out
+logout_event_name: PCLogoutEvent
+
+// Name of event when a player logs in
+login_event_name: PCLoginEvent
+
+// For events to be activated do we require
+// a 'set [EventName],1;' to be called first?
+event_requires_trigger: yes
diff --git a/conf-tmpl/water.txt b/conf-tmpl/water.txt
deleted file mode 100644
index 3844802db..000000000
--- a/conf-tmpl/water.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-// 水の設定。
-// waterは水ありでall_waterは全て水だと判断するマップ。
-
-mjolnir_12.gat mapflag water
-mjolnir_02.gat mapflag water
-glast_01.gat mapflag water
-gef_fild04.gat mapflag water
-prt_fild02.gat mapflag water
-prt_fild01.gat mapflag water
-prt_fild00.gat mapflag water
-gef_fild00.gat mapflag water
-gef_fild07.gat mapflag water
-gef_fild13.gat mapflag water
-gef_fild09.gat mapflag water
-gef_fild01.gat mapflag water
-prt_fild05.gat mapflag water
-gef_fild03.gat mapflag water
-gef_fild10.gat mapflag water
-prt_fild10.gat mapflag water
-pay_arche.gat mapflag water
-moc_ruins.gat mapflag water
-comodo.gat mapflag water
-cmd_fild01.gat mapflag water
-cmd_fild02.gat mapflag water
-cmd_fild03.gat mapflag water
-cmd_fild04.gat mapflag water
-cmd_fild05.gat mapflag water
-moc_fild11.gat mapflag water
-ama_fild01.gat mapflag water
-
-iz_dun00.gat mapflag water
-iz_dun01.gat mapflag water
-iz_dun02.gat mapflag water
-//iz_dun03.gat mapflag all_water
-//iz_dun04.gat mapflag all_water
-treasure01.gat mapflag water
-treasure02.gat mapflag water
-mjo_dun01.gat mapflag water
-orcsdun02.gat mapflag water
-pay_dun01.gat mapflag water
-pay_dun02.gat mapflag water
-pay_dun03.gat mapflag water
-prt_sewb2.gat mapflag water
-prt_sewb3.gat mapflag water
-gl_prison1.gat mapflag water
-alde_dun03.gat mapflag water
-alde_dun04.gat mapflag water
-beach_dun.gat mapflag water
-beach_dun2.gat mapflag water
-beach_dun3.gat mapflag water
-tur_dun01.gat mapflag water
-gld_dun02.gat mapflag water
-gld_dun03.gat mapflag water
-gld_dun04.gat mapflag water
diff --git a/conf-tmpl/water_height.txt b/conf-tmpl/water_height.txt
deleted file mode 100644
index 9a89e29c0..000000000
--- a/conf-tmpl/water_height.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-// 水場の高さを設定
-//water_height.txt@AthenaDB計画 2004/03/31 18:52:09 +0900 (JST)
-
-xmas.gat 3
-mjolnir_01.gat 0
-mjolnir_02.gat -19
-mjolnir_12.gat 15
-prt_fild00.gat 11
-prt_fild01.gat 25
-prt_fild02.gat 42
-prt_fild04.gat 14
-prt_fild05.gat 14
-prt_fild10.gat 40
-gef_fild00.gat 10
-gef_fild01.gat 14
-gef_fild03.gat 82
-gef_fild04.gat 14
-gef_fild07.gat 19
-gef_fild09.gat 11
-gef_fild10.gat 24
-moc_fild01.gat 26
-moc_fild11.gat 9
-iz_dun00.gat 5
-iz_dun01.gat 5
-iz_dun02.gat -58
-mjo_dun01.gat 7
-orcsdun02.gat 3
-pay_dun01.gat 8
-pay_dun02.gat 5
-pay_dun03.gat 10
-prt_sewb2.gat 5
-prt_sewb3.gat 5
-treasure01.gat -4
-treasure02.gat -1
-moc_ruins.gat 6
-pay_arche.gat 8
-glast_01.gat 8
-alde_dun03.gat 2
-alde_dun04.gat 0
-gl_prison1.gat 35
-gl_sew01.gat 56
-gl_sew02.gat 12
-gl_sew03.gat 15
-gl_sew04.gat 70
-comodo.gat 14
-cmd_fild01.gat 46
-cmd_fild02.gat 4
-cmd_fild03.gat 0
-cmd_fild04.gat 4
-cmd_fild05.gat 46
-beach_dun2.gat 6
-beach_dun3.gat 0
-beach_dun.gat 9
-gef_fild13.gat 19
-gld_dun02.gat 5
-gld_dun03.gat 14
-gld_dun04.gat 3
-aldeg_cas01.gat 40
-aldeg_cas02.gat 35
-aldeg_cas03.gat 16
-aldeg_cas04.gat 31
-aldeg_cas05.gat 25
-gefg_cas02.gat 8
-gefg_cas04.gat 15
-gefg_cas05.gat 5
-prtg_cas05.gat 13
-tur_dun01.gat -65
-ama_fild01.gat 5