diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf index f19805a79f..f28e41b6d4 100644 --- a/conf/battle/skill.conf +++ b/conf/battle/skill.conf @@ -122,7 +122,8 @@ gvg_traps_target_all: 1 // 0 = Always visible // 1 = Enable invisibility in versus maps (GVG/PVP/BG) // 2 = Enable invisibility in all maps -traps_setting: 0 +// Default on official servers: 0 for Pre-renewal, 2 for Renewal +//traps_setting: 0 // Restrictions applied to the Alchemist's Summon Flora skill (add as necessary) // 1: Enable players to damage the floras outside of versus grounds. diff --git a/src/map/battle.cpp b/src/map/battle.cpp index 2db6368af1..3d9dab9cd3 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -8009,7 +8009,11 @@ static const struct _battle_data { { "player_damage_delay_rate", &battle_config.pc_damage_delay_rate, 100, 0, INT_MAX, }, { "defunit_not_enemy", &battle_config.defnotenemy, 0, 0, 1, }, { "gvg_traps_target_all", &battle_config.vs_traps_bctall, BL_PC, BL_NUL, BL_ALL, }, +#ifdef RENEWAL + { "traps_setting", &battle_config.traps_setting, 2, 0, 2, }, +#else { "traps_setting", &battle_config.traps_setting, 0, 0, 2, }, +#endif { "summon_flora_setting", &battle_config.summon_flora, 1|2, 0, 1|2, }, { "clear_skills_on_death", &battle_config.clear_unit_ondeath, BL_NUL, BL_NUL, BL_ALL, }, { "clear_skills_on_warp", &battle_config.clear_unit_onwarp, BL_ALL, BL_NUL, BL_ALL, },