summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/Changelog.txt2
-rw-r--r--conf/battle/client.conf4
-rw-r--r--conf/battle/exp.conf2
-rw-r--r--conf/battle/gm.conf4
-rw-r--r--conf/battle/items.conf8
-rw-r--r--conf/battle/player.conf12
-rw-r--r--conf/battle/skill.conf14
-rw-r--r--conf/char_athena.conf2
-rw-r--r--conf/map_athena.conf10
-rw-r--r--conf/mapflag/partylock.txt2
-rw-r--r--conf/mapflag/reset.txt84
-rw-r--r--conf/msg_athena.conf4
12 files changed, 78 insertions, 70 deletions
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 43c92fc74..8a32c7f47 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
+2011/10/15
+ * Rev. 14972 Updated misleading comment in conf/mapflag/partylock.txt (bugreport:4930, since r14092). [Ai4rei]
2011/08/21
* Rev. 14938 Added setting 'client_limit_unit_lv' to control the unit types which are affected by 'max_lv' and 'aura_lv' settings. [Ai4rei]
2011/08/10
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
index c6a5159d5..7194c23bf 100644
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -78,7 +78,7 @@ area_size: 14
// NOTE: You also need to adjust the client if you want this to work.
// NOTE: Default is 99. Values above 127 will probably behave incorrectly.
// NOTE: If you don't know what this does, don't change it!!!
-max_lv: 150
+max_lv: 99
// Level required to display an aura.
// NOTE: This assumes that sending max_lv to the client will display the aura.
@@ -86,7 +86,7 @@ max_lv: 150
// Example: If max_lv is 99 and aura_lv is 150, characters with level 99~149
// will be sent as being all level 98, and only characters with level
// 150 or more will be reported as having level 99 and show an aura.
-aura_lv: 150
+aura_lv: 99
// Units types affected by max_lv and aura_lv settings. (Note 3)
// Note: If an unit type, which normally does not show an aura, is
diff --git a/conf/battle/exp.conf b/conf/battle/exp.conf
index f3d438ea2..f5078b0b6 100644
--- a/conf/battle/exp.conf
+++ b/conf/battle/exp.conf
@@ -87,7 +87,7 @@ death_penalty_base: 100
// Job exp. penalty rate (Each 100 is 1% of their exp)
death_penalty_job: 100
-// When a player dies, how much zeny should we penalize them with?
+// When a player dies (to another player), how much zeny should we penalize them with?
// NOTE: It is a percentage of their zeny, so 100 = 1%
zeny_penalty: 0
diff --git a/conf/battle/gm.conf b/conf/battle/gm.conf
index 21b54f386..d345b3978 100644
--- a/conf/battle/gm.conf
+++ b/conf/battle/gm.conf
@@ -56,6 +56,10 @@ gm_kick_chat: no
// set to 'Yes', Normal players (gm level 0) can never use a GM command even if you set the command level to 0.
atcommand_gm_only: no
+// (@) @allstats/@str/@agi/@vit/@int/@dex/@luk
+// allow gms to bypass the maximum stat parameter? ( if yes gm stats can go up to 32k ) default: no
+atcommand_max_stat_bypass: no
+
// Is the character of a GM account set as the object of a display by @ command etc. or not?
hide_GM_session: no
diff --git a/conf/battle/items.conf b/conf/battle/items.conf
index 200241ca6..9dc7ca314 100644
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -87,11 +87,3 @@ gtb_sc_immunity: 50
// NOTE: Different cards that grant the same skill will both
// always work independently of each other regardless of setting.
autospell_stacking: no
-
-// Rune consumption is blocked by the skill's cooldown (note 1)
-rune_block_by_skill: yes
-
-// Rune consumption is blocked by previously activated status effect (Note 1)
-// associated with the skill the rune stone being used would cast.
-// ie: if SC_REFRESH is active, then the Nosiege Runestone is unuseable.
-rune_block_by_status: no
diff --git a/conf/battle/player.conf b/conf/battle/player.conf
index 005570c9c..d8efd9f3a 100644
--- a/conf/battle/player.conf
+++ b/conf/battle/player.conf
@@ -88,20 +88,18 @@ max_sp: 1000000
// Max limit of char stats. (agi, str, etc.)
max_parameter: 99
-// Same as max_parameter, but for baby classes.
-max_baby_parameter: 80
-
-// Same as max_parameter, but for third classes.
+// Same as max_parameter, but for 3rd classes.
max_third_parameter: 120
-// Same as max_parameter, but for baby third classes.
-max_baby_third_parameter: 108
+// Same as max_parameter, but for baby classes.
+max_baby_parameter: 80
// Max armor def/mdef
+// NOTE: This setting have no effect if server is run on Renewal Mode (RRMODE)
// NOTE: does not affects skills and status effects like Mental Strength
// If weapon_defense_type is non-zero, it won't apply to max def.
// If magic_defense_type is non-zero, it won't apply to max mdef.
-max_def: 32767
+max_def: 99
// Def to Def2 conversion bonus. If the armor def/mdef exceeds max_def,
// the remaining is converted to vit def/int mdef using this multiplier
diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
index 061f7b0f3..960960692 100644
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -27,6 +27,11 @@ casting_rate: 100
// Delay time after casting (Note 2)
delay_rate: 100
+// Does the delay time depend on the caster's DEX and/or AGI? (Note 1)
+// Note: On Official servers, neither Dex nor Agi affect delay time
+delay_dependon_dex: no
+delay_dependon_agi: 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
@@ -44,6 +49,9 @@ default_walk_delay: 300
// min_skill_delay_limit.
no_skill_delay: 2
+// At what dex does the cast time become zero (instacast)?
+castrate_dex_scale: 150
+
// Will normal attacks be able to ignore the delay after skills? (Note 1)
skill_delay_attack_enable: yes
@@ -205,12 +213,6 @@ berserk_cancels_buffs: no
max_heal: 9999
max_heal_lv: 11
-// Level and Strength of "MVP Decrease AGI". When someone casts Decrease AGI of this
-// level or above, Agility will be reduced by max_decagi for max_decagi_dur milliseconds.
-max_decagi: 50
-max_decagi_dur: 120000
-max_decagi_lv: 11
-
// Emergency Recall Guild Skill setting (add as appropiate).
// Note that for the skill to be usable at all,
// you need at least one of 1/2 and 4/8
diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index 512f3cb97..4ffd47783 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -10,7 +10,7 @@ passwd: p1
// Server name, use alternative character such as ASCII 160 for spaces.
// NOTE: Do not use spaces in the name, or guild emblems won't work client-side!
-server_name: eAthenaRE
+server_name: RAthena
// Wisp name for server: used to send wisp from server to players (between 4 to 23 characters)
wisp_server_name: Server
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 644bafd53..f25f6a695 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -19,7 +19,7 @@
// only as information/reference.
//--------------------------------------------------------------
-// Configuration Info
+// Configuration Info
//--------------------------------------------------------------
// Interserver communication passwords, set in account.txt (or equiv.)
userid: s1
@@ -59,6 +59,14 @@ map_port: 5121
//If redirected output contains escape sequences (color codes)
stdout_with_ansisequence: no
+//Makes server log selected message types to a file in the /log/ folder
+//1: Log Warning Messages
+//2: Log Error and SQL Error messages.
+//4: Log Debug Messages
+//Example: "console_msg_log: 7" logs all 3 kinds
+//Messages logged by this overrides console_silent setting
+console_msg_log: 0
+
//Makes server output more silent by ommitting certain types of messages:
//1: Hide Information messages
//2: Hide Status messages
diff --git a/conf/mapflag/partylock.txt b/conf/mapflag/partylock.txt
index 78faf4b50..e3720f5a6 100644
--- a/conf/mapflag/partylock.txt
+++ b/conf/mapflag/partylock.txt
@@ -1,6 +1,6 @@
//===== eAthena Script =======================================
//= Map flag that disable party modification.
-//= Currently not used.
+//= Currently not used officially by any maps.
//===== By: ==================================================
//= eAthena Dev Team
//= v 1.0
diff --git a/conf/mapflag/reset.txt b/conf/mapflag/reset.txt
index b6693eaf2..5e0e621d9 100644
--- a/conf/mapflag/reset.txt
+++ b/conf/mapflag/reset.txt
@@ -1,42 +1,42 @@
-//===== eAthena Script =======================================
-//= Map flags that enable the use of Neuralizer
-//===== By: ==================================================
-//= Daegaladh
-//===== Current Version: =====================================
-//= 1.0 [Daegaladh]
-//===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//=
-//============================================================
-
-alberta mapflag reset
-aldebaran mapflag reset
-amatsu mapflag reset
-ayothaya mapflag reset
-brasilis mapflag reset
-comodo mapflag reset
-einbroch mapflag reset
-einbech mapflag reset
-geffen mapflag reset
-gonryun mapflag reset
-izlude mapflag reset
-jawaii mapflag reset
-hugel mapflag reset
-lighthalzen mapflag reset
-louyang mapflag reset
-manuk mapflag reset
-mid_camp mapflag reset
-moc_ruins mapflag reset
-morocc mapflag reset
-moscovia mapflag reset
-niflheim mapflag reset
-prontera mapflag reset
-payon mapflag reset
-pay_arche mapflag reset
-rachel mapflag reset
-splendide mapflag reset
-umbala mapflag reset
-veins mapflag reset
-xmas mapflag reset
-yuno mapflag reset
+//===== eAthena Script =======================================
+//= Map flags that enable the use of Neuralizer
+//===== By: ==================================================
+//= Daegaladh
+//===== Current Version: =====================================
+//= 1.0 [Daegaladh]
+//===== Compatible With: =====================================
+//=
+//===== Description: =========================================
+//=
+//============================================================
+
+alberta mapflag reset
+aldebaran mapflag reset
+amatsu mapflag reset
+ayothaya mapflag reset
+brasilis mapflag reset
+comodo mapflag reset
+einbroch mapflag reset
+einbech mapflag reset
+geffen mapflag reset
+gonryun mapflag reset
+izlude mapflag reset
+jawaii mapflag reset
+hugel mapflag reset
+lighthalzen mapflag reset
+louyang mapflag reset
+manuk mapflag reset
+mid_camp mapflag reset
+moc_ruins mapflag reset
+morocc mapflag reset
+moscovia mapflag reset
+niflheim mapflag reset
+prontera mapflag reset
+payon mapflag reset
+pay_arche mapflag reset
+rachel mapflag reset
+splendide mapflag reset
+umbala mapflag reset
+veins mapflag reset
+xmas mapflag reset
+yuno mapflag reset
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index f6d696e27..ae2cd5cd9 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -217,7 +217,7 @@
201: You don't have this quest skill.
202: This player has forgotten the skill.
203: This player doesn't have this quest skill.
-//204: FREE
+204: You can't open a shop on this cell.
//205: FREE
206: '%s' skill points reset.
207: '%s' stats points reset.
@@ -427,6 +427,8 @@
504: Used %d kafra points and %d cash points. %d kafra and %d cash points remaining.
505: Gained %d cash points. Total %d points.
506: Gained %d kafra points. Total %d points.
+410: Removed %d cash points. Total %d points.
+411: Removed %d kafra points. Total %d points.
// Trade Spoof Messages
507: This player has been banned for %d minute(s).