diff --git a/800OTClient/otclientv8.log b/800OTClient/otclientv8.log
index e1a9622..4a5baba 100644
--- a/800OTClient/otclientv8.log
+++ b/800OTClient/otclientv8.log
@@ -5426,3 +5426,15 @@ OTCv8 3.1 rev 163 (dev) made by otclient.net built on Mar 31 2022 for arch x86
 Connecting to: 127.0.0.1:7171
 Login to 127.0.0.1:7172
 Exiting application..
+GPU Radeon RX 580 Series (ATI Technologies Inc.)
+OpenGL 4.6.13596 Compatibility Profile Context 20.10.35.02 27.20.1034.6
+[Atlas] Texture size is: 4096x4096 (max: 16384x16384)
+Found work dir at 'C:/Users/erika/source/repos/Sabrehaven/800OTClient/'
+== application started at Apr 24 2022 15:54:11
+OTCv8 3.1 rev 163 (dev) made by otclient.net built on Mar 31 2022 for arch x86
+Connecting to: 127.0.0.1:7171
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
diff --git a/data/monster/800/new/annihilon.xml b/data/monster/800/annihilon.xml
similarity index 87%
rename from data/monster/800/new/annihilon.xml
rename to data/monster/800/annihilon.xml
index 0451065..29b61d7 100644
--- a/data/monster/800/new/annihilon.xml
+++ b/data/monster/800/annihilon.xml
@@ -1,7 +1,8 @@
-<monster name="Annihilon" nameDescription="Annihilon" race="fire" experience="15000" speed="380" manacost="0">
+<monster name="Annihilon" nameDescription="Annihilon" race="fire" experience="15000" speed="108" manacost="0">
 	<health now="46500" max="46500" />
 	<look type="12" head="19" body="104" legs="96" feet="96" corpse="8721" />
-	<targetchange interval="5000" chance="8" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -12,16 +13,14 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="85" />
 		<flag runonhealth="200" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="185" attack="175" />
-		<attack name="death" interval="1000" chance="11" length="8" spread="0" min="0" max="-600">
+	<attacks skill="185" attack="175">
+		<attack name="physical" interval="1000" chance="11" length="8" spread="0" min="0" max="-600">
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
-		<attack name="death" interval="2000" chance="15" target="0" radius="4" min="-200" max="-700">
-			<attribute key="areaEffect" value="icearea" />
+		<attack name="physical" interval="2000" chance="15" target="0" radius="4" min="-200" max="-700">
+			<attribute key="areaEffect" value="poff" />
 		</attack>
 		<attack name="physical" interval="3000" chance="18" radius="5" target="1" min="-50" max="-255">
 			<attribute key="areaEffect" value="groundshaker" />
@@ -35,15 +34,12 @@
 		<defense name="healing" interval="1000" chance="14" min="400" max="900">
 			<attribute key="areaEffect" value="greenshimmer" />
 		</defense>
-		<defense name="speed" interval="1000" chance="4" speedchange="500" duration="7000">
+		<defense name="speed" interval="1000" chance="4" speedchange="142" duration="7000">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
 	</defenses>
 	<elements>
-		<element icePercent="20" />
 		<element energyPercent="95" />
-		<element deathPercent="95" />
-		<element holyPercent="-5" />
 	</elements>
 	<immunities>
 		<immunity invisible="1" />
diff --git a/data/monster/800/arena/greenhorn/achad.xml b/data/monster/800/arena/greenhorn/achad.xml
index 6a02eb9..c98d3a7 100644
--- a/data/monster/800/arena/greenhorn/achad.xml
+++ b/data/monster/800/arena/greenhorn/achad.xml
@@ -13,8 +13,8 @@
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-80" />
+	<attacks skill="30" attack="40">
+
 	</attacks>
 	<elements>
 		<element firePercent="10" />
diff --git a/data/monster/800/arena/greenhorn/axeitus headbanger.xml b/data/monster/800/arena/greenhorn/axeitus headbanger.xml
index 2ec0fdb..0a0c1ee 100644
--- a/data/monster/800/arena/greenhorn/axeitus headbanger.xml	
+++ b/data/monster/800/arena/greenhorn/axeitus headbanger.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="30" attack="40" />
+	<attacks skill="30" attack="40">
 		<attack name="physical" interval="1000" chance="80" range="5" radius="1" target="1" min="0" max="-50">
 			<attribute key="shootEffect" value="smallstone" />
 		</attack>
diff --git a/data/monster/800/arena/greenhorn/bloodpaw.xml b/data/monster/800/arena/greenhorn/bloodpaw.xml
index 2fc537a..01f528b 100644
--- a/data/monster/800/arena/greenhorn/bloodpaw.xml
+++ b/data/monster/800/arena/greenhorn/bloodpaw.xml
@@ -12,8 +12,8 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="10" attack="40" />
+	<attacks skill="10" attack="40">
+
 	</attacks>
 	<defenses armor="3" defense="8" />
 	<elements>
diff --git a/data/monster/800/arena/greenhorn/bovinus.xml b/data/monster/800/arena/greenhorn/bovinus.xml
index 3a8b2f4..2086332 100644
--- a/data/monster/800/arena/greenhorn/bovinus.xml
+++ b/data/monster/800/arena/greenhorn/bovinus.xml
@@ -12,8 +12,8 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-50" />
+	<attacks skill="10" attack="50">
+
 	</attacks>
 	<elements>
 		<element firePercent="20" />
diff --git a/data/monster/800/arena/greenhorn/colerian the barbarian.xml b/data/monster/800/arena/greenhorn/colerian the barbarian.xml
index 0bb09e1..6240f1f 100644
--- a/data/monster/800/arena/greenhorn/colerian the barbarian.xml	
+++ b/data/monster/800/arena/greenhorn/colerian the barbarian.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="20" attack="40" />
+	<attacks skill="20" attack="40">
 		<attack name="physical" interval="1000" chance="80" range="5" radius="1" target="1" min="0" max="-40">
 			<attribute key="shootEffect" value="piercingbolt" />
 		</attack>
diff --git a/data/monster/800/arena/greenhorn/cursed gladiator.xml b/data/monster/800/arena/greenhorn/cursed gladiator.xml
index ce14752..1499865 100644
--- a/data/monster/800/arena/greenhorn/cursed gladiator.xml	
+++ b/data/monster/800/arena/greenhorn/cursed gladiator.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-150" />
+	<attacks skill="40" attack="60">
 		<attack name="lifedrain" interval="4000" chance="50" range="5" target="1" min="0" max="-50">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
diff --git a/data/monster/800/arena/greenhorn/frostfur.xml b/data/monster/800/arena/greenhorn/frostfur.xml
index 7c1b70b..c7cd52f 100644
--- a/data/monster/800/arena/greenhorn/frostfur.xml
+++ b/data/monster/800/arena/greenhorn/frostfur.xml
@@ -12,8 +12,8 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="10" attack="30" />
+	<attacks skill="10" attack="30">
+
 	</attacks>
 	<defenses armor="2" defense="3" />
 	<elements>
diff --git a/data/monster/800/arena/greenhorn/orcus the cruel.xml b/data/monster/800/arena/greenhorn/orcus the cruel.xml
index 898ada1..37f7c00 100644
--- a/data/monster/800/arena/greenhorn/orcus the cruel.xml	
+++ b/data/monster/800/arena/greenhorn/orcus the cruel.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-180" />
+	<attacks skill="50" attack="60">
 		<attack name="physical" interval="2000" chance="40" range="5" min="0" max="-70">
 			<attribute key="shootEffect" value="throwingknife" />
 		</attack>
diff --git a/data/monster/800/arena/greenhorn/rocky.xml b/data/monster/800/arena/greenhorn/rocky.xml
index 729250f..0f20a4a 100644
--- a/data/monster/800/arena/greenhorn/rocky.xml
+++ b/data/monster/800/arena/greenhorn/rocky.xml
@@ -12,8 +12,8 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="30" attack="40" />
+	<attacks skill="30" attack="40">
+
 	</attacks>
 	<defenses armor="30" defense="30">
 		<defense name="healing" interval="2000" chance="50" min="15" max="35">
diff --git a/data/monster/800/arena/greenhorn/the hairy one.xml b/data/monster/800/arena/greenhorn/the hairy one.xml
index 072cf3c..23b78da 100644
--- a/data/monster/800/arena/greenhorn/the hairy one.xml	
+++ b/data/monster/800/arena/greenhorn/the hairy one.xml	
@@ -12,8 +12,8 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="10" attack="70" />
+	<attacks skill="10" attack="70">
+
 	</attacks>
 	<defenses armor="3" defense="5" />
 	<elements>
diff --git a/data/monster/800/arena/scrapper/avalanche.xml b/data/monster/800/arena/scrapper/avalanche.xml
index 647c955..b6a1714 100644
--- a/data/monster/800/arena/scrapper/avalanche.xml
+++ b/data/monster/800/arena/scrapper/avalanche.xml
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="50" attack="60" />
+	<attacks skill="50" attack="60">
 		<attack name="drown" interval="1000" chance="100" length="5" spread="6" min="-10" max="-50">
 			<attribute key="areaEffect" value="energyarea" />
 		</attack>
@@ -30,7 +29,6 @@
 		<element energyPercent="-10" />
 	</elements>
 	<immunities>
-		<immunity ice="1" />
 		<immunity earth="1" />
 		<immunity invisible="1" />
 	</immunities>
diff --git a/data/monster/800/arena/scrapper/drasilla.xml b/data/monster/800/arena/scrapper/drasilla.xml
index e602666..90a42e4 100644
--- a/data/monster/800/arena/scrapper/drasilla.xml
+++ b/data/monster/800/arena/scrapper/drasilla.xml
@@ -13,8 +13,7 @@
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="30" attack="60" />
+	<attacks skill="30" attack="60">
 		<attack name="fire" interval="6000" chance="60" min="-100" max="-180" length="8" spread="3">
 			<attribute key="areaEffect" value="firearea" />
 		</attack>
@@ -29,7 +28,6 @@
 	</defenses>
 	<elements>
 		<element energyPercent="20" />
-		<element icePercent="-10" />
 	</elements>
 	<immunities>
 		<immunity fire="1" />
diff --git a/data/monster/800/arena/scrapper/grimgor guteater.xml b/data/monster/800/arena/scrapper/grimgor guteater.xml
index b2df09e..ea5cd3c 100644
--- a/data/monster/800/arena/scrapper/grimgor guteater.xml	
+++ b/data/monster/800/arena/scrapper/grimgor guteater.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-230" />
+	<attacks skill="105" attack="40">
 		<attack name="physical" interval="4000" chance="60" min="0" max="-100">
 			<attribute key="shootEffect" value="throwingstar" />
 		</attack>
@@ -25,7 +24,6 @@
 	</defenses>
 	<elements>
 		<element energyPercent="20" />
-		<element deathPercent="-2" />
 		<element earthPercent="-10" />
 	</elements>
 	<immunities>
diff --git a/data/monster/800/arena/scrapper/kreebosh the exile.xml b/data/monster/800/arena/scrapper/kreebosh the exile.xml
index c91cd56..ff4d44d 100644
--- a/data/monster/800/arena/scrapper/kreebosh the exile.xml	
+++ b/data/monster/800/arena/scrapper/kreebosh the exile.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="30" attack="50" />
+	<attacks skill="30" attack="50">
 		<attack name="fire" interval="6000" chance="80" radius="3" min="0" max="-120">
 			<attribute key="areaEffect" value="energy" />
 		</attack>
@@ -36,7 +35,6 @@
 	<defenses armor="30" defense="40" />
 	<elements>
 		<element energyPercent="55" />
-		<element deathPercent="-10" />
 	</elements>
 	<immunities>
 		<immunity invisible="1" />
diff --git a/data/monster/800/arena/scrapper/slim.xml b/data/monster/800/arena/scrapper/slim.xml
index ac1ba82..e326e1b 100644
--- a/data/monster/800/arena/scrapper/slim.xml
+++ b/data/monster/800/arena/scrapper/slim.xml
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-150" poison="3" />
+	<attacks skill="50" attack="50" poison="3">
 		<attack name="lifedrain" interval="2000" chance="20" target="0" radius="3" min="-10" max="-50">
 			<attribute key="areaEffect" value="blackspark" />
 		</attack>
@@ -27,10 +26,8 @@
 	<defenses armor="36" defense="38" />
 	<elements>
 		<element firePercent="-10" />
-		<element holyPercent="-5" />
 	</elements>
 	<immunities>
-		<immunity death="1" />
 		<immunity earth="1" />
 		<immunity invisible="1" />
 	</immunities>
diff --git a/data/monster/800/arena/scrapper/spirit of earth.xml b/data/monster/800/arena/scrapper/spirit of earth.xml
index 78a0ef0..f506515 100644
--- a/data/monster/800/arena/scrapper/spirit of earth.xml	
+++ b/data/monster/800/arena/scrapper/spirit of earth.xml	
@@ -12,8 +12,8 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="50" attack="60" />
+	<attacks skill="50" attack="60">
+
 	</attacks>
 	<defenses armor="30" defense="32" />
 	<elements>
diff --git a/data/monster/800/arena/scrapper/spirit of fire.xml b/data/monster/800/arena/scrapper/spirit of fire.xml
index 5c908ff..97bf95b 100644
--- a/data/monster/800/arena/scrapper/spirit of fire.xml	
+++ b/data/monster/800/arena/scrapper/spirit of fire.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-300" />
+	<attacks skill="50" attack="100">
 		<attack name="firefield" interval="1000" chance="15" range="7" radius="4" target="1">
 			<attribute key="shootEffect" value="fire" />
 		</attack>
@@ -34,7 +32,6 @@
 	</defenses>
 	<elements>
 		<element energyPercent="20" />
-		<element icePercent="-10" />
 	</elements>
 	<immunities>
 		<immunity fire="1" />
diff --git a/data/monster/800/arena/scrapper/spirit of water.xml b/data/monster/800/arena/scrapper/spirit of water.xml
index 6f330e9..4d45375 100644
--- a/data/monster/800/arena/scrapper/spirit of water.xml	
+++ b/data/monster/800/arena/scrapper/spirit of water.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="70" attack="100" />
+	<attacks skill="70" attack="100">
 		<attack name="poisonfield" interval="1000" chance="50">
 			<attribute key="shootEffect" value="poison" />
 		</attack>
@@ -27,7 +26,6 @@
 	</elements>
 	<immunities>
 		<immunity fire="1" />
-		<immunity ice="1" />
 		<immunity invisible="1" />
 	</immunities>
 	<voices interval="5000" chance="5">
diff --git a/data/monster/800/arena/scrapper/the dark dancer.xml b/data/monster/800/arena/scrapper/the dark dancer.xml
index cd7588b..a0bd1a2 100644
--- a/data/monster/800/arena/scrapper/the dark dancer.xml	
+++ b/data/monster/800/arena/scrapper/the dark dancer.xml	
@@ -12,15 +12,14 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="4" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-45" poison="11" />
+	<attacks skill="20" attack="30" poison="11">
 		<attack name="speed" interval="3500" chance="35" range="5" duration="10000" speed="-250">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
 		<attack name="manadrain" interval="4000" chance="30" range="5" min="0" max="-110">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
-		<attack name="death" interval="3000" chance="70" range="5" min="-50" max="-90">
+		<attack name="physical" interval="3000" chance="70" range="5" min="-50" max="-90">
 			<attribute key="areaEffect" value="mortarea" />
 			<attribute key="shootEffect" value="suddendeath" />
 		</attack>
@@ -35,7 +34,6 @@
 	</defenses>
 	<elements>
 		<element firePercent="40" />
-		<element deathPercent="5" />
 	</elements>
 	<immunities>
 		<immunity invisible="1" />
diff --git a/data/monster/800/arena/scrapper/the hag.xml b/data/monster/800/arena/scrapper/the hag.xml
index 61f98f4..1232b66 100644
--- a/data/monster/800/arena/scrapper/the hag.xml	
+++ b/data/monster/800/arena/scrapper/the hag.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="5" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="40" attack="40" />
+	<attacks skill="40" attack="40">
 		<attack name="drunk" interval="3000" chance="35" range="5" radius="1" target="1" duration="15000" />
 		<attack name="speed" interval="4000" chance="55" radius="1" target="1" range="5" duration="12000" speed="-400">
 			<attribute key="areaEffect" value="redshimmer" />
@@ -29,7 +28,6 @@
 	</defenses>
 	<elements>
 		<element firePercent="30" />
-		<element icePercent="20" />
 		<element energyPercent="10" />
 	</elements>
 	<immunities>
diff --git a/data/monster/800/arena/warlord/darakan the executioner.xml b/data/monster/800/arena/warlord/darakan the executioner.xml
index bdf60e6..68a967e 100644
--- a/data/monster/800/arena/warlord/darakan the executioner.xml	
+++ b/data/monster/800/arena/warlord/darakan the executioner.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="50" attack="70" />
+	<attacks skill="50" attack="70">
 		<attack name="physical" interval="1000" chance="100" min="-72" max="-130">
 			<attribute key="shootEffect" value="spear" />
 		</attack>
@@ -24,7 +23,6 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element icePercent="15" />
 		<element firePercent="-15" />
 	</elements>
 	<immunities>
diff --git a/data/monster/800/arena/warlord/deathbringer.xml b/data/monster/800/arena/warlord/deathbringer.xml
index fdf427d..985004f 100644
--- a/data/monster/800/arena/warlord/deathbringer.xml
+++ b/data/monster/800/arena/warlord/deathbringer.xml
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-460" />
+	<attacks skill="50" attack="155">
 		<attack name="poison" interval="2000" chance="12" length="8" spread="3" min="-200" max="-250" poison="10">
 			<attribute key="areaEffect" value="poison" />
 		</attack>
@@ -27,7 +26,7 @@
 		<attack name="lifedrain" interval="2000" chance="10" radius="6" target="0" min="-80" max="-595">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
-		<attack name="death" interval="2000" chance="5" range="7" min="-30" max="-397">
+		<attack name="physical" interval="2000" chance="5" range="7" min="-30" max="-397">
 			<attribute key="shootEffect" value="suddendeath" />
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
@@ -35,12 +34,9 @@
 	<defenses armor="15" defense="15" />
 	<elements>
 		<element energyPercent="10" />
-		<element holyPercent="-15" />
 	</elements>
 	<immunities>
-		<immunity death="1" />
 		<immunity fire="1" />
-		<immunity ice="1" />
 		<immunity earth="1" />
 		<immunity invisible="1" />
 	</immunities>
diff --git a/data/monster/800/arena/warlord/fallen mooh'tah master ghar.xml b/data/monster/800/arena/warlord/fallen mooh'tah master ghar.xml
index 3ccdb4d..9d67ba7 100644
--- a/data/monster/800/arena/warlord/fallen mooh'tah master ghar.xml	
+++ b/data/monster/800/arena/warlord/fallen mooh'tah master ghar.xml	
@@ -12,18 +12,16 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-525" poison="18" />
+	<attacks skill="60" attack="150" poison="18">
 		<attack name="physical" interval="3000" chance="45" radius="5" target="1" min="0" max="-390">
 			<attribute key="shootEffect" value="fire" />
 		</attack>
 		<attack name="physical" interval="6000" chance="30" length="7" spread="0" min="0" max="-290">
 			<attribute key="areaEffect" value="firearea" />
 		</attack>
-		<attack name="death" interval="4000" chance="30" min="-80" max="-270">
+		<attack name="physical" interval="4000" chance="30" min="-80" max="-270">
 			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
diff --git a/data/monster/800/arena/warlord/gnorre chyllson.xml b/data/monster/800/arena/warlord/gnorre chyllson.xml
index d0f5612..eb1199a 100644
--- a/data/monster/800/arena/warlord/gnorre chyllson.xml	
+++ b/data/monster/800/arena/warlord/gnorre chyllson.xml	
@@ -12,24 +12,21 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-450" />
+	<attacks skill="60" attack="130">
 		<attack name="physical" interval="3000" chance="50" target="0" radius="3" min="0" max="-400">
 			<attribute key="areaEffect" value="blackspark" />
 		</attack>
-		<attack name="ice" interval="1000" chance="15" range="7" min="0" max="-200">
+		<attack name="physical" interval="1000" chance="15" range="7" min="0" max="-200">
 			<attribute key="shootEffect" value="snowball" />
 		</attack>
 	</attacks>
 	<defenses armor="51" defense="52" />
 	<elements>
-		<element holyPercent="2" />
 		<element energyPercent="-10" />
 		<element physicalPercent="-2" />
 	</elements>
 	<immunities>
 		<immunity fire="1" />
-		<immunity ice="1" />
 		<immunity earth="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
diff --git a/data/monster/800/arena/warlord/norgle glacierbeard.xml b/data/monster/800/arena/warlord/norgle glacierbeard.xml
index 3a2e408..1a38f6a 100644
--- a/data/monster/800/arena/warlord/norgle glacierbeard.xml	
+++ b/data/monster/800/arena/warlord/norgle glacierbeard.xml	
@@ -12,16 +12,14 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="80" attack="50" />
+	<attacks skill="80" attack="50">
+
 	</attacks>
 	<defenses armor="25" defense="27" />
 	<elements>
-		<element deathPercent="-15" />
-		<element energyPercent="-10" />
+
 	</elements>
 	<immunities>
-		<immunity ice="1" />
 		<immunity invisible="1" />
 	</immunities>
 	<voices interval="2000" chance="5">
diff --git a/data/monster/800/arena/warlord/svoren the mad.xml b/data/monster/800/arena/warlord/svoren the mad.xml
index 00a713c..38a144d 100644
--- a/data/monster/800/arena/warlord/svoren the mad.xml	
+++ b/data/monster/800/arena/warlord/svoren the mad.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="60" attack="150" />
+	<attacks skill="60" attack="150">
 		<attack name="speed" interval="3500" chance="35" radius="1" target="1" range="1" duration="40" speedchange="-250">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
@@ -21,7 +20,6 @@
 	<defenses armor="25" defense="27" />
 	<immunities>
 		<immunity fire="1" />
-		<immunity ice="1" />
 		<immunity energy="1" />
 		<immunity earth="1" />
 		<immunity invisible="1" />
diff --git a/data/monster/800/arena/warlord/the masked marauder.xml b/data/monster/800/arena/warlord/the masked marauder.xml
index a1628a7..779e20e 100644
--- a/data/monster/800/arena/warlord/the masked marauder.xml	
+++ b/data/monster/800/arena/warlord/the masked marauder.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="70" attack="160" />
+	<attacks skill="70" attack="160">
 		<attack name="physical" interval="2000" chance="40" min="-38" max="-150">
 			<attribute key="shootEffect" value="throwingknife" />
 		</attack>
@@ -24,7 +23,6 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element holyPercent="-15" />
 		<element energyPercent="30" />
 	</elements>
 	<immunities>
diff --git a/data/monster/800/arena/warlord/the obliverator.xml b/data/monster/800/arena/warlord/the obliverator.xml
index e01573d..7cf8f0c 100644
--- a/data/monster/800/arena/warlord/the obliverator.xml	
+++ b/data/monster/800/arena/warlord/the obliverator.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="90" attack="140" />
+	<attacks skill="90" attack="140">
 		<attack name="fire" interval="1000" chance="20" range="5" radius="7" target="1" min="-100" max="-250">
 			<attribute key="areaEffect" value="firearea" />
 			<attribute key="shootEffect" value="fire" />
@@ -29,8 +28,6 @@
 	</defenses>
 	<elements>
 		<element energyPercent="50" />
-		<element deathPercent="35" />
-		<element holyPercent="-15" />
 	</elements>
 	<immunities>
 		<immunity fire="1" />
diff --git a/data/monster/800/arena/warlord/the pit lord.xml b/data/monster/800/arena/warlord/the pit lord.xml
index 47f3c01..3566a85 100644
--- a/data/monster/800/arena/warlord/the pit lord.xml	
+++ b/data/monster/800/arena/warlord/the pit lord.xml	
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="85" attack="80" />
+	<attacks skill="85" attack="80">
 		<attack name="physical" interval="7500" chance="100" min="-100" max="-250">
 			<attribute key="shootEffect" value="largerock" />
 		</attack>
@@ -28,7 +27,6 @@
 	</defenses>
 	<elements>
 		<element earthPercent="35" />
-		<element icePercent="-20" />
 	</elements>
 	<immunities>
 		<immunity invisible="1" />
diff --git a/data/monster/800/arena/warlord/webster.xml b/data/monster/800/arena/warlord/webster.xml
index 22f6a83..c3b1746 100644
--- a/data/monster/800/arena/warlord/webster.xml
+++ b/data/monster/800/arena/warlord/webster.xml
@@ -12,8 +12,7 @@
 		<flag canpushitems="1" />
 		<flag targetdistance="1" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="40" attack="100" />
+	<attacks skill="40" attack="100">
 		<attack name="speed" interval="3500" chance="65" radius="1" target="1" range="1" duration="40" speedchange="-500">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
@@ -30,7 +29,6 @@
 		<element energyPercent="-20" />
 	</elements>
 	<immunities>
-		<immunity ice="1" />
 		<immunity invisible="1" />
 	</immunities>
 	<voices interval="2000" chance="5">
diff --git a/data/monster/800/new/barbarian bloodwalker.xml b/data/monster/800/barbarian bloodwalker.xml
similarity index 82%
rename from data/monster/800/new/barbarian bloodwalker.xml
rename to data/monster/800/barbarian bloodwalker.xml
index 8c842cb..6fcabb5 100644
--- a/data/monster/800/new/barbarian bloodwalker.xml	
+++ b/data/monster/800/barbarian bloodwalker.xml	
@@ -1,7 +1,8 @@
-<monster name="Barbarian Bloodwalker" nameDescription="a barbarian bloodwalker" race="blood" experience="195" speed="230" manacost="590">
+<monster name="Barbarian Bloodwalker" nameDescription="a barbarian bloodwalker" race="blood" experience="195" speed="65" manacost="590">
 	<health now="305" max="305" />
 	<look type="255" head="114" body="132" legs="132" feet="132" corpse="20335" />
-	<targetchange interval="4000" chance="10" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,26 +11,22 @@
 		<flag convinceable="1" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="80" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="50" attack="80" />
+	<attacks skill="50" attack="80">
+
 	</attacks>
 	<defenses armor="15" defense="15">
-		<defense name="speed" interval="2000" chance="15" speedchange="240" duration="5000">
+		<defense name="speed" interval="2000" chance="15" speedchange="68" duration="5000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
 	<elements>
 		<element physicalPercent="5" />
-		<element holyPercent="20" />
 		<element energyPercent="10" />
-		<element icePercent="50" />
-		<element deathPercent="-5" />
 		<element earthPercent="-5" />
 	</elements>
 	<voices interval="2000" chance="7">
diff --git a/data/monster/800/new/barbarian brutetamer.xml b/data/monster/800/barbarian brutetamer.xml
similarity index 82%
rename from data/monster/800/new/barbarian brutetamer.xml
rename to data/monster/800/barbarian brutetamer.xml
index bb64401..0965dfb 100644
--- a/data/monster/800/new/barbarian brutetamer.xml	
+++ b/data/monster/800/barbarian brutetamer.xml	
@@ -1,7 +1,8 @@
-<monster name="Barbarian Brutetamer" nameDescription="a barbarian brutetamer" race="blood" experience="90" speed="190" manacost="0">
+<monster name="Barbarian Brutetamer" nameDescription="a barbarian brutetamer" race="blood" experience="90" speed="54" manacost="0">
 	<health now="145" max="145" />
 	<look type="264" head="78" body="116" legs="95" feet="121" corpse="20339" />
-	<targetchange interval="60000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,18 +11,15 @@
 		<flag convinceable="0" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="90" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="4" />
 		<flag runonhealth="10" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="10" attack="20" />
+	<attacks skill="10" attack="20">
 		<attack name="physical" interval="2000" chance="20" range="7" radius="1" target="1" min="0" max="-34">
 			<attribute key="shootEffect" value="snowball" />
 		</attack>
-		<attack name="barbarian brutetamer skill reducer" range="5" interval="2000" chance="15" />
 	</attacks>
 	<defenses armor="10" defense="10">
 		<defense name="healing" interval="2000" chance="40" min="50" max="80">
@@ -29,11 +27,8 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element icePercent="50" />
-		<element holyPercent="10" />
 		<element energyPercent="20" />
 		<element physicalPercent="-20" />
-		<element deathPercent="-1" />
 	</elements>
 	<immunities>
 		<immunity lifedrain="1" />
diff --git a/data/monster/800/new/barbarian headsplitter.xml b/data/monster/800/barbarian headsplitter.xml
similarity index 84%
rename from data/monster/800/new/barbarian headsplitter.xml
rename to data/monster/800/barbarian headsplitter.xml
index afe4f37..e71cf38 100644
--- a/data/monster/800/new/barbarian headsplitter.xml	
+++ b/data/monster/800/barbarian headsplitter.xml	
@@ -1,7 +1,8 @@
-<monster name="Barbarian Headsplitter" nameDescription="a barbarian headsplitter" race="blood" experience="85" speed="200" manacost="450">
+<monster name="Barbarian Headsplitter" nameDescription="a barbarian headsplitter" race="blood" experience="85" speed="57" manacost="450">
 	<health now="100" max="100" />
 	<look type="253" head="115" body="105" legs="119" feet="132" corpse="20343" />
-	<targetchange interval="60000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,25 +11,20 @@
 		<flag convinceable="1" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="70" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="40" attack="20" />
+	<attacks skill="40" attack="20">
 		<attack name="physical" interval="2000" chance="15" range="7" radius="1" target="1" min="0" max="-60">
 			<attribute key="shootEffect" value="whirlwindaxe" />
 		</attack>
 	</attacks>
 	<defenses armor="15" defense="15" />
 	<elements>
-		<element icePercent="50" />
-		<element holyPercent="10" />
 		<element energyPercent="20" />
 		<element earthPercent="-10" />
-		<element deathPercent="-1" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
diff --git a/data/monster/800/new/barbarian skullhunter.xml b/data/monster/800/barbarian skullhunter.xml
similarity index 83%
rename from data/monster/800/new/barbarian skullhunter.xml
rename to data/monster/800/barbarian skullhunter.xml
index 1d58945..24443a0 100644
--- a/data/monster/800/new/barbarian skullhunter.xml	
+++ b/data/monster/800/barbarian skullhunter.xml	
@@ -1,7 +1,8 @@
-<monster name="Barbarian Skullhunter" nameDescription="a barbarian skullhunter" race="blood" experience="85" speed="220" manacost="450">
+<monster name="Barbarian Skullhunter" nameDescription="a barbarian skullhunter" race="blood" experience="85" speed="62" manacost="450">
 	<health now="135" max="135" />
 	<look type="254" head="0" body="77" legs="77" feet="114" corpse="20347" />
-	<targetchange interval="60000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,23 +11,18 @@
 		<flag convinceable="1" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="70" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="20" attack="40" />
+	<attacks skill="20" attack="40">
 	</attacks>
 	<defenses armor="15" defense="15" />
 	<elements>
-		<element icePercent="50" />
-		<element holyPercent="10" />
 		<element energyPercent="20" />
 		<element physicalPercent="5" />
 		<element earthPercent="-10" />
-		<element deathPercent="-1" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
diff --git a/data/monster/800/new/braindeath.xml b/data/monster/800/braindeath.xml
similarity index 85%
rename from data/monster/800/new/braindeath.xml
rename to data/monster/800/braindeath.xml
index 4e6bbbb..f205918 100644
--- a/data/monster/800/new/braindeath.xml
+++ b/data/monster/800/braindeath.xml
@@ -1,7 +1,8 @@
-<monster name="Braindeath" nameDescription="a braindeath" race="undead" experience="895" speed="230" manacost="0">
+<monster name="Braindeath" nameDescription="a braindeath" race="undead" experience="895" speed="65" manacost="0">
 	<health now="1225" max="1225" />
 	<look type="256" corpse="7256" />
-	<targetchange interval="4000" chance="10" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -12,19 +13,17 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="4" />
-		<flag staticattack="80" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="30" attack="50" />
+	<attacks skill="30" attack="50">
 		<attack name="energy" interval="2000" chance="10" range="7" min="-93" max="-170">
 			<attribute key="shootEffect" value="energy" />
 		</attack>
 		<attack name="fire" interval="2000" chance="10" range="7" min="-75" max="-125">
 			<attribute key="shootEffect" value="fire" />
 		</attack>
-		<attack name="death" interval="2000" chance="10" range="7" min="-85" max="-170">
-			<attribute key="shootEffect" value="suddendeath" />
+		<attack name="physical" interval="2000" chance="10" range="7" min="-85" max="-170">
+			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="earth" interval="2000" chance="10" range="7" min="-65" max="-125">
@@ -40,20 +39,17 @@
 		<defense name="healing" interval="2000" chance="15" min="150" max="200">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
-		<defense name="speed" interval="2000" chance="15" speedchange="260" duration="5000">
+		<defense name="speed" interval="2000" chance="15" speedchange="74" duration="5000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
 	<elements>
-		<element icePercent="20" />
 		<element physicalPercent="10" />
 		<element energyPercent="10" />
-		<element holyPercent="-20" />
 		<element firePercent="-15" />
 	</elements>
 	<immunities>
 		<immunity earth="1" />
-		<immunity death="1" />
 		<immunity invisible="1" />
 	</immunities>
 	<summons maxSummons="2">
diff --git a/data/monster/800/new/chakoya toolshaper.xml b/data/monster/800/chakoya toolshaper.xml
similarity index 83%
rename from data/monster/800/new/chakoya toolshaper.xml
rename to data/monster/800/chakoya toolshaper.xml
index 8fe0e48..e20cbe1 100644
--- a/data/monster/800/new/chakoya toolshaper.xml	
+++ b/data/monster/800/chakoya toolshaper.xml	
@@ -1,7 +1,8 @@
-<monster name="Chakoya Toolshaper" nameDescription="a chakoya toolshaper" race="blood" experience="40" speed="200" manacost="0">
+<monster name="Chakoya Toolshaper" nameDescription="a chakoya toolshaper" race="blood" experience="40" speed="57" manacost="0">
 	<health now="80" max="80" />
 	<look type="259" corpse="7320" />
-	<targetchange interval="60000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,14 +11,12 @@
 		<flag convinceable="0" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="80" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="25" attack="20" />
+	<attacks skill="25" attack="20">
 		<attack name="physical" interval="2000" chance="10" range="7" radius="3" target="1" min="0" max="-45">
 			<attribute key="shootEffect" value="smallstone" />
 		</attack>
@@ -25,12 +24,10 @@
 	<defenses armor="10" defense="10" />
 	<elements>
 		<element firePercent="40" />
-		<element holyPercent="10" />
 		<element energyPercent="-15" />
-		<element deathPercent="-5" />
 	</elements>
 	<immunities>
-		<immunity ice="1" />
+
 	</immunities>
 	<voices interval="2000" chance="7">
 		<voice sentence="Chikuva!!" />
diff --git a/data/monster/800/new/chakoya tribewarden.xml b/data/monster/800/chakoya tribewarden.xml
similarity index 80%
rename from data/monster/800/new/chakoya tribewarden.xml
rename to data/monster/800/chakoya tribewarden.xml
index 4ab4217..9b3e0d0 100644
--- a/data/monster/800/new/chakoya tribewarden.xml	
+++ b/data/monster/800/chakoya tribewarden.xml	
@@ -1,7 +1,8 @@
-<monster name="Chakoya Tribewarden" nameDescription="a chakoya tribewarden" race="blood" experience="40" speed="200" manacost="305">
+<monster name="Chakoya Tribewarden" nameDescription="a chakoya tribewarden" race="blood" experience="40" speed="57" manacost="305">
 	<health now="68" max="68" />
 	<look type="259" corpse="7320" />
-	<targetchange interval="60000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,24 +11,21 @@
 		<flag convinceable="1" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="80" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="20" attack="20" />
+	<attacks skill="20" attack="20">
+
 	</attacks>
 	<defenses armor="10" defense="10" />
 	<elements>
 		<element firePercent="25" />
-		<element holyPercent="10" />
 		<element energyPercent="-15" />
-		<element deathPercent="-5" />
 	</elements>
 	<immunities>
-		<immunity ice="1" />
+
 	</immunities>
 	<voices interval="2000" chance="7">
 		<voice sentence="Quisavu tukavi!" />
diff --git a/data/monster/800/new/chakoya windcaller.xml b/data/monster/800/chakoya windcaller.xml
similarity index 64%
rename from data/monster/800/new/chakoya windcaller.xml
rename to data/monster/800/chakoya windcaller.xml
index fb4abc2..8e63ab3 100644
--- a/data/monster/800/new/chakoya windcaller.xml	
+++ b/data/monster/800/chakoya windcaller.xml	
@@ -1,7 +1,8 @@
-<monster name="Chakoya Windcaller" nameDescription="a chakoya windcaller" race="blood" experience="48" speed="200" manacost="305">
+<monster name="Chakoya Windcaller" nameDescription="a chakoya windcaller" race="blood" experience="48" speed="57" manacost="305">
 	<health now="84" max="84" />
 	<look type="260" corpse="7320" />
-	<targetchange interval="60000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,22 +11,17 @@
 		<flag convinceable="1" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="90" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="4" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="12" attack="20" />
-		<attack name="ice" interval="2000" chance="15" range="7" min="-16" max="-32">
-			<attribute key="shootEffect" value="ice" />
+	<attacks skill="12" attack="20">
+		<attack name="physical" interval="2000" chance="15" range="7" min="-16" max="-32">
+			<attribute key="shootEffect" value="snowball" />
 		</attack>
-		<attack name="freezecondition" interval="2000" chance="10" target="0" radius="3" min="-130" max="-160">
-			<attribute key="areaEffect" value="icearea" />
-		</attack>
-		<attack name="ice" interval="2000" chance="10" target="0" length="5" spread="2" min="-9" max="-30">
-			<attribute key="areaEffect" value="icearea" />
+		<attack name="physical" interval="2000" chance="10" target="0" length="5" spread="2" min="-9" max="-30">
+			<attribute key="areaEffect" value="poff" />
 		</attack>
 	</attacks>
 	<defenses armor="10" defense="10">
@@ -35,12 +31,10 @@
 	</defenses>
 	<elements>
 		<element firePercent="50" />
-		<element holyPercent="20" />
 		<element energyPercent="-15" />
-		<element deathPercent="-10" />
 	</elements>
 	<immunities>
-		<immunity ice="1" />
+
 	</immunities>
 	<voices interval="2000" chance="7">
 		<voice sentence="Mupi! Si siyoqua jinuma!" />
diff --git a/data/monster/800/new/crystal spider.xml b/data/monster/800/crystal spider.xml
similarity index 83%
rename from data/monster/800/new/crystal spider.xml
rename to data/monster/800/crystal spider.xml
index 2a4055f..6e7d4c4 100644
--- a/data/monster/800/new/crystal spider.xml	
+++ b/data/monster/800/crystal spider.xml	
@@ -1,7 +1,8 @@
-<monster name="Crystal Spider" nameDescription="a crystal spider" race="undead" experience="900" speed="220" manacost="0">
+<monster name="Crystal Spider" nameDescription="a crystal spider" race="undead" experience="900" speed="62" manacost="0">
 	<health now="1250" max="1250" />
 	<look type="263" corpse="7344" />
-	<targetchange interval="4000" chance="15" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,27 +11,25 @@
 		<flag convinceable="0" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="80" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-250" poison="160" />
+	<attacks skill="40" attack="100" poison="8">
 		<attack name="speed" interval="2000" chance="15" range="7" radius="6" target="0" speedchange="-800" duration="15000">
 			<attribute key="areaEffect" value="poff" />
 		</attack>
-		<attack name="ice" interval="2000" chance="15" range="7" target="1" min="-50" max="-100">
-			<attribute key="shootEffect" value="ice" />
-			<attribute key="areaEffect" value="icearea" />
+		<attack name="physical" interval="2000" chance="15" range="7" target="1" min="-50" max="-100">
+			<attribute key="shootEffect" value="snowball" />
+			<attribute key="areaEffect" value="poff" />
 		</attack>
 		<attack name="speed" interval="2000" chance="20" range="7" target="1" speedchange="-600" duration="10000">
 			<attribute key="shootEffect" value="snowball" />
 		</attack>
 	</attacks>
 	<defenses armor="40" defense="40">
-		<defense name="speed" interval="2000" chance="15" speedchange="250" duration="5000">
+		<defense name="speed" interval="2000" chance="15" speedchange="71" duration="5000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
@@ -40,7 +39,6 @@
 	</elements>
 	<immunities>
 		<immunity fire="1" />
-		<immunity ice="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 	</immunities>
diff --git a/data/monster/800/new/desktop.ini b/data/monster/800/desktop.ini
similarity index 100%
rename from data/monster/800/new/desktop.ini
rename to data/monster/800/desktop.ini
index 79b4e39..f6fba3b 100644
--- a/data/monster/800/new/desktop.ini
+++ b/data/monster/800/desktop.ini
@@ -1,14 +1,14 @@
 [LocalizedFileNames]
 crystal spider.xml=@crystal spider.xml,0
 dire penguin.xml=@dire penguin.xml,0
-penguin.xml=@penguin.xml,0
 frost dragon.xml=@frost dragon.xml,0
 frost giant.xml=@frost giant.xml,0
 frost giantess.xml=@frost giantess.xml,0
-husky.xml=@husky.xml,0
-ice witch.xml=@ice witch.xml,0
-ice golem.xml=@ice golem.xml,0
-silver rabbit.xml=@silver rabbit.xml,0
-man in the cave.xml=@man in the cave.xml,0
 ghazbaran.xml=@ghazbaran.xml,0
+husky.xml=@husky.xml,0
+ice golem.xml=@ice golem.xml,0
+ice witch.xml=@ice witch.xml,0
+man in the cave.xml=@man in the cave.xml,0
+penguin.xml=@penguin.xml,0
+silver rabbit.xml=@silver rabbit.xml,0
 yakchal.xml=@yakchal.xml,0
diff --git a/data/monster/800/new/dire penguin.xml b/data/monster/800/dire penguin.xml
similarity index 85%
rename from data/monster/800/new/dire penguin.xml
rename to data/monster/800/dire penguin.xml
index c56ae14..f86f757 100644
--- a/data/monster/800/new/dire penguin.xml	
+++ b/data/monster/800/dire penguin.xml	
@@ -1,7 +1,8 @@
-<monster name="Dire Penguin" nameDescription="dire penguin" race="blood" experience="119" speed="200" manacost="0">
+<monster name="Dire Penguin" nameDescription="dire penguin" race="blood" experience="119" speed="57" manacost="0">
 	<health now="173" max="173" />
 	<look type="250" corpse="7334" />
-	<targetchange interval="4000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -14,8 +15,7 @@
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="30" attack="40" />
+	<attacks skill="30" attack="40">
 		<attack name="physical" interval="2000" chance="15" target="1" radius="1" range="7" min="0" max="-35">
 			<attribute key="shootEffect" value="smallstone" />
 			<attribute key="areaEffect" value="explosionarea" />
@@ -25,7 +25,7 @@
 		</attack>
 	</attacks>
 	<defenses armor="10" defense="10">
-		<defense name="speed" interval="2000" chance="15" range="7" speedchange="310" duration="3000">
+		<defense name="speed" interval="2000" chance="15" range="7" speedchange="88" duration="3000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
diff --git a/data/monster/800/new/frost dragon.xml b/data/monster/800/frost dragon.xml
similarity index 81%
rename from data/monster/800/new/frost dragon.xml
rename to data/monster/800/frost dragon.xml
index e5b5cf6..e719589 100644
--- a/data/monster/800/new/frost dragon.xml	
+++ b/data/monster/800/frost dragon.xml	
@@ -1,7 +1,8 @@
-<monster name="Frost Dragon" nameDescription="a frost dragon" race="undead" experience="2100" speed="240" manacost="0">
+<monster name="Frost Dragon" nameDescription="a frost dragon" race="undead" experience="2100" speed="68" manacost="0">
 	<health now="1800" max="1800" />
 	<look type="248" corpse="7091" />
-	<targetchange interval="4000" chance="10" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -12,11 +13,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="70" />
 		<flag runonhealth="250" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="57" attack="67" />
+	<attacks skill="57" attack="67">
 		<attack name="lifedrain" interval="2000" chance="10" target="0" length="8" spread="3" min="-175" max="-380">
 			<attribute key="areaEffect" value="poff" />
 		</attack>
@@ -24,39 +23,37 @@
 			<attribute key="areaEffect" value="poff" />
 		</attack>
 		<attack name="speed" interval="2000" chance="15" target="0" length="7" spread="3" speedchange="-850" duration="18000">
-			<attribute key="areaEffect" value="iceattack" />
+			<attribute key="areaEffect" value="poff" />
 		</attack>
-		<attack name="ice" interval="2000" chance="5" radius="3" target="0" min="-60" max="-120">
-			<attribute key="areaEffect" value="icetornado" />
+		<attack name="physical" interval="2000" chance="5" radius="3" target="0" min="-60" max="-120">
+			<attribute key="areaEffect" value="poff" />
 		</attack>
-		<attack name="ice" interval="2000" chance="10" target="1" radius="4" min="-100" max="-240">
-			<attribute key="areaEffect" value="icearea" />
+		<attack name="physical" interval="2000" chance="10" target="1" radius="4" min="-100" max="-240">
+			<attribute key="areaEffect" value="poff" />
 		</attack>
 		<attack name="physical" interval="2000" chance="5" target="0" length="1" spread="0" min="0" max="-220">
 			<attribute key="areaEffect" value="poff" />
 		</attack>
 		<attack name="speed" interval="2000" chance="20" target="1" radius="4" speedchange="-600" duration="12000">
-			<attribute key="areaEffect" value="icearea" />
+			<attribute key="areaEffect" value="poff" />
 		</attack>
 	</attacks>
 	<defenses armor="45" defense="45">
 		<defense name="healing" interval="2000" chance="10" min="150" max="200">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
-		<defense name="speed" interval="2000" chance="15" speedchange="290" duration="5000">
+		<defense name="speed" interval="2000" chance="15" speedchange="82" duration="5000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
 	<elements>
 		<element physicalPercent="10" />
-		<element deathPercent="10" />
 	</elements>
 	<immunities>
 		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 		<immunity fire="1" />
-		<immunity ice="1" />
 		<immunity earth="1" />
 	</immunities>
 	<voices interval="2000" chance="7">
diff --git a/data/monster/800/new/frost giant.xml b/data/monster/800/frost giant.xml
similarity index 86%
rename from data/monster/800/new/frost giant.xml
rename to data/monster/800/frost giant.xml
index a55586d..53d6c8a 100644
--- a/data/monster/800/new/frost giant.xml	
+++ b/data/monster/800/frost giant.xml	
@@ -1,7 +1,8 @@
-<monster name="Frost Giant" nameDescription="a frost giant" race="blood" experience="150" speed="200" manacost="490">
+<monster name="Frost Giant" nameDescription="a frost giant" race="blood" experience="150" speed="57" manacost="490">
 	<health now="270" max="270" />
 	<look type="257" corpse="7330" />
-	<targetchange interval="4000" chance="10" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,25 +11,23 @@
 		<flag convinceable="1" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="80" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="45" attack="40" />
+	<attacks skill="45" attack="40">
 		<attack name="physical" interval="2000" chance="15" range="7" min="0" max="-90">
 			<attribute key="shootEffect" value="largerock" />
 		</attack>
 	</attacks>
 	<defenses armor="20" defense="20">
-		<defense name="speed" interval="2000" chance="15" speedchange="300" duration="5000">
+		<defense name="speed" interval="2000" chance="15" speedchange="85" duration="5000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
 	<immunities>
-		<immunity ice="1" />
+
 	</immunities>
 	<voices interval="2000" chance="7">
 		<voice sentence="Hmm Humansoup" />
diff --git a/data/monster/800/new/frost giantess.xml b/data/monster/800/frost giantess.xml
similarity index 84%
rename from data/monster/800/new/frost giantess.xml
rename to data/monster/800/frost giantess.xml
index 4696a1d..c50e2ba 100644
--- a/data/monster/800/new/frost giantess.xml	
+++ b/data/monster/800/frost giantess.xml	
@@ -1,7 +1,8 @@
-<monster name="Frost Giantess" nameDescription="a frost giantess" race="blood" experience="150" speed="210" manacost="490">
+<monster name="Frost Giantess" nameDescription="a frost giantess" race="blood" experience="150" speed="59" manacost="490">
 	<health now="275" max="275" />
 	<look type="265" corpse="7330" />
-	<targetchange interval="4000" chance="10" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,31 +11,27 @@
 		<flag convinceable="1" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="60" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="4" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="30" attack="30" />
+	<attacks skill="30" attack="30">
 		<attack name="physical" interval="2000" chance="30" range="7" min="0" max="-90">
 			<attribute key="shootEffect" value="largerock" />
 		</attack>
 	</attacks>
 	<defenses armor="15" defense="15">
-		<defense name="speed" interval="2000" chance="15" speedchange="300" duration="5000">
+		<defense name="speed" interval="2000" chance="15" speedchange="85" duration="5000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
 	<elements>
 		<element firePercent="20" />
-		<element holyPercent="10" />
 		<element energyPercent="-10" />
-		<element deathPercent="-3" />
 	</elements>
 	<immunities>
-		<immunity ice="1" />
+
 	</immunities>
 	<voices interval="2000" chance="7">
 		<voice sentence="Ymirs Mjalle!" />
diff --git a/data/monster/800/new/ghazbaran.xml b/data/monster/800/ghazbaran.xml
similarity index 89%
rename from data/monster/800/new/ghazbaran.xml
rename to data/monster/800/ghazbaran.xml
index 95cd497..eec0c09 100644
--- a/data/monster/800/new/ghazbaran.xml
+++ b/data/monster/800/ghazbaran.xml
@@ -1,7 +1,8 @@
-<monster name="Ghazbaran" nameDescription="ghazbaran" race="fire" experience="15000" speed="400" manacost="0">
+<monster name="Ghazbaran" nameDescription="ghazbaran" race="fire" experience="15000" speed="114" manacost="0">
 	<health now="60000" max="60000" />
 	<look type="12" head="0" body="123" legs="97" feet="94" corpse="6068" />
-	<targetchange interval="10000" chance="20" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -11,40 +12,35 @@
 		<flag pushable="0" />
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
-		<flag staticattack="98" />
 		<flag targetdistance="1" />
 		<flag runonhealth="3500" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-3000" />
+	<attacks attack="199" skill="250">
 		<attack name="manadrain" interval="2000" chance="10" range="7" min="0" max="-1000" />
 		<attack name="physical" interval="3000" chance="34" range="7" min="0" max="-2000">
-			<attribute key="shootEffect" value="whirlwindsword" />
+			<attribute key="shootEffect" value="largerock" />
 			<attribute key="areaEffect" value="redspark" />
 		</attack>
 		<attack name="speed" interval="2000" chance="15" range="7" speedchange="-400" duration="15000">
 			<attribute key="shootEffect" value="throwingknife" />
 		</attack>
-		<attack name="ice" interval="2000" chance="20" range="7" radius="7" target="0" min="0" max="-800">
-			<attribute key="areaEffect" value="bigplants" />
+		<attack name="physical" interval="2000" chance="20" range="7" radius="7" target="0" min="0" max="-800">
+			<attribute key="areaEffect" value="poison" />
 		</attack>
 	</attacks>
 	<defenses armor="55" defense="65">
 		<defense name="healing" interval="3000" chance="35" min="400" max="6000">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
-		<defense name="speed" interval="4000" chance="80" speedchange="440" duration="6000">
+		<defense name="speed" interval="4000" chance="80" speedchange="125" duration="6000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
 	<elements>
 		<element physicalPercent="1" />
-		<element deathPercent="1" />
-		<element holyPercent="-1" />
 	</elements>
 	<immunities>
 		<immunity fire="1" />
-		<immunity ice="1" />
 		<immunity earth="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
diff --git a/data/monster/800/new/golgordan.xml b/data/monster/800/golgordan.xml
similarity index 86%
rename from data/monster/800/new/golgordan.xml
rename to data/monster/800/golgordan.xml
index 0910879..1b4e527 100644
--- a/data/monster/800/new/golgordan.xml
+++ b/data/monster/800/golgordan.xml
@@ -1,8 +1,8 @@
-<monster name="Golgordan" nameDescription="Golgordan" race="fire" experience="10000" speed="350" manacost="0">
+<monster name="Golgordan" nameDescription="Golgordan" race="fire" experience="10000" speed="100" manacost="0">
 	<health now="40000" max="40000" />
 	<look type="12" head="108" body="100" legs="105" feet="114" corpse="8721" />
-	<targetchange interval="7000" chance="10" />
-	<strategy attack="90" defense="10" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -13,22 +13,20 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="85" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-500" />
+	<attacks skill="105" attack="100">
 		<attack name="fire" interval="2000" chance="15" range="7" radius="4" min="-60" max="-200">
 			<attribute key="shootEffect" value="fire" />
 			<attribute key="areaEffect" value="firearea" />
 		</attack>
-		<attack name="poisoncondition" interval="1000" chance="11" length="5" spread="0" min="-30" max="-30">
+		<attack name="poisoncondition" interval="1000" chance="11" length="5" spread="0" min="-30" max="-30" count="70">
 			<attribute key="areaEffect" value="poison" />
 		</attack>
-		<attack name="death" interval="3000" chance="15" length="8" spread="3" min="-50" max="-600">
+		<attack name="physical" interval="3000" chance="15" length="8" spread="3" min="-50" max="-600">
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
-		<attack name="death" interval="2000" chance="10" radius="1" range="4" min="0" max="-600">
+		<attack name="physical" interval="2000" chance="10" radius="1" range="4" min="0" max="-600">
 			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
@@ -41,13 +39,10 @@
 	</attacks>
 	<defenses armor="48" defense="54" />
 	<elements>
-		<element icePercent="-1" />
-		<element holyPercent="1" />
 		<element physicalPercent="1" />
 		<element firePercent="-1" />
 	</elements>
 	<immunities>
-		<immunity death="1" />
 		<immunity invisible="1" />
 	</immunities>
 	<voices interval="2000" chance="7">
diff --git a/data/monster/800/new/hellgorak.xml b/data/monster/800/hellgorak.xml
similarity index 89%
rename from data/monster/800/new/hellgorak.xml
rename to data/monster/800/hellgorak.xml
index a0986aa..527dfcc 100644
--- a/data/monster/800/new/hellgorak.xml
+++ b/data/monster/800/hellgorak.xml
@@ -1,7 +1,8 @@
-<monster name="Hellgorak" nameDescription="Hellgorak" race="blood" experience="10000" speed="360" manacost="0">
+<monster name="Hellgorak" nameDescription="Hellgorak" race="blood" experience="10000" speed="105" manacost="0">
 	<health now="25850" max="25850" />
 	<look type="12" head="19" body="96" legs="21" feet="81" corpse="8721" />
-	<targetchange interval="5000" chance="8" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -12,14 +13,11 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="85" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack script="monster/smokeue.lua" interval="2000" chance="8" />
-		<attack name="melee" interval="2000" min="0" max="-800" />
+	<attacks skill="130" attack="130">
 		<attack name="energy" interval="1000" chance="11" length="8" spread="0" min="-250" max="-850">
-			<attribute key="areaEffect" value="purpleenergy" />
+			<attribute key="areaEffect" value="energy" />
 		</attack>
 		<attack name="fire" interval="1000" chance="11" radius="5" target="1" min="-50" max="-600">
 			<attribute key="areaEffect" value="firearea" />
@@ -38,11 +36,8 @@
 	</defenses>
 	<elements>
 		<element physicalPercent="98" />
-		<element icePercent="98" />
 		<element energyPercent="98" />
 		<element earthPercent="98" />
-		<element holyPercent="95" />
-		<element deathPercent="98" />
 		<element firePercent="98" />
 		<element drownPercent="-205" />
 	</elements>
diff --git a/data/monster/800/new/husky.xml b/data/monster/800/husky.xml
similarity index 78%
rename from data/monster/800/new/husky.xml
rename to data/monster/800/husky.xml
index 34aa367..e633e05 100644
--- a/data/monster/800/new/husky.xml
+++ b/data/monster/800/husky.xml
@@ -1,7 +1,8 @@
-<monster name="Husky" nameDescription="a husky" race="blood" experience="0" speed="250" manacost="420">
+<monster name="Husky" nameDescription="a husky" race="blood" experience="0" speed="71" manacost="420">
 	<health now="140" max="140" />
 	<look type="258" corpse="7316" />
-	<targetchange interval="4000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="1" />
 		<flag attackable="1" />
@@ -12,7 +13,6 @@
 		<flag canpushitems="0" />
 		<flag canpushcreatures="0" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="0" />
 	</flags>
 	<defenses armor="5" defense="5" />
diff --git a/data/monster/800/new/ice golem.xml b/data/monster/800/ice golem.xml
similarity index 75%
rename from data/monster/800/new/ice golem.xml
rename to data/monster/800/ice golem.xml
index 748a178..7e2ba0f 100644
--- a/data/monster/800/new/ice golem.xml	
+++ b/data/monster/800/ice golem.xml	
@@ -1,7 +1,8 @@
-<monster name="Ice Golem" nameDescription="an ice golem" race="undead" experience="295" speed="195" manacost="0">
+<monster name="Ice Golem" nameDescription="an ice golem" race="undead" experience="295" speed="55" manacost="0">
 	<health now="385" max="385" />
 	<look type="261" corpse="7282" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -10,22 +11,19 @@
 		<flag convinceable="0" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="50" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="100" attack="40" />
+	<attacks skill="100" attack="40">
 		<attack name="speed" interval="1000" chance="13" length="8" spread="0" speedchange="-800" duration="20000">
 			<attribute key="areaEffect" value="energy" />
 		</attack>
-		<attack name="ice" interval="1000" chance="15" range="7" min="-50" max="-85">
-			<attribute key="shootEffect" value="smallice" />
-			<attribute key="areaEffect" value="iceattack" />
+		<attack name="physical" interval="1000" chance="15" range="7" min="-50" max="-85">
+			<attribute key="shootEffect" value="snowball" />
+			<attribute key="areaEffect" value="poff" />
 		</attack>
-		<attack name="ice golem skill reducer" interval="2000" chance="10" />
 	</attacks>
 	<defenses armor="25" defense="26" />
 	<elements>
@@ -33,10 +31,7 @@
 		<element energyPercent="-20" />
 	</elements>
 	<immunities>
-		<immunity holy="1" />
-		<immunity death="1" />
 		<immunity fire="1" />
-		<immunity ice="1" />
 		<immunity invisible="1" />
 		<immunity paralyze="1" />
 	</immunities>
diff --git a/data/monster/800/new/ice witch.xml b/data/monster/800/ice witch.xml
similarity index 74%
rename from data/monster/800/new/ice witch.xml
rename to data/monster/800/ice witch.xml
index 6021372..f54443a 100644
--- a/data/monster/800/new/ice witch.xml	
+++ b/data/monster/800/ice witch.xml	
@@ -1,7 +1,8 @@
-<monster name="Ice Witch" nameDescription="an ice witch" race="blood" experience="580" speed="200" manacost="0">
+<monster name="Ice Witch" nameDescription="an ice witch" race="blood" experience="580" speed="57" manacost="0">
 	<health now="650" max="650" />
 	<look type="149" head="0" body="47" legs="105" feet="105" addons="0" corpse="20426" />
-	<targetchange interval="4000" chance="10" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -11,26 +12,24 @@
 		<flag pushable="0" />
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
-		<flag staticattack="70" />
 		<flag targetdistance="4" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-60" />
-		<attack name="ice" interval="2000" chance="10" length="8" spread="3" min="0" max="-100">
-			<attribute key="areaEffect" value="iceattack" />
+	<attacks skill="30" attack="30">
+		<attack name="physical" interval="2000" chance="10" length="8" spread="3" min="0" max="-100">
+			<attribute key="areaEffect" value="poff" />
 		</attack>
-		<attack name="ice" interval="2000" chance="20" range="7" min="0" max="-110">
+		<attack name="physical" interval="2000" chance="20" range="7" min="0" max="-110">
 			<attribute key="shootEffect" value="snowball" />
 		</attack>
-		<attack name="ice" interval="2000" chance="10" length="8" spread="3" min="-50" max="-124">
-			<attribute key="areaEffect" value="icearea" />
+		<attack name="physical" interval="2000" chance="10" length="8" spread="3" min="-50" max="-124">
+			<attribute key="areaEffect" value="poff" />
 		</attack>
 		<attack name="outfit" interval="2000" chance="10" range="7" item="7172" duration="4000">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</attack>
 		<attack name="speed" interval="2000" chance="15" range="7" speedchange="-300" duration="20000">
-			<attribute key="areaEffect" value="icetornado" />
+			<attribute key="areaEffect" value="poff" />
 		</attack>
 	</attacks>
 	<defenses armor="20" defense="20">
@@ -41,12 +40,9 @@
 	<elements>
 		<element firePercent="50" />
 		<element earthPercent="40" />
-		<element holyPercent="30" />
 		<element energyPercent="-10" />
-		<element deathPercent="-10" />
 	</elements>
 	<immunities>
-		<immunity ice="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 	</immunities>
diff --git a/data/monster/800/new/latrivan.xml b/data/monster/800/latrivan.xml
similarity index 89%
rename from data/monster/800/new/latrivan.xml
rename to data/monster/800/latrivan.xml
index d6c2381..4a5476f 100644
--- a/data/monster/800/new/latrivan.xml
+++ b/data/monster/800/latrivan.xml
@@ -1,8 +1,8 @@
-<monster name="Latrivan" nameDescription="Latrivan" race="fire" experience="10000" speed="340" manacost="0">
+<monster name="Latrivan" nameDescription="Latrivan" race="fire" experience="10000" speed="97" manacost="0">
 	<health now="25000" max="25000" />
 	<look type="12" head="120" body="128" legs="121" feet="111" corpse="8721" />
-	<targetchange interval="5000" chance="8" />
-	<strategy attack="80" defense="20" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -13,18 +13,16 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="85" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-1" />
+	<attacks skill="1" attack="1">
 		<attack name="fire" interval="2000" chance="10" length="8" spread="3" min="0" max="-850">
 			<attribute key="areaEffect" value="firearea" />
 		</attack>
 		<attack name="fire" interval="1000" chance="10" length="7" spread="0" min="-50" max="-250">
 			<attribute key="areaEffect" value="explosion" />
 		</attack>
-		<attack name="death" interval="2000" chance="10" radius="1" range="4" min="0" max="-600">
+		<attack name="physical" interval="2000" chance="10" radius="1" range="4" min="0" max="-600">
 			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
@@ -35,12 +33,10 @@
 	</attacks>
 	<defenses armor="35" defense="45" />
 	<elements>
-		<element icePercent="-1" />
 		<element energyPercent="1" />
 	</elements>
 	<immunities>
 		<immunity fire="1" />
-		<immunity death="1" />
 		<immunity invisible="1" />
 	</immunities>
 	<voices interval="2000" chance="7">
diff --git a/data/monster/800/new/madareth.xml b/data/monster/800/madareth.xml
similarity index 88%
rename from data/monster/800/new/madareth.xml
rename to data/monster/800/madareth.xml
index 6dafe07..3de8aae 100644
--- a/data/monster/800/new/madareth.xml
+++ b/data/monster/800/madareth.xml
@@ -1,7 +1,8 @@
-<monster name="Madareth" nameDescription="Madareth" race="fire" experience="10000" speed="380" manacost="0">
+<monster name="Madareth" nameDescription="Madareth" race="fire" experience="10000" speed="108" manacost="0">
 	<health now="75000" max="75000" />
 	<look type="12" head="77" body="116" legs="82" feet="79" corpse="8721" />
-	<targetchange interval="5000" chance="8" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -12,16 +13,14 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="85" />
 		<flag runonhealth="1200" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-2000" />
+	<attacks skill="120" attack="135">
 		<attack name="energy" interval="2000" chance="15" radius="4" target="1" min="-180" max="-660">
-			<attribute key="areaEffect" value="purpleenergy" />
+			<attribute key="areaEffect" value="energy" />
 		</attack>
-		<attack name="death" interval="2000" chance="10" length="5" spread="2" min="-600" max="-850">
-			<attribute key="areaEffect" value="blacksmoke" />
+		<attack name="physical" interval="2000" chance="10" length="5" spread="2" min="-600" max="-850">
+			<attribute key="areaEffect" value="poff" />
 		</attack>
 		<attack name="manadrain" interval="2000" chance="20" radius="4" target="1" min="0" max="-200">
 			<attribute key="areaEffect" value="redshimmer" />
@@ -37,8 +36,6 @@
 	</defenses>
 	<elements>
 		<element firePercent="-5" />
-		<element icePercent="5" />
-		<element deathPercent="95" />
 		<element energyPercent="99" />
 	</elements>
 	<immunities>
diff --git a/data/monster/800/new/man in the cave.xml b/data/monster/800/man in the cave.xml
similarity index 87%
rename from data/monster/800/new/man in the cave.xml
rename to data/monster/800/man in the cave.xml
index c01c184..7fc3c59 100644
--- a/data/monster/800/new/man in the cave.xml	
+++ b/data/monster/800/man in the cave.xml	
@@ -1,7 +1,8 @@
-<monster name="Man In The Cave" nameDescription="man in the cave" race="blood" experience="770" speed="210" manacost="0">
+<monster name="Man In The Cave" nameDescription="man in the cave" race="blood" experience="770" speed="59" manacost="0">
 	<health now="485" max="485" />
 	<look type="128" head="77" body="59" legs="20" feet="116" addons="1" corpse="20446" />
-	<targetchange interval="5000" chance="8" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -12,17 +13,15 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="0" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="50" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-62" />
+	<attacks skill="60" attack="30">
 		<attack name="physical" interval="2000" chance="20" range="7" min="0" max="-95">
 			<attribute key="shootEffect" value="smallstone" />
 		</attack>
 	</attacks>
 	<defenses armor="15" defense="15">
-		<defense name="speed" interval="2000" chance="12" speedchange="250" duration="4000">
+		<defense name="speed" interval="2000" chance="12" speedchange="71" duration="4000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 		<defense name="healing" interval="2000" chance="25" min="10" max="50">
diff --git a/data/monster/800/new/UniqueItems.txt b/data/monster/800/new/UniqueItems.txt
deleted file mode 100644
index 9f33b90..0000000
--- a/data/monster/800/new/UniqueItems.txt
+++ /dev/null
@@ -1,249 +0,0 @@
-{2148, 0000},
-{9810, 0000},
-{7632, 0000},
-{7633, 0000},
-{2452, 0000},
-{7368, 0000},
-{2158, 0000},
-{2127, 0000},
-{2154, 0000},
-{6529, 0000},
-{2427, 0000},
-{2381, 0000},
-{2156, 0000},
-{7439, 0000},
-{7840, 0000},
-{9971, 0000},
-{2152, 0000},
-{2547, 0000},
-{5944, 0000},
-{2153, 0000},
-{7366, 0000},
-{2155, 0000},
-{7440, 0000},
-{8473, 0000},
-{7591, 0000},
-{7421, 0000},
-{2519, 0000},
-{8472, 0000},
-{5954, 0000},
-{7590, 0000},
-{8891, 0000},
-{2528, 0000},
-{7387, 0000},
-{2515, 0000},
-{2514, 0000},
-{2520, 0000},
-{7431, 0000},
-{8877, 0000},
-{8928, 0000},
-{8929, 0000},
-{2671, 0000},
-{2044, 0000},
-{2458, 0000},
-{2378, 0000},
-{2464, 0000},
-{5911, 0000},
-{7618, 0000},
-{3962, 0000},
-{7457, 0000},
-{7290, 0000},
-{3965, 0000},
-{2686, 0000},
-{2401, 0000},
-{7343, 0000},
-{1958, 0000},
-{7620, 0000},
-{7379, 0000},
-{7464, 0000},
-{7463, 0000},
-{2050, 0000},
-{2403, 0000},
-{2460, 0000},
-{2483, 0000},
-{2473, 0000},
-{2229, 0000},
-{5913, 0000},
-{2168, 0000},
-{7461, 0000},
-{7449, 0000},
-{7462, 0000},
-{7364, 0000},
-{2175, 0000},
-{2450, 0000},
-{2423, 0000},
-{2509, 0000},
-{5898, 0000},
-{7407, 0000},
-{2518, 0000},
-{7452, 0000},
-{3972, 0000},
-{10580, 0000},
-{2667, 0000},
-{2398, 0000},
-{2553, 0000},
-{2541, 0000},
-{7381, 0000},
-{7441, 0000},
-{7159, 0000},
-{2669, 0000},
-{7158, 0000},
-{2406, 0000},
-{7589, 0000},
-{2463, 0000},
-{2457, 0000},
-{2125, 0000},
-{2124, 0000},
-{5879, 0000},
-{2169, 0000},
-{2477, 0000},
-{2476, 0000},
-{7902, 0000},
-{2171, 0000},
-{7437, 0000},
-{5801, 0000},
-{2434, 0000},
-{2672, 0000},
-{2796, 0000},
-{1976, 0000},
-{2146, 0000},
-{2167, 0000},
-{2033, 0000},
-{2177, 0000},
-{2492, 0000},
-{2479, 0000},
-{2498, 0000},
-{7402, 0000},
-{2396, 0000},
-{2666, 0000},
-{2513, 0000},
-{7460, 0000},
-{2490, 0000},
-{2209, 0000},
-{10575, 0000},
-{1294, 0000},
-{6500, 0000},
-{2145, 0000},
-{6300, 0000},
-{8904, 0000},
-{2143, 0000},
-{2178, 0000},
-{2214, 0000},
-{2150, 0000},
-{2149, 0000},
-{1984, 0000},
-{2176, 0000},
-{8918, 0000},
-{8901, 0000},
-{2179, 0000},
-{7405, 0000},
-{8884, 0000},
-{8903, 0000},
-{7433, 0000},
-{6553, 0000},
-{2112, 0000},
-{2164, 0000},
-{2165, 0000},
-{2151, 0000},
-{2144, 0000},
-{7896, 0000},
-{8902, 0000},
-{2174, 0000},
-{2447, 0000},
-{8887, 0000},
-{2466, 0000},
-{2646, 0000},
-{2472, 0000},
-{7455, 0000},
-{2387, 0000},
-{2162, 0000},
-{2170, 0000},
-{2393, 0000},
-{2470, 0000},
-{2462, 0000},
-{2432, 0000},
-{2402, 0000},
-{2182, 0000},
-{2197, 0000},
-{9813, 0000},
-{2487, 0000},
-{2147, 0000},
-{7456, 0000},
-{7894, 0000},
-{2133, 0000},
-{9970, 0000},
-{8870, 0000},
-{8871, 0000},
-{2645, 0000},
-{2488, 0000},
-{2130, 0000},
-{2656, 0000},
-{7412, 0000},
-{7388, 0000},
-{14333, 0000},
-{7453, 0000},
-{8926, 0000},
-{8879, 0000},
-{10578, 0000},
-{7588, 0000},
-{2663, 0000},
-{7892, 0000},
-{7459, 0000},
-{7443, 0000},
-{2183, 0000},
-{2370, 0000},
-{2377, 0000},
-{7404, 0000},
-{2208, 0000},
-{8910, 0000},
-{2071, 0000},
-{7418, 0000},
-{8912, 0000},
-{3953, 0000},
-{2187, 0000},
-{8922, 0000},
-{7416, 0000},
-{7383, 0000},
-{8920, 0000},
-{2079, 0000},
-{2374, 0000},
-{3952, 0000},
-{2213, 0000},
-{7386, 0000},
-{2207, 0000},
-{2120, 0000},
-{7458, 0000},
-{2684, 0000},
-{11209, 0000},
-{3031, 0000},
-{3731, 0000},
-{2789, 0000},
-{5880, 0000},
-{5925, 0000},
-{7391, 0000},
-{5741, 0000},
-{2475, 0000},
-{2392, 0000},
-{5892, 0000},
-{5669, 0000},
-{2419, 0000},
-{7385, 0000},
-{2383, 0000},
-{5891, 0000},
-{7417, 0000},
-{2491, 0000},
-{5885, 0000},
-{5884, 0000},
-{6103, 0000},
-{5912, 0000},
-{2201, 0000},
-{7897, 0000},
-{2436, 0000},
-{7410, 0000},
-{2195, 0000},
-{6104, 0000},
-{2134, 0000},
-{5909, 0000},
-{5910, 0000},
-{5914, 0000},
-{2173, 0000},
diff --git a/data/monster/800/new/penguin.xml b/data/monster/800/penguin.xml
similarity index 75%
rename from data/monster/800/new/penguin.xml
rename to data/monster/800/penguin.xml
index e0aaa60..265cad4 100644
--- a/data/monster/800/new/penguin.xml
+++ b/data/monster/800/penguin.xml
@@ -1,7 +1,8 @@
-<monster name="Penguin" nameDescription="penguin" race="blood" experience="1" speed="180" manacost="300">
+<monster name="Penguin" nameDescription="penguin" race="blood" experience="1" speed="51" manacost="300">
 	<health now="33" max="33" />
 	<look type="250" corpse="7334" />
-	<targetchange interval="4000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="1" />
 		<flag attackable="1" />
@@ -13,14 +14,12 @@
 		<flag canpushcreatures="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="32" />
-		<flag staticattack="90" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="10" attack="3" />
+	<attacks skill="10" attack="3">
+
 	</attacks>
 	<defenses armor="5" defense="5" />
 	<elements>
-		<element icePercent="5" />
 		<element energyPercent="-5" />
 	</elements>
 	<loot>
diff --git a/data/monster/800/new/silver rabbit.xml b/data/monster/800/silver rabbit.xml
similarity index 77%
rename from data/monster/800/new/silver rabbit.xml
rename to data/monster/800/silver rabbit.xml
index ed06678..a91e9ea 100644
--- a/data/monster/800/new/silver rabbit.xml	
+++ b/data/monster/800/silver rabbit.xml	
@@ -1,7 +1,8 @@
-<monster name="Silver Rabbit" nameDescription="a silver rabbit" race="blood" experience="0" speed="195" manacost="220">
+<monster name="Silver Rabbit" nameDescription="a silver rabbit" race="blood" experience="0" speed="55" manacost="220">
 	<health now="15" max="15" />
 	<look type="262" head="69" body="66" legs="69" feet="66" corpse="7338" />
-	<targetchange interval="4000" chance="0" />
+	<targetchange interval="1000" chance="5" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="1" />
 		<flag attackable="1" />
@@ -10,7 +11,6 @@
 		<flag convinceable="1" />
 		<flag pushable="0" />
 		<flag canpushitems="0" />
-		<flag staticattack="70" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="0" />
diff --git a/data/monster/800/new/ungreez.xml b/data/monster/800/ungreez.xml
similarity index 100%
rename from data/monster/800/new/ungreez.xml
rename to data/monster/800/ungreez.xml
diff --git a/data/monster/800/new/ushuriel.xml b/data/monster/800/ushuriel.xml
similarity index 84%
rename from data/monster/800/new/ushuriel.xml
rename to data/monster/800/ushuriel.xml
index 1f5fad7..f407ef9 100644
--- a/data/monster/800/new/ushuriel.xml
+++ b/data/monster/800/ushuriel.xml
@@ -1,7 +1,8 @@
-<monster name="Ushuriel" nameDescription="Ushuriel" race="fire" experience="10500" speed="350" manacost="0">
+<monster name="Ushuriel" nameDescription="Ushuriel" race="fire" experience="10500" speed="100" manacost="0">
 	<health now="31500" max="31500" />
 	<look type="12" head="0" body="95" legs="19" feet="112" corpse="8721" />
-	<targetchange interval="5000" chance="8" />
+	<targetchange interval="1000" chance="10" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -12,28 +13,23 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="85" />
 		<flag runonhealth="1500" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-1200" />
+	<attacks skill="140" attack="145">
 		<attack name="physical" interval="1000" chance="10" length="10" spread="0" min="-250" max="-500">
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
-		<attack name="ice" interval="2000" chance="10" length="8" spread="3" min="0" max="-400">
-			<attribute key="areaEffect" value="icetornado" />
+		<attack name="physical" interval="2000" chance="10" length="8" spread="3" min="0" max="-400">
+			<attribute key="areaEffect" value="poff" />
 		</attack>
-		<attack name="cursecondition" interval="2000" chance="15" radius="4" target="0" min="0" max="-800">
-			<attribute key="areaEffect" value="mortarea" />
-		</attack>
-		<attack name="energycondition" interval="2000" chance="15" radius="4" target="0" min="-25" max="-25">
+		<attack name="energycondition" interval="2000" chance="15" radius="4" target="0" min="-25" max="-25" count="70">
 			<attribute key="areaEffect" value="energy" />
 		</attack>
 		<attack name="drunk" interval="3000" chance="11" radius="6" target="0" duration="25000">
 			<attribute key="areaEffect" value="purplenote" />
 		</attack>
 		<attack name="earth" interval="2000" chance="9" length="8" spread="3" min="0" max="-600">
-			<attribute key="areaEffect" value="smallplants" />
+			<attribute key="areaEffect" value="poison" />
 		</attack>
 	</attacks>
 	<defenses armor="50" defense="45">
@@ -45,12 +41,9 @@
 		<element physicalPercent="50" />
 		<element firePercent="30" />
 		<element energyPercent="30" />
-		<element icePercent="30" />
 		<element earthPercent="30" />
-		<element holyPercent="25" />
 	</elements>
 	<immunities>
-		<immunity death="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 	</immunities>
diff --git a/data/monster/800/new/yakchal.xml b/data/monster/800/yakchal.xml
similarity index 86%
rename from data/monster/800/new/yakchal.xml
rename to data/monster/800/yakchal.xml
index a89950f..a37b138 100644
--- a/data/monster/800/new/yakchal.xml
+++ b/data/monster/800/yakchal.xml
@@ -1,7 +1,8 @@
-<monster name="Yakchal" nameDescription="Yakchal" race="blood" experience="4400" speed="220" manacost="0">
+<monster name="Yakchal" nameDescription="Yakchal" race="blood" experience="4400" speed="62" manacost="0">
 	<health now="5000" max="5000" />
 	<look type="149" head="8" body="0" legs="85" feet="85" addons="1" corpse="20546" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="1000" chance="10" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -11,15 +12,13 @@
 		<flag pushable="0" />
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
-		<flag staticattack="50" />
 		<flag targetdistance="4" />
 		<flag runonhealth="100" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-389" />
-		<attack name="ice" interval="2000" chance="18" target="1" radius="4" min="0" max="-430">
-			<attribute key="areaEffect" value="icearea" />
-			<attribute key="shootEffect" value="smallice" />
+	<attacks skill="30" attack="50">
+		<attack name="physical" interval="2000" chance="18" target="1" radius="4" min="0" max="-430">
+			<attribute key="areaEffect" value="poff" />
+			<attribute key="shootEffect" value="snowball" />
 		</attack>
 		<attack name="physical" interval="3000" chance="34" range="7" radius="3" target="1" min="-200" max="-300">
 			<attribute key="shootEffect" value="snowball" />
@@ -34,7 +33,6 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element holyPercent="50" />
 		<element energyPercent="-5" />
 	</elements>
 	<immunities>
diff --git a/data/monster/800/new/zugurosh.xml b/data/monster/800/zugurosh.xml
similarity index 85%
rename from data/monster/800/new/zugurosh.xml
rename to data/monster/800/zugurosh.xml
index 8074642..01a1e21 100644
--- a/data/monster/800/new/zugurosh.xml
+++ b/data/monster/800/zugurosh.xml
@@ -1,7 +1,8 @@
-<monster name="Zugurosh" nameDescription="Zugurosh" race="fire" experience="10000" speed="340" manacost="0">
+<monster name="Zugurosh" nameDescription="Zugurosh" race="fire" experience="10000" speed="97" manacost="0">
 	<health now="90500" max="90500" />
 	<look type="12" head="2" body="35" legs="57" feet="91" corpse="8721" />
-	<targetchange interval="5000" chance="15" />
+	<targetchange interval="1000" chance="10" />
+	<targetstrategy nearest="70" weakest="10" mostdamage="10" random="10" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
@@ -12,25 +13,23 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="85" />
 		<flag runonhealth="4500" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-800" />
+	<attacks skill="120" attack="110">
 		<attack name="lifedrain" interval="2000" chance="10" target="1" range="4" min="0" max="-500">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
-		<attack name="death" interval="2000" chance="15" length="7" spread="0" min="0" max="-500">
+		<attack name="physical" interval="2000" chance="15" length="7" spread="0" min="0" max="-500">
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
-		<attack name="death" interval="2000" chance="15" target="0" radius="4" min="0" max="-100">
-			<attribute key="areaEffect" value="smallclouds" />
+		<attack name="physical" interval="2000" chance="15" target="0" radius="4" min="0" max="-100">
+			<attribute key="areaEffect" value="poff" />
 		</attack>
-		<attack name="firecondition" interval="3000" chance="20" target="1" radius="4" min="-10" max="-10">
+		<attack name="firecondition" interval="3000" chance="20" target="1" radius="4" min="-10" max="-10" count="70">
 			<attribute key="areaEffect" value="explosion" />
 		</attack>
 		<attack name="manadrain" interval="1000" chance="13" radius="5" target="0" min="-60" max="-200">
-			<attribute key="areaEffect" value="watersplash" />
+			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
 	</attacks>
 	<defenses armor="45" defense="55">
@@ -46,14 +45,11 @@
 	</defenses>
 	<elements>
 		<element physicalPercent="50" />
-		<element holyPercent="30" />
 		<element firePercent="30" />
 		<element energyPercent="20" />
-		<element icePercent="25" />
 		<element earthPercent="40" />
 	</elements>
 	<immunities>
-		<immunity death="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 	</immunities>
diff --git a/data/monster/monsters.xml b/data/monster/monsters.xml
index 1c99c1e..8689dd3 100644
--- a/data/monster/monsters.xml
+++ b/data/monster/monsters.xml
@@ -255,4 +255,25 @@
 	<monster name="Latrivan" file="800/latrivan.xml" />
 	<monster name="Annihilon" file="800/annihilon.xml" />
 	<monster name="Hellgorak" file="800/hellgorak.xml" />
+	<monster name="Barbarian Bloodwalker" file="800/barbarian bloodwalker.xml" />
+	<monster name="Barbarian Brutetamer" file="800/barbarian brutetamer.xml" />
+	<monster name="Barbarian Headsplitter" file="800/barbarian headsplitter.xml" />
+	<monster name="Barbarian Skullhunter" file="800/barbarian skullhunter.xml" />
+	<monster name="Braindeath" file="800/braindeath.xml" />
+	<monster name="Chakoya Toolshaper" file="800/chakoya toolshaper.xml" />
+	<monster name="Chakoya Tribewarden" file="800/chakoya tribewarden.xml" />
+	<monster name="Chakoya Windcaller" file="800/chakoya windcaller.xml" />
+	<monster name="Crystal Spider" file="800/crystal spider.xml" />
+	<monster name="Dire Penguin" file="800/dire penguin.xml" />
+	<monster name="Frost Dragon" file="800/frost dragon.xml" />
+	<monster name="Frost Giant" file="800/frost giant.xml" />
+	<monster name="Frost Giantess" file="800/frost giantess.xml" />
+	<monster name="Ghazbaran" file="800/ghazbaran.xml" />
+	<monster name="Husky" file="800/husky.xml" />
+	<monster name="Ice Golem" file="800/ice golem.xml" />
+	<monster name="Ice Witch" file="800/ice witch.xml" />
+	<monster name="Man In The Cave" file="800/man in the cave.xml" />
+	<monster name="Penguin" file="800/penguin.xml" />
+	<monster name="Silver Rabbit" file="800/silver rabbit.xml" />
+	<monster name="Yakchal" file="800/yakchal.xml" />
 </monsters>
\ No newline at end of file
diff --git a/src/combat.cpp b/src/combat.cpp
index 1ecbbf1..c6d02c5 100644
--- a/src/combat.cpp
+++ b/src/combat.cpp
@@ -604,12 +604,38 @@ void Combat::combatTileEffects(const SpectatorVec& list, Creature* caster, Tile*
 void Combat::postCombatEffects(Creature* caster, const Position& pos, const CombatParams& params)
 {
 	if (caster && params.distanceEffect != CONST_ANI_NONE) {
-		addDistanceEffect(caster->getPosition(), pos, params.distanceEffect);
+		addDistanceEffect(caster, caster->getPosition(), pos, params.distanceEffect);
 	}
 }
 
-void Combat::addDistanceEffect(const Position& fromPos, const Position& toPos, uint8_t effect)
+void Combat::addDistanceEffect(Creature* caster, const Position& fromPos, const Position& toPos, uint8_t effect)
 {
+	if (effect == CONST_ANI_WEAPONTYPE) {
+		if (!caster) {
+			return;
+		}
+
+		Player* player = caster->getPlayer();
+		if (!player) {
+			return;
+		}
+
+		switch (player->getWeaponType()) {
+		case WEAPON_AXE:
+			effect = CONST_ANI_WHIRLWINDAXE;
+			break;
+		case WEAPON_SWORD:
+			effect = CONST_ANI_WHIRLWINDSWORD;
+			break;
+		case WEAPON_CLUB:
+			effect = CONST_ANI_WHIRLWINDCLUB;
+			break;
+		default:
+			effect = CONST_ANI_NONE;
+			break;
+		}
+	}
+
 	if (effect != CONST_ANI_NONE) {
 		g_game.addDistanceEffect(fromPos, toPos, effect);
 	}
@@ -1326,7 +1352,7 @@ bool Combat::doCombatHealth(Creature* caster, Creature* target, CombatDamage& da
 
 	if (canCombat) {
 		if (caster && params.distanceEffect != CONST_ANI_NONE) {
-			addDistanceEffect(caster->getPosition(), target->getPosition(), params.distanceEffect);
+			addDistanceEffect(caster, caster->getPosition(), target->getPosition(), params.distanceEffect);
 		}
 
 		canCombat = CombatHealthFunc(caster, target, params, &damage);
@@ -1352,7 +1378,7 @@ void Combat::doCombatMana(Creature* caster, Creature* target, CombatDamage& dama
 
 	if (canCombat) {
 		if (caster && params.distanceEffect != CONST_ANI_NONE) {
-			addDistanceEffect(caster->getPosition(), target->getPosition(), params.distanceEffect);
+			addDistanceEffect(caster, caster->getPosition(), target->getPosition(), params.distanceEffect);
 		}
 
 		CombatManaFunc(caster, target, params, &damage);
@@ -1381,7 +1407,7 @@ void Combat::doCombatCondition(Creature* caster, Creature* target, const CombatP
 
 	if (canCombat) {
 		if (caster && params.distanceEffect != CONST_ANI_NONE) {
-			addDistanceEffect(caster->getPosition(), target->getPosition(), params.distanceEffect);
+			addDistanceEffect(caster, caster->getPosition(), target->getPosition(), params.distanceEffect);
 		}
 
 		CombatConditionFunc(caster, target, params, nullptr);
@@ -1410,7 +1436,7 @@ void Combat::doCombatDispel(Creature* caster, Creature* target, const CombatPara
 		}
 
 		if (caster && params.distanceEffect != CONST_ANI_NONE) {
-			addDistanceEffect(caster->getPosition(), target->getPosition(), params.distanceEffect);
+			addDistanceEffect(caster, caster->getPosition(), target->getPosition(), params.distanceEffect);
 		}
 	}
 }
@@ -1435,7 +1461,7 @@ void Combat::doCombatDefault(Creature* caster, Creature* target, const CombatPar
 		*/
 
 		if (caster && params.distanceEffect != CONST_ANI_NONE) {
-			addDistanceEffect(caster->getPosition(), target->getPosition(), params.distanceEffect);
+			addDistanceEffect(caster, caster->getPosition(), target->getPosition(), params.distanceEffect);
 		}
 	}
 }
diff --git a/src/combat.h b/src/combat.h
index 7d69b55..9b77839 100644
--- a/src/combat.h
+++ b/src/combat.h
@@ -317,7 +317,7 @@ class Combat
 		static ReturnValue canDoCombat(Creature* attacker, Creature* target);
 		static void postCombatEffects(Creature* caster, const Position& pos, const CombatParams& params);
 
-		static void addDistanceEffect(const Position& fromPos, const Position& toPos, uint8_t effect);
+		static void addDistanceEffect(Creature* caster, const Position& fromPos, const Position& toPos, uint8_t effect);
 
 		void doCombat(Creature* caster, Creature* target) const;
 		void doCombat(Creature* caster, const Position& pos) const;
diff --git a/src/const.h b/src/const.h
index 1aa0412..265dc96 100644
--- a/src/const.h
+++ b/src/const.h
@@ -58,6 +58,10 @@ enum MagicEffectClasses : uint8_t {
 	CONST_ME_FIREWORK_YELLOW = 29,
 	CONST_ME_FIREWORK_RED = 30,
 	CONST_ME_FIREWORK_BLUE = 31,
+	CONST_ME_STUN = 32,
+	CONST_ME_SLEEP = 33,
+	CONST_ME_WATERCREATURE = 34,
+	CONST_ME_GROUNDSHAKER = 35,
 };
 
 enum ShootType_t : uint8_t {
@@ -79,6 +83,21 @@ enum ShootType_t : uint8_t {
 	CONST_ANI_POWERBOLT = 14,
 	CONST_ANI_POISON = 15,
 	CONST_ANI_INFERNALBOLT = 16,
+	CONST_ANI_HUNTINGSPEAR = 17,
+	CONST_ANI_ENCHANTEDSPEAR = 18,
+	CONST_ANI_REDSTAR = 19,
+	CONST_ANI_GREENSTAR = 20,
+	CONST_ANI_ROYALSPEAR = 21,
+	CONST_ANI_SNIPERARROW = 22,
+	CONST_ANI_ONYXARROW = 23,
+	CONST_ANI_PIERCINGBOLT = 24,
+	CONST_ANI_WHIRLWINDSWORD = 25,
+	CONST_ANI_WHIRLWINDAXE = 26,
+	CONST_ANI_WHIRLWINDCLUB = 27,
+	CONST_ANI_ETHEREALSPEAR = 28,
+
+	// for internal use, don't send to client
+	CONST_ANI_WEAPONTYPE = 0xFE, // 254
 };
 
 enum SpeakClasses : uint8_t {
diff --git a/src/luascript.cpp b/src/luascript.cpp
index c232772..c01bdb4 100644
--- a/src/luascript.cpp
+++ b/src/luascript.cpp
@@ -1214,6 +1214,11 @@ void LuaScriptInterface::registerFunctions()
 	registerEnum(CONST_ME_FIREWORK_YELLOW)
 	registerEnum(CONST_ME_FIREWORK_RED)
 	registerEnum(CONST_ME_FIREWORK_BLUE)
+	registerEnum(CONST_ME_STUN)
+	registerEnum(CONST_ME_SLEEP)
+	registerEnum(CONST_ME_WATERCREATURE)
+	registerEnum(CONST_ME_GROUNDSHAKER)
+
 	registerEnum(CONST_ANI_NONE)
 	registerEnum(CONST_ANI_SPEAR)
 	registerEnum(CONST_ANI_BOLT)
@@ -1231,6 +1236,19 @@ void LuaScriptInterface::registerFunctions()
 	registerEnum(CONST_ANI_POWERBOLT)
 	registerEnum(CONST_ANI_POISON)
 	registerEnum(CONST_ANI_INFERNALBOLT)
+	registerEnum(CONST_ANI_HUNTINGSPEAR)
+	registerEnum(CONST_ANI_ENCHANTEDSPEAR)
+	registerEnum(CONST_ANI_REDSTAR)
+	registerEnum(CONST_ANI_GREENSTAR)
+	registerEnum(CONST_ANI_ROYALSPEAR)
+	registerEnum(CONST_ANI_SNIPERARROW)
+	registerEnum(CONST_ANI_ONYXARROW)
+	registerEnum(CONST_ANI_PIERCINGBOLT)
+	registerEnum(CONST_ANI_WHIRLWINDSWORD)
+	registerEnum(CONST_ANI_WHIRLWINDAXE)
+	registerEnum(CONST_ANI_WHIRLWINDCLUB)
+	registerEnum(CONST_ANI_ETHEREALSPEAR)
+	registerEnum(CONST_ANI_WEAPONTYPE)
 
 	registerEnum(CONST_PROP_BLOCKSOLID)
 	registerEnum(CONST_PROP_HASHEIGHT)
diff --git a/src/monsters.cpp b/src/monsters.cpp
index 1d11d2e..8854a75 100644
--- a/src/monsters.cpp
+++ b/src/monsters.cpp
@@ -949,6 +949,8 @@ bool Monsters::loadMonster(const std::string& file, const std::string& monsterNa
 				mType->info.elementMap[COMBAT_FIREDAMAGE] = pugi::cast<int32_t>(attr.value());
 			} else if ((attr = elementNode.attribute("energyPercent"))) {
 				mType->info.elementMap[COMBAT_ENERGYDAMAGE] = pugi::cast<int32_t>(attr.value());				
+			} else if ((attr = elementNode.attribute("drownPercent"))) {
+				mType->info.elementMap[COMBAT_DROWNDAMAGE] = pugi::cast<int32_t>(attr.value());
 			} else if ((attr = elementNode.attribute("lifedrainPercent"))) {
 				mType->info.elementMap[COMBAT_LIFEDRAIN] = pugi::cast<int32_t>(attr.value());
 			} else if ((attr = elementNode.attribute("manadrainPercent"))) {
diff --git a/src/player.cpp b/src/player.cpp
index 9ce1451..69c8d0e 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -184,6 +184,15 @@ Item* Player::getWeapon() const
 	return nullptr;
 }
 
+WeaponType_t Player::getWeaponType() const
+{
+	Item* item = getWeapon();
+	if (!item) {
+		return WEAPON_NONE;
+	}
+	return item->getWeaponType();
+}
+
 Item* Player::getAmmunition() const
 {
 	return inventory[CONST_SLOT_AMMO];
diff --git a/src/player.h b/src/player.h
index 826b3f9..c23fd6e 100644
--- a/src/player.h
+++ b/src/player.h
@@ -568,6 +568,7 @@ class Player final : public Creature, public Cylinder
 		}
 
 		Item* getWeapon() const;
+		WeaponType_t getWeaponType() const;
 		Item* getAmmunition() const;
 		void getShieldAndWeapon(const Item*& shield, const Item*& weapon) const;
 
diff --git a/src/tools.cpp b/src/tools.cpp
index d3522b3..367281b 100644
--- a/src/tools.cpp
+++ b/src/tools.cpp
@@ -674,6 +674,10 @@ MagicEffectNames magicEffectNames[] = {
 	{"yellowfirework",	CONST_ME_FIREWORK_YELLOW},
 	{"redfirework",		CONST_ME_FIREWORK_RED},
 	{"bluefirework",	CONST_ME_FIREWORK_BLUE},
+	{"stun",	CONST_ME_STUN},
+	{"sleep",	CONST_ME_SLEEP},
+	{"watercreature",	CONST_ME_WATERCREATURE},
+	{"groundshaker",	CONST_ME_GROUNDSHAKER},
 };
 
 ShootTypeNames shootTypeNames[] = {
@@ -693,6 +697,18 @@ ShootTypeNames shootTypeNames[] = {
 	{"powerbolt",		CONST_ANI_POWERBOLT},
 	{"poison",		CONST_ANI_POISON},
 	{"infernalbolt",	CONST_ANI_INFERNALBOLT},
+	{"huntingspear",	CONST_ANI_HUNTINGSPEAR},
+	{"enchantedspear",	CONST_ANI_ENCHANTEDSPEAR},
+	{"redstar",	CONST_ANI_REDSTAR},
+	{"greenstar",	CONST_ANI_GREENSTAR},
+	{"royalspear",	CONST_ANI_ROYALSPEAR},
+	{"sniperarrow",	CONST_ANI_SNIPERARROW},
+	{"onyxarrow",	CONST_ANI_ONYXARROW},
+	{"piercingbolt",	CONST_ANI_PIERCINGBOLT},
+	{"whirlwindsword",	CONST_ANI_WHIRLWINDSWORD},
+	{"whirlwindaxe",	CONST_ANI_WHIRLWINDAXE},
+	{"whirldwindclub",	CONST_ANI_WHIRLWINDCLUB},
+	{"etherealspear",	CONST_ANI_ETHEREALSPEAR},
 };
 
 CombatTypeNames combatTypeNames[] = {