From e2924aed1257900242a8d98040b93cdd603ebae2 Mon Sep 17 00:00:00 2001
From: ErikasKontenis <e.kontenis@gmail.com>
Date: Sun, 3 May 2020 21:02:11 +0300
Subject: [PATCH] fix 790 melee attacks

---
 data/monster/790/apprentice sheng.xml    | 1 -
 data/monster/790/betrayed wraith.xml     | 1 -
 data/monster/790/blightwalker.xml        | 3 +--
 data/monster/790/countess sorrow.xml     | 4 +---
 data/monster/790/dark torturer.xml       | 4 +---
 data/monster/790/defiler.xml             | 4 +---
 data/monster/790/destroyer.xml           | 4 +---
 data/monster/790/diabolic imp.xml        | 4 +---
 data/monster/790/dracola.xml             | 3 +--
 data/monster/790/fury.xml                | 4 +---
 data/monster/790/grynch clan goblin.xml  | 1 -
 data/monster/790/hand of cursed fate.xml | 4 +---
 data/monster/790/hellfire fighter.xml    | 4 +---
 data/monster/790/hellhound.xml           | 4 +---
 data/monster/790/juggernaut.xml          | 4 +---
 data/monster/790/lost soul.xml           | 4 +---
 data/monster/790/massacre.xml            | 4 +---
 data/monster/790/mr. punish.xml          | 4 +---
 data/monster/790/munster.xml             | 4 +---
 data/monster/790/nightmare.xml           | 4 +---
 data/monster/790/nomad.xml               | 3 +--
 data/monster/790/phantasm summon.xml     | 4 +---
 data/monster/790/phantasm.xml            | 4 +---
 data/monster/790/plaguesmith.xml         | 4 +---
 data/monster/790/son of verminor.xml     | 4 +---
 data/monster/790/spectre.xml             | 4 +---
 data/monster/790/the handmaiden.xml      | 4 +---
 data/monster/790/the imperor.xml         | 4 +---
 data/monster/790/the plasmother.xml      | 4 +---
 data/monster/790/undead dragon.xml       | 4 +---
 30 files changed, 27 insertions(+), 81 deletions(-)

diff --git a/data/monster/790/apprentice sheng.xml b/data/monster/790/apprentice sheng.xml
index 8cfeae7..3fe47f4 100644
--- a/data/monster/790/apprentice sheng.xml	
+++ b/data/monster/790/apprentice sheng.xml	
@@ -12,7 +12,6 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="4" />
-		<flag staticattack="90" />
 		<flag runonhealth="20" />
 	</flags>
 	<attacks attack="15" skill="18">
diff --git a/data/monster/790/betrayed wraith.xml b/data/monster/790/betrayed wraith.xml
index 92a8334..ebfb85d 100644
--- a/data/monster/790/betrayed wraith.xml	
+++ b/data/monster/790/betrayed wraith.xml	
@@ -12,7 +12,6 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="300" />
 	</flags>
 	<attacks attack="80" skill="100">
diff --git a/data/monster/790/blightwalker.xml b/data/monster/790/blightwalker.xml
index f02753b..945ce25 100644
--- a/data/monster/790/blightwalker.xml
+++ b/data/monster/790/blightwalker.xml
@@ -15,8 +15,7 @@
 		<flag staticattack="90" />
 		<flag runonhealth="800" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-490" />
+	<attacks attack="90" skill="100">
 		<attack name="earth" interval="2000" chance="20" range="7" target="1" min="-220" max="-405">
 			<attribute key="shootEffect" value="poison" />
 		</attack>
diff --git a/data/monster/790/countess sorrow.xml b/data/monster/790/countess sorrow.xml
index 18fb7d1..a9f9067 100644
--- a/data/monster/790/countess sorrow.xml	
+++ b/data/monster/790/countess sorrow.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" skill="70" attack="90" poison="50" />
+	<attacks skill="70" attack="90" poison="50">
 		<attack name="poison" interval="1000" chance="10" range="7" radius="4" target="1" min="-150" max="-350">
 			<attribute key="shootEffect" value="poison" />
 			<attribute key="areaEffect" value="poison" />
diff --git a/data/monster/790/dark torturer.xml b/data/monster/790/dark torturer.xml
index 39cb915..48f29ef 100644
--- a/data/monster/790/dark torturer.xml	
+++ b/data/monster/790/dark torturer.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="80" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="90" attack="100" />
+	<attacks skill="90" attack="100">
 		<attack name="physical" interval="2000" chance="10" range="7" min="0" max="-781">
 			<attribute key="shootEffect" value="throwingknife" />
 		</attack>
diff --git a/data/monster/790/defiler.xml b/data/monster/790/defiler.xml
index 3691a25..87ef148 100644
--- a/data/monster/790/defiler.xml
+++ b/data/monster/790/defiler.xml
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="80" />
 		<flag runonhealth="85" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="50" attack="80" poison="150" />
+	<attacks skill="50" attack="80" poison="150">
 		<attack name="poison" interval="2000" chance="20" range="7" min="-160" max="-270">
 			<attribute key="shootEffect" value="poison" />
 		</attack>
diff --git a/data/monster/790/destroyer.xml b/data/monster/790/destroyer.xml
index 7061653..bcf5316 100644
--- a/data/monster/790/destroyer.xml
+++ b/data/monster/790/destroyer.xml
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="70" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="90" attack="100" />
+	<attacks skill="90" attack="100">
 		<attack name="physical" interval="2000" chance="15" range="7" min="0" max="-200">
 			<attribute key="shootEffect" value="largerock" />
 		</attack>
diff --git a/data/monster/790/diabolic imp.xml b/data/monster/790/diabolic imp.xml
index b9a8b81..6ac8ce0 100644
--- a/data/monster/790/diabolic imp.xml	
+++ b/data/monster/790/diabolic imp.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="4" />
-		<flag staticattack="90" />
 		<flag runonhealth="400" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="70" attack="60" poison="160" />
+	<attacks skill="70" attack="60" poison="160">
 		<attack name="fire" interval="2000" chance="20" range="7" radius="4" target="1" min="-100" max="-240">
 			<attribute key="shootEffect" value="fire" />
 			<attribute key="areaEffect" value="firearea" />
diff --git a/data/monster/790/dracola.xml b/data/monster/790/dracola.xml
index 31ab2d3..806f9a3 100644
--- a/data/monster/790/dracola.xml
+++ b/data/monster/790/dracola.xml
@@ -14,8 +14,7 @@
 		<flag targetdistance="1" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-700" />
+	<attacks skill="100" attack="130">
 		<attack name="lifedrain" interval="3000" chance="20" length="8" spread="3" min="-800" max="-1000">
 			<attribute key="areaEffect" value="greenshimmer" />
 		</attack>
diff --git a/data/monster/790/fury.xml b/data/monster/790/fury.xml
index 33fd4e8..39f2f2f 100644
--- a/data/monster/790/fury.xml
+++ b/data/monster/790/fury.xml
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="70" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="50" attack="170" />
+	<attacks skill="50" attack="170">
 		<attack name="fire" interval="2000" chance="10" length="8" spread="3" min="-200" max="-300">
 			<attribute key="areaEffect" value="explosionarea" />
 		</attack>
diff --git a/data/monster/790/grynch clan goblin.xml b/data/monster/790/grynch clan goblin.xml
index f7cd3ae..5437df4 100644
--- a/data/monster/790/grynch clan goblin.xml	
+++ b/data/monster/790/grynch clan goblin.xml	
@@ -12,7 +12,6 @@
 		<flag canpushitems="0" />
 		<flag canpushcreatures="0" />
 		<flag targetdistance="11" />
-		<flag staticattack="0" />
 		<flag runonhealth="80" />
 	</flags>
 	<attacks>
diff --git a/data/monster/790/hand of cursed fate.xml b/data/monster/790/hand of cursed fate.xml
index 4d6517c..f8a86db 100644
--- a/data/monster/790/hand of cursed fate.xml	
+++ b/data/monster/790/hand of cursed fate.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="20" />
 		<flag runonhealth="3500" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="70" attack="130" poison="380" />
+	<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" />
diff --git a/data/monster/790/hellfire fighter.xml b/data/monster/790/hellfire fighter.xml
index 656c13b..1b13de8 100644
--- a/data/monster/790/hellfire fighter.xml	
+++ b/data/monster/790/hellfire fighter.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="-520" />
+	<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" />
diff --git a/data/monster/790/hellhound.xml b/data/monster/790/hellhound.xml
index d9ca139..c07af85 100644
--- a/data/monster/790/hellhound.xml
+++ b/data/monster/790/hellhound.xml
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="70" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="70" attack="130" poison="800" />
+	<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" />
 		</attack>
diff --git a/data/monster/790/juggernaut.xml b/data/monster/790/juggernaut.xml
index 423ed6c..ae5f713 100644
--- a/data/monster/790/juggernaut.xml
+++ b/data/monster/790/juggernaut.xml
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="60" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="200" attack="140" />
+	<attacks skill="200" attack="140">
 		<attack name="physical" interval="2000" chance="15" range="7" min="0" max="-780">
 			<attribute key="shootEffect" value="largerock" />
 		</attack>
diff --git a/data/monster/790/lost soul.xml b/data/monster/790/lost soul.xml
index 4d1a96b..84cecef 100644
--- a/data/monster/790/lost soul.xml	
+++ b/data/monster/790/lost soul.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="450" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-429" />
+	<attacks skill="80" attack="90">
 		<attack name="death" interval="2000" chance="10" length="3" spread="0" target="0" min="-40" max="-210">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
diff --git a/data/monster/790/massacre.xml b/data/monster/790/massacre.xml
index 42ab2a2..0705550 100644
--- a/data/monster/790/massacre.xml
+++ b/data/monster/790/massacre.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" skill="150" attack="150" />
+	<attacks skill="150" attack="150">
 		<attack name="physical" interval="2000" chance="24" range="7" min="-280" max="-500">
 			<attribute key="shootEffect" value="largerock" />
 		</attack>
diff --git a/data/monster/790/mr. punish.xml b/data/monster/790/mr. punish.xml
index 1e2f04f..3be992e 100644
--- a/data/monster/790/mr. punish.xml	
+++ b/data/monster/790/mr. punish.xml	
@@ -10,14 +10,12 @@
 		<flag convinceable="0" />
 		<flag pushable="0" />
 		<flag canpushitems="1" />
-		<flag staticattack="50" />
 		<flag lightlevel="0" />
 		<flag lightcolor="0" />
 		<flag targetdistance="1" />
 		<flag runonhealth="2000" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="-660" max="-1280" />
+	<attacks skill="170" attack="140">
 	</attacks>
 	<defenses armor="64" defense="72" />
 	<immunities>
diff --git a/data/monster/790/munster.xml b/data/monster/790/munster.xml
index b469acc..f981851 100644
--- a/data/monster/790/munster.xml
+++ b/data/monster/790/munster.xml
@@ -11,12 +11,10 @@
 		<flag pushable="1" />
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
-		<flag staticattack="80" />
 		<flag targetdistance="1" />
 		<flag runonhealth="10" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-15" />
+	<attacks attack="8" skill="18">
 	</attacks>
 	<defenses armor="2" defense="4" />
 	<voices interval="2000" chance="5">
diff --git a/data/monster/790/nightmare.xml b/data/monster/790/nightmare.xml
index ace1b40..a9090dc 100644
--- a/data/monster/790/nightmare.xml
+++ b/data/monster/790/nightmare.xml
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="300" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="50" attack="50" />
+	<attacks skill="50" attack="50">
 		<attack name="death" interval="2000" chance="10" range="7" radius="1" target="1" min="-120" max="-170">
 			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="smallclouds" />
diff --git a/data/monster/790/nomad.xml b/data/monster/790/nomad.xml
index d4a43c0..b1d4ab9 100644
--- a/data/monster/790/nomad.xml
+++ b/data/monster/790/nomad.xml
@@ -12,10 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="0" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="15" />
 	</flags>
-	<attacks>
+	<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" />
diff --git a/data/monster/790/phantasm summon.xml b/data/monster/790/phantasm summon.xml
index 3e1ad73..132a53c 100644
--- a/data/monster/790/phantasm summon.xml	
+++ b/data/monster/790/phantasm summon.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" skill="30" attack="25" />
+	<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" />
diff --git a/data/monster/790/phantasm.xml b/data/monster/790/phantasm.xml
index 9047f41..f01aefd 100644
--- a/data/monster/790/phantasm.xml
+++ b/data/monster/790/phantasm.xml
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="350" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="90" attack="95" />
+	<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" />
diff --git a/data/monster/790/plaguesmith.xml b/data/monster/790/plaguesmith.xml
index 43abb91..00bb4f2 100644
--- a/data/monster/790/plaguesmith.xml
+++ b/data/monster/790/plaguesmith.xml
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="70" />
 		<flag runonhealth="500" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="1500" skill="100" attack="98" poison="200" />
+	<attacks skill="100" attack="98" poison="200">
 		<attack name="poison" interval="2000" chance="15" radius="4" target="0" min="-60" max="-114">
 			<attribute key="areaEffect" value="poison" />
 		</attack>
diff --git a/data/monster/790/son of verminor.xml b/data/monster/790/son of verminor.xml
index 140fdb4..6a7a59b 100644
--- a/data/monster/790/son of verminor.xml	
+++ b/data/monster/790/son of verminor.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="70" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="95" attack="90" poison="450" />
+	<attacks skill="95" attack="90" poison="450">
 		<attack name="earth" interval="2000" chance="20" range="7" target="1" min="-150" max="-200">
 			<attribute key="shootEffect" value="poison" />
 		</attack>
diff --git a/data/monster/790/spectre.xml b/data/monster/790/spectre.xml
index 690c0c3..3fa131c 100644
--- a/data/monster/790/spectre.xml
+++ b/data/monster/790/spectre.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" skill="65" attack="82" poison="300" />
+	<attacks skill="65" attack="82" poison="300">
 		<attack name="drunk" interval="2000" chance="15" radius="4" target="0" duration="6000">
 			<attribute key="areaEffect" value="purplenote" />
 		</attack>
diff --git a/data/monster/790/the handmaiden.xml b/data/monster/790/the handmaiden.xml
index 3037de1..841c1f2 100644
--- a/data/monster/790/the handmaiden.xml	
+++ b/data/monster/790/the handmaiden.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="70" />
 		<flag runonhealth="3100" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" min="0" max="-800" />
+	<attacks skill="150" attack="100">
 		<attack name="manadrain" interval="2000" chance="25" range="7" min="-150" max="-800">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</attack>
diff --git a/data/monster/790/the imperor.xml b/data/monster/790/the imperor.xml
index 82ffbb0..1368ff8 100644
--- a/data/monster/790/the imperor.xml	
+++ b/data/monster/790/the imperor.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="4" />
-		<flag staticattack="90" />
 		<flag runonhealth="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="110" attack="110" />
+	<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" />
diff --git a/data/monster/790/the plasmother.xml b/data/monster/790/the plasmother.xml
index fc358d2..2e02f78 100644
--- a/data/monster/790/the plasmother.xml	
+++ b/data/monster/790/the plasmother.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="90" />
 		<flag runonhealth="250" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="30" attack="50" />
+	<attacks skill="30" attack="50">
 		<attack name="speed" interval="1000" chance="8" radius="6" target="0" speedchange="-100" duration="10000">
 			<attribute key="areaEffect" value="poison" />
 		</attack>
diff --git a/data/monster/790/undead dragon.xml b/data/monster/790/undead dragon.xml
index b04605c..45c579b 100644
--- a/data/monster/790/undead dragon.xml	
+++ b/data/monster/790/undead dragon.xml	
@@ -12,11 +12,9 @@
 		<flag canpushitems="1" />
 		<flag canpushcreatures="1" />
 		<flag targetdistance="1" />
-		<flag staticattack="70" />
 		<flag runonhealth="300" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="90" attack="96" />
+	<attacks skill="90" attack="96">
 		<attack name="physical" interval="2000" chance="5" range="7" radius="4" target="1" min="-300" max="-400">
 			<attribute key="areaEffect" value="redspark" />
 		</attack>