From 3667a349be34c3d7bc47c61c2384fe7a4568979c Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 23 Jan 2015 00:33:00 -0800 Subject: Update conf for tmwa 15.1.23 --- world/map/conf/battle_athena.conf | 13 ++----------- world/map/conf/map_athena.conf | 3 --- world/map/conf/tmwa-map.conf | 1 - 3 files changed, 2 insertions(+), 15 deletions(-) (limited to 'world/map') diff --git a/world/map/conf/battle_athena.conf b/world/map/conf/battle_athena.conf index 8288601d..6e80b1e7 100644 --- a/world/map/conf/battle_athena.conf +++ b/world/map/conf/battle_athena.conf @@ -99,8 +99,8 @@ monster_max_aspd: 199 // 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 -// [GM] Can equip anything? (No or minimum GM level, can cause client errors.) -gm_all_equipment: no +// [GM] Can equip anything? (0 to disable, or minimum GM level, can cause client errors.) +gm_all_equipment: 0 // Should GMs be given a hashed IP instead of the real one? mask_ip_gms: 1 @@ -131,9 +131,6 @@ natural_healhp_interval: 6000 // The time interval for SP to restore naturally. (in milliseconds) natural_healsp_interval: 8000 -// Automatic healing skill's time interval. (in milliseconds) -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 @@ -211,12 +208,6 @@ prevent_logout: yes // If skill fails by delay, should it display or not. (Note 1) display_delay_skill_fail: yes -// Is a monster summoned via dead branch aggresive? (Note 1) -dead_branch_active: yes - -// If someone loots, show name in party? (Note 1) -show_steal_in_same_party: no - // How to count the number of the enemies who do an agi penalty... // 1 or less: It is a count altogether. // 2: Full evasion exclusion diff --git a/world/map/conf/map_athena.conf b/world/map/conf/map_athena.conf index f03c0123..f0f59fd7 100644 --- a/world/map/conf/map_athena.conf +++ b/world/map/conf/map_athena.conf @@ -6,9 +6,6 @@ autosave_time: 60 // Message of the day file, when a character logs on, this message is displayed. motd_txt: conf/motd.txt -// When @help or @h is typed when you are a gm, this is displayed for helping new gms understand gm commands. -help_txt: conf/help.txt - mapreg_txt: save/mapreg.txt import: npc/scripts.conf diff --git a/world/map/conf/tmwa-map.conf b/world/map/conf/tmwa-map.conf index 44ac5757..5eea5862 100644 --- a/world/map/conf/tmwa-map.conf +++ b/world/map/conf/tmwa-map.conf @@ -5,7 +5,6 @@ // Older server versions hard-coded the loaders in (mostly) this order, // and there may still be code dependencies. -// The plan is to turn some of these into just plain 'import' eventually? map_conf: conf/map_athena.conf battle_conf: conf/battle_athena.conf atcommand_conf: conf/atcommand_athena.conf -- cgit v1.2.3-60-g2f50