25 files changed, 24 insertions, 37 deletions
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/map_local.conf.example b/world/map/conf/map_local.conf.example
index 894a43d3..d4270347 100644
--- a/world/map/conf/map_local.conf.example
+++ b/world/map/conf/map_local.conf.example
@@ -15,4 +15,4 @@ map_ip: 127.0.0.1
 map_port: 5122
 
 // Log of map actions, disabled by default because this is huge.
-//map_log: log/map.log
+//log_file: log/map.log
diff --git a/world/map/conf/tmwa-map.conf b/world/map/conf/tmwa-map.conf
index 44ac5757..10dd615e 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
@@ -15,22 +14,22 @@ const_db: db/const-quest.txt
 const_db: db/const-mapflags.txt
 const_db: db/const-debugflag.txt
 
-item_db: db/chest_item_db.txt
-item_db: db/foot_item_db.txt
-item_db: db/generic_item_db.txt
-item_db: db/hand_item_db.txt
-item_db: db/head_item_db.txt
-item_db: db/leg_item_db.txt
-item_db: db/offhand_item_db.txt
-item_db: db/trinket_item_db.txt
-item_db: db/use_item_db.txt
-item_db: db/weapon_item_db.txt
-mob_db: db/0_19_mob_db.txt
-mob_db: db/20_39_mob_db.txt
-mob_db: db/40_59_mob_db.txt
-mob_db: db/60_79_mob_db.txt
-mob_db: db/80_99_mob_db.txt
-mob_db: db/over_100_mob_db.txt
+item_db: db/item_db_chest.txt
+item_db: db/item_db_foot.txt
+item_db: db/item_db_generic.txt
+item_db: db/item_db_hand.txt
+item_db: db/item_db_head.txt
+item_db: db/item_db_leg.txt
+item_db: db/item_db_offhand.txt
+item_db: db/item_db_trinket.txt
+item_db: db/item_db_use.txt
+item_db: db/item_db_weapon.txt
+mob_db: db/mob_db_0_19.txt
+mob_db: db/mob_db_20_39.txt
+mob_db: db/mob_db_40_59.txt
+mob_db: db/mob_db_60_79.txt
+mob_db: db/mob_db_80_99.txt
+mob_db: db/mob_db_over_100.txt
 mob_skill_db: db/mob_skill_db.txt
 skill_db: db/skill_db.txt
 
diff --git a/world/map/data/027-4.wlk b/world/map/data/027-4.wlk
index 4d561765..0933cbc6 100644
--- a/world/map/data/027-4.wlk
+++ b/world/map/data/027-4.wlk
diff --git a/world/map/data/031-1.wlk b/world/map/data/031-1.wlk
index 7ca3abd2..130fd021 100644
--- a/world/map/data/031-1.wlk
+++ b/world/map/data/031-1.wlk
diff --git a/world/map/db/chest_item_db.txt b/world/map/db/item_db_chest.txt
index de94086c..de94086c 100644
--- a/world/map/db/chest_item_db.txt
+++ b/world/map/db/item_db_chest.txt
diff --git a/world/map/db/foot_item_db.txt b/world/map/db/item_db_foot.txt
index e86be1c2..e86be1c2 100644
--- a/world/map/db/foot_item_db.txt
+++ b/world/map/db/item_db_foot.txt
diff --git a/world/map/db/generic_item_db.txt b/world/map/db/item_db_generic.txt
index efae1569..efae1569 100644
--- a/world/map/db/generic_item_db.txt
+++ b/world/map/db/item_db_generic.txt
diff --git a/world/map/db/hand_item_db.txt b/world/map/db/item_db_hand.txt
index d57062b5..d57062b5 100644
--- a/world/map/db/hand_item_db.txt
+++ b/world/map/db/item_db_hand.txt
diff --git a/world/map/db/head_item_db.txt b/world/map/db/item_db_head.txt
index 922ea4b3..922ea4b3 100644
--- a/world/map/db/head_item_db.txt
+++ b/world/map/db/item_db_head.txt
diff --git a/world/map/db/leg_item_db.txt b/world/map/db/item_db_leg.txt
index 95fb53b4..95fb53b4 100644
--- a/world/map/db/leg_item_db.txt
+++ b/world/map/db/item_db_leg.txt
diff --git a/world/map/db/offhand_item_db.txt b/world/map/db/item_db_offhand.txt
index a36e1778..a36e1778 100644
--- a/world/map/db/offhand_item_db.txt
+++ b/world/map/db/item_db_offhand.txt
diff --git a/world/map/db/trinket_item_db.txt b/world/map/db/item_db_trinket.txt
index f3b77bc9..f3b77bc9 100644
--- a/world/map/db/trinket_item_db.txt
+++ b/world/map/db/item_db_trinket.txt
diff --git a/world/map/db/use_item_db.txt b/world/map/db/item_db_use.txt
index b2b13008..b2b13008 100644
--- a/world/map/db/use_item_db.txt
+++ b/world/map/db/item_db_use.txt
diff --git a/world/map/db/weapon_item_db.txt b/world/map/db/item_db_weapon.txt
index a16425f8..a16425f8 100644
--- a/world/map/db/weapon_item_db.txt
+++ b/world/map/db/item_db_weapon.txt
diff --git a/world/map/db/0_19_mob_db.txt b/world/map/db/mob_db_0_19.txt
index 36169593..36169593 100644
--- a/world/map/db/0_19_mob_db.txt
+++ b/world/map/db/mob_db_0_19.txt
diff --git a/world/map/db/20_39_mob_db.txt b/world/map/db/mob_db_20_39.txt
index b0d1d096..b0d1d096 100644
--- a/world/map/db/20_39_mob_db.txt
+++ b/world/map/db/mob_db_20_39.txt
diff --git a/world/map/db/40_59_mob_db.txt b/world/map/db/mob_db_40_59.txt
index a27c015c..a27c015c 100644
--- a/world/map/db/40_59_mob_db.txt
+++ b/world/map/db/mob_db_40_59.txt
diff --git a/world/map/db/60_79_mob_db.txt b/world/map/db/mob_db_60_79.txt
index 5dd9231a..5dd9231a 100644
--- a/world/map/db/60_79_mob_db.txt
+++ b/world/map/db/mob_db_60_79.txt
diff --git a/world/map/db/80_99_mob_db.txt b/world/map/db/mob_db_80_99.txt
index d6cdde0c..d6cdde0c 100644
--- a/world/map/db/80_99_mob_db.txt
+++ b/world/map/db/mob_db_80_99.txt
diff --git a/world/map/db/over_100_mob_db.txt b/world/map/db/mob_db_over_100.txt
index 3644b4dc..3644b4dc 100644
--- a/world/map/db/over_100_mob_db.txt
+++ b/world/map/db/mob_db_over_100.txt
diff --git a/world/map/npc/009-2/trader.txt b/world/map/npc/009-2/trader.txt
index 572cad1b..c386b05a 100644
--- a/world/map/npc/009-2/trader.txt
+++ b/world/map/npc/009-2/trader.txt
@@ -3,7 +3,7 @@
 // Updated by: TheKandiman
 // Reviewed by: Wombat
 
-009-2.gat,39,93,0|script|Trader|115
+009-2.gat,29,98,0|script|Trader|115
 {
     set @Ironprice, 1000;
     set @Sulphurprice, 1200;
diff --git a/world/map/npc/011-6/_warps.txt b/world/map/npc/011-6/_warps.txt
index f4a1c05f..8465b47d 100644
--- a/world/map/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
@@ -5,12 +5,12 @@
 011-6.gat,61,71|warp|To Small Bandit Cave|-1,-1,011-6.gat,270,124
 011-6.gat,270,125|warp|To Bandit Cave|-1,-1,011-6.gat,61,72
 011-6.gat,260,128|warp|To Bandit Cave|-1,-1,011-6.gat,51,76
-011-6.gat,145,118|warp|To Bandit Cave|-1,-1,011-6.gat,48,119
+011-6.gat,145,118|warp|To Bandit Cave|-1,-1,011-6.gat,47,119
 011-6.gat,196,26|warp|To Small Bandit Cave|-1,-1,011-6.gat,261,46
 011-6.gat,261,47|warp|To Second Bandit Cave|-1,-1,011-6.gat,196,27
 011-6.gat,271,52|warp|To Bandit Cave|-1,-1,011-6.gat,98,31
 011-6.gat,98,30|warp|To Small Bandit Cave|-1,-1,011-6.gat,271,51
-011-6.gat,47,120|warp|To Second Bandit Cave|-1,-1,011-6.gat,146,117
+011-6.gat,47,120|warp|To Second Bandit Cave|-1,-1,011-6.gat,145,117
 011-6.gat,49,101|warp|To Woodland|-1,-1,011-1.gat,38,37
 011-6.gat,24,206|warp|To Lake Cave|-1,-1,011-4.gat,16,58
 011-6.gat,47,185|warp|To Lake Cave|-1,-1,011-4.gat,39,36
diff --git a/world/map/npc/annuals/xmas/core.txt b/world/map/npc/annuals/xmas/core.txt
index 30562e13..d064efca 100644
--- a/world/map/npc/annuals/xmas/core.txt
+++ b/world/map/npc/annuals/xmas/core.txt
@@ -209,9 +209,9 @@ L_FinalGift:
     set @xmas_reward_item2$, $@xmas_uncommon_reward$[@xmas_uncommon_slot2];
     if(checkweight("Iten", 1) == 0)
         goto L_FullInv;
-    if(@xmas_reward >= 80)
+    if(@xmas_reward >= $@xmas_reward_tally_rare)
         getitem @xmas_reward_item$, 1;
-    if(@xmas_reward >= 40)
+    if(@xmas_reward >= $@xmas_reward_tally_common)
         getitem @xmas_reward_item1$, 1;
     getitem @xmas_reward_item2$, 1;
     set @xmas_uncommon_slot1, 0;