Merge branch 'master' of github.com:HerculesWS/Hercules

Signed-off-by: shennetsind <ind@henn.et>

Conflicts:
	src/map/battle.c

1 files changed, 1 insertions, 10 deletions

diff --git a/conf/battle/skill.conf b/conf/battle/skill.conf
index 1bb58211a..e6828749b 100644
--- a/conf/battle/skill.conf
+++ b/conf/battle/skill.conf
@@ -293,13 +293,4 @@ mob_max_skilllvl: 100
 // 1: Gutter line system without demi gutter bug
 // 2-20: Area around caster (2 = 5x5, 3 = 7x7, 4 = 9x9, ..., 20 = 41x41)
 // Note: If you knock the target out of the area it will only be hit once and won't do splash damage
-bowling_bash_area: 0
-
-// How many attempts should a monster need until it can escape from an icewall casted directly on it?
-// On official servers, monsters can only leave an icewall to the west and south. If their target is north or east of them
-// they will continously try to chase it but fail doing so. This brings them into a loop during which they will cast idle
-// and rudeattacked skills (if attacked). Official servers have a safety system that eventually allows monsters to escape
-// when their walk routine failed many times in row so they won't stay on the loop endlessly. The time for this seems to be
-// around 15 seconds for fast monsters and 35 seconds for slow monsters, this equals about 75 attempts.
-// Set this to 0 if you don't want monsters to be stuck in icewalls at all.
-icewall_walk_block: 75
\ No newline at end of file
+bowling_bash_area: 0
\ No newline at end of file