- Renamed skill_clear_element_field to skill_clear_group, it accepts a flag to determine what to erase. &1 for elemental fields, &2 for traps. Also rewrote how it works to prevent missing elements (since each time an element is erased, the array contents shift)

- Added battle config traps_setting to determine how traps should behave. With &1 traps are invisible if you didn't see them get set up. With &2 traps will be removed after changing maps. The default is 2.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6285 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 0 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index 9976d3d9b..77c1981a2 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3599,6 +3599,7 @@ static const struct battle_data_short {
 	{ "player_damage_delay_rate",          &battle_config.pc_damage_delay_rate		},

 	{ "defunit_not_enemy",                 &battle_config.defnotenemy				},

 	{ "gvg_traps_target_all",	            &battle_config.vs_traps_bctall			},

+	{ "traps_setting",	                  &battle_config.traps_setting	},

 	{ "clear_skills_on_death",             &battle_config.clear_unit_ondeath },

 	{ "random_monster_checklv",            &battle_config.random_monster_checklv	},

 	{ "attribute_recover",                 &battle_config.attr_recover				},

@@ -3974,6 +3975,7 @@ void battle_set_defaults() {
 	battle_config.pc_damage_delay_rate=100;

 	battle_config.defnotenemy=0;

 	battle_config.vs_traps_bctall=BL_PC;

+	battle_config.traps_setting=0;

 	battle_config.clear_unit_ondeath=BL_ALL;

 	battle_config.random_monster_checklv=1;

 	battle_config.attr_recover=1;