diff --git a/data/monster/790/apprentice sheng.xml b/data/monster/790/apprentice sheng.xml
index 15139b6..9ac6d28 100644
--- a/data/monster/790/apprentice sheng.xml	
+++ b/data/monster/790/apprentice sheng.xml	
@@ -20,8 +20,8 @@
 			<attribute key="shootEffect" value="energy" />
 		</attack>
 		<attack name="energy" interval="1000" chance="14" range="7" min="0" max="-25">
-			<attribute key="shootEffect" value="energyball" />
-			<attribute key="areaEffect" value="energyarea" />
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
 		</attack>
 		<attack name="fire" interval="2000" chance="10" range="7" min="0" max="-45">
 			<attribute key="shootEffect" value="fire" />
diff --git a/data/monster/790/betrayed wraith.xml b/data/monster/790/betrayed wraith.xml
index ba26b24..fef2a23 100644
--- a/data/monster/790/betrayed wraith.xml	
+++ b/data/monster/790/betrayed wraith.xml	
@@ -17,7 +17,7 @@
 	</flags>
 	<attacks attack="80" skill="100">
 		<attack name="speed" interval="2000" chance="20" range="7" target="1" speedchange="-100" duration="3000">
-			<attribute key="shootEffect" value="suddendeath" />
+			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 	</attacks>
@@ -33,7 +33,6 @@
 		</defense>
 	</defenses>
 	<immunities>
-		<immunity death="1" />
 		<immunity fire="1" />
 		<immunity energy="1" />
 		<immunity earth="1" />
diff --git a/data/monster/790/blightwalker.xml b/data/monster/790/blightwalker.xml
index f305cf2..b84e5c8 100644
--- a/data/monster/790/blightwalker.xml
+++ b/data/monster/790/blightwalker.xml
@@ -25,7 +25,6 @@
 		<attack name="drunk" interval="2000" chance="10" target="0" radius="3" duration="5000">
 			<attribute key="areaEffect" value="greenspark" />
 		</attack>
-		<attack name="blightwalker curse" interval="2000" chance="15" />
 		<attack name="speed" interval="2000" chance="15" range="7" speedchange="-100" duration="30000">
 			<attribute key="shootEffect" value="poison" />
 		</attack>
@@ -33,7 +32,6 @@
 	<defenses armor="50" defense="50" />
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity death="1" />
 		<immunity earth="1" />
 		<immunity invisible="1" />
 	</immunities>
diff --git a/data/monster/790/countess sorrow.xml b/data/monster/790/countess sorrow.xml
index b4881f5..6207cee 100644
--- a/data/monster/790/countess sorrow.xml	
+++ b/data/monster/790/countess sorrow.xml	
@@ -35,7 +35,6 @@
 	<immunities>
 		<immunity physical="1" />
 		<immunity poison="1" />
-		<immunity ice="1" />
 		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
diff --git a/data/monster/790/dark torturer.xml b/data/monster/790/dark torturer.xml
index 48e7100..91c3b3e 100644
--- a/data/monster/790/dark torturer.xml	
+++ b/data/monster/790/dark torturer.xml	
@@ -19,7 +19,6 @@
 		<attack name="physical" interval="2000" chance="10" range="7" min="0" max="-781">
 			<attribute key="shootEffect" value="throwingknife" />
 		</attack>
-		<attack name="dark torturer skill reducer" interval="2000" chance="5" />
 	</attacks>
 	<defenses armor="40" defense="40">
 		<defense name="healing" interval="2000" chance="10" min="200" max="250">
diff --git a/data/monster/790/defiler.xml b/data/monster/790/defiler.xml
index 8eb26f8..6b3b807 100644
--- a/data/monster/790/defiler.xml
+++ b/data/monster/790/defiler.xml
@@ -19,17 +19,17 @@
 		<attack name="poison" interval="2000" chance="20" range="7" min="-160" max="-270">
 			<attribute key="shootEffect" value="poison" />
 		</attack>
-		<attack name="poisoncondition" interval="2000" chance="15" target="0" radius="7" range="7" min="-400" max="-640">
+		<attack name="poisoncondition" interval="2000" chance="15" target="0" radius="7" range="7" count="70" min="-400" max="-640">
 			<attribute key="areaEffect" value="greenspark" />
 		</attack>
 		<attack name="poison" interval="2000" chance="20" radius="3" target="0" min="-120" max="-170">
 			<attribute key="areaEffect" value="poison" />
 		</attack>
-		<attack name="poisoncondition" interval="2000" chance="10" length="8" spread="3" min="-500" max="-1000">
-			<attribute key="areaEffect" value="smallplants" />
+		<attack name="poisoncondition" interval="2000" chance="10" length="8" spread="3" count="70" min="-500" max="-1000">
+			<attribute key="areaEffect" value="poison" />
 		</attack>
 		<attack name="speed" interval="2000" chance="15" length="8" spread="3" speedchange="-100" duration="15000">
-			<attribute key="areaEffect" value="smallclouds" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 	</attacks>
 	<defenses armor="20" defense="20">
diff --git a/data/monster/790/diabolic imp.xml b/data/monster/790/diabolic imp.xml
index 5882237..a3508b2 100644
--- a/data/monster/790/diabolic imp.xml	
+++ b/data/monster/790/diabolic imp.xml	
@@ -22,9 +22,8 @@
 		</attack>
 		<attack name="fire" interval="2000" chance="10" range="7" radius="2" target="1" min="-300" max="-430">
 			<attribute key="shootEffect" value="fire" />
-			<attribute key="areaEffect" value="fireattack" />
+			<attribute key="areaEffect" value="firearea" />
 		</attack>
-		<attack name="diabolic imp skill reducer" range="5" interval="2000" chance="5" />
 	</attacks>
 	<defenses armor="25" defense="25">
 		<defense name="healing" interval="2000" chance="10" min="650" max="800">
diff --git a/data/monster/790/dracola.xml b/data/monster/790/dracola.xml
index 05637a8..356d267 100644
--- a/data/monster/790/dracola.xml
+++ b/data/monster/790/dracola.xml
@@ -23,7 +23,7 @@
 			<attribute key="shootEffect" value="poison" />
 			<attribute key="areaEffect" value="poison" />
 		</attack>
-		<attack name="drowncondition" interval="1000" chance="20" length="8" spread="3">
+		<attack name="drowncondition" interval="1000" chance="20" count="70" length="8" spread="3">
 			<attribute key="areaEffect" value="poff" />
 		</attack>
 		<attack name="physical" interval="2000" chance="20" range="7" radius="4" target="1" min="-300" max="-870">
@@ -31,7 +31,7 @@
 			<attribute key="areaEffect" value="redspark" />
 		</attack>
 		<attack name="physical" interval="3000" chance="10" range="7" min="0" max="-750">
-			<attribute key="shootEffect" value="suddendeath" />
+			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="poison" interval="1000" chance="23" range="7" radius="4" target="1" min="-50" max="-175">
diff --git a/data/monster/790/fury.xml b/data/monster/790/fury.xml
index 8ba722b..07ed8ce 100644
--- a/data/monster/790/fury.xml
+++ b/data/monster/790/fury.xml
@@ -19,23 +19,22 @@
 		<attack name="fire" interval="2000" chance="10" length="8" spread="3" min="-200" max="-300">
 			<attribute key="areaEffect" value="explosionarea" />
 		</attack>
-		<attack name="death" interval="2000" chance="5" length="8" spread="0" min="-120" max="-700">
+		<attack name="physical" interval="2000" chance="5" length="8" spread="0" min="-120" max="-700">
 			<attribute key="areaEffect" value="redspark" />
 		</attack>
-		<attack name="death" interval="2000" chance="10" radius="4" target="0" min="-120" max="-300">
+		<attack name="physical" interval="2000" chance="10" radius="4" target="0" min="-120" max="-300">
 			<attribute key="areaEffect" value="redspark" />
 		</attack>
-		<attack name="fury skill reducer" interval="2000" chance="5" />
 		<attack name="lifedrain" interval="2000" chance="10" radius="3" target="0" min="-120" max="-300">
 			<attribute key="areaEffect" value="blackspark" />
 		</attack>
-		<attack name="death" interval="2000" chance="10" range="7" min="-125" max="-250">
-			<attribute key="shootEffect" value="suddendeath" />
-			<attribute key="areaEffect" value="smallclouds" />
+		<attack name="physical" interval="2000" chance="10" range="7" min="-125" max="-250">
+			<attribute key="shootEffect" value="death" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="speed" interval="2000" chance="15" range="7" speedchange="-100" duration="30000">
-			<attribute key="shootEffect" value="suddendeath" />
-			<attribute key="areaEffect" value="smallclouds" />
+			<attribute key="shootEffect" value="death" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 	</attacks>
 	<defenses armor="20" defense="20">
diff --git a/data/monster/790/hand of cursed fate.xml b/data/monster/790/hand of cursed fate.xml
index bef3b4c..9305ea7 100644
--- a/data/monster/790/hand of cursed fate.xml	
+++ b/data/monster/790/hand of cursed fate.xml	
@@ -18,10 +18,10 @@
 	<attacks skill="70" attack="130" poison="380">
 		<attack name="manadrain" interval="2000" chance="15" range="1" min="0" max="-920" />
 		<attack name="drunk" interval="2000" chance="10" target="0" radius="4" duration="3000">
-			<attribute key="areaEffect" value="smallclouds" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="lifedrain" interval="2000" chance="15" range="1" min="-220" max="-880">
-			<attribute key="areaEffect" value="smallclouds" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 	</attacks>
 	<defenses armor="25" defense="25">
@@ -39,7 +39,6 @@
 		<immunity earth="1" />
 		<immunity energy="1" />
 		<immunity fire="1" />
-		<immunity death="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 	</immunities>
diff --git a/data/monster/790/hellfire fighter.xml b/data/monster/790/hellfire fighter.xml
index d4abe96..a075d17 100644
--- a/data/monster/790/hellfire fighter.xml	
+++ b/data/monster/790/hellfire fighter.xml	
@@ -18,12 +18,11 @@
 	<attacks attack="80" skill="120">
 		<attack name="firefield" interval="2000" chance="10" range="7" radius="3" target="0" />
 		<attack name="fire" interval="2000" chance="10" target="0" length="8" spread="0" min="-392" max="-1500">
-			<attribute key="areaEffect" value="fireattack" />
+			<attribute key="areaEffect" value="firearea" />
 		</attack>
 		<attack name="fire" interval="2000" chance="15" range="7" radius="3" target="0" min="-60" max="-330">
 			<attribute key="areaEffect" value="fire" />
 		</attack>
-		<attack name="hellfire fighter soulfire" interval="2000" chance="15" />
 	</attacks>
 	<defenses armor="35" defense="35" />
 	<immunities>
diff --git a/data/monster/790/hellhound.xml b/data/monster/790/hellhound.xml
index 896d4b5..00916e2 100644
--- a/data/monster/790/hellhound.xml
+++ b/data/monster/790/hellhound.xml
@@ -17,11 +17,11 @@
 	</flags>
 	<attacks skill="70" attack="130" poison="800">
 		<attack name="earth" interval="2000" chance="5" length="8" spread="3" min="-300" max="-700">
-			<attribute key="areaEffect" value="carniphila" />
+			<attribute key="areaEffect" value="poison" />
 		</attack>
-		<attack name="death" interval="2000" chance="10" range="7" min="-395" max="-498">
-			<attribute key="shootEffect" value="suddendeath" />
-			<attribute key="areaEffect" value="smallclouds" />
+		<attack name="physical" interval="2000" chance="10" range="7" min="-395" max="-498">
+			<attribute key="shootEffect" value="death" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="fire" interval="2000" chance="10" length="8" spread="3" min="-350" max="-660">
 			<attribute key="areaEffect" value="firearea" />
diff --git a/data/monster/790/lost soul.xml b/data/monster/790/lost soul.xml
index bf352f9..15e8a2c 100644
--- a/data/monster/790/lost soul.xml	
+++ b/data/monster/790/lost soul.xml	
@@ -16,18 +16,17 @@
 		<flag runonhealth="450" />
 	</flags>
 	<attacks skill="80" attack="90">
-		<attack name="death" interval="2000" chance="10" length="3" spread="0" target="0" min="-40" max="-210">
+		<attack name="physical" interval="2000" chance="10" length="3" spread="0" target="0" min="-40" max="-210">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
 		<attack name="speed" interval="2000" chance="20" radius="6" target="0" speedchange="-100" duration="4000">
-			<attribute key="areaEffect" value="smallclouds" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 	</attacks>
 	<defenses armor="30" defense="30" />
 	<immunities>
 		<immunity fire="1" />
 		<immunity earth="1" />
-		<immunity death="1" />
 		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
diff --git a/data/monster/790/nightmare.xml b/data/monster/790/nightmare.xml
index 6df0b1b..5b621e1 100644
--- a/data/monster/790/nightmare.xml
+++ b/data/monster/790/nightmare.xml
@@ -16,9 +16,9 @@
 		<flag runonhealth="300" />
 	</flags>
 	<attacks skill="50" attack="50">
-		<attack name="death" interval="2000" chance="10" range="7" radius="1" target="1" min="-120" max="-170">
+		<attack name="physical" interval="2000" chance="10" range="7" radius="1" target="1" min="-120" max="-170">
 			<attribute key="shootEffect" value="death" />
-			<attribute key="areaEffect" value="smallclouds" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="earth" interval="2000" chance="20" range="7" radius="4" target="1" min="-150" max="-350">
 			<attribute key="shootEffect" value="poison" />
@@ -35,7 +35,6 @@
 	</defenses>
 	<immunities>
 		<immunity invisible="1" />
-		<immunity death="1" />
 		<immunity earth="1" />
 		<immunity lifedrain="1" />
 	</immunities>
diff --git a/data/monster/790/nomad.xml b/data/monster/790/nomad.xml
index 653a9e5..4eb3912 100644
--- a/data/monster/790/nomad.xml
+++ b/data/monster/790/nomad.xml
@@ -16,7 +16,6 @@
 		<flag runonhealth="15" />
 	</flags>
 	<attacks attack="30" skill="40">
-		<attack name="melee" interval="2000" min="0" max="-80" />
 		<attack name="physical" interval="2000" chance="10" target="0" radius="1">
 			<attribute key="areaeffect" value="whitenote" />
 		</attack>
diff --git a/data/monster/790/phantasm summon.xml b/data/monster/790/phantasm summon.xml
index 78f6459..52beff2 100644
--- a/data/monster/790/phantasm summon.xml	
+++ b/data/monster/790/phantasm summon.xml	
@@ -16,14 +16,13 @@
 		<flag runonhealth="0" />
 	</flags>
 	<attacks skill="30" attack="25">
-		<attack name="death" interval="2000" chance="15" range="7" min="-50" max="-80">
-			<attribute key="shootEffect" value="suddendeath" />
-			<attribute key="areaEffect" value="smallclouds" />
+		<attack name="physical" interval="2000" chance="15" range="7" min="-50" max="-80">
+			<attribute key="shootEffect" value="death" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="manadrain" interval="2000" chance="10" target="0" radius="3" min="-5" max="-80">
 			<attribute key="areaEffect" value="yellowbubble" />
 		</attack>
-		<attack name="phantasm drown" interval="2000" chance="10" />
 		<attack name="drunk" interval="2000" chance="5" radius="5" target="0" duration="6000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
@@ -42,7 +41,6 @@
 	<immunities>
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
-		<immunity death="1" />
 		<immunity lifedrain="1" />
 		<immunity physical="1" />
 	</immunities>
diff --git a/data/monster/790/phantasm.xml b/data/monster/790/phantasm.xml
index d9c381a..f3fd13d 100644
--- a/data/monster/790/phantasm.xml
+++ b/data/monster/790/phantasm.xml
@@ -16,14 +16,13 @@
 		<flag runonhealth="350" />
 	</flags>
 	<attacks skill="90" attack="95">
-		<attack name="death" interval="2000" chance="10" range="7" min="-250" max="-610">
-			<attribute key="shootEffect" value="suddendeath" />
-			<attribute key="areaEffect" value="smallclouds" />
+		<attack name="physical" interval="2000" chance="10" range="7" min="-250" max="-610">
+			<attribute key="shootEffect" value="death" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="manadrain" interval="2000" chance="20" target="0" radius="3" min="-5" max="-80">
 			<attribute key="areaEffect" value="yellowbubble" />
 		</attack>
-		<attack name="phantasm drown" interval="2000" chance="15" />
 		<attack name="drunk" interval="2000" chance="15" radius="5" target="0" duration="6000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
@@ -42,7 +41,6 @@
 	<immunities>
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
-		<immunity death="1" />
 		<immunity lifedrain="1" />
 		<immunity physical="1" />
 	</immunities>
diff --git a/data/monster/790/son of verminor.xml b/data/monster/790/son of verminor.xml
index 1edd7a8..3dddb91 100644
--- a/data/monster/790/son of verminor.xml	
+++ b/data/monster/790/son of verminor.xml	
@@ -22,8 +22,8 @@
 		<attack name="earth" interval="2000" chance="15" radius="3" target="0" min="-350" max="-390">
 			<attribute key="areaEffect" value="poison" />
 		</attack>
-		<attack name="death" interval="2000" chance="15" radius="3" target="0" min="-220" max="-270">
-			<attribute key="areaEffect" value="smallclouds" />
+		<attack name="physical" interval="2000" chance="15" radius="3" target="0" min="-220" max="-270">
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 	</attacks>
 	<defenses armor="20" defense="20">
diff --git a/data/monster/790/spectre.xml b/data/monster/790/spectre.xml
index f31ecf3..e9f075d 100644
--- a/data/monster/790/spectre.xml
+++ b/data/monster/790/spectre.xml
@@ -19,7 +19,6 @@
 		<attack name="drunk" interval="2000" chance="15" radius="4" target="0" duration="6000">
 			<attribute key="areaEffect" value="purplenote" />
 		</attack>
-		<attack name="spectre drown" interval="2000" chance="15" />
 		<attack name="manadrain" interval="2000" chance="15" range="7" min="-100" max="-400" />
 		<attack name="lifedrain" interval="2000" chance="20" range="7" min="-300" max="-550">
 			<attribute key="areaEffect" value="redshimmer" />
@@ -42,7 +41,6 @@
 		<immunity drown="1" />
 		<immunity lifedrain="1" />
 		<immunity earth="1" />
-		<immunity death="1" />
 	</immunities>
 	<voices interval="2000" chance="7">
 		<voice sentence="Revenge ... is so ... sweet!" />
diff --git a/data/monster/790/the handmaiden.xml b/data/monster/790/the handmaiden.xml
index db55e5e..39dc681 100644
--- a/data/monster/790/the handmaiden.xml	
+++ b/data/monster/790/the handmaiden.xml	
@@ -38,7 +38,6 @@
 	<immunities>
 		<immunity energy="1" />
 		<immunity fire="1" />
-		<immunity ice="1" />
 		<immunity poison="1" />
 		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
diff --git a/data/monster/790/the imperor.xml b/data/monster/790/the imperor.xml
index f5af84d..e006ec7 100644
--- a/data/monster/790/the imperor.xml	
+++ b/data/monster/790/the imperor.xml	
@@ -18,7 +18,7 @@
 	<attacks skill="110" attack="110">
 		<attack name="fire" interval="1000" chance="13" range="1" target="1" min="-50" max="-800">
 			<attribute key="shootEffect" value="fire" />
-			<attribute key="areaEffect" value="fireattack" />
+			<attribute key="areaEffect" value="firearea" />
 		</attack>
 		<attack name="fire" interval="2000" chance="20" range="7" radius="6" target="1" min="-50" max="-800">
 			<attribute key="shootEffect" value="fire" />
diff --git a/data/monster/790/undead dragon.xml b/data/monster/790/undead dragon.xml
index ddaaea1..adca963 100644
--- a/data/monster/790/undead dragon.xml	
+++ b/data/monster/790/undead dragon.xml	
@@ -19,9 +19,9 @@
 		<attack name="physical" interval="2000" chance="5" range="7" radius="4" target="1" min="-300" max="-400">
 			<attribute key="areaEffect" value="redspark" />
 		</attack>
-		<attack name="death" interval="2000" chance="10" range="7" min="-125" max="-600">
-			<attribute key="shootEffect" value="suddendeath" />
-			<attribute key="areaEffect" value="smallclouds" />
+		<attack name="physical" interval="2000" chance="10" range="7" min="-125" max="-600">
+			<attribute key="shootEffect" value="death" />
+			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="earth" interval="2000" chance="5" range="7" radius="4" target="1" min="-100" max="-390">
 			<attribute key="shootEffect" value="poison" />
@@ -40,7 +40,6 @@
 		<attack name="lifedrain" interval="2000" chance="10" radius="3" min="-100" max="-200">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
-		<attack name="undead dragon curse" interval="2000" chance="10" />
 	</attacks>
 	<defenses armor="40" defense="40">
 		<defense name="healing" interval="2000" chance="15" min="200" max="250">
@@ -50,7 +49,6 @@
 	<immunities>
 		<immunity fire="1" />
 		<immunity earth="1" />
-		<immunity death="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 		<immunity drown="1" />