2 files changed, 10 insertions, 2 deletions
diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index 8e976b451..afb4d1ba2 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,11 @@
 Date	Added
 
+2006/08/24
+	* Added setting clear_skills_on_warp to specify when a character's
+	  land-based skills are deleted when the caster changes maps. Defaults to all
+	  types (skill.conf). [Skotlex]
+	* The previous setting now obsoletes traps_setting &2, which now can only
+	  be 0/1. [Skotlex]
 2006/08/21
 	* Removed config setting "muting_players", and expanded the manner_system
 	  config to specify how having negative manner (mute) affects a player (see
diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf
index 99bf07ffe..a7cc6f53d 100644
--- a/conf-tmpl/battle/skill.conf
+++ b/conf-tmpl/battle/skill.conf
@@ -89,6 +89,9 @@ skill_caster_check: yes
 // Should ground placed skills be removed as soon as the caster dies? [Note 4]
 clear_skills_on_death: 15
 
+// Should ground placed skills be removed when the caster changes maps? [Note 4]
+clear_skills_on_warp: 15
+
 //Setting this to YES will override the target mode of ground-based skills with the flag 0x01 to "No Enemies"
 //The two skills affected by default are Pneuma and Safety Wall (if set to yes, those two skills will not protect everyone, but only allies)
 //See db/skill_unit_db.txt for more info.
@@ -123,8 +126,7 @@ gvg_traps_target_all: 1
 // Some traps settings (add as necessary):
 // 1: Traps are invisible to those who come into view of it. When unset, all traps are visible at all times.
 //    (Invisible traps can be revealed through Hunter's Detecting skill)
-// 2: Traps are removed on map-change. When unset, traps last until they time-out.
-traps_setting: 2
+traps_setting: 0
 
 // Whether placed down skills will check walls (Note 1)
 // (Makes it so that Storm Gust/Lord of Vermillion/etc when casted next to a wall, won't hit on the other side)