From 0e86227080735446de03b6436dc8a21bddec1420 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Sun, 1 May 2022 18:57:20 -0300
Subject: [PATCH 01/38] Adding monsters bases

---
 data/monster/monsters.xml                     |  67 ++++++++++++
 .../monsters/a_shielded_astral_glyph.xml      |  49 +++++++++
 data/monster/monsters/an_astral_glyph.xml     |  47 ++++++++
 data/monster/monsters/an_observer_eye.xml     |  47 ++++++++
 data/monster/monsters/angry_plant.xml         |  47 ++++++++
 data/monster/monsters/animated_sword.xml      |  49 +++++++++
 .../monsters/baby_dragon_(creature).xml       |  44 ++++++++
 data/monster/monsters/bound_astral_power.xml  |  49 +++++++++
 data/monster/monsters/broken_shaper.xml       |  85 +++++++++++++++
 data/monster/monsters/cave_parrot.xml         |  47 ++++++++
 data/monster/monsters/corrupted_soul.xml      |  47 ++++++++
 .../monsters/cosmic_energy_prism_a.xml        |  52 +++++++++
 .../monsters/cosmic_energy_prism_b.xml        |  52 +++++++++
 .../monsters/cosmic_energy_prism_c.xml        |  52 +++++++++
 .../monsters/cosmic_energy_prism_d.xml        |  52 +++++++++
 .../monsters/diamond_servant_replica.xml      |  66 +++++++++++
 data/monster/monsters/dragon_essence.xml      |  47 ++++++++
 data/monster/monsters/dragon_warden.xml       |  47 ++++++++
 data/monster/monsters/dragon_wrath.xml        |  47 ++++++++
 data/monster/monsters/dragonking_zyrtarch.xml |  47 ++++++++
 data/monster/monsters/fallen_challenger.xml   |  47 ++++++++
 data/monster/monsters/frozen_minion.xml       |  47 ++++++++
 .../monsters/gelidrazah_the_frozen.xml        |  70 ++++++++++++
 .../monsters/golden_servant_replica.xml       |  59 ++++++++++
 data/monster/monsters/haunted_dragon.xml      |  72 ++++++++++++
 data/monster/monsters/ice_dragon.xml          |  67 ++++++++++++
 data/monster/monsters/icicle_(creature).xml   |  47 ++++++++
 .../monster/monsters/iron_servant_replica.xml |  55 ++++++++++
 data/monster/monsters/kalyassa.xml            |  66 +++++++++++
 data/monster/monsters/lady_tenebris.xml       |  89 +++++++++++++++
 data/monster/monsters/lloyd.xml               |  66 +++++++++++
 data/monster/monsters/lost_time.xml           |  44 ++++++++
 .../monsters/melting_frozen_horror.xml        |  50 +++++++++
 .../monster/monsters/mounted_thorn_knight.xml |  47 ++++++++
 data/monster/monsters/orclops_doomhauler.xml  |  73 +++++++++++++
 data/monster/monsters/orclops_ravager.xml     |  75 +++++++++++++
 .../monsters/pi\303\261ata_dragon.xml"        |  72 ++++++++++++
 data/monster/monsters/possessed_tree.xml      |  47 ++++++++
 data/monster/monsters/shadow_fiend.xml        |  47 ++++++++
 data/monster/monsters/shadow_tentacle.xml     |  49 +++++++++
 data/monster/monsters/shaper_matriarch.xml    |  74 +++++++++++++
 data/monster/monsters/solid_frozen_horror.xml |  50 +++++++++
 .../monsters/somewhat_beatable_dragon.xml     |  47 ++++++++
 .../monsters/soul_of_dragonking_zyrtarch.xml  |  87 +++++++++++++++
 data/monster/monsters/soulcatcher.xml         |  44 ++++++++
 data/monster/monsters/spirit_of_fertility.xml |  47 ++++++++
 data/monster/monsters/stone_rhino.xml         |  59 ++++++++++
 data/monster/monsters/sword_of_vengeance.xml  |  49 +++++++++
 data/monster/monsters/tazhadur.xml            |  67 ++++++++++++
 data/monster/monsters/the_astral_source.xml   |  49 +++++++++
 .../monsters/the_blazing_time_guardian.xml    |  80 ++++++++++++++
 .../monsters/the_distorted_astral_source.xml  |  47 ++++++++
 .../monsters/the_enraged_thorn_knight.xml     |  91 ++++++++++++++++
 data/monster/monsters/the_first_dragon.xml    |  44 ++++++++
 .../monsters/the_freezing_time_guardian.xml   |  79 ++++++++++++++
 .../monster/monsters/the_last_lore_keeper.xml | 103 ++++++++++++++++++
 .../monsters/the_shielded_thorn_knight.xml    |  47 ++++++++
 data/monster/monsters/the_time_guardian.xml   |  90 +++++++++++++++
 data/monster/monsters/thorn_minion.xml        |  47 ++++++++
 data/monster/monsters/time_keeper.xml         |  47 ++++++++
 data/monster/monsters/time_waster.xml         |  44 ++++++++
 data/monster/monsters/twisted_shaper.xml      |  74 +++++++++++++
 data/monster/monsters/unbeatable_dragon.xml   |  47 ++++++++
 .../monster/monsters/unbound_blightwalker.xml |  47 ++++++++
 data/monster/monsters/unbound_defiler.xml     |  47 ++++++++
 data/monster/monsters/unbound_demon.xml       |  47 ++++++++
 .../monsters/unbound_demon_outcast.xml        |  47 ++++++++
 data/monster/monsters/zorvorax.xml            |  68 ++++++++++++
 68 files changed, 3898 insertions(+)
 create mode 100644 data/monster/monsters/a_shielded_astral_glyph.xml
 create mode 100644 data/monster/monsters/an_astral_glyph.xml
 create mode 100644 data/monster/monsters/an_observer_eye.xml
 create mode 100644 data/monster/monsters/angry_plant.xml
 create mode 100644 data/monster/monsters/animated_sword.xml
 create mode 100644 data/monster/monsters/baby_dragon_(creature).xml
 create mode 100644 data/monster/monsters/bound_astral_power.xml
 create mode 100644 data/monster/monsters/broken_shaper.xml
 create mode 100644 data/monster/monsters/cave_parrot.xml
 create mode 100644 data/monster/monsters/corrupted_soul.xml
 create mode 100644 data/monster/monsters/cosmic_energy_prism_a.xml
 create mode 100644 data/monster/monsters/cosmic_energy_prism_b.xml
 create mode 100644 data/monster/monsters/cosmic_energy_prism_c.xml
 create mode 100644 data/monster/monsters/cosmic_energy_prism_d.xml
 create mode 100644 data/monster/monsters/diamond_servant_replica.xml
 create mode 100644 data/monster/monsters/dragon_essence.xml
 create mode 100644 data/monster/monsters/dragon_warden.xml
 create mode 100644 data/monster/monsters/dragon_wrath.xml
 create mode 100644 data/monster/monsters/dragonking_zyrtarch.xml
 create mode 100644 data/monster/monsters/fallen_challenger.xml
 create mode 100644 data/monster/monsters/frozen_minion.xml
 create mode 100644 data/monster/monsters/gelidrazah_the_frozen.xml
 create mode 100644 data/monster/monsters/golden_servant_replica.xml
 create mode 100644 data/monster/monsters/haunted_dragon.xml
 create mode 100644 data/monster/monsters/ice_dragon.xml
 create mode 100644 data/monster/monsters/icicle_(creature).xml
 create mode 100644 data/monster/monsters/iron_servant_replica.xml
 create mode 100644 data/monster/monsters/kalyassa.xml
 create mode 100644 data/monster/monsters/lady_tenebris.xml
 create mode 100644 data/monster/monsters/lloyd.xml
 create mode 100644 data/monster/monsters/lost_time.xml
 create mode 100644 data/monster/monsters/melting_frozen_horror.xml
 create mode 100644 data/monster/monsters/mounted_thorn_knight.xml
 create mode 100644 data/monster/monsters/orclops_doomhauler.xml
 create mode 100644 data/monster/monsters/orclops_ravager.xml
 create mode 100644 "data/monster/monsters/pi\303\261ata_dragon.xml"
 create mode 100644 data/monster/monsters/possessed_tree.xml
 create mode 100644 data/monster/monsters/shadow_fiend.xml
 create mode 100644 data/monster/monsters/shadow_tentacle.xml
 create mode 100644 data/monster/monsters/shaper_matriarch.xml
 create mode 100644 data/monster/monsters/solid_frozen_horror.xml
 create mode 100644 data/monster/monsters/somewhat_beatable_dragon.xml
 create mode 100644 data/monster/monsters/soul_of_dragonking_zyrtarch.xml
 create mode 100644 data/monster/monsters/soulcatcher.xml
 create mode 100644 data/monster/monsters/spirit_of_fertility.xml
 create mode 100644 data/monster/monsters/stone_rhino.xml
 create mode 100644 data/monster/monsters/sword_of_vengeance.xml
 create mode 100644 data/monster/monsters/tazhadur.xml
 create mode 100644 data/monster/monsters/the_astral_source.xml
 create mode 100644 data/monster/monsters/the_blazing_time_guardian.xml
 create mode 100644 data/monster/monsters/the_distorted_astral_source.xml
 create mode 100644 data/monster/monsters/the_enraged_thorn_knight.xml
 create mode 100644 data/monster/monsters/the_first_dragon.xml
 create mode 100644 data/monster/monsters/the_freezing_time_guardian.xml
 create mode 100644 data/monster/monsters/the_last_lore_keeper.xml
 create mode 100644 data/monster/monsters/the_shielded_thorn_knight.xml
 create mode 100644 data/monster/monsters/the_time_guardian.xml
 create mode 100644 data/monster/monsters/thorn_minion.xml
 create mode 100644 data/monster/monsters/time_keeper.xml
 create mode 100644 data/monster/monsters/time_waster.xml
 create mode 100644 data/monster/monsters/twisted_shaper.xml
 create mode 100644 data/monster/monsters/unbeatable_dragon.xml
 create mode 100644 data/monster/monsters/unbound_blightwalker.xml
 create mode 100644 data/monster/monsters/unbound_defiler.xml
 create mode 100644 data/monster/monsters/unbound_demon.xml
 create mode 100644 data/monster/monsters/unbound_demon_outcast.xml
 create mode 100644 data/monster/monsters/zorvorax.xml

diff --git a/data/monster/monsters.xml b/data/monster/monsters.xml
index 8ddf956ebe..15835e6417 100644
--- a/data/monster/monsters.xml
+++ b/data/monster/monsters.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monsters>
 	<monster name="a carved stone tile" file="monsters/a_carved_stone_tile.xml" />
+	<monster name="A Shielded Astral Glyph" file="monsters/a_shielded_astral_glyph.xml" />
 	<monster name="Abyssador" file="monsters/abyssador.xml" />
 	<monster name="Achad" file="monsters/achad.xml" />
 	<monster name="Acid Blob" file="monsters/acid_blob.xml" />
@@ -10,8 +11,12 @@
 	<monster name="Adventurer" file="monsters/adventurer.xml" />
 	<monster name="Amarie" file="monsters/amarie.xml" />
 	<monster name="Amazon" file="monsters/amazon.xml" />
+	<monster name="An Astral Glyph" file="monsters/an_astral_glyph.xml" />
+	<monster name="An Observer Eye" file="monsters/an_observer_eye.xml" />
 	<monster name="Ancient Scarab" file="monsters/ancient_scarab.xml" />
 	<monster name="Angry Adventurer" file="monsters/angry_adventurer.xml" />
+	<monster name="Angry Plant" file="monsters/angry_plant.xml" />
+	<monster name="Animated Sword" file="monsters/angry_plant.xml" />
 	<monster name="Annihilon" file="monsters/annihilon.xml" />
 	<monster name="Apocalypse" file="monsters/apocalypse.xml" />
 	<monster name="Apprentice Sheng" file="monsters/apprentice_sheng.xml" />
@@ -27,6 +32,7 @@
 	<monster name="Axeitus Headbanger" file="monsters/axeitus_headbanger.xml" />
 	<monster name="Azerus" file="monsters/azerus.xml" />
 	<monster name="Azure Frog" file="monsters/azure_frog.xml" />
+	<monster name="Baby Dragon" file="monsters/baby_dragon_(creature).xml" />
 	<monster name="Bad Dream" file="monsters/bad_dream.xml" />
 	<monster name="Badger" file="monsters/badger.xml" />
 	<monster name="Bandit" file="monsters/bandit.xml" />
@@ -68,10 +74,12 @@
 	<monster name="Bonelord" file="monsters/bonelord.xml" />
 	<monster name="Bones" file="monsters/bones.xml" />
 	<monster name="Boogey" file="monsters/boogey.xml" />
+	<monster name="Bound Astral Power" file="monsters/bound_astral_power.xml" />
 	<monster name="Bovinus" file="monsters/bovinus.xml" />
 	<monster name="Bragrumol" file="monsters/Bragrumol.xml" />
 	<monster name="Braindeath" file="monsters/braindeath.xml" />
 	<monster name="Brimstone Bug" file="monsters/brimstone_bug.xml" />
+	<monster name="Broken Shaper" file="monsters/broken_shaper.xml" />
 	<monster name="Brown Horse" file="monsters/brown_horse.xml" />
 	<monster name="Brutus Bloodbeard" file="monsters/brutus_bloodbeard.xml" />
 	<monster name="Bug" file="monsters/bug.xml" />
@@ -82,6 +90,7 @@
 	<monster name="Carrion Worm" file="monsters/carrion_worm.xml" />
 	<monster name="Cart Packed With Gold" file="monsters/cart_packed_with_gold.xml" />
 	<monster name="Cat" file="monsters/cat.xml" />
+	<monster name="Cave Parrot" file="monsters/cave_parrot.xml" />
 	<monster name="Cave Rat" file="monsters/cave_rat.xml" />
 	<monster name="Centipede" file="monsters/centipede.xml" />
 	<monster name="Chakoya Toolshaper" file="monsters/chakoya_toolshaper.xml" />
@@ -103,9 +112,14 @@
 	<monster name="Colerian The Barbarian" file="monsters/colerian_the_barbarian.xml" />
 	<monster name="Condensed Sin" file="monsters/condensed_sin.xml" />
 	<monster name="Coral Frog" file="monsters/coral_frog.xml" />
+	<monster name="Corrupted Soul" file="monsters/corrupted_soul.xml" />
 	<monster name="Corym Charlatan" file="monsters/corym_charlatan.xml" />
 	<monster name="Corym Skirmisher" file="monsters/corym_skirmisher.xml" />
 	<monster name="Corym Vanguard" file="monsters/corym_vanguard.xml" />
+	<monster name="Cosmic Energy Prism A" file="monsters/cosmic_energy_prism_a.xml" />
+	<monster name="Cosmic Energy Prism B" file="monsters/cosmic_energy_prism_b.xml" />
+	<monster name="Cosmic Energy Prism C" file="monsters/cosmic_energy_prism_c.xml" />
+	<monster name="Cosmic Energy Prism D" file="monsters/cosmic_energy_prism_d.xml" />
 	<monster name="Count Vlarkorth" file="monsters/count_vlarkorth.xml" />
 	<monster name="Countess Sorrow" file="monsters/countess_sorrow.xml" />
 	<monster name="Crab" file="monsters/crab.xml" />
@@ -167,6 +181,7 @@
 	<monster name="Destroyer" file="monsters/destroyer.xml" />
 	<monster name="Dharalion" file="monsters/dharalion.xml" />
 	<monster name="Diabolic Imp" file="monsters/diabolic_imp.xml" />
+	<monster name="Diamond Servant Replica" file="monsters/diamond_servant_replica.xml" />
 	<monster name="Diamond Servant" file="monsters/diamond_servant.xml" />
 	<monster name="Diblis the Fair" file="monsters/diblis_the_fair.xml" />
 	<monster name="Dipthrah" file="monsters/dipthrah.xml" />
@@ -180,10 +195,14 @@
 	<monster name="Doom Deer" file="monsters/doom_deer.xml" />
 	<monster name="Doomhowl" file="monsters/doomhowl.xml" />
 	<monster name="Dracola" file="monsters/dracola.xml" />
+	<monster name="Dragon Essence" file="monsters/dragon_essence.xml" />
 	<monster name="Dragon Hatchling" file="monsters/dragon_hatchling.xml" />
 	<monster name="Dragon Lord Hatchling" file="monsters/dragon_lord_hatchling.xml" />
 	<monster name="Dragon Lord" file="monsters/dragon_lord.xml" />
+	<monster name="Dragon Warden" file="monsters/dragon_warden.xml" />
+	<monster name="Dragon Wrath" file="monsters/dragon_wrath.xml" />
 	<monster name="Dragon" file="monsters/dragon.xml" />
+	<monster name="Dragonking Zyrtarch" file="monsters/dragonking_zyrtarch.xml" />
 	<monster name="Dragonling" file="monsters/dragonling.xml" />
 	<monster name="Draken Abomination" file="monsters/draken_abomination.xml" />
 	<monster name="Draken Elite" file="monsters/draken_elite.xml" />
@@ -239,6 +258,7 @@
 	<monster name="Evil Sheep" file="monsters/evil_sheep.xml" />
 	<monster name="Execowtioner" file="monsters/execowtioner.xml" />
 	<monster name="Eye of the Seven" file="monsters/eye_of_the_seven.xml" />
+	<monster name="Fallen Challenger" file="monsters/fallen_challenger.xml" />
 	<monster name="Fallen Mooh'tah Master Ghar" file="monsters/fallen_mooh'tah_master_ghar.xml" />
 	<monster name="Fatality" file="monsters/fatality.xml" />
 	<monster name="Feral Sphinx" file="monsters/feral_sphinx.xml" />
@@ -269,6 +289,7 @@
 	<monster name="Frost Giantess" file="monsters/frost_giantess.xml" />
 	<monster name="Frost Troll" file="monsters/frost_troll.xml" />
 	<monster name="Frostfur" file="monsters/frostfur.xml" />
+	<monster name="Frozen Minion" file="monsters/fallen_challenger.xml" />
 	<monster name="Furious Orc Berserker" file="monsters/furious_orc_berserker.xml" />
 	<monster name="Furious Troll" file="monsters/furious_troll.xml" />
 	<monster name="Fury of the Emperor" file="monsters/fury_of_the_emperor.xml" />
@@ -278,6 +299,7 @@
 	<monster name="Gargoyle" file="monsters/gargoyle.xml" />
 	<monster name="Gaz'haragoth" file="monsters/gaz'haragoth.xml" />
 	<monster name="Gazer" file="monsters/gazer.xml" />
+	<monster name="Gelidrazah The Frozen" file="monsters/gelidrazah_the_frozen.xml" />
 	<monster name="General Murius" file="monsters/general_murius.xml" />
 	<monster name="Ghastly Dragon" file="monsters/ghastly_dragon.xml" />
 	<monster name="Ghazbaran" file="monsters/ghazbaran.xml" />
@@ -302,6 +324,7 @@
 	<monster name="Goblin Leader" file="monsters/goblin_leader.xml" />
 	<monster name="Goblin Scavenger" file="monsters/goblin_scavenger.xml" />
 	<monster name="Goblin" file="monsters/goblin.xml" />
+	<monster name="Golden Servant Replica" file="monsters/golden_servant_replica.xml" />
 	<monster name="Golden Servant" file="monsters/golden_servant.xml" />
 	<monster name="Golgordan" file="monsters/golgordan.xml" />
 	<monster name="Gozzler" file="monsters/gozzler.xml" />
@@ -326,6 +349,7 @@
 	<monster name="Hacker" file="monsters/hacker.xml" />
 	<monster name="Hairman The Huge" file="monsters/hairman_the_huge.xml" />
 	<monster name="Hand of Cursed Fate" file="monsters/hand_of_cursed_fate.xml" />
+	<monster name="Haunted Dragon" file="monsters/haunted_dragon.xml" />
 	<monster name="Haunted Treeling" file="monsters/haunted_treeling.xml" />
 	<monster name="Haunter" file="monsters/haunter.xml" />
 	<monster name="Hell Hole" file="monsters/hell_hole.xml" />
@@ -352,9 +376,11 @@
 	<monster name="Husky" file="monsters/husky.xml" />
 	<monster name="Hyaena" file="monsters/hyaena.xml" />
 	<monster name="Hydra" file="monsters/hydra.xml" />
+	<monster name="Ice Dragon" file="monsters/ice_dragon.xml" />
 	<monster name="Ice Golem" file="monsters/ice_golem.xml" />
 	<monster name="Ice Overlord" file="monsters/ice_overlord.xml" />
 	<monster name="Ice Witch" file="monsters/ice_witch.xml" />
+	<monster name="Icicle" file="monsters/icicle_(creature).xml" />
 	<monster name="Incineron" file="monsters/incineron.xml" />
 	<monster name="Incredibly Old Witch" file="monsters/incredibly_old_witch.xml" />
 	<monster name="Infected Weeper" file="monsters/infected_weeper.xml" />
@@ -365,6 +391,7 @@
 	<monster name="Insect Swarm" file="monsters/insect_swarm.xml" />
 	<monster name="Insectoid Scout" file="monsters/insectoid_scout.xml" />
 	<monster name="Insectoid Worker" file="monsters/insectoid_worker.xml" />
+	<monster name="Iron Servant Replica" file="monsters/iron_servant_replica.xml" />
 	<monster name="Iron Servant" file="monsters/iron_servant.xml" />
 	<monster name="Ironblight" file="monsters/ironblight.xml" />
 	<monster name="Island Troll" file="monsters/island_troll.xml" />
@@ -373,6 +400,7 @@
 	<monster name="Jellyfish" file="monsters/jellyfish.xml" />
 	<monster name="Jesse the Wicked" file="monsters/jesse_the_wicked.xml" />
 	<monster name="Juggernaut" file="monsters/juggernaut.xml" />
+	<monster name="Kalyassa" file="monsters/kalyassa.xml" />
 	<monster name="Killer Caiman" file="monsters/killer_caiman.xml" />
 	<monster name="Killer Rabbit" file="monsters/killer_rabbit.xml" />
 	<monster name="King Zelos" file="monsters/king_zelos.xml" />
@@ -384,6 +412,7 @@
 	<monster name="Kraknaknork's Demon" file="monsters/kraknaknork's_demon.xml" />
 	<monster name="Kraknaknork" file="monsters/kraknaknork.xml" />
 	<monster name="Kreebosh the Exile" file="monsters/kreebosh_the_exile.xml" />
+	<monster name="Lady Tenebris" file="monsters/lady_tenebris.xml" />
 	<monster name="Ladybug" file="monsters/ladybug.xml" />
 	<monster name="Lamassu" file="monsters/lamassu.xml" />
 	<monster name="Lancer Beetle" file="monsters/lancer_beetle.xml" />
@@ -409,6 +438,7 @@
 	<monster name="Lizard Snakecharmer" file="monsters/lizard_snakecharmer.xml" />
 	<monster name="Lizard Templar" file="monsters/lizard_templar.xml" />
 	<monster name="Lizard Zaogun" file="monsters/lizard_zaogun.xml" />
+	<monster name="Lloyd" file="monsters/lloyd.xml" />
 	<monster name="Lord Azaram" file="monsters/lord_azaram.xml" />
 	<monster name="Lord of the Elements" file="monsters/lord_of_the_elements.xml" />
 	<monster name="Lost Basher" file="monsters/lost_basher.xml" />
@@ -416,6 +446,7 @@
 	<monster name="Lost Husher" file="monsters/lost_husher.xml" />
 	<monster name="Lost Soul" file="monsters/lost_soul.xml" />
 	<monster name="Lost Thrower" file="monsters/lost_thrower.xml" />
+	<monster name="Lost Time" file="monsters/lost_time.xml" />
 	<monster name="Mad Mage" file="monsters/mad_mage.xml" />
 	<monster name="Mad Scientist" file="monsters/mad_scientist.xml" />
 	<monster name="Mad Sheep" file="monsters/mad_sheep.xml" />
@@ -440,6 +471,7 @@
 	<monster name="Mazoran" file="monsters/mazoran.xml" />
 	<monster name="Mechanical Fighter" file="monsters/mechanical_fighter.xml" />
 	<monster name="Medusa" file="monsters/medusa.xml" />
+	<monster name="Melting Frozen Horror" file="monsters/melting_frozen_horror.xml" />
 	<monster name="Menace" file="monsters/menace.xml" />
 	<monster name="Mephiles" file="monsters/mephiles.xml" />
 	<monster name="Mercury Blob" file="monsters/mercury_blob.xml" />
@@ -466,6 +498,7 @@
 	<monster name="Morguthis" file="monsters/morguthis.xml" />
 	<monster name="Morik The Gladiator" file="monsters/morik_the_gladiator.xml" />
 	<monster name="Mornenion" file="monsters/mornenion.xml" />
+	<monster name="Mounted Thorn Knight" file="monsters/mounted_thorn_knight.xml" />
 	<monster name="Mozradek" file="monsters/mozradek.xml" />
 	<monster name="Mr. Punish" file="monsters/mr._punish.xml" />
 	<monster name="Muddy Earth Elemental" file="monsters/muddy_earth_elemental.xml" />
@@ -509,6 +542,8 @@
 	<monster name="Orc Warrior" file="monsters/orc_warrior.xml" />
 	<monster name="Orc" file="monsters/orc.xml" />
 	<monster name="Orchid Frog" file="monsters/orchid_frog.xml" />
+	<monster name="Orclops Doomhauler" file="monsters/orclops_doomhauler.xml" />
+	<monster name="Orclops Ravager" file="monsters/orclops_ravager.xml" />
 	<monster name="Orcus the Cruel" file="monsters/orcus_the_cruel.xml" />
 	<monster name="Orewalker" file="monsters/orewalker.xml" />
 	<monster name="Orshabaal" file="monsters/orshabaal.xml" />
@@ -524,6 +559,7 @@
 	<monster name="Pig" file="monsters/pig.xml" />
 	<monster name="Pigeon" file="monsters/pigeon.xml" />
 	<monster name="Pillar" file="monsters/pillar.xml" />
+	<monster name="Piñata Dragon" file="monsters/piñata_dragon.xml" />
 	<monster name="Pirate Buccaneer" file="monsters/pirate_buccaneer.xml" />
 	<monster name="Pirate Corsair" file="monsters/pirate_corsair.xml" />
 	<monster name="Pirate Cutthroat" file="monsters/pirate_cutthroat.xml" />
@@ -537,6 +573,7 @@
 	<monster name="Poison Spider" file="monsters/poison_spider.xml" />
 	<monster name="Polar Bear" file="monsters/polar_bear.xml" />
 	<monster name="Poodle" file="monsters/poodle.xml" />
+	<monster name="Possessed Tree" file="monsters/possessed_tree.xml" />
 	<monster name="Priestess Of The Wild Sun" file="monsters/priestess_of_the_wild_sun.xml" />
 	<monster name="Priestess" file="monsters/priestess.xml" />
 	<monster name="Primitive" file="monsters/primitive.xml" />
@@ -594,8 +631,11 @@
 	<monster name="Shaburak Demon" file="monsters/shaburak_demon.xml" />
 	<monster name="Shaburak Lord" file="monsters/shaburak_lord.xml" />
 	<monster name="Shaburak Prince" file="monsters/shaburak_prince.xml" />
+	<monster name="Shadow Fiend" file="monsters/shadow_fiend.xml" />
 	<monster name="Shadow Hound" file="monsters/shadow_hound.xml" />
 	<monster name="Shadow Pupil" file="monsters/shadow_pupil.xml" />
+	<monster name="Shadow Tentacle" file="monsters/shadow_tentacle.xml" />
+	<monster name="Shaper Matriarch" file="monsters/shaper_matriarch.xml" />
 	<monster name="Shard Of Magnor" file="monsters/shard_of_magnor.xml" />
 	<monster name="Shardhead" file="monsters/shardhead.xml" />
 	<monster name="Shark" file="monsters/shark.xml" />
@@ -624,8 +664,12 @@
 	<monster name="Snake God Essence" file="monsters/snake_god_essence.xml" />
 	<monster name="Snake Thing" file="monsters/snake_thing.xml" />
 	<monster name="Snake" file="monsters/snake.xml" />
+	<monster name="Solid Frozen Horror" file="monsters/solid_frozen_horror.xml" />
+	<monster name="Somewhat Beatable Dragon" file="monsters/somewhat_beatable_dragon.xml" />
 	<monster name="Son of Verminor" file="monsters/son_of_verminor.xml" />
 	<monster name="Sorcerer Familiar" file="monsters/sorcerer_familiar.xml" />
+	<monster name="Soul Of Dragonking Zyrtarch" file="monsters/soul_of_dragonking_zyrtarch.xml" />
+	<monster name="Soulcatcher" file="monsters/soulcatcher.xml" />
 	<monster name="Souleater" file="monsters/souleater.xml" />
 	<monster name="Soulless Minion" file="monsters/soulless_minion.xml" />
 	<monster name="Sparkion" file="monsters/sparkion.xml" />
@@ -637,6 +681,7 @@
 	<monster name="Spidris Elite" file="monsters/spidris_elite.xml" />
 	<monster name="Spidris" file="monsters/spidris.xml" />
 	<monster name="Spirit of Earth" file="monsters/spirit_of_earth.xml" />
+	<monster name="Spirit Of Fertility" file="monsters/spirit_of_fertility.xml" />
 	<monster name="Spirit of Fire" file="monsters/spirit_of_fire.xml" />
 	<monster name="Spirit of Water" file="monsters/spirit_of_water.xml" />
 	<monster name="Spit Nettle" file="monsters/spit_nettle.xml" />
@@ -651,6 +696,7 @@
 	<monster name="Starving Wolf" file="monsters/starving_wolf.xml" />
 	<monster name="Stone Devourer" file="monsters/stone_devourer.xml" />
 	<monster name="Stone Golem" file="monsters/stone_golem.xml" />
+	<monster name="Stone Rhino" file="monsters/stone_rhino.xml" />
 	<monster name="Stonecracker" file="monsters/stonecracker.xml" />
 	<monster name="Strange Slime" file="monsters/strange_slime.xml" />
 	<monster name="Sun-Marked Goanna" file="monsters/sun-marked_goanna.xml" />
@@ -659,9 +705,11 @@
 	<monster name="Swampling" file="monsters/swampling.xml" />
 	<monster name="Swarmer Hatchling" file="monsters/swarmer_hatchling.xml" />
 	<monster name="Swarmer" file="monsters/swarmer.xml" />
+	<monster name="Sword Of Vengeance" file="monsters/sword_of_vengeance.xml" />
 	<monster name="Tanjis" file="monsters/tanjis.xml" />
 	<monster name="Tarantula" file="monsters/tarantula.xml" />
 	<monster name="Tarnished Spirit" file="monsters/tarnished_spirit.xml" />
+	<monster name="Tazhadur" file="monsters/tazhadur.xml" />
 	<monster name="Teleskor" file="monsters/teleskor.xml" />
 	<monster name="Terofar" file="monsters/terofar.xml" />
 	<monster name="Terramite" file="monsters/terramite.xml" />
@@ -670,17 +718,23 @@
 	<monster name="Terrorsleep" file="monsters/terrorsleep.xml" />
 	<monster name="Thalas" file="monsters/thalas.xml" />
 	<monster name="The Abomination" file="monsters/the_abomination.xml" />
+	<monster name="The Astral Source" file="monsters/the_astral_source.xml" />
 	<monster name="The Axeorcist" file="monsters/the_axeorcist.xml" />
 	<monster name="The Big Bad One" file="monsters/the_big_bad_one.xml" />
+	<monster name="The Blazing Time Guardian" file="monsters/the_blazing_time_guardian.xml" />
 	<monster name="The Blightfather" file="monsters/the_blightfather.xml" />
 	<monster name="The Bloodtusk" file="monsters/the_bloodtusk.xml" />
 	<monster name="The Bloodweb" file="monsters/the_bloodweb.xml" />
 	<monster name="The Collector" file="monsters/the_collector.xml" />
 	<monster name="The Count" file="monsters/the_count.xml" />
 	<monster name="The Dark Dancer" file="monsters/the_dark_dancer.xml" />
+	<monster name="The Distorted Astral Source" file="monsters/the_distorted_astral_source.xml" />
 	<monster name="The Dreadorian" file="monsters/the_dreadorian.xml" />
+	<monster name="The Enraged Thorn Knight" file="monsters/the_enraged_thorn_knight.xml" />
 	<monster name="The Evil Eye" file="monsters/the_evil_eye.xml" />
 	<monster name="The Fettered Shatterer" file="monsters/the_fettered_shatterer.xml" />
+	<monster name="The First Dragon" file="monsters/the_first_dragon.xml" />
+	<monster name="The Freezing Time Guardian" file="monsters/the_freezing_time_guardian.xml" />
 	<monster name="The Frog Prince" file="monsters/the_frog_prince.xml" />
 	<monster name="The Hag" file="monsters/the_hag.xml" />
 	<monster name="The Hairy One" file="monsters/the_hairy_one.xml" />
@@ -688,6 +742,7 @@
 	<monster name="The Handmaiden" file="monsters/the_handmaiden.xml" />
 	<monster name="The Horned Fox" file="monsters/the_horned_fox.xml" />
 	<monster name="The Imperor" file="monsters/the_imperor.xml" />
+	<monster name="The Last Lore Keeper" file="monsters/the_last_lore_keeper.xml" />
 	<monster name="The Many" file="monsters/the_many.xml" />
 	<monster name="The Masked Marauder" file="monsters/the_masked_marauder.xml" />
 	<monster name="The Noxious Spawn" file="monsters/the_noxious_spawn.xml" />
@@ -698,13 +753,18 @@
 	<monster name="The Pit Lord" file="monsters/the_pit_lord.xml" />
 	<monster name="The Plasmother" file="monsters/the_plasmother.xml" />
 	<monster name="The Ruthless Herald" file="monsters/the_ruthless_herald.xml" />
+	<monster name="The Shielded Thorn Knight" file="monsters/the_shielded_thorn_knight.xml" />
 	<monster name="The Snapper" file="monsters/the_snapper.xml" />
+	<monster name="The Time Guardian" file="monsters/the_time_guardian.xml" />
 	<monster name="The Weakened Count" file="monsters/the_weakened_count.xml" />
 	<monster name="Thief" file="monsters/thief.xml" />
+	<monster name="Thorn Minion" file="monsters/thorn_minion.xml" />
 	<monster name="Thornback Tortoise" file="monsters/thornback_tortoise.xml" />
 	<monster name="Thornfire Wolf" file="monsters/thornfire_wolf.xml" />
 	<monster name="Thul" file="monsters/thul.xml" />
 	<monster name="Tiger" file="monsters/tiger.xml" />
+	<monster name="Time Keeper" file="monsters/time_keeper.xml" />
+	<monster name="Time Waster" file="monsters/time_waster.xml" />
 	<monster name="Tiquandas Revenge" file="monsters/tiquandas_revenge.xml" />
 	<monster name="Tirecz" file="monsters/tirecz.xml" />
 	<monster name="Toad" file="monsters/toad.xml" />
@@ -716,7 +776,13 @@
 	<monster name="Troll Guard" file="monsters/troll_guard.xml" />
 	<monster name="Troll Legionnaire" file="monsters/troll_legionnaire.xml" />
 	<monster name="Troll" file="monsters/troll.xml" />
+	<monster name="Twisted Shaper" file="monsters/twisted_shaper.xml" />
 	<monster name="Ugly Monster" file="monsters/ugly_monster.xml" />
+	<monster name="Unbeatable Dragon" file="monsters/unbeatable_dragon.xml" />
+	<monster name="Unbound Blightwalker" file="monsters/unbound_blightwalker.xml" />
+	<monster name="Unbound Defiler" file="monsters/unbound_defiler.xml" />
+	<monster name="Unbound Demon Outcast" file="monsters/unbound_demon_outcast.xml" />
+	<monster name="Unbound Demon" file="monsters/unbound_demon.xml" />
 	<monster name="Undead Cavebear" file="monsters/undead_cavebear.xml" />
 	<monster name="Undead Dragon" file="monsters/undead_dragon.xml" />
 	<monster name="Undead Gladiator" file="monsters/undead_gladiator.xml" />
@@ -795,6 +861,7 @@
 	<monster name="Zomba" file="monsters/zomba.xml" />
 	<monster name="Zombie" file="monsters/zombie.xml" />
 	<monster name="Zoralurk" file="monsters/zoralurk.xml" />
+	<monster name="Zorvorax" file="monsters/zorvorax.xml" />
 	<monster name="Zugurosh" file="monsters/zugurosh.xml" />
 	<monster name="Zulazza the Corruptor" file="monsters/zulazza_the_corruptor.xml" />
 	<monster name="Zushuka" file="monsters/zushuka.xml" />
diff --git a/data/monster/monsters/a_shielded_astral_glyph.xml b/data/monster/monsters/a_shielded_astral_glyph.xml
new file mode 100644
index 0000000000..e14b964f79
--- /dev/null
+++ b/data/monster/monsters/a_shielded_astral_glyph.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="A Shielded Astral Glyph" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-780" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="118" />
+	</defenses>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/an_astral_glyph.xml b/data/monster/monsters/an_astral_glyph.xml
new file mode 100644
index 0000000000..bd550ac4c8
--- /dev/null
+++ b/data/monster/monsters/an_astral_glyph.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="An Astral Glyph" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/an_observer_eye.xml b/data/monster/monsters/an_observer_eye.xml
new file mode 100644
index 0000000000..7398e4f865
--- /dev/null
+++ b/data/monster/monsters/an_observer_eye.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="An Observer Eye" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="30000" max="30000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<defenses armor="10" defense="5" />
+	<loot>
+		<item id="27585" name="Lightsphere" chance="100000" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/angry_plant.xml b/data/monster/monsters/angry_plant.xml
new file mode 100644
index 0000000000..87c6a6805a
--- /dev/null
+++ b/data/monster/monsters/angry_plant.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Angry Plant" nameDescription="an angry plant" experience="0" speed="0" manacost="0">
+	<health now="10000" max="10000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/animated_sword.xml b/data/monster/monsters/animated_sword.xml
new file mode 100644
index 0000000000..378bd7526d
--- /dev/null
+++ b/data/monster/monsters/animated_sword.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Animated Sword" nameDescription="an animated sword" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
+	</defenses>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/baby_dragon_(creature).xml b/data/monster/monsters/baby_dragon_(creature).xml
new file mode 100644
index 0000000000..146a3629a9
--- /dev/null
+++ b/data/monster/monsters/baby_dragon_(creature).xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Baby Dragon" nameDescription="a baby dragon" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="100" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/bound_astral_power.xml b/data/monster/monsters/bound_astral_power.xml
new file mode 100644
index 0000000000..53cf5d01bc
--- /dev/null
+++ b/data/monster/monsters/bound_astral_power.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Bound Astral Power" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-349" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="400" />
+	</defenses>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/broken_shaper.xml b/data/monster/monsters/broken_shaper.xml
new file mode 100644
index 0000000000..a6fb34b6cc
--- /dev/null
+++ b/data/monster/monsters/broken_shaper.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Broken Shaper" nameDescription="a broken shaper" experience="1600" speed="310" manacost="0">
+	<health now="2200" max="2200" />
+	<look type="932" head="94" body="76" legs="0" feet="82" addons="1" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-200" />
+	</attacks>
+	<defenses armor="37" defense="37">
+		<defense name="healing" interval="2000" chance="20" min="0" max="327" />
+		<defense name="speed" interval="2000" chance="15" minspeedchange="300" maxspeedchange="300" duration="7000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="&lt;grunt&gt;" yell="false" />
+		<voice sentence="Raar!!" yell="false" />
+	</voices>
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="173" />
+		<item id="2152" name="platinum coin" chance="75194" countmax="2" />
+		<item id="27039" name="cave turnip" chance="20255" countmax="2" />
+		<item id="27041" name="cracked alabaster vase" chance="19957" />
+		<item id="27040" name="ancient belt buckle" chance="17550" />
+		<item id="27042" name="rhino horn carving" chance="13976" />
+		<item id="2666" name="meat" chance="9722" />
+		<item id="2260" name="blank rune" chance="8245" />
+		<item id="7591" name="great health potion" chance="7196" />
+		<item id="2789" name="brown mushroom" chance="6100" countmax="2" />
+		<item id="2146" name="small sapphire" chance="5099" />
+		<item id="5022" name="orichalcum pearl" chance="4968" countmax="3" />
+		<item id="5913" name="brown piece of cloth" chance="4635" />
+		<item id="24849" name="onyx chip" chance="4373" />
+		<item id="27046" name="ancient coin" chance="4361" />
+		<item id="2147" name="small ruby" chance="4027" />
+		<item id="9809" name="rusted armor" chance="2895" />
+		<item id="2214" name="ring of healing" chance="2597" />
+		<item id="5914" name="yellow piece of cloth" chance="2037" />
+		<item id="27047" name="coral brooch" chance="1620" />
+		<item id="2396" name="ice rapier" chance="1180" />
+		<item id="5912" name="blue piece of cloth" chance="1037" />
+		<item id="2162" name="magic light wand" chance="1025" />
+		<item id="5909" name="white piece of cloth" chance="965" />
+		<item id="5910" name="green piece of cloth" chance="643" />
+		<item id="5911" name="red piece of cloth" chance="536" />
+		<item id="2195" name="boots of haste" chance="226" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/cave_parrot.xml b/data/monster/monsters/cave_parrot.xml
new file mode 100644
index 0000000000..f2d72cbf1f
--- /dev/null
+++ b/data/monster/monsters/cave_parrot.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Cave Parrot" nameDescription="a cave parrot" experience="0" speed="320" manacost="0">
+	<health now="30" max="30" />
+	<look type="217" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="1" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="1" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" />
+	</attacks>
+	<defenses armor="2" defense="2" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/corrupted_soul.xml b/data/monster/monsters/corrupted_soul.xml
new file mode 100644
index 0000000000..8a99724a82
--- /dev/null
+++ b/data/monster/monsters/corrupted_soul.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Corrupted Soul" nameDescription="a corrupted soul" experience="1300" speed="0" manacost="0">
+	<health now="1100" max="1100" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-200" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/cosmic_energy_prism_a.xml b/data/monster/monsters/cosmic_energy_prism_a.xml
new file mode 100644
index 0000000000..06805dc4c7
--- /dev/null
+++ b/data/monster/monsters/cosmic_energy_prism_a.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Cosmic Energy Prism A" nameDescription="" experience="840" speed="0" manacost="0">
+	<health now="1000" max="1000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="1" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="*Zap!*" yell="false" />
+	</voices>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/cosmic_energy_prism_b.xml b/data/monster/monsters/cosmic_energy_prism_b.xml
new file mode 100644
index 0000000000..1098d778c1
--- /dev/null
+++ b/data/monster/monsters/cosmic_energy_prism_b.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Cosmic Energy Prism B" nameDescription="" experience="840" speed="0" manacost="0">
+	<health now="1000" max="1000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="1" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="*Zap!*" yell="false" />
+	</voices>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/cosmic_energy_prism_c.xml b/data/monster/monsters/cosmic_energy_prism_c.xml
new file mode 100644
index 0000000000..30adff5fd5
--- /dev/null
+++ b/data/monster/monsters/cosmic_energy_prism_c.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Cosmic Energy Prism C" nameDescription="" experience="840" speed="0" manacost="0">
+	<health now="1000" max="1000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="1" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="*Zap!*" yell="false" />
+	</voices>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/cosmic_energy_prism_d.xml b/data/monster/monsters/cosmic_energy_prism_d.xml
new file mode 100644
index 0000000000..c3f8d69e4d
--- /dev/null
+++ b/data/monster/monsters/cosmic_energy_prism_d.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Cosmic Energy Prism D" nameDescription="" experience="840" speed="0" manacost="0">
+	<health now="1000" max="1000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="1" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="*Zap!*" yell="false" />
+	</voices>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/diamond_servant_replica.xml b/data/monster/monsters/diamond_servant_replica.xml
new file mode 100644
index 0000000000..a5e5266e61
--- /dev/null
+++ b/data/monster/monsters/diamond_servant_replica.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Diamond Servant Replica" nameDescription="a diamond servant replica" experience="700" speed="172" manacost="0">
+	<health now="2000" max="2000" />
+	<look type="397" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="1" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="25" defense="25" />
+	<loot>
+		<item id="2148" name="gold coin" chance="93197" countmax="179" />
+		<item id="5944" name="soul orb" chance="45574" />
+		<item id="2177" name="life crystal" chance="9590" />
+		<item id="7589" name="strong mana potion" chance="6270" />
+		<item id="7588" name="strong health potion" chance="6066" />
+		<item id="9690" name="gear wheel" chance="5697" />
+		<item id="10572" name="gear crystal" chance="5205" />
+		<item name="crystal pedestal" chance="4303" />
+		<item id="2164" name="might ring" chance="984" />
+		<item id="7889" name="lightning pendant" chance="820" />
+		<item id="13758" name="slime mould" chance="574" />
+		<item id="2154" name="yellow gem" chance="574" />
+		<item id="7440" name="mastermind potion" chance="451" />
+		<item id="2189" name="wand of cosmic energy" chance="369" />
+		<item id="10221" name="shockwave amulet" chance="123" />
+		<item id="7428" name="bonebreaker" chance="82" />
+		<item id="8878" name="crystalline armor" chance="41" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/dragon_essence.xml b/data/monster/monsters/dragon_essence.xml
new file mode 100644
index 0000000000..d72defae8f
--- /dev/null
+++ b/data/monster/monsters/dragon_essence.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Dragon Essence" nameDescription="a Dragon Essence" experience="0" speed="0" manacost="0">
+	<health now="30000" max="30000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="1" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/dragon_warden.xml b/data/monster/monsters/dragon_warden.xml
new file mode 100644
index 0000000000..c6d4c999b8
--- /dev/null
+++ b/data/monster/monsters/dragon_warden.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Dragon Warden" nameDescription="a Dragon Warden" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/dragon_wrath.xml b/data/monster/monsters/dragon_wrath.xml
new file mode 100644
index 0000000000..b21e361cb3
--- /dev/null
+++ b/data/monster/monsters/dragon_wrath.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Dragon Wrath" nameDescription="a dragon wrath" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/dragonking_zyrtarch.xml b/data/monster/monsters/dragonking_zyrtarch.xml
new file mode 100644
index 0000000000..7a8be4b52a
--- /dev/null
+++ b/data/monster/monsters/dragonking_zyrtarch.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Dragonking Zyrtarch" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="100" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/fallen_challenger.xml b/data/monster/monsters/fallen_challenger.xml
new file mode 100644
index 0000000000..a7c5cd6513
--- /dev/null
+++ b/data/monster/monsters/fallen_challenger.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Fallen Challenger" nameDescription="a fallen challenger" experience="0" speed="0" manacost="0">
+	<health now="9000" max="9000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/frozen_minion.xml b/data/monster/monsters/frozen_minion.xml
new file mode 100644
index 0000000000..38a4a5873d
--- /dev/null
+++ b/data/monster/monsters/frozen_minion.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Frozen Minion" nameDescription="a frozen minion" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-196" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/gelidrazah_the_frozen.xml b/data/monster/monsters/gelidrazah_the_frozen.xml
new file mode 100644
index 0000000000..d31b72fa88
--- /dev/null
+++ b/data/monster/monsters/gelidrazah_the_frozen.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Gelidrazah The Frozen" nameDescription="" experience="9000" speed="0" manacost="0">
+	<health now="10000" max="10000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="1" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-380" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="180" max="240" />
+	</defenses>
+	<loot>
+		<item id="27593" name="dragon blood" chance="100000" />
+		<item id="27594" name="dragon tongue" chance="100000" />
+		<item id="27595" name="scale of gelidrazah" chance="100000" />
+		<item id="2148" name="gold coin" chance="87243" countmax="138" />
+		<item id="2672" name="dragon ham" chance="81481" />
+		<item id="2152" name="platinum coin" chance="66667" countmax="3" />
+		<item id="7290" name="shard" chance="30453" />
+		<item id="7888" name="glacier amulet" chance="26337" />
+		<item id="2146" name="small sapphire" chance="11523" />
+		<item id="7902" name="glacier mask" chance="10700" />
+		<item id="21696" name="icicle bow" chance="9465" />
+		<item id="21697" name="runic ice shield" chance="6173" />
+		<item id="2167" name="energy ring" chance="5761" />
+		<item id="7441" name="ice cube" chance="5350" />
+		<item id="18412" name="glacial rod" chance="3704" />
+		<item id="2033" name="golden mug" chance="3292" />
+		<item id="8887" name="frozen plate" chance="1646" />
+		<item id="7409" name="northern star" chance="823" />
+		<item id="2177" name="life crystal" chance="412" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/golden_servant_replica.xml b/data/monster/monsters/golden_servant_replica.xml
new file mode 100644
index 0000000000..4fe345297f
--- /dev/null
+++ b/data/monster/monsters/golden_servant_replica.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Golden Servant Replica" nameDescription="a golden servant replica" experience="450" speed="210" manacost="0">
+	<health now="2000" max="2000" />
+	<look type="396" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="1" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="29" defense="29" />
+	<loot>
+		<item id="2148" name="gold coin" chance="85419" countmax="137" />
+		<item id="7620" name="mana potion" chance="5290" />
+		<item id="7618" name="health potion" chance="4559" />
+		<item id="2381" name="halberd" chance="2280" />
+		<item id="2796" name="green mushroom" chance="1634" />
+		<item id="9690" name="gear wheel" chance="989" />
+		<item id="8900" name="spellbook of enlightenment" chance="430" />
+		<item id="2165" name="stealth ring" chance="301" />
+		<item id="13758" name="slime mould" chance="258" />
+		<item id="13938" name="golden can of oil" chance="43" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/haunted_dragon.xml b/data/monster/monsters/haunted_dragon.xml
new file mode 100644
index 0000000000..017613fb53
--- /dev/null
+++ b/data/monster/monsters/haunted_dragon.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Haunted Dragon" nameDescription="a haunted dragon" experience="6500" speed="280" manacost="0">
+	<health now="6500" max="6500" />
+	<look type="231" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="1" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="58" defense="58" />
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="186" />
+		<item id="11233" name="unholy bone" chance="33910" />
+		<item id="2152" name="platinum coin" chance="33397" countmax="2" />
+		<item id="27046" name="ancient coin" chance="28782" countmax="2" />
+		<item id="7368" name="assassin star" chance="25321" countmax="5" />
+		<item id="2144" name="black pearl" chance="24744" countmax="2" />
+		<item id="2146" name="small sapphire" chance="23846" countmax="2" />
+		<item id="7591" name="great health potion" chance="23269" countmax="2" />
+		<item id="7590" name="great mana potion" chance="19744" countmax="2" />
+		<item id="5925" name="hardened bone" chance="15705" />
+		<item id="6500" name="demonic essence" chance="14359" />
+		<item id="2178" name="mind stone" chance="7692" />
+		<item id="2201" name="dragon necklace" chance="6410" />
+		<item id="2156" name="red gem" chance="5128" />
+		<item id="2489" name="dark armor" chance="4551" />
+		<item id="2521" name="dark shield" chance="4487" />
+		<item id="7430" name="dragonbone staff" chance="3654" />
+		<item id="9971" name="gold ingot" chance="2628" />
+		<item id="6300" name="death ring" chance="1923" />
+		<item id="2177" name="life crystal" chance="1346" />
+		<item id="11355" name="spellweaver's robe" chance="577" />
+		<item id="7402" name="dragon slayer" chance="513" />
+		<item id="8889" name="skullcracker armor" chance="192" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/ice_dragon.xml b/data/monster/monsters/ice_dragon.xml
new file mode 100644
index 0000000000..4401964b4f
--- /dev/null
+++ b/data/monster/monsters/ice_dragon.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Ice Dragon" nameDescription="an ice dragon" experience="2300" speed="212" manacost="0">
+	<health now="2500" max="2500" />
+	<look type="947" head="0" body="9" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
+	</attacks>
+	<defenses armor="41" defense="41">
+		<defense name="healing" interval="2000" chance="20" min="100" max="200" />
+	</defenses>
+	<loot>
+		<item id="2148" name="gold coin" chance="96552" countmax="219" />
+		<item id="2672" name="dragon ham" chance="78796" />
+		<item id="27593" name="dragon blood" chance="19506" />
+		<item id="27594" name="dragon tongue" chance="12043" />
+		<item id="7839" name="shiver arrow" chance="7977" countmax="10" />
+		<item id="7441" name="ice cube" chance="4426" />
+		<item id="2167" name="energy ring" chance="4117" />
+		<item id="2146" name="small sapphire" chance="3911" />
+		<item id="7590" name="great mana potion" chance="3500" countmax="2" />
+		<item id="2033" name="golden mug" chance="2934" />
+		<item id="2183" name="hailstorm rod" chance="2213" />
+		<item id="7902" name="glacier mask" chance="1081" />
+		<item id="7888" name="glacier amulet" chance="978" />
+		<item id="7290" name="shard" chance="978" />
+		<item id="2177" name="life crystal" chance="669" />
+		<item id="2492" name="dragon scale mail" chance="257" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/icicle_(creature).xml b/data/monster/monsters/icicle_(creature).xml
new file mode 100644
index 0000000000..96e8fa8211
--- /dev/null
+++ b/data/monster/monsters/icicle_(creature).xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Icicle" nameDescription="an icicle" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-219" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/iron_servant_replica.xml b/data/monster/monsters/iron_servant_replica.xml
new file mode 100644
index 0000000000..6c7eeb95b7
--- /dev/null
+++ b/data/monster/monsters/iron_servant_replica.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Iron Servant Replica" nameDescription="an iron servant replica" experience="210" speed="190" manacost="0">
+	<health now="1000" max="1000" />
+	<look type="395" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="1" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-154" />
+	</attacks>
+	<defenses armor="17" defense="17" />
+	<loot>
+		<item id="2148" name="gold coin" chance="82462" countmax="55" />
+		<item id="9690" name="gear wheel" chance="5374" />
+		<item id="7618" name="health potion" chance="2320" />
+		<item id="2381" name="halberd" chance="953" />
+		<item id="9808" name="heavily rusted armor" chance="489" />
+		<item id="13758" name="slime mould" chance="269" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/kalyassa.xml b/data/monster/monsters/kalyassa.xml
new file mode 100644
index 0000000000..e7a65174ab
--- /dev/null
+++ b/data/monster/monsters/kalyassa.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Kalyassa" nameDescription="" experience="9000" speed="0" manacost="0">
+	<health now="10000" max="10000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="1" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="600" max="700" />
+	</defenses>
+	<loot>
+		<item id="27593" name="dragon blood" chance="100000" />
+		<item id="27594" name="dragon tongue" chance="100000" />
+		<item id="27597" name="horn of kalyassa" chance="100000" />
+		<item id="2152" name="platinum coin" chance="100000" countmax="10" />
+		<item id="5948" name="red dragon leather" chance="97207" />
+		<item id="2672" name="dragon ham" chance="70391" />
+		<item id="2547" name="power bolt" chance="52514" countmax="10" />
+		<item id="2167" name="energy ring" chance="19553" />
+		<item id="2392" name="fire sword" chance="9497" />
+		<item id="7591" name="great health potion" chance="9497" countmax="2" />
+		<item id="7590" name="great mana potion" chance="9497" countmax="2" />
+		<item id="7365" name="onyx arrow" chance="9497" countmax="10" />
+		<item id="2498" name="royal helmet" chance="3352" />
+		<item id="2492" name="dragon scale mail" chance="2793" />
+		<item id="2177" name="life crystal" chance="2793" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
new file mode 100644
index 0000000000..aaa18d04d3
--- /dev/null
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Lady Tenebris" nameDescription="" experience="50000" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-1800" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+	<voices interval="5000" chance="10">
+		<voice sentence="May the embrace of darkness kill you!" yell="false" />
+	</voices>
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="200" />
+		<item id="7440" name="mastermind potion" chance="100000" />
+		<item id="2152" name="platinum coin" chance="100000" countmax="35" />
+		<item id="2214" name="ring of healing" chance="100000" />
+		<item id="2436" name="skull staff" chance="98837" />
+		<item id="18415" name="green crystal shard" chance="67442" countmax="3" />
+		<item id="18414" name="violet crystal shard" chance="67442" countmax="3" />
+		<item id="18413" name="blue crystal shard" chance="65116" countmax="3" />
+		<item id="7590" name="great mana potion" chance="53488" countmax="10" />
+		<item id="8472" name="great spirit potion" chance="51163" countmax="10" />
+		<item id="8473" name="ultimate health potion" chance="47674" countmax="10" />
+		<item id="24851" name="onyx pendant" chance="37209" />
+		<item id="25172" name="silver token" chance="29070" />
+		<item id="2158" name="blue gem" chance="26744" />
+		<item id="9970" name="small topaz" chance="23256" countmax="10" />
+		<item id="25377" name="gold token" chance="22093" />
+		<item id="2147" name="small ruby" chance="20930" countmax="10" />
+		<item id="2156" name="red gem" chance="19767" />
+		<item id="2150" name="small amethyst" chance="19767" countmax="10" />
+		<item id="2145" name="small diamond" chance="19767" countmax="10" />
+		<item name="giant shimmering pearl" chance="18605" />
+		<item id="2123" name="ring of the sky" chance="17442" />
+		<item id="18390" name="wand of defiance" chance="16279" />
+		<item id="2155" name="green gem" chance="13953" />
+		<item id="2149" name="small emerald" chance="12791" countmax="10" />
+		<item id="2154" name="yellow gem" chance="11628" />
+		<item id="11355" name="spellweaver's robe" chance="8140" />
+		<item id="27613" name="part of a rune (four)" chance="6977" />
+		<item id="2153" name="violet gem" chance="6977" />
+		<item id="7414" name="abyss hammer" chance="4651" />
+		<item id="8901" name="spellbook of warding" chance="4651" />
+		<item id="2453" name="arcane staff" chance="3488" />
+		<item id="22396" name="cluster of solace" chance="3488" countmax="2" />
+		<item id="2138" name="sapphire amulet" chance="3488" />
+		<item id="8903" name="spellbook of lost souls" chance="2326" />
+		<item id="27629" name="shadow mask" chance="1163" />
+		<item id="27630" name="shadow paint" chance="1163" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
new file mode 100644
index 0000000000..b9ccd9151b
--- /dev/null
+++ b/data/monster/monsters/lloyd.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Lloyd" nameDescription="" experience="50000" speed="0" manacost="0">
+	<health now="64000" max="64000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-1200" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="100" />
+		<item id="9970" name="small topaz" chance="100000" countmax="10" />
+		<item id="8920" name="wand of starstorm" chance="100000" />
+		<item id="18413" name="blue crystal shard" chance="66667" countmax="3" />
+		<item name="collar of blue plasma" chance="66667" />
+		<item id="18415" name="green crystal shard" chance="66667" countmax="3" />
+		<item id="18414" name="violet crystal shard" chance="66667" countmax="3" />
+		<item id="5891" name="enchanted chicken wing" chance="33333" />
+		<item name="giant shimmering pearl" chance="33333" />
+		<item id="7590" name="great mana potion" chance="33333" countmax="5" />
+		<item id="8472" name="great spirit potion" chance="33333" countmax="5" />
+		<item id="2155" name="green gem" chance="33333" />
+		<item id="12410" name="luminous orb" chance="33333" />
+		<item id="7440" name="mastermind potion" chance="33333" />
+		<item id="2156" name="red gem" chance="33333" />
+		<item id="9809" name="rusted armor" chance="33333" />
+		<item id="5909" name="white piece of cloth" chance="33333" countmax="3" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/lost_time.xml b/data/monster/monsters/lost_time.xml
new file mode 100644
index 0000000000..cb40fb4f6f
--- /dev/null
+++ b/data/monster/monsters/lost_time.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Lost Time" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="1" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
new file mode 100644
index 0000000000..1726d94e09
--- /dev/null
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Melting Frozen Horror" nameDescription="a melting frozen horror" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+	<voices interval="5000" chance="10">
+		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />
+	</voices>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/mounted_thorn_knight.xml b/data/monster/monsters/mounted_thorn_knight.xml
new file mode 100644
index 0000000000..5bdeab78f1
--- /dev/null
+++ b/data/monster/monsters/mounted_thorn_knight.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Mounted Thorn Knight" nameDescription="" experience="15000" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-1032" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/orclops_doomhauler.xml b/data/monster/monsters/orclops_doomhauler.xml
new file mode 100644
index 0000000000..ebdcb3a1a5
--- /dev/null
+++ b/data/monster/monsters/orclops_doomhauler.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Orclops Doomhauler" nameDescription="an orclops doomhauler" experience="1200" speed="240" manacost="0">
+	<health now="1700" max="1700" />
+	<look type="934" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-215" />
+	</attacks>
+	<defenses armor="35" defense="35" />
+	<voices interval="5000" chance="10">
+		<voice sentence="Me mash!" yell="false" />
+		<voice sentence="GRRRRR!" yell="false" />
+		<voice sentence="Muhahaha!" yell="false" />
+		<voice sentence="Me strong, you weak!" yell="false" />
+	</voices>
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="184" />
+		<item id="27038" name="bug meat" chance="20240" />
+		<item id="27036" name="bone toothpick" chance="19822" />
+		<item id="7588" name="strong health potion" chance="16606" />
+		<item id="27037" name="beetle carapace" chance="14976" />
+		<item id="2788" name="red mushroom" chance="8105" countmax="3" />
+		<item id="2428" name="orcish axe" chance="7863" />
+		<item id="2194" name="mysterious fetish" chance="5969" />
+		<item id="2147" name="small ruby" chance="3227" countmax="3" />
+		<item id="2144" name="black pearl" chance="3116" countmax="2" />
+		<item id="9970" name="small topaz" chance="2951" countmax="2" />
+		<item id="8843" name="onion" chance="2918" countmax="2" />
+		<item id="18417" name="brown crystal splinter" chance="2445" countmax="2" />
+		<item id="7452" name="spiked squelcher" chance="1388" />
+		<item id="20108" name="pair of iron fists" chance="1377" />
+		<item id="7439" name="berserk potion" chance="1046" />
+		<item id="11374" name="beetle necklace" chance="1002" />
+		<item id="3953" name="war drum" chance="947" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/orclops_ravager.xml b/data/monster/monsters/orclops_ravager.xml
new file mode 100644
index 0000000000..682fe8cca2
--- /dev/null
+++ b/data/monster/monsters/orclops_ravager.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Orclops Ravager" nameDescription="an orclops ravager" experience="1100" speed="260" manacost="0">
+	<health now="1200" max="1200" />
+	<look type="935" head="94" body="1" legs="80" feet="94" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="1" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-132" />
+	</attacks>
+	<defenses armor="35" defense="35">
+		<defense name="healing" interval="2000" chance="20" min="0" max="119" />
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="Crushing! Smashing! Ripping! Yeah!!" yell="false" />
+		<voice sentence="It's clobberin time!" yell="false" />
+	</voices>
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="120" />
+		<item id="2152" name="platinum coin" chance="59783" />
+		<item id="27038" name="bug meat" chance="19122" />
+		<item id="27037" name="beetle carapace" chance="18375" />
+		<item id="27036" name="bone toothpick" chance="18147" />
+		<item id="7588" name="strong health potion" chance="16354" />
+		<item id="26467" name="reinvigorating seeds" chance="10313" />
+		<item id="2428" name="orcish axe" chance="8014" />
+		<item id="2788" name="red mushroom" chance="7870" countmax="3" />
+		<item id="2194" name="mysterious fetish" chance="6354" />
+		<item id="9970" name="small topaz" chance="3706" countmax="2" />
+		<item id="8843" name="onion" chance="3249" countmax="2" />
+		<item id="2147" name="small ruby" chance="3165" countmax="3" />
+		<item id="2144" name="black pearl" chance="2864" countmax="2" />
+		<item id="18417" name="brown crystal splinter" chance="2623" countmax="2" />
+		<item id="7452" name="spiked squelcher" chance="1552" />
+		<item id="20108" name="pair of iron fists" chance="1288" />
+		<item id="3953" name="war drum" chance="1059" />
+		<item id="7439" name="berserk potion" chance="890" />
+		<item id="7419" name="dreaded cleaver" chance="12" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git "a/data/monster/monsters/pi\303\261ata_dragon.xml" "b/data/monster/monsters/pi\303\261ata_dragon.xml"
new file mode 100644
index 0000000000..bcc1916f10
--- /dev/null
+++ "b/data/monster/monsters/pi\303\261ata_dragon.xml"
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Piñata Dragon" nameDescription="a Piñata Dragon" experience="50" speed="0" manacost="0">
+	<health now="10000" max="10000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="0" />
+		<immunity outfit="0" />
+		<immunity invisible="0" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="130" max="170" />
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="You can't have my treasures!" yell="false" />
+		<voice sentence="Hit me one more time!" yell="false" />
+		<voice sentence="Na Nana Naaa Naaa!" yell="false" />
+		<voice sentence="You'll never get my stuff!" yell="false" />
+		<voice sentence="Do you really want to hurt me?" yell="false" />
+		<voice sentence="Bring it on!" yell="false" />
+	</voices>
+	<loot>
+		<item id="6569" name="candy" chance="100000" countmax="3" />
+		<item name="surprise bag" chance="52950" countmax="2" />
+		<item id="2687" name="cookie" chance="50552" countmax="5" />
+		<item id="32858" name="winterberry liquor" chance="13909" />
+		<item id="32854" name="meringue cake" chance="11127" />
+		<item id="6574" name="bar of chocolate" chance="6859" />
+		<item id="32971" name="pinata" chance="6523" />
+		<item id="6280" name="party cake" chance="6379" />
+		<item id="27605" name="costume bag (retro)" chance="5084" />
+		<item id="32853" name="festive backpack" chance="3981" />
+		<item id="27058" name="chocolatey dragon scale legs" chance="2734" />
+		<item id="27053" name="ferumbras' candy hat" chance="2302" />
+		<item id="2110" name="doll" chance="1487" />
+		<item id="32973" name="ferumbras puppet" chance="240" />
+		<item id="7487" name="toy mouse" chance="240" />
+		<item name="stuffed dragon" chance="192" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/possessed_tree.xml b/data/monster/monsters/possessed_tree.xml
new file mode 100644
index 0000000000..48e06f06ec
--- /dev/null
+++ b/data/monster/monsters/possessed_tree.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Possessed Tree" nameDescription="a possessed tree" experience="1300" speed="0" manacost="0">
+	<health now="2500" max="2500" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-162" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/shadow_fiend.xml b/data/monster/monsters/shadow_fiend.xml
new file mode 100644
index 0000000000..fe704a8d5c
--- /dev/null
+++ b/data/monster/monsters/shadow_fiend.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Shadow Fiend" nameDescription="a shadow fiend" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/shadow_tentacle.xml b/data/monster/monsters/shadow_tentacle.xml
new file mode 100644
index 0000000000..c7d2b17c61
--- /dev/null
+++ b/data/monster/monsters/shadow_tentacle.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Shadow Tentacle" nameDescription="a shadow tentacle" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-330" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
+	</defenses>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/shaper_matriarch.xml b/data/monster/monsters/shaper_matriarch.xml
new file mode 100644
index 0000000000..80e0a8b979
--- /dev/null
+++ b/data/monster/monsters/shaper_matriarch.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Shaper Matriarch" nameDescription="a shaper matriarch" experience="1650" speed="260" manacost="0">
+	<health now="2000" max="2000" />
+	<look type="933" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="4" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-120" />
+	</attacks>
+	<defenses armor="40" defense="40">
+		<defense name="healing" interval="2000" chance="20" min="0" max="86" />
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="Tar Marra Zik Tazz!" yell="false" />
+	</voices>
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="138" />
+		<item id="2152" name="platinum coin" chance="80558" countmax="2" />
+		<item id="27042" name="rhino horn carving" chance="20256" />
+		<item id="27039" name="cave turnip" chance="17519" countmax="2" />
+		<item id="27041" name="cracked alabaster vase" chance="15353" />
+		<item id="27043" name="tarnished rhino figurine" chance="15058" />
+		<item id="7589" name="strong mana potion" chance="14538" />
+		<item id="2229" name="skull (item)" chance="9704" />
+		<item id="2792" name="dark mushroom" chance="6723" />
+		<item id="27046" name="ancient coin" chance="5926" />
+		<item id="9821" name="rusted helmet" chance="4419" />
+		<item id="27048" name="gemmed figurine" chance="4315" />
+		<item id="2147" name="small ruby" chance="3639" />
+		<item id="27618" name="prismatic quartz" chance="3084" />
+		<item id="2144" name="black pearl" chance="2391" />
+		<item id="2031" name="waterskin" chance="2114" />
+		<item id="2188" name="wand of decay" chance="1594" />
+		<item id="2197" name="stone skin amulet" chance="1525" />
+		<item id="2214" name="ring of healing" chance="1248" />
+		<item id="8922" name="wand of voodoo" chance="780" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
new file mode 100644
index 0000000000..b97e55b399
--- /dev/null
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Solid Frozen Horror" nameDescription="a solid frozen horror" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="100" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-677" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+	<voices interval="5000" chance="10">
+		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />
+	</voices>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/somewhat_beatable_dragon.xml b/data/monster/monsters/somewhat_beatable_dragon.xml
new file mode 100644
index 0000000000..32926ce851
--- /dev/null
+++ b/data/monster/monsters/somewhat_beatable_dragon.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Somewhat Beatable Dragon" nameDescription="a somewhat beatable dragon" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="1" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
new file mode 100644
index 0000000000..5f7d87a817
--- /dev/null
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Soul Of Dragonking Zyrtarch" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<defenses armor="10" defense="5" />
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="200" />
+		<item id="2152" name="platinum coin" chance="100000" countmax="35" />
+		<item id="5948" name="red dragon leather" chance="100000" />
+		<item id="5882" name="red dragon scale" chance="100000" />
+		<item id="5904" name="magic sulphur" chance="76744" />
+		<item id="5889" name="piece of draconian steel" chance="76744" />
+		<item id="18413" name="blue crystal shard" chance="74419" countmax="3" />
+		<item id="18414" name="violet crystal shard" chance="67442" countmax="3" />
+		<item id="7590" name="great mana potion" chance="60465" countmax="10" />
+		<item id="18415" name="green crystal shard" chance="60465" countmax="3" />
+		<item id="8472" name="great spirit potion" chance="51163" countmax="10" />
+		<item id="8473" name="ultimate health potion" chance="41860" countmax="10" />
+		<item id="25377" name="gold token" chance="32558" />
+		<item id="2156" name="red gem" chance="32558" />
+		<item id="9970" name="small topaz" chance="32558" countmax="10" />
+		<item id="25172" name="silver token" chance="27907" />
+		<item id="2147" name="small ruby" chance="23256" countmax="10" />
+		<item id="2158" name="blue gem" chance="20930" />
+		<item id="9971" name="gold ingot" chance="18605" />
+		<item id="2155" name="green gem" chance="18605" />
+		<item id="2145" name="small diamond" chance="18605" countmax="10" />
+		<item id="8902" name="spellbook of mind control" chance="18605" />
+		<item id="9980" name="crystal of power" chance="16279" />
+		<item name="giant shimmering pearl" chance="16279" />
+		<item id="2150" name="small amethyst" chance="16279" countmax="10" />
+		<item id="12608" name="broken key ring" chance="13953" />
+		<item id="9809" name="rusted armor" chance="13953" />
+		<item id="9810" name="slightly rusted armor" chance="11628" />
+		<item id="2154" name="yellow gem" chance="11628" />
+		<item id="8849" name="modified crossbow" chance="9302" />
+		<item id="2149" name="small emerald" chance="9302" countmax="10" />
+		<item id="7430" name="dragonbone staff" chance="6977" />
+		<item id="2492" name="dragon scale mail" chance="4651" />
+		<item id="27624" name="golden talon" chance="4651" />
+		<item id="5887" name="piece of royal steel" chance="4651" />
+		<item id="11308" name="drachaku" chance="2326" />
+		<item id="27623" name="dragon crown" chance="2326" />
+		<item id="12646" name="draken boots" chance="2326" />
+		<item id="11305" name="drakinata" chance="2326" />
+		<item id="27611" name="part of a rune (two)" chance="2326" />
+		<item id="12648" name="snake god's sceptre" chance="2326" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/soulcatcher.xml b/data/monster/monsters/soulcatcher.xml
new file mode 100644
index 0000000000..12dad49f40
--- /dev/null
+++ b/data/monster/monsters/soulcatcher.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Soulcatcher" nameDescription="a soulcatcher" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="1" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/spirit_of_fertility.xml b/data/monster/monsters/spirit_of_fertility.xml
new file mode 100644
index 0000000000..d505cfb9d5
--- /dev/null
+++ b/data/monster/monsters/spirit_of_fertility.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Spirit Of Fertility" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
diff --git a/data/monster/monsters/stone_rhino.xml b/data/monster/monsters/stone_rhino.xml
new file mode 100644
index 0000000000..96cfebe898
--- /dev/null
+++ b/data/monster/monsters/stone_rhino.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Stone Rhino" nameDescription="a stone rhino" experience="1800" speed="290" manacost="0">
+	<health now="3000" max="3000" />
+	<look type="936" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="1" />
+		<flag canwalkonfire="1" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-400" />
+	</attacks>
+	<defenses armor="72" defense="72">
+		<defense name="healing" interval="2000" chance="20" min="0" max="195" />
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="SNIFF!" yell="false" />
+	</voices>
+	<loot>
+		<item id="24842" name="raw meat" chance="17625" />
+		<item id="5925" name="hardened bone" chance="10024" />
+		<item id="27044" name="rhino hide" chance="8694" />
+		<item id="27045" name="rhino horn" chance="4608" />
+		<item id="3973" name="tusk shield" chance="1378" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/sword_of_vengeance.xml b/data/monster/monsters/sword_of_vengeance.xml
new file mode 100644
index 0000000000..dd7a1e8a65
--- /dev/null
+++ b/data/monster/monsters/sword_of_vengeance.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Sword Of Vengeance" nameDescription="a sword of vengeance" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
+	</defenses>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/tazhadur.xml b/data/monster/monsters/tazhadur.xml
new file mode 100644
index 0000000000..eab415c30c
--- /dev/null
+++ b/data/monster/monsters/tazhadur.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Tazhadur" nameDescription="" experience="9000" speed="0" manacost="0">
+	<health now="10000" max="10000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="1" />
+		<flag canwalkonfire="1" />
+		<flag canwalkonpoison="1" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="120" max="202" />
+	</defenses>
+	<loot>
+		<item id="27593" name="dragon blood" chance="100000" />
+		<item id="27594" name="dragon tongue" chance="100000" />
+		<item id="5920" name="green dragon scale" chance="100000" />
+		<item id="27596" name="tooth of tazhadur" chance="100000" />
+		<item id="5877" name="green dragon leather" chance="98598" />
+		<item id="2148" name="gold coin" chance="90654" countmax="99" />
+		<item id="2672" name="dragon ham" chance="39252" />
+		<item id="2387" name="double axe" chance="10748" />
+		<item id="2201" name="dragon necklace" chance="8879" />
+		<item id="2516" name="dragon shield" chance="4673" />
+		<item id="2434" name="dragon hammer" chance="3738" />
+		<item id="2187" name="wand of inferno" chance="2804" />
+		<item id="2492" name="dragon scale mail" chance="2336" />
+		<item id="7588" name="strong health potion" chance="1869" />
+		<item id="7430" name="dragonbone staff" chance="935" />
+		<item id="2145" name="small diamond" chance="467" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_astral_source.xml b/data/monster/monsters/the_astral_source.xml
new file mode 100644
index 0000000000..b592403b34
--- /dev/null
+++ b/data/monster/monsters/the_astral_source.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="The Astral Source" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-401" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="467" />
+	</defenses>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_blazing_time_guardian.xml b/data/monster/monsters/the_blazing_time_guardian.xml
new file mode 100644
index 0000000000..a2d2c806ba
--- /dev/null
+++ b/data/monster/monsters/the_blazing_time_guardian.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="The Blazing Time Guardian" nameDescription="" experience="50000" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="200" />
+		<item id="7440" name="mastermind potion" chance="100000" />
+		<item id="2152" name="platinum coin" chance="100000" countmax="35" />
+		<item id="2214" name="ring of healing" chance="100000" />
+		<item id="2436" name="skull staff" chance="100000" />
+		<item id="18415" name="green crystal shard" chance="84615" countmax="3" />
+		<item id="18414" name="violet crystal shard" chance="69231" countmax="3" />
+		<item id="18413" name="blue crystal shard" chance="61538" countmax="3" />
+		<item id="7590" name="great mana potion" chance="53846" countmax="10" />
+		<item id="8473" name="ultimate health potion" chance="53846" countmax="10" />
+		<item id="8472" name="great spirit potion" chance="46154" countmax="5" />
+		<item id="12410" name="luminous orb" chance="46154" />
+		<item id="9970" name="small topaz" chance="38462" countmax="10" />
+		<item id="2197" name="stone skin amulet" chance="38462" />
+		<item id="2155" name="green gem" chance="30769" />
+		<item id="25172" name="silver token" chance="30769" />
+		<item id="7387" name="diamond sceptre" chance="23077" />
+		<item name="giant shimmering pearl" chance="23077" />
+		<item id="22396" name="cluster of solace" chance="15385" />
+		<item id="25377" name="gold token" chance="15385" />
+		<item id="5892" name="huge chunk of crude iron" chance="15385" />
+		<item id="5904" name="magic sulphur" chance="15385" />
+		<item id="2156" name="red gem" chance="15385" />
+		<item id="2150" name="small amethyst" chance="15385" countmax="10" />
+		<item id="2145" name="small diamond" chance="15385" countmax="10" />
+		<item id="2154" name="yellow gem" chance="15385" />
+		<item id="7897" name="glacier robe" chance="7692" />
+		<item id="27612" name="part of a rune (three)" chance="7692" />
+		<item id="2149" name="small emerald" chance="7692" countmax="10" />
+		<item id="2147" name="small ruby" chance="7692" countmax="10" />
+		<item id="8904" name="spellscroll of prophecies" chance="7692" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_distorted_astral_source.xml b/data/monster/monsters/the_distorted_astral_source.xml
new file mode 100644
index 0000000000..a58f83f6f8
--- /dev/null
+++ b/data/monster/monsters/the_distorted_astral_source.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="The Distorted Astral Source" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_enraged_thorn_knight.xml b/data/monster/monsters/the_enraged_thorn_knight.xml
new file mode 100644
index 0000000000..e6fbe24969
--- /dev/null
+++ b/data/monster/monsters/the_enraged_thorn_knight.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="The Enraged Thorn Knight" nameDescription="" experience="30000" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="100" />
+		<item id="2430" name="knight axe" chance="100000" />
+		<item id="2152" name="platinum coin" chance="100000" countmax="35" />
+		<item id="2214" name="ring of healing" chance="100000" />
+		<item id="18414" name="violet crystal shard" chance="72222" countmax="3" />
+		<item id="18415" name="green crystal shard" chance="70833" countmax="3" />
+		<item id="18413" name="blue crystal shard" chance="65278" countmax="3" />
+		<item id="8472" name="great spirit potion" chance="58333" countmax="10" />
+		<item id="8473" name="ultimate health potion" chance="54167" countmax="10" />
+		<item id="7443" name="bullseye potion" chance="51389" />
+		<item id="7590" name="great mana potion" chance="51389" countmax="10" />
+		<item id="7439" name="berserk potion" chance="48611" />
+		<item id="22537" name="trapped bad dream monster" chance="37500" />
+		<item id="10219" name="sacred tree amulet" chance="31944" />
+		<item id="2156" name="red gem" chance="29167" />
+		<item id="6500" name="demonic essence" chance="25000" />
+		<item id="2149" name="small emerald" chance="25000" countmax="10" />
+		<item id="2150" name="small amethyst" chance="23611" countmax="10" />
+		<item id="25377" name="gold token" chance="22222" />
+		<item id="2158" name="blue gem" chance="20833" />
+		<item name="giant shimmering pearl" chance="19444" />
+		<item id="5910" name="green piece of cloth" chance="19444" countmax="3" />
+		<item id="9809" name="rusted armor" chance="18056" />
+		<item id="25172" name="silver token" chance="18056" />
+		<item id="2145" name="small diamond" chance="16667" countmax="10" />
+		<item id="2147" name="small ruby" chance="16667" countmax="10" />
+		<item id="9970" name="small topaz" chance="16667" countmax="10" />
+		<item id="2155" name="green gem" chance="15278" />
+		<item id="2536" name="medusa shield" chance="11111" />
+		<item id="5884" name="spirit container" chance="11111" />
+		<item id="7452" name="spiked squelcher" chance="9722" />
+		<item id="2154" name="yellow gem" chance="9722" />
+		<item id="7407" name="haunted blade" chance="6944" />
+		<item id="2498" name="royal helmet" chance="5556" />
+		<item id="5885" name="flask of warrior's sweat" chance="4167" />
+		<item id="27610" name="part of a rune (one)" chance="4167" />
+		<item id="2153" name="violet gem" chance="4167" />
+		<item id="5015" name="mandrake" chance="2778" />
+		<item id="8880" name="swamplair armor" chance="2778" />
+		<item id="5887" name="piece of royal steel" chance="1389" countmax="2" />
+		<item id="6553" name="ruthless axe" chance="1389" />
+		<item id="27621" name="thorn seed" chance="1389" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_first_dragon.xml b/data/monster/monsters/the_first_dragon.xml
new file mode 100644
index 0000000000..56e7138f8e
--- /dev/null
+++ b/data/monster/monsters/the_first_dragon.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="The First Dragon" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="50000" max="50000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="1" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_freezing_time_guardian.xml b/data/monster/monsters/the_freezing_time_guardian.xml
new file mode 100644
index 0000000000..53ce13263d
--- /dev/null
+++ b/data/monster/monsters/the_freezing_time_guardian.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="The Freezing Time Guardian" nameDescription="" experience="50000" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="200" />
+		<item id="7440" name="mastermind potion" chance="100000" />
+		<item id="2152" name="platinum coin" chance="100000" countmax="35" />
+		<item id="2214" name="ring of healing" chance="100000" />
+		<item id="2436" name="skull staff" chance="100000" />
+		<item id="18415" name="green crystal shard" chance="90909" countmax="3" />
+		<item id="8473" name="ultimate health potion" chance="90909" countmax="10" />
+		<item id="12410" name="luminous orb" chance="63636" />
+		<item id="25172" name="silver token" chance="54545" />
+		<item id="7590" name="great mana potion" chance="45455" countmax="5" />
+		<item id="18413" name="blue crystal shard" chance="36364" countmax="3" />
+		<item id="2145" name="small diamond" chance="36364" countmax="10" />
+		<item id="2197" name="stone skin amulet" chance="36364" />
+		<item name="giant shimmering pearl" chance="27273" />
+		<item id="25377" name="gold token" chance="27273" />
+		<item id="8472" name="great spirit potion" chance="27273" countmax="10" />
+		<item id="2156" name="red gem" chance="27273" />
+		<item id="2149" name="small emerald" chance="27273" countmax="10" />
+		<item id="18414" name="violet crystal shard" chance="27273" countmax="3" />
+		<item id="7387" name="diamond sceptre" chance="18182" />
+		<item id="2150" name="small amethyst" chance="18182" countmax="10" />
+		<item id="5809" name="soul stone" chance="18182" />
+		<item id="2154" name="yellow gem" chance="18182" />
+		<item id="2158" name="blue gem" chance="9091" />
+		<item id="22396" name="cluster of solace" chance="9091" />
+		<item id="5892" name="huge chunk of crude iron" chance="9091" />
+		<item id="2539" name="phoenix shield" chance="9091" />
+		<item id="7417" name="runed sword" chance="9091" />
+		<item id="9970" name="small topaz" chance="9091" countmax="10" />
+		<item id="2153" name="violet gem" chance="9091" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
new file mode 100644
index 0000000000..5cf1224fcf
--- /dev/null
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="The Last Lore Keeper" nameDescription="" experience="45000" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="4" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="1" />
+		<flag canwalkonfire="1" />
+		<flag canwalkonpoison="1" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-1000" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+	<voices interval="5000" chance="10">
+		<voice sentence="You shall not pass!" yell="false" />
+		<voice sentence="You are not worthy!" yell="false" />
+		<voice sentence="This knowledge is forbidden!" yell="false" />
+	</voices>
+	<loot>
+		<item id="10549" name="ancient stone" chance="100000" />
+		<item id="2148" name="gold coin" chance="100000" countmax="200" />
+		<item id="24849" name="onyx chip" chance="100000" />
+		<item id="25377" name="gold token" chance="99627" countmax="3" />
+		<item id="5880" name="iron ore" chance="99627" />
+		<item id="5887" name="piece of royal steel" chance="99627" />
+		<item id="2152" name="platinum coin" chance="99627" countmax="35" />
+		<item id="25172" name="silver token" chance="99627" countmax="4" />
+		<item id="18413" name="blue crystal shard" chance="73881" countmax="6" />
+		<item id="18414" name="violet crystal shard" chance="67164" countmax="10" />
+		<item id="18415" name="green crystal shard" chance="64925" countmax="3" />
+		<item id="7590" name="great mana potion" chance="57836" countmax="10" />
+		<item id="8473" name="ultimate health potion" chance="54104" countmax="10" />
+		<item id="8472" name="great spirit potion" chance="53358" countmax="10" />
+		<item id="2156" name="red gem" chance="27985" />
+		<item id="2146" name="small sapphire" chance="27612" countmax="20" />
+		<item id="2154" name="yellow gem" chance="26119" />
+		<item id="2149" name="small emerald" chance="20896" countmax="20" />
+		<item id="9971" name="gold ingot" chance="20522" />
+		<item id="2158" name="blue gem" chance="19030" />
+		<item id="24850" name="opal" chance="17164" countmax="2" />
+		<item id="10577" name="mystical hourglass" chance="16791" />
+		<item id="9970" name="small topaz" chance="16418" countmax="20" />
+		<item name="giant shimmering pearl" chance="15672" />
+		<item id="2155" name="green gem" chance="15672" />
+		<item id="5909" name="white piece of cloth" chance="14925" countmax="4" />
+		<item id="5904" name="magic sulphur" chance="14552" />
+		<item id="2150" name="small amethyst" chance="14179" countmax="20" />
+		<item id="2147" name="small ruby" chance="14179" countmax="20" />
+		<item name="ring of red plasma" chance="12687" />
+		<item id="5891" name="enchanted chicken wing" chance="11567" />
+		<item id="2436" name="skull staff" chance="11194" />
+		<item id="2153" name="violet gem" chance="10821" />
+		<item id="7437" name="sapphire hammer" chance="9701" />
+		<item name="part of a rune" chance="5597" />
+		<item id="8857" name="silkweaver bow" chance="3731" />
+		<item id="8879" name="voltage armor" chance="2985" />
+		<item id="3972" name="bonelord helmet" chance="1866" />
+		<item id="2466" name="golden armor" chance="1866" />
+		<item id="2452" name="heavy mace" chance="1493" />
+		<item id="8904" name="spellscroll of prophecies" chance="1493" />
+		<item id="27632" name="astral glyph" chance="746" />
+		<item id="27631" name="astral source" chance="746" />
+		<item id="27627" name="forbidden tome" chance="746" />
+		<item id="27628" name="key to knowledge" chance="746" />
+		<item id="7418" name="nightmare blade" chance="746" />
+		<item id="18450" name="crystalline sword" chance="373" />
+		<item id="5809" name="soul stone" chance="373" />
+		<item id="22414" name="umbral hammer" chance="373" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_shielded_thorn_knight.xml b/data/monster/monsters/the_shielded_thorn_knight.xml
new file mode 100644
index 0000000000..84dd9732c6
--- /dev/null
+++ b/data/monster/monsters/the_shielded_thorn_knight.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="The Shielded Thorn Knight" nameDescription="" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
new file mode 100644
index 0000000000..a57ce1ee44
--- /dev/null
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="The Time Guardian" nameDescription="" experience="50000" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-744" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+	<voices interval="5000" chance="10">
+		<voice sentence="This place is sacred!" yell="false" />
+	</voices>
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="200" />
+		<item id="7440" name="mastermind potion" chance="100000" />
+		<item id="2152" name="platinum coin" chance="100000" countmax="30" />
+		<item id="2214" name="ring of healing" chance="100000" />
+		<item id="2436" name="skull staff" chance="100000" />
+		<item id="18415" name="green crystal shard" chance="73913" countmax="3" />
+		<item id="18413" name="blue crystal shard" chance="69565" countmax="3" />
+		<item id="7590" name="great mana potion" chance="69565" countmax="10" />
+		<item id="18414" name="violet crystal shard" chance="65217" countmax="3" />
+		<item id="8472" name="great spirit potion" chance="60870" countmax="10" />
+		<item id="8473" name="ultimate health potion" chance="43478" countmax="10" />
+		<item id="22396" name="cluster of solace" chance="34783" />
+		<item id="2197" name="stone skin amulet" chance="34783" />
+		<item id="12410" name="luminous orb" chance="30435" />
+		<item id="25172" name="silver token" chance="30435" />
+		<item id="2149" name="small emerald" chance="30435" countmax="10" />
+		<item id="25377" name="gold token" chance="26087" />
+		<item id="2158" name="blue gem" chance="21739" />
+		<item id="2155" name="green gem" chance="21739" />
+		<item id="9970" name="small topaz" chance="21739" countmax="10" />
+		<item id="2154" name="yellow gem" chance="21739" />
+		<item id="7387" name="diamond sceptre" chance="17391" />
+		<item id="5904" name="magic sulphur" chance="17391" />
+		<item id="11240" name="guardian boots" chance="13043" />
+		<item id="2145" name="small diamond" chance="13043" countmax="10" />
+		<item id="2147" name="small ruby" chance="13043" countmax="10" />
+		<item name="giant shimmering pearl" chance="8696" />
+		<item id="2156" name="red gem" chance="8696" />
+		<item id="2150" name="small amethyst" chance="8696" countmax="10" />
+		<item id="5809" name="soul stone" chance="8696" />
+		<item id="7896" name="glacier kilt" chance="4348" />
+		<item id="7897" name="glacier robe" chance="4348" />
+		<item id="5892" name="huge chunk of crude iron" chance="4348" />
+		<item id="13293" name="leather whip" chance="4348" />
+		<item id="7894" name="magma legs" chance="4348" />
+		<item id="27612" name="part of a rune (three)" chance="4348" />
+		<item id="2539" name="phoenix shield" chance="4348" />
+		<item id="2153" name="violet gem" chance="4348" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/thorn_minion.xml b/data/monster/monsters/thorn_minion.xml
new file mode 100644
index 0000000000..97e87171e2
--- /dev/null
+++ b/data/monster/monsters/thorn_minion.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Thorn Minion" nameDescription="a thorn minion" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-264" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/time_keeper.xml b/data/monster/monsters/time_keeper.xml
new file mode 100644
index 0000000000..d93c78a831
--- /dev/null
+++ b/data/monster/monsters/time_keeper.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Time Keeper" nameDescription="a time keeper" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="1" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-113" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/time_waster.xml b/data/monster/monsters/time_waster.xml
new file mode 100644
index 0000000000..e20f46d449
--- /dev/null
+++ b/data/monster/monsters/time_waster.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Time Waster" nameDescription="a Time Waster" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="1" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/twisted_shaper.xml b/data/monster/monsters/twisted_shaper.xml
new file mode 100644
index 0000000000..5530320c94
--- /dev/null
+++ b/data/monster/monsters/twisted_shaper.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Twisted Shaper" nameDescription="a twisted shaper" experience="1750" speed="280" manacost="0">
+	<health now="2500" max="2500" />
+	<look type="932" head="105" body="0" legs="0" feet="94" addons="1" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="1" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="1" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-100" />
+	</attacks>
+	<defenses armor="35" defense="35">
+		<defense name="healing" interval="2000" chance="20" min="0" max="300" />
+	</defenses>
+	<voices interval="5000" chance="10">
+		<voice sentence="Ti Jezz Kur Tar!" yell="false" />
+	</voices>
+	<loot>
+		<item id="2148" name="gold coin" chance="100000" countmax="175" />
+		<item id="2152" name="platinum coin" chance="75010" countmax="2" />
+		<item id="27039" name="cave turnip" chance="20014" countmax="2" />
+		<item id="27040" name="ancient belt buckle" chance="18933" />
+		<item id="27041" name="cracked alabaster vase" chance="17574" />
+		<item id="27043" name="tarnished rhino figurine" chance="14608" />
+		<item id="2666" name="meat" chance="10256" />
+		<item id="2167" name="energy ring" chance="7651" />
+		<item id="7591" name="great health potion" chance="7124" />
+		<item id="27046" name="ancient coin" chance="5502" />
+		<item id="2147" name="small ruby" chance="5461" />
+		<item id="2789" name="brown mushroom" chance="5184" countmax="3" />
+		<item id="5022" name="orichalcum pearl" chance="5128" countmax="5" />
+		<item id="15649" name="vortex bolt" chance="5031" countmax="4" />
+		<item id="24849" name="onyx chip" chance="4990" />
+		<item id="2189" name="wand of cosmic energy" chance="3617" />
+		<item id="27048" name="gemmed figurine" chance="970" />
+		<item id="2171" name="platinum amulet" chance="402" />
+		<item id="2114" name="piggy bank" chance="180" />
+		<item id="11343" name="piece of marble rock" chance="55" />
+	</loot>
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/unbeatable_dragon.xml b/data/monster/monsters/unbeatable_dragon.xml
new file mode 100644
index 0000000000..077027b01d
--- /dev/null
+++ b/data/monster/monsters/unbeatable_dragon.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Unbeatable Dragon" nameDescription="an unbeatable dragon" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="1" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/unbound_blightwalker.xml b/data/monster/monsters/unbound_blightwalker.xml
new file mode 100644
index 0000000000..cd028dafa7
--- /dev/null
+++ b/data/monster/monsters/unbound_blightwalker.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Unbound Blightwalker" nameDescription="an unbound blightwalker" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-99" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/unbound_defiler.xml b/data/monster/monsters/unbound_defiler.xml
new file mode 100644
index 0000000000..e2d9ceb4a2
--- /dev/null
+++ b/data/monster/monsters/unbound_defiler.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Unbound Defiler" nameDescription="an unbound defiler" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/unbound_demon.xml b/data/monster/monsters/unbound_demon.xml
new file mode 100644
index 0000000000..c25d906020
--- /dev/null
+++ b/data/monster/monsters/unbound_demon.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Unbound Demon" nameDescription="an unbound demon" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/unbound_demon_outcast.xml b/data/monster/monsters/unbound_demon_outcast.xml
new file mode 100644
index 0000000000..b0e0d5314f
--- /dev/null
+++ b/data/monster/monsters/unbound_demon_outcast.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Unbound Demon Outcast" nameDescription="an unbound demon outcast" experience="0" speed="0" manacost="0">
+	<health now="0" max="0" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="0" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
+</monster>
\ No newline at end of file
diff --git a/data/monster/monsters/zorvorax.xml b/data/monster/monsters/zorvorax.xml
new file mode 100644
index 0000000000..ece6bcc727
--- /dev/null
+++ b/data/monster/monsters/zorvorax.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<monster name="Zorvorax" nameDescription="" experience="9000" speed="0" manacost="0">
+	<health now="10000" max="10000" />
+	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="1" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="1" />
+		<flag canpushcreatures="1" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="1" />
+	</flags>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
+	<elements>
+		<element physicalPercent="0" />
+		<element energyPercent="0" />
+		<element earthPercent="0" />
+		<element firePercent="0" />
+		<element lifedrainPercent="100" />
+		<element manadrainPercent="0" />
+		<element drownPercent="0" />
+		<element icePercent="0" />
+		<element holyPercent="0" />
+		<element deathPercent="0" />
+	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="120" max="360" />
+	</defenses>
+	<loot>
+		<item id="27598" name="bones of zorvorax" chance="100000" />
+		<item id="6300" name="death ring" chance="100000" />
+		<item id="2148" name="gold coin" chance="100000" countmax="100" />
+		<item id="11233" name="unholy bone" chance="100000" countmax="2" />
+		<item id="9971" name="gold ingot" chance="76440" />
+		<item id="2152" name="platinum coin" chance="65969" countmax="3" />
+		<item id="7430" name="dragonbone staff" chance="35602" />
+		<item id="7590" name="great mana potion" chance="35602" countmax="3" />
+		<item id="7591" name="great health potion" chance="33508" countmax="4" />
+		<item id="8472" name="great spirit potion" chance="33508" countmax="3" />
+		<item id="5925" name="hardened bone" chance="30366" />
+		<item id="9810" name="slightly rusted armor" chance="27749" />
+		<item id="6500" name="demonic essence" chance="25131" />
+		<item id="5741" name="skull helmet" chance="5759" />
+		<item id="5944" name="soul orb" chance="4188" />
+		<item id="2173" name="amulet of loss" chance="1571" />
+		<item id="13291" name="maxilla maximus" chance="1047" />
+	</loot>
+</monster>
\ No newline at end of file

From 1bc384570814a3f31647b36c03a1e8b50a608b5f Mon Sep 17 00:00:00 2001
From: Torresmon <70948057+torresmon@users.noreply.github.com>
Date: Sun, 1 May 2022 21:48:22 -0300
Subject: [PATCH 02/38] Following TFS code style (#5)

---
 .../monsters/a_shielded_astral_glyph.xml      | 26 +++++++--------
 data/monster/monsters/an_astral_glyph.xml     | 22 ++++++-------
 data/monster/monsters/an_observer_eye.xml     | 16 +++++-----
 data/monster/monsters/angry_plant.xml         | 22 ++++++-------
 data/monster/monsters/animated_sword.xml      | 26 +++++++--------
 .../monsters/baby_dragon_(creature).xml       | 16 +++++-----
 data/monster/monsters/bound_astral_power.xml  | 26 +++++++--------
 data/monster/monsters/broken_shaper.xml       | 32 +++++++++----------
 data/monster/monsters/cave_parrot.xml         | 22 ++++++-------
 data/monster/monsters/corrupted_soul.xml      | 22 ++++++-------
 .../monsters/cosmic_energy_prism_a.xml        | 26 +++++++--------
 .../monsters/cosmic_energy_prism_b.xml        | 26 +++++++--------
 .../monsters/cosmic_energy_prism_c.xml        | 26 +++++++--------
 .../monsters/cosmic_energy_prism_d.xml        | 26 +++++++--------
 .../monsters/diamond_servant_replica.xml      | 22 ++++++-------
 data/monster/monsters/dragon_essence.xml      | 22 ++++++-------
 data/monster/monsters/dragon_warden.xml       | 22 ++++++-------
 data/monster/monsters/dragon_wrath.xml        | 22 ++++++-------
 data/monster/monsters/dragonking_zyrtarch.xml | 22 ++++++-------
 data/monster/monsters/fallen_challenger.xml   | 22 ++++++-------
 data/monster/monsters/frozen_minion.xml       | 22 ++++++-------
 .../monsters/gelidrazah_the_frozen.xml        | 26 +++++++--------
 .../monsters/golden_servant_replica.xml       | 22 ++++++-------
 data/monster/monsters/haunted_dragon.xml      | 22 ++++++-------
 data/monster/monsters/ice_dragon.xml          | 26 +++++++--------
 data/monster/monsters/icicle_(creature).xml   | 22 ++++++-------
 .../monster/monsters/iron_servant_replica.xml | 22 ++++++-------
 data/monster/monsters/kalyassa.xml            | 26 +++++++--------
 data/monster/monsters/lady_tenebris.xml       | 22 ++++++-------
 data/monster/monsters/lloyd.xml               | 22 ++++++-------
 data/monster/monsters/lost_time.xml           | 16 +++++-----
 .../monsters/melting_frozen_horror.xml        | 22 ++++++-------
 .../monster/monsters/mounted_thorn_knight.xml | 22 ++++++-------
 data/monster/monsters/orclops_doomhauler.xml  | 22 ++++++-------
 data/monster/monsters/orclops_ravager.xml     | 26 +++++++--------
 .../monsters/pi\303\261ata_dragon.xml"        | 20 ++++++------
 data/monster/monsters/possessed_tree.xml      | 22 ++++++-------
 data/monster/monsters/shadow_fiend.xml        | 22 ++++++-------
 data/monster/monsters/shadow_tentacle.xml     | 26 +++++++--------
 data/monster/monsters/shaper_matriarch.xml    | 26 +++++++--------
 data/monster/monsters/solid_frozen_horror.xml | 22 ++++++-------
 .../monsters/somewhat_beatable_dragon.xml     | 22 ++++++-------
 .../monsters/soul_of_dragonking_zyrtarch.xml  | 16 +++++-----
 data/monster/monsters/soulcatcher.xml         | 16 +++++-----
 data/monster/monsters/spirit_of_fertility.xml | 22 ++++++-------
 data/monster/monsters/stone_rhino.xml         | 26 +++++++--------
 data/monster/monsters/sword_of_vengeance.xml  | 26 +++++++--------
 data/monster/monsters/tazhadur.xml            | 26 +++++++--------
 data/monster/monsters/the_astral_source.xml   | 26 +++++++--------
 .../monsters/the_blazing_time_guardian.xml    | 22 ++++++-------
 .../monsters/the_distorted_astral_source.xml  | 22 ++++++-------
 .../monsters/the_enraged_thorn_knight.xml     | 22 ++++++-------
 data/monster/monsters/the_first_dragon.xml    | 16 +++++-----
 .../monsters/the_freezing_time_guardian.xml   | 22 ++++++-------
 .../monster/monsters/the_last_lore_keeper.xml | 22 ++++++-------
 .../monsters/the_shielded_thorn_knight.xml    | 22 ++++++-------
 data/monster/monsters/the_time_guardian.xml   | 22 ++++++-------
 data/monster/monsters/thorn_minion.xml        | 22 ++++++-------
 data/monster/monsters/time_keeper.xml         | 22 ++++++-------
 data/monster/monsters/time_waster.xml         | 16 +++++-----
 data/monster/monsters/twisted_shaper.xml      | 26 +++++++--------
 data/monster/monsters/unbeatable_dragon.xml   | 22 ++++++-------
 .../monster/monsters/unbound_blightwalker.xml | 22 ++++++-------
 data/monster/monsters/unbound_defiler.xml     | 22 ++++++-------
 data/monster/monsters/unbound_demon.xml       | 22 ++++++-------
 .../monsters/unbound_demon_outcast.xml        | 22 ++++++-------
 data/monster/monsters/zorvorax.xml            | 26 +++++++--------
 67 files changed, 758 insertions(+), 758 deletions(-)

diff --git a/data/monster/monsters/a_shielded_astral_glyph.xml b/data/monster/monsters/a_shielded_astral_glyph.xml
index e14b964f79..6526a809ca 100644
--- a/data/monster/monsters/a_shielded_astral_glyph.xml
+++ b/data/monster/monsters/a_shielded_astral_glyph.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-780" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="118" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +39,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-780" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="0" max="118" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/an_astral_glyph.xml b/data/monster/monsters/an_astral_glyph.xml
index bd550ac4c8..c8b38dd1df 100644
--- a/data/monster/monsters/an_astral_glyph.xml
+++ b/data/monster/monsters/an_astral_glyph.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/an_observer_eye.xml b/data/monster/monsters/an_observer_eye.xml
index 7398e4f865..f26a413d65 100644
--- a/data/monster/monsters/an_observer_eye.xml
+++ b/data/monster/monsters/an_observer_eye.xml
@@ -21,13 +21,7 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,7 +34,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="27585" name="Lightsphere" chance="100000" />
 	</loot>
diff --git a/data/monster/monsters/angry_plant.xml b/data/monster/monsters/angry_plant.xml
index 87c6a6805a..32efe26a06 100644
--- a/data/monster/monsters/angry_plant.xml
+++ b/data/monster/monsters/angry_plant.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/animated_sword.xml b/data/monster/monsters/animated_sword.xml
index 378bd7526d..c28eb06c6e 100644
--- a/data/monster/monsters/animated_sword.xml
+++ b/data/monster/monsters/animated_sword.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +39,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/baby_dragon_(creature).xml b/data/monster/monsters/baby_dragon_(creature).xml
index 146a3629a9..11870e32ab 100644
--- a/data/monster/monsters/baby_dragon_(creature).xml
+++ b/data/monster/monsters/baby_dragon_(creature).xml
@@ -21,13 +21,7 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,5 +34,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/bound_astral_power.xml b/data/monster/monsters/bound_astral_power.xml
index 53cf5d01bc..26a5228c35 100644
--- a/data/monster/monsters/bound_astral_power.xml
+++ b/data/monster/monsters/bound_astral_power.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-349" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="400" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +39,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-349" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="0" max="400" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/broken_shaper.xml b/data/monster/monsters/broken_shaper.xml
index a6fb34b6cc..86778c9d15 100644
--- a/data/monster/monsters/broken_shaper.xml
+++ b/data/monster/monsters/broken_shaper.xml
@@ -21,13 +21,15 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-200" />
+	</attacks>
+	<defenses armor="37" defense="37">
+		<defense name="healing" interval="2000" chance="20" min="0" max="327" />
+		<defense name="speed" interval="2000" chance="15" minspeedchange="300" maxspeedchange="300" duration="7000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,15 +42,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-200" />
-	</attacks>
-	<defenses armor="37" defense="37">
-		<defense name="healing" interval="2000" chance="20" min="0" max="327" />
-		<defense name="speed" interval="2000" chance="15" minspeedchange="300" maxspeedchange="300" duration="7000">
-			<attribute key="areaEffect" value="redshimmer" />
-		</defense>
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="&lt;grunt&gt;" yell="false" />
 		<voice sentence="Raar!!" yell="false" />
diff --git a/data/monster/monsters/cave_parrot.xml b/data/monster/monsters/cave_parrot.xml
index f2d72cbf1f..b4e2701a1b 100644
--- a/data/monster/monsters/cave_parrot.xml
+++ b/data/monster/monsters/cave_parrot.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" />
+	</attacks>
+	<defenses armor="2" defense="2" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" />
-	</attacks>
-	<defenses armor="2" defense="2" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/corrupted_soul.xml b/data/monster/monsters/corrupted_soul.xml
index 8a99724a82..dc1da7d57d 100644
--- a/data/monster/monsters/corrupted_soul.xml
+++ b/data/monster/monsters/corrupted_soul.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-200" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-200" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/cosmic_energy_prism_a.xml b/data/monster/monsters/cosmic_energy_prism_a.xml
index 06805dc4c7..d817894282 100644
--- a/data/monster/monsters/cosmic_energy_prism_a.xml
+++ b/data/monster/monsters/cosmic_energy_prism_a.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="*Zap!*" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/cosmic_energy_prism_b.xml b/data/monster/monsters/cosmic_energy_prism_b.xml
index 1098d778c1..95dfa0c96b 100644
--- a/data/monster/monsters/cosmic_energy_prism_b.xml
+++ b/data/monster/monsters/cosmic_energy_prism_b.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="*Zap!*" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/cosmic_energy_prism_c.xml b/data/monster/monsters/cosmic_energy_prism_c.xml
index 30adff5fd5..4dfcfb6341 100644
--- a/data/monster/monsters/cosmic_energy_prism_c.xml
+++ b/data/monster/monsters/cosmic_energy_prism_c.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="*Zap!*" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/cosmic_energy_prism_d.xml b/data/monster/monsters/cosmic_energy_prism_d.xml
index c3f8d69e4d..39ac167af3 100644
--- a/data/monster/monsters/cosmic_energy_prism_d.xml
+++ b/data/monster/monsters/cosmic_energy_prism_d.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="*Zap!*" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/diamond_servant_replica.xml b/data/monster/monsters/diamond_servant_replica.xml
index a5e5266e61..99ce9700a5 100644
--- a/data/monster/monsters/diamond_servant_replica.xml
+++ b/data/monster/monsters/diamond_servant_replica.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="25" defense="25" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="25" defense="25" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="93197" countmax="179" />
 		<item id="5944" name="soul orb" chance="45574" />
diff --git a/data/monster/monsters/dragon_essence.xml b/data/monster/monsters/dragon_essence.xml
index d72defae8f..e288c25ad8 100644
--- a/data/monster/monsters/dragon_essence.xml
+++ b/data/monster/monsters/dragon_essence.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/dragon_warden.xml b/data/monster/monsters/dragon_warden.xml
index c6d4c999b8..c8a1ae07e0 100644
--- a/data/monster/monsters/dragon_warden.xml
+++ b/data/monster/monsters/dragon_warden.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/dragon_wrath.xml b/data/monster/monsters/dragon_wrath.xml
index b21e361cb3..f0da8d9253 100644
--- a/data/monster/monsters/dragon_wrath.xml
+++ b/data/monster/monsters/dragon_wrath.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/dragonking_zyrtarch.xml b/data/monster/monsters/dragonking_zyrtarch.xml
index 7a8be4b52a..80e111ff43 100644
--- a/data/monster/monsters/dragonking_zyrtarch.xml
+++ b/data/monster/monsters/dragonking_zyrtarch.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/fallen_challenger.xml b/data/monster/monsters/fallen_challenger.xml
index a7c5cd6513..17e965ce39 100644
--- a/data/monster/monsters/fallen_challenger.xml
+++ b/data/monster/monsters/fallen_challenger.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/frozen_minion.xml b/data/monster/monsters/frozen_minion.xml
index 38a4a5873d..d560131ef4 100644
--- a/data/monster/monsters/frozen_minion.xml
+++ b/data/monster/monsters/frozen_minion.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-196" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-196" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/gelidrazah_the_frozen.xml b/data/monster/monsters/gelidrazah_the_frozen.xml
index d31b72fa88..146dbbc75a 100644
--- a/data/monster/monsters/gelidrazah_the_frozen.xml
+++ b/data/monster/monsters/gelidrazah_the_frozen.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-380" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="180" max="240" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-380" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="180" max="240" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="27593" name="dragon blood" chance="100000" />
 		<item id="27594" name="dragon tongue" chance="100000" />
diff --git a/data/monster/monsters/golden_servant_replica.xml b/data/monster/monsters/golden_servant_replica.xml
index 4fe345297f..b5fd07a570 100644
--- a/data/monster/monsters/golden_servant_replica.xml
+++ b/data/monster/monsters/golden_servant_replica.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="29" defense="29" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="29" defense="29" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="85419" countmax="137" />
 		<item id="7620" name="mana potion" chance="5290" />
diff --git a/data/monster/monsters/haunted_dragon.xml b/data/monster/monsters/haunted_dragon.xml
index 017613fb53..bb5222927e 100644
--- a/data/monster/monsters/haunted_dragon.xml
+++ b/data/monster/monsters/haunted_dragon.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="58" defense="58" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="58" defense="58" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="186" />
 		<item id="11233" name="unholy bone" chance="33910" />
diff --git a/data/monster/monsters/ice_dragon.xml b/data/monster/monsters/ice_dragon.xml
index 4401964b4f..3c3eb0f3db 100644
--- a/data/monster/monsters/ice_dragon.xml
+++ b/data/monster/monsters/ice_dragon.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
+	</attacks>
+	<defenses armor="41" defense="41">
+		<defense name="healing" interval="2000" chance="20" min="100" max="200" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
-	</attacks>
-	<defenses armor="41" defense="41">
-		<defense name="healing" interval="2000" chance="20" min="100" max="200" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="96552" countmax="219" />
 		<item id="2672" name="dragon ham" chance="78796" />
diff --git a/data/monster/monsters/icicle_(creature).xml b/data/monster/monsters/icicle_(creature).xml
index 96e8fa8211..d08d03d238 100644
--- a/data/monster/monsters/icicle_(creature).xml
+++ b/data/monster/monsters/icicle_(creature).xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-219" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-219" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/iron_servant_replica.xml b/data/monster/monsters/iron_servant_replica.xml
index 6c7eeb95b7..70d752bc93 100644
--- a/data/monster/monsters/iron_servant_replica.xml
+++ b/data/monster/monsters/iron_servant_replica.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-154" />
+	</attacks>
+	<defenses armor="17" defense="17" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-154" />
-	</attacks>
-	<defenses armor="17" defense="17" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="82462" countmax="55" />
 		<item id="9690" name="gear wheel" chance="5374" />
diff --git a/data/monster/monsters/kalyassa.xml b/data/monster/monsters/kalyassa.xml
index e7a65174ab..83c8cb8877 100644
--- a/data/monster/monsters/kalyassa.xml
+++ b/data/monster/monsters/kalyassa.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="600" max="700" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="600" max="700" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="27593" name="dragon blood" chance="100000" />
 		<item id="27594" name="dragon tongue" chance="100000" />
diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
index aaa18d04d3..eb02085ec2 100644
--- a/data/monster/monsters/lady_tenebris.xml
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-1800" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-1800" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="May the embrace of darkness kill you!" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index b9ccd9151b..64a7c16d16 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-1200" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-1200" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="100" />
 		<item id="9970" name="small topaz" chance="100000" countmax="10" />
diff --git a/data/monster/monsters/lost_time.xml b/data/monster/monsters/lost_time.xml
index cb40fb4f6f..59f55774de 100644
--- a/data/monster/monsters/lost_time.xml
+++ b/data/monster/monsters/lost_time.xml
@@ -21,13 +21,7 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,5 +34,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index 1726d94e09..a932f08666 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/mounted_thorn_knight.xml b/data/monster/monsters/mounted_thorn_knight.xml
index 5bdeab78f1..a59888fd00 100644
--- a/data/monster/monsters/mounted_thorn_knight.xml
+++ b/data/monster/monsters/mounted_thorn_knight.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-1032" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-1032" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/orclops_doomhauler.xml b/data/monster/monsters/orclops_doomhauler.xml
index ebdcb3a1a5..b841116af8 100644
--- a/data/monster/monsters/orclops_doomhauler.xml
+++ b/data/monster/monsters/orclops_doomhauler.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-215" />
+	</attacks>
+	<defenses armor="35" defense="35" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-215" />
-	</attacks>
-	<defenses armor="35" defense="35" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Me mash!" yell="false" />
 		<voice sentence="GRRRRR!" yell="false" />
diff --git a/data/monster/monsters/orclops_ravager.xml b/data/monster/monsters/orclops_ravager.xml
index 682fe8cca2..86ed776f95 100644
--- a/data/monster/monsters/orclops_ravager.xml
+++ b/data/monster/monsters/orclops_ravager.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-132" />
+	</attacks>
+	<defenses armor="35" defense="35">
+		<defense name="healing" interval="2000" chance="20" min="0" max="119" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-132" />
-	</attacks>
-	<defenses armor="35" defense="35">
-		<defense name="healing" interval="2000" chance="20" min="0" max="119" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Crushing! Smashing! Ripping! Yeah!!" yell="false" />
 		<voice sentence="It's clobberin time!" yell="false" />
diff --git "a/data/monster/monsters/pi\303\261ata_dragon.xml" "b/data/monster/monsters/pi\303\261ata_dragon.xml"
index bcc1916f10..53c01426e7 100644
--- "a/data/monster/monsters/pi\303\261ata_dragon.xml"
+++ "b/data/monster/monsters/pi\303\261ata_dragon.xml"
@@ -21,13 +21,9 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="0" />
-		<immunity outfit="0" />
-		<immunity invisible="0" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="130" max="170" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,9 +36,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="130" max="170" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="0" />
+		<immunity outfit="0" />
+		<immunity invisible="0" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="You can't have my treasures!" yell="false" />
 		<voice sentence="Hit me one more time!" yell="false" />
diff --git a/data/monster/monsters/possessed_tree.xml b/data/monster/monsters/possessed_tree.xml
index 48e06f06ec..1a1d488a8b 100644
--- a/data/monster/monsters/possessed_tree.xml
+++ b/data/monster/monsters/possessed_tree.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-162" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-162" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/shadow_fiend.xml b/data/monster/monsters/shadow_fiend.xml
index fe704a8d5c..04de05d989 100644
--- a/data/monster/monsters/shadow_fiend.xml
+++ b/data/monster/monsters/shadow_fiend.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/shadow_tentacle.xml b/data/monster/monsters/shadow_tentacle.xml
index c7d2b17c61..af5ff4ea02 100644
--- a/data/monster/monsters/shadow_tentacle.xml
+++ b/data/monster/monsters/shadow_tentacle.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-330" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +39,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-330" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/shaper_matriarch.xml b/data/monster/monsters/shaper_matriarch.xml
index 80e0a8b979..a3efb84588 100644
--- a/data/monster/monsters/shaper_matriarch.xml
+++ b/data/monster/monsters/shaper_matriarch.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-120" />
+	</attacks>
+	<defenses armor="40" defense="40">
+		<defense name="healing" interval="2000" chance="20" min="0" max="86" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-120" />
-	</attacks>
-	<defenses armor="40" defense="40">
-		<defense name="healing" interval="2000" chance="20" min="0" max="86" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Tar Marra Zik Tazz!" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index b97e55b399..1497bdce85 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-677" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-677" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/somewhat_beatable_dragon.xml b/data/monster/monsters/somewhat_beatable_dragon.xml
index 32926ce851..1c0c00e66b 100644
--- a/data/monster/monsters/somewhat_beatable_dragon.xml
+++ b/data/monster/monsters/somewhat_beatable_dragon.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
index 5f7d87a817..a0b0533744 100644
--- a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -21,13 +21,7 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,7 +34,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="200" />
 		<item id="2152" name="platinum coin" chance="100000" countmax="35" />
diff --git a/data/monster/monsters/soulcatcher.xml b/data/monster/monsters/soulcatcher.xml
index 12dad49f40..d4ab6560cc 100644
--- a/data/monster/monsters/soulcatcher.xml
+++ b/data/monster/monsters/soulcatcher.xml
@@ -21,13 +21,7 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,5 +34,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/spirit_of_fertility.xml b/data/monster/monsters/spirit_of_fertility.xml
index d505cfb9d5..00b869b4de 100644
--- a/data/monster/monsters/spirit_of_fertility.xml
+++ b/data/monster/monsters/spirit_of_fertility.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
diff --git a/data/monster/monsters/stone_rhino.xml b/data/monster/monsters/stone_rhino.xml
index 96cfebe898..d0f7f9fc25 100644
--- a/data/monster/monsters/stone_rhino.xml
+++ b/data/monster/monsters/stone_rhino.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-400" />
+	</attacks>
+	<defenses armor="72" defense="72">
+		<defense name="healing" interval="2000" chance="20" min="0" max="195" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-400" />
-	</attacks>
-	<defenses armor="72" defense="72">
-		<defense name="healing" interval="2000" chance="20" min="0" max="195" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="SNIFF!" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/sword_of_vengeance.xml b/data/monster/monsters/sword_of_vengeance.xml
index dd7a1e8a65..ffae813627 100644
--- a/data/monster/monsters/sword_of_vengeance.xml
+++ b/data/monster/monsters/sword_of_vengeance.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +39,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/tazhadur.xml b/data/monster/monsters/tazhadur.xml
index eab415c30c..44ffe7cb5e 100644
--- a/data/monster/monsters/tazhadur.xml
+++ b/data/monster/monsters/tazhadur.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="1" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="120" max="202" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="120" max="202" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="27593" name="dragon blood" chance="100000" />
 		<item id="27594" name="dragon tongue" chance="100000" />
diff --git a/data/monster/monsters/the_astral_source.xml b/data/monster/monsters/the_astral_source.xml
index b592403b34..7e500f3b96 100644
--- a/data/monster/monsters/the_astral_source.xml
+++ b/data/monster/monsters/the_astral_source.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-401" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="0" max="467" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +39,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-401" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="0" max="467" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_blazing_time_guardian.xml b/data/monster/monsters/the_blazing_time_guardian.xml
index a2d2c806ba..2fec92e4f7 100644
--- a/data/monster/monsters/the_blazing_time_guardian.xml
+++ b/data/monster/monsters/the_blazing_time_guardian.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="200" />
 		<item id="7440" name="mastermind potion" chance="100000" />
diff --git a/data/monster/monsters/the_distorted_astral_source.xml b/data/monster/monsters/the_distorted_astral_source.xml
index a58f83f6f8..c36c1b3316 100644
--- a/data/monster/monsters/the_distorted_astral_source.xml
+++ b/data/monster/monsters/the_distorted_astral_source.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_enraged_thorn_knight.xml b/data/monster/monsters/the_enraged_thorn_knight.xml
index e6fbe24969..cca69a57c8 100644
--- a/data/monster/monsters/the_enraged_thorn_knight.xml
+++ b/data/monster/monsters/the_enraged_thorn_knight.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="100" />
 		<item id="2430" name="knight axe" chance="100000" />
diff --git a/data/monster/monsters/the_first_dragon.xml b/data/monster/monsters/the_first_dragon.xml
index 56e7138f8e..a850eb0f34 100644
--- a/data/monster/monsters/the_first_dragon.xml
+++ b/data/monster/monsters/the_first_dragon.xml
@@ -21,13 +21,7 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,5 +34,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_freezing_time_guardian.xml b/data/monster/monsters/the_freezing_time_guardian.xml
index 53ce13263d..846770c8f3 100644
--- a/data/monster/monsters/the_freezing_time_guardian.xml
+++ b/data/monster/monsters/the_freezing_time_guardian.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="200" />
 		<item id="7440" name="mastermind potion" chance="100000" />
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index 5cf1224fcf..c472903c75 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="1" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-1000" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-1000" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="You shall not pass!" yell="false" />
 		<voice sentence="You are not worthy!" yell="false" />
diff --git a/data/monster/monsters/the_shielded_thorn_knight.xml b/data/monster/monsters/the_shielded_thorn_knight.xml
index 84dd9732c6..2dabac7fa8 100644
--- a/data/monster/monsters/the_shielded_thorn_knight.xml
+++ b/data/monster/monsters/the_shielded_thorn_knight.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
index a57ce1ee44..cdc287619c 100644
--- a/data/monster/monsters/the_time_guardian.xml
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-744" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,10 +37,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-744" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="This place is sacred!" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/thorn_minion.xml b/data/monster/monsters/thorn_minion.xml
index 97e87171e2..0fda10cf1c 100644
--- a/data/monster/monsters/thorn_minion.xml
+++ b/data/monster/monsters/thorn_minion.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-264" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-264" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/time_keeper.xml b/data/monster/monsters/time_keeper.xml
index d93c78a831..44115e6f68 100644
--- a/data/monster/monsters/time_keeper.xml
+++ b/data/monster/monsters/time_keeper.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-113" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-113" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/time_waster.xml b/data/monster/monsters/time_waster.xml
index e20f46d449..14eb63f992 100644
--- a/data/monster/monsters/time_waster.xml
+++ b/data/monster/monsters/time_waster.xml
@@ -21,13 +21,7 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,5 +34,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/twisted_shaper.xml b/data/monster/monsters/twisted_shaper.xml
index 5530320c94..d97e60e7f2 100644
--- a/data/monster/monsters/twisted_shaper.xml
+++ b/data/monster/monsters/twisted_shaper.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-100" />
+	</attacks>
+	<defenses armor="35" defense="35">
+		<defense name="healing" interval="2000" chance="20" min="0" max="300" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-100" />
-	</attacks>
-	<defenses armor="35" defense="35">
-		<defense name="healing" interval="2000" chance="20" min="0" max="300" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Ti Jezz Kur Tar!" yell="false" />
 	</voices>
diff --git a/data/monster/monsters/unbeatable_dragon.xml b/data/monster/monsters/unbeatable_dragon.xml
index 077027b01d..caaceb35fd 100644
--- a/data/monster/monsters/unbeatable_dragon.xml
+++ b/data/monster/monsters/unbeatable_dragon.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/unbound_blightwalker.xml b/data/monster/monsters/unbound_blightwalker.xml
index cd028dafa7..d2638e994e 100644
--- a/data/monster/monsters/unbound_blightwalker.xml
+++ b/data/monster/monsters/unbound_blightwalker.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-99" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-99" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/unbound_defiler.xml b/data/monster/monsters/unbound_defiler.xml
index e2d9ceb4a2..01b44023e3 100644
--- a/data/monster/monsters/unbound_defiler.xml
+++ b/data/monster/monsters/unbound_defiler.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/unbound_demon.xml b/data/monster/monsters/unbound_demon.xml
index c25d906020..6a2210ea4b 100644
--- a/data/monster/monsters/unbound_demon.xml
+++ b/data/monster/monsters/unbound_demon.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/unbound_demon_outcast.xml b/data/monster/monsters/unbound_demon_outcast.xml
index b0e0d5314f..bdc77868ae 100644
--- a/data/monster/monsters/unbound_demon_outcast.xml
+++ b/data/monster/monsters/unbound_demon_outcast.xml
@@ -21,13 +21,10 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+	</attacks>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,8 +37,11 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-	</attacks>
-	<defenses armor="10" defense="5" />
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 </monster>
\ No newline at end of file
diff --git a/data/monster/monsters/zorvorax.xml b/data/monster/monsters/zorvorax.xml
index ece6bcc727..9bb3085e98 100644
--- a/data/monster/monsters/zorvorax.xml
+++ b/data/monster/monsters/zorvorax.xml
@@ -21,13 +21,12 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
 	</flags>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
+	<attacks>
+		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
+	</attacks>
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" min="120" max="360" />
+	</defenses>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
@@ -40,12 +39,13 @@
 		<element holyPercent="0" />
 		<element deathPercent="0" />
 	</elements>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
-	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="120" max="360" />
-	</defenses>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity outfit="0" />
+		<immunity invisible="1" />
+		<immunity drunk="1" />
+		<immunity bleed="0" />
+	</immunities>
 	<loot>
 		<item id="27598" name="bones of zorvorax" chance="100000" />
 		<item id="6300" name="death ring" chance="100000" />

From 690e9e9b48fd3701bcd67d654cdb4c7a349fd04c Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Sun, 1 May 2022 23:44:15 -0300
Subject: [PATCH 03/38] Partial monster fixes

---
 .../monsters/a_shielded_astral_glyph.xml      |  45 ++++----
 data/monster/monsters/an_astral_glyph.xml     |  19 ++--
 data/monster/monsters/an_observer_eye.xml     |  28 ++---
 data/monster/monsters/angry_plant.xml         |   9 +-
 data/monster/monsters/animated_sword.xml      |  35 +++---
 .../monsters/baby_dragon_(creature).xml       |  50 +++++----
 data/monster/monsters/bound_astral_power.xml  |  30 ++---
 data/monster/monsters/broken_shaper.xml       |  30 ++---
 data/monster/monsters/cave_parrot.xml         |  23 +---
 data/monster/monsters/corrupted_soul.xml      | 105 ++++++++++--------
 .../monsters/cosmic_energy_prism_a.xml        |  27 ++---
 .../monsters/cosmic_energy_prism_b.xml        |  27 ++---
 .../monsters/cosmic_energy_prism_c.xml        |  27 ++---
 .../monsters/cosmic_energy_prism_d.xml        |  27 ++---
 .../monsters/diamond_servant_replica.xml      |  42 ++++---
 data/monster/monsters/dragon_essence.xml      |  41 ++++---
 data/monster/monsters/dragon_warden.xml       |  34 +++---
 data/monster/monsters/dragon_wrath.xml        |  50 +++++----
 data/monster/monsters/dragonking_zyrtarch.xml |  59 ++++++----
 data/monster/monsters/fallen_challenger.xml   |  39 +++----
 data/monster/monsters/frozen_minion.xml       |  42 +++----
 .../monsters/gelidrazah_the_frozen.xml        |   5 +-
 .../monsters/golden_servant_replica.xml       |   5 +-
 data/monster/monsters/haunted_dragon.xml      |   5 +-
 data/monster/monsters/ice_dragon.xml          |   5 +-
 data/monster/monsters/icicle_(creature).xml   |   5 +-
 .../monster/monsters/iron_servant_replica.xml |   5 +-
 data/monster/monsters/kalyassa.xml            |   5 +-
 data/monster/monsters/lady_tenebris.xml       |   5 +-
 data/monster/monsters/lloyd.xml               |   5 +-
 data/monster/monsters/lost_time.xml           |   5 +-
 .../monsters/melting_frozen_horror.xml        |   5 +-
 .../monster/monsters/mounted_thorn_knight.xml |   5 +-
 data/monster/monsters/orclops_doomhauler.xml  |   5 +-
 data/monster/monsters/orclops_ravager.xml     |   5 +-
 .../monsters/pi\303\261ata_dragon.xml"        |   5 +-
 data/monster/monsters/possessed_tree.xml      |   5 +-
 data/monster/monsters/shadow_fiend.xml        |   5 +-
 data/monster/monsters/shadow_tentacle.xml     |   5 +-
 data/monster/monsters/shaper_matriarch.xml    |   5 +-
 data/monster/monsters/solid_frozen_horror.xml |   5 +-
 .../monsters/somewhat_beatable_dragon.xml     |   5 +-
 .../monsters/soul_of_dragonking_zyrtarch.xml  |   5 +-
 data/monster/monsters/soulcatcher.xml         |   4 +-
 data/monster/monsters/spirit_of_fertility.xml |   3 +-
 data/monster/monsters/stone_rhino.xml         |   5 +-
 data/monster/monsters/sword_of_vengeance.xml  |   5 +-
 data/monster/monsters/tazhadur.xml            |   5 +-
 data/monster/monsters/the_astral_source.xml   |   5 +-
 .../monsters/the_blazing_time_guardian.xml    |   5 +-
 .../monsters/the_distorted_astral_source.xml  |   5 +-
 .../monsters/the_enraged_thorn_knight.xml     |   5 +-
 data/monster/monsters/the_first_dragon.xml    |   5 +-
 .../monsters/the_freezing_time_guardian.xml   |   5 +-
 .../monster/monsters/the_last_lore_keeper.xml |   5 +-
 .../monsters/the_shielded_thorn_knight.xml    |   5 +-
 data/monster/monsters/the_time_guardian.xml   |   5 +-
 data/monster/monsters/thorn_minion.xml        |   5 +-
 data/monster/monsters/time_keeper.xml         |   5 +-
 data/monster/monsters/time_waster.xml         |   5 +-
 data/monster/monsters/twisted_shaper.xml      |   5 +-
 data/monster/monsters/unbeatable_dragon.xml   |   5 +-
 .../monster/monsters/unbound_blightwalker.xml |   5 +-
 data/monster/monsters/unbound_defiler.xml     |   5 +-
 data/monster/monsters/unbound_demon.xml       |   5 +-
 .../monsters/unbound_demon_outcast.xml        |   5 +-
 data/monster/monsters/zorvorax.xml            |   5 +-
 67 files changed, 477 insertions(+), 539 deletions(-)

diff --git a/data/monster/monsters/a_shielded_astral_glyph.xml b/data/monster/monsters/a_shielded_astral_glyph.xml
index 6526a809ca..3c61da7df6 100644
--- a/data/monster/monsters/a_shielded_astral_glyph.xml
+++ b/data/monster/monsters/a_shielded_astral_glyph.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="A Shielded Astral Glyph" nameDescription="" experience="0" speed="0" manacost="0">
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="A Shielded Astral Glyph" nameDescription="a shielded astral glyph" race="undead" experience="0" speed="470">
+	<health now="50000" max="50000" />
+	<look typeex="26894" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,34 +16,35 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-780" />
+		<attack name="melee" interval="2000" skill="90" attack="100" />
+		<attack name="energy" interval="2000" chance="25" radius="3" target="0" min="-200" max="-400">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="25" radius="5" min="-200" max="-400">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
 		<defense name="healing" interval="2000" chance="20" min="0" max="118" />
 	</defenses>
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
+		<immunity physical="1" />
+		<immunity energy="1" />
+		<immunity fire="1" />
+		<immunity poison="1" />
+		<immunity ice="1" />
+		<immunity holy="1" />
+		<immunity death="1" />
+		<immunity lifedrain="1" />
+		<immunity manadrain="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity outfit="1" />
+		<immunity invisible="1" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/an_astral_glyph.xml b/data/monster/monsters/an_astral_glyph.xml
index c8b38dd1df..2609863e1f 100644
--- a/data/monster/monsters/an_astral_glyph.xml
+++ b/data/monster/monsters/an_astral_glyph.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="An Astral Glyph" nameDescription="" experience="0" speed="0" manacost="0">
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="An Astral Glyph" nameDescription="an astral glyph" race="energy" experience="0" speed="470">
+	<health now="50000" max="50000" />
+	<look typeex="26893" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,13 +16,18 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" skill="90" attack="100" />
+		<attack name="energy" interval="2000" chance="25" radius="3" target="0" min="-200" max="-400">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="25" radius="5" min="-200" max="-400">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5" />
 	<elements>
@@ -44,4 +49,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/an_observer_eye.xml b/data/monster/monsters/an_observer_eye.xml
index f26a413d65..462c4bfa09 100644
--- a/data/monster/monsters/an_observer_eye.xml
+++ b/data/monster/monsters/an_observer_eye.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="An Observer Eye" nameDescription="" experience="0" speed="0" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="An Observer Eye" nameDescription="An Observer Eye" race="blood" experience="0" speed="0" >
 	<health now="30000" max="30000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="925" corpse="5995" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,32 +16,22 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
+	<attacks>
+		<attack name="energy" interval="2000" chance="4" range="3" min="-3000" max="-5000">
+			<attribute key="shootEffect" value="energy" />
+		</attack>
+	</attacks>
 	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="27585" name="Lightsphere" chance="100000" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/angry_plant.xml b/data/monster/monsters/angry_plant.xml
index 32efe26a06..254e1e577a 100644
--- a/data/monster/monsters/angry_plant.xml
+++ b/data/monster/monsters/angry_plant.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Angry Plant" nameDescription="an angry plant" experience="0" speed="0" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Angry Plant" nameDescription="an angry plant" race="venom" experience="110" speed="0" >
 	<health now="10000" max="10000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="120" corpse="9679" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/animated_sword.xml b/data/monster/monsters/animated_sword.xml
index c28eb06c6e..e5d3ec3444 100644
--- a/data/monster/monsters/animated_sword.xml
+++ b/data/monster/monsters/animated_sword.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Animated Sword" nameDescription="an animated sword" experience="0" speed="0" manacost="0">
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Animated Sword" nameDescription="an animated sword" race="fire" experience="0" speed="360" >
+	<health now="2000" max="2000" />
+	<look typeex="26895" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,34 +16,27 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
+		<attack name="manadrain" interval="2000" chance="20" radius="6" min="-40" max="-160">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</attack>
+		<attack name="berserk" interval="2000" chance="15" min="-40" max="-160" />
+		<attack name="energy" interval="2000" chance="15" length="4" spread="0" min="-40" max="-100">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
 		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
 	</defenses>
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
+		<immunity lifedrain="1" />
 		<immunity invisible="1" />
+		<immunity paralyze="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/baby_dragon_(creature).xml b/data/monster/monsters/baby_dragon_(creature).xml
index 11870e32ab..2ecc8efb9e 100644
--- a/data/monster/monsters/baby_dragon_(creature).xml
+++ b/data/monster/monsters/baby_dragon_(creature).xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Baby Dragon" nameDescription="a baby dragon" experience="0" speed="0" manacost="0">
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Baby Dragon" nameDescription="a baby dragon" race="blood" experience="185" speed="176">
+	<health now="380" max="380" />
+	<look type="271" corpse="7621" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,29 +16,39 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<defenses armor="10" defense="5" />
+	<attacks>
+		<attack name="melee" interval="2000" skill="45" attack="20" />
+		<attack name="fire" interval="2000" chance="12" length="8" spread="3" min="-60" max="-90">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="14" radius="4" target="1" range="7" min="-30" max="-55">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+	</attacks>
+	<defenses armor="25" defense="38">
+		<defense name="healing" interval="2000" chance="13" min="5" max="35">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="100" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element earthPercent="75" />
+		<element icePercent="-10" />
+		<element energyPercent="-5" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
+		<immunity fire="1" />
+		<immunity energy="1" />
+		<immunity death="1" />
+		<immunity ice="1" />
+		<immunity earth="1" />
+		<immunity holy="1" />
+		<immunity physical="1" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/bound_astral_power.xml b/data/monster/monsters/bound_astral_power.xml
index 26a5228c35..a57b59c116 100644
--- a/data/monster/monsters/bound_astral_power.xml
+++ b/data/monster/monsters/bound_astral_power.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Bound Astral Power" nameDescription="" experience="0" speed="0" manacost="0">
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<monster name="Bound Astral Power" nameDescription="a bound astral power" race="energy" experience="0" speed="350">
+	<health now="70000" max="70000" />
+	<look type="879" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,34 +16,26 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-349" />
+		<attack name="energy" interval="2000" chance="15" length="6" spread="2" min="-400" max="-500">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" radius="5" target="1" min="-300" max="-450">
+			<attribute key="areaEffect" value="energyarea" />
+			<attribute key="shootEffect" value="energy" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
 		<defense name="healing" interval="2000" chance="20" min="0" max="400" />
 	</defenses>
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/broken_shaper.xml b/data/monster/monsters/broken_shaper.xml
index 86778c9d15..e32b8eb6e3 100644
--- a/data/monster/monsters/broken_shaper.xml
+++ b/data/monster/monsters/broken_shaper.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Broken Shaper" nameDescription="a broken shaper" experience="1600" speed="310" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Broken Shaper" nameDescription="a broken shaper" race="blood" experience="1600" speed="310" manacost="290">
 	<health now="2200" max="2200" />
 	<look type="932" head="94" body="76" legs="0" feet="82" addons="1" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,31 +16,31 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-200" />
+		<attack name="physical" interval="2000" chance="35" range="7" target="1" min="0" max="-150">
+			<attribute key="shootEffect" value="smallstone" />
+		</attack>
+		<attack name="physical" interval="2000" chance="35" length="5" spread="0" min="0" max="-100">
+			<attribute key="areaEffect" value="rednote" />
+		</attack>
 	</attacks>
 	<defenses armor="37" defense="37">
-		<defense name="healing" interval="2000" chance="20" min="0" max="327" />
+		<defense name="healing" interval="2000" chance="20" min="0" max="327">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
 		<defense name="speed" interval="2000" chance="15" minspeedchange="300" maxspeedchange="300" duration="7000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="-20" />
+		<element earthPercent="20" />
+		<element firePercent="-15" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
@@ -82,4 +82,4 @@
 		<item id="5911" name="red piece of cloth" chance="536" />
 		<item id="2195" name="boots of haste" chance="226" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/cave_parrot.xml b/data/monster/monsters/cave_parrot.xml
index b4e2701a1b..051bafd375 100644
--- a/data/monster/monsters/cave_parrot.xml
+++ b/data/monster/monsters/cave_parrot.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Cave Parrot" nameDescription="a cave parrot" experience="0" speed="320" manacost="0">
+<monster name="Cave Parrot" nameDescription="a cave parrot" experience="0" speed="320" manacost="250">
 	<health now="30" max="30" />
-	<look type="217" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="217" corpse="6056" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
-		<flag summonable="0" />
+		<flag summonable="1" />
 		<flag convinceable="1" />
 		<flag illusionable="0" />
 		<flag isboss="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -25,23 +24,9 @@
 		<attack name="melee" interval="2000" chance="100" />
 	</attacks>
 	<defenses armor="2" defense="2" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/corrupted_soul.xml b/data/monster/monsters/corrupted_soul.xml
index dc1da7d57d..11e665b06f 100644
--- a/data/monster/monsters/corrupted_soul.xml
+++ b/data/monster/monsters/corrupted_soul.xml
@@ -1,47 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Corrupted Soul" nameDescription="a corrupted soul" experience="1300" speed="0" manacost="0">
-	<health now="1100" max="1100" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
-	<targetchange interval="2000" chance="0" />
-	<flags>
-		<flag attackable="1" />
-		<flag hostile="1" />
-		<flag summonable="0" />
-		<flag convinceable="0" />
-		<flag illusionable="0" />
-		<flag isboss="0" />
-		<flag ignorespawnblock="0" />
-		<flag pushable="0" />
-		<flag canpushitems="0" />
-		<flag canpushcreatures="0" />
-		<flag staticattack="90" />
-		<flag targetdistance="1" />
-		<flag healthhidden="0" />
-		<flag canwalkonenergy="0" />
-		<flag canwalkonfire="0" />
-		<flag canwalkonpoison="0" />
-	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-200" />
-	</attacks>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
-</monster>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Corrupted Soul" nameDescription="a corrupted soul" race="undead" experience="1300" speed="210">
+    <health now="1100" max="1100" />
+	<look type="355" corpse="0" />
+    <targetchange interval="2000" chance="0" />
+    <flags>
+        <flag attackable="1" />
+        <flag hostile="1" />
+        <flag summonable="0" />
+        <flag convinceable="0" />
+        <flag illusionable="0" />
+        <flag isboss="0" />
+        <flag ignorespawnblock="0" />
+        <flag pushable="0" />
+        <flag canpushitems="0" />
+        <flag canpushcreatures="0" />
+        <flag staticattack="90" />
+        <flag targetdistance="1" />
+        <flag healthhidden="0" />
+        <flag canwalkonenergy="0" />
+        <flag canwalkonfire="0" />
+        <flag canwalkonpoison="0" />
+    </flags>
+    <attacks>
+        <attack name="melee" interval="2000" skill="60" attack="60" />
+        <attack name="souleater drown" interval="2000" chance="9" />
+        <attack name="ice" interval="2000" chance="8" radius="1" target="1" min="-50" max="-100">
+            <attribute key="shootEffect" value="ice" />
+            <attribute key="areaEffect" value="iceattack" />
+        </attack>
+        <attack name="lifedrain" interval="2000" chance="14" radius="4" target="0" min="-10" max="-60">
+            <attribute key="areaEffect" value="redshimmer" />
+        </attack>
+        <attack name="souleater wave" interval="2000" chance="12" min="-100" max="-210" />
+    </attacks>
+    <defenses armor="25" defense="20">
+        <defense name="invisible" interval="2000" chance="12" duration="4000">
+            <attribute key="areaEffect" value="poff" />
+        </defense>
+        <defense name="healing" interval="2000" chance="16" min="130" max="205">
+            <attribute key="areaEffect" value="redshimmer" />
+        </defense>
+    </defenses>
+    <elements>
+        <element holyPercent="-10" />
+        <element icePercent="50" />
+        <element firePercent="-10" />
+        <element energyPercent="-10" />
+        <element physicalPercent="70" />
+    </elements>
+    <immunities>
+        <immunity paralyze="1" />
+        <immunity invisible="1" />
+        <immunity lifedrain="1" />
+        <immunity drown="1" />
+        <immunity death="1" />
+    </immunities>
+</monster>
diff --git a/data/monster/monsters/cosmic_energy_prism_a.xml b/data/monster/monsters/cosmic_energy_prism_a.xml
index d817894282..8af7e37b11 100644
--- a/data/monster/monsters/cosmic_energy_prism_a.xml
+++ b/data/monster/monsters/cosmic_energy_prism_a.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Cosmic Energy Prism A" nameDescription="" experience="840" speed="0" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Cosmic Energy Prism A" nameDescription="cosmic energy prism A" race="energy" experience="840" speed="0">
 	<health now="1000" max="1000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look typeex="1548" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -28,25 +28,20 @@
 		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="50" />
+		<element earthPercent="50" />
+		<element energyPercent="50" />
+		<element deathPercent="50" />
+		<element physicalPercent="50" />
+		<element holyPercent="50" />
+		<element icePercent="50" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="*Zap!*" yell="false" />
 	</voices>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/cosmic_energy_prism_b.xml b/data/monster/monsters/cosmic_energy_prism_b.xml
index 95dfa0c96b..acb96268bf 100644
--- a/data/monster/monsters/cosmic_energy_prism_b.xml
+++ b/data/monster/monsters/cosmic_energy_prism_b.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Cosmic Energy Prism B" nameDescription="" experience="840" speed="0" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Cosmic Energy Prism B" nameDescription="cosmic energy prism B" race="energy" experience="840" speed="0">
 	<health now="1000" max="1000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look typeex="1548" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -28,25 +28,20 @@
 		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="50" />
+		<element earthPercent="50" />
+		<element energyPercent="50" />
+		<element deathPercent="50" />
+		<element physicalPercent="50" />
+		<element holyPercent="50" />
+		<element icePercent="50" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="*Zap!*" yell="false" />
 	</voices>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/cosmic_energy_prism_c.xml b/data/monster/monsters/cosmic_energy_prism_c.xml
index 4dfcfb6341..5b448f7c72 100644
--- a/data/monster/monsters/cosmic_energy_prism_c.xml
+++ b/data/monster/monsters/cosmic_energy_prism_c.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Cosmic Energy Prism C" nameDescription="" experience="840" speed="0" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Cosmic Energy Prism C" nameDescription="cosmic energy prism C" race="energy" experience="840" speed="0">
 	<health now="1000" max="1000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look typeex="1548" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -28,25 +28,20 @@
 		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="50" />
+		<element earthPercent="50" />
+		<element energyPercent="50" />
+		<element deathPercent="50" />
+		<element physicalPercent="50" />
+		<element holyPercent="50" />
+		<element icePercent="50" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="*Zap!*" yell="false" />
 	</voices>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/cosmic_energy_prism_d.xml b/data/monster/monsters/cosmic_energy_prism_d.xml
index 39ac167af3..c93bb78bcb 100644
--- a/data/monster/monsters/cosmic_energy_prism_d.xml
+++ b/data/monster/monsters/cosmic_energy_prism_d.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Cosmic Energy Prism D" nameDescription="" experience="840" speed="0" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Cosmic Energy Prism D" nameDescription="cosmic energy prism D" race="undead" experience="840" speed="0">
 	<health now="1000" max="1000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look typeex="1548" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -28,25 +28,20 @@
 		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="50" />
+		<element earthPercent="50" />
+		<element energyPercent="50" />
+		<element deathPercent="50" />
+		<element physicalPercent="50" />
+		<element holyPercent="50" />
+		<element icePercent="50" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="*Zap!*" yell="false" />
 	</voices>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/diamond_servant_replica.xml b/data/monster/monsters/diamond_servant_replica.xml
index 99ce9700a5..0fa771fcf5 100644
--- a/data/monster/monsters/diamond_servant_replica.xml
+++ b/data/monster/monsters/diamond_servant_replica.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Diamond Servant Replica" nameDescription="a diamond servant replica" experience="700" speed="172" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Diamond Servant Replica" nameDescription="a diamond servant replica" experience="700" speed="172" >
 	<health now="2000" max="2000" />
-	<look type="397" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="397" corpse="13485" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,33 +16,39 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="energy" interval="2000" chance="11" radius="3" min="-100" max="-210">
+			<attribute key="areaEffect" value="yellowenergy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="10" range="7" target="1" min="-75" max="-125">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="wyrm wave" interval="2000" chance="9" min="-70" max="-120" />
 	</attacks>
-	<defenses armor="25" defense="25" />
+	<defenses armor="40" defense="45">
+		<defense name="healing" interval="2000" chance="11" min="50" max="150">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+		<defense name="healing" interval="2000" chance="10" min="0" max="0">
+			<attribute key="areaEffect" value="yellowenergy" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element earthPercent="80" />
+		<element firePercent="10" />
+		<element icePercent="-5" />
+		<element deathPercent="-5" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="93197" countmax="179" />
@@ -63,4 +69,4 @@
 		<item id="7428" name="bonebreaker" chance="82" />
 		<item id="8878" name="crystalline armor" chance="41" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/dragon_essence.xml b/data/monster/monsters/dragon_essence.xml
index e288c25ad8..43db389cac 100644
--- a/data/monster/monsters/dragon_essence.xml
+++ b/data/monster/monsters/dragon_essence.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Dragon Essence" nameDescription="a Dragon Essence" experience="0" speed="0" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Dragon Essence" nameDescription="a dragon essence" race="undead" experience="0" speed="250" >
 	<health now="30000" max="30000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="248" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,32 +16,37 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" />
+		<attack name="fire" interval="2000" chance="18" length="8" spread="0" min="-850" max="-1250">
+			<attribute key="areaEffect" value="icearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" range="7" radius="3" target="0" min="-450" max="-720">
+			<attribute key="areaEffect" value="fire" />
+		</attack>
+		<attack name="fire" interval="2000" chance="12" length="8" spread="3" min="-750" max="-880">
+			<attribute key="areaEffect" value="fire" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="22" defense="35">
+		<defense name="healing" interval="2000" chance="16" min="150" max="200">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+		<defense name="speed" interval="2000" chance="8" speedchange="262" duration="7000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element poisonPercent="10" />
+		<element energyPercent="10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/dragon_warden.xml b/data/monster/monsters/dragon_warden.xml
index c8a1ae07e0..b0897d6de5 100644
--- a/data/monster/monsters/dragon_warden.xml
+++ b/data/monster/monsters/dragon_warden.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Dragon Warden" nameDescription="a Dragon Warden" experience="0" speed="0" manacost="0">
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Dragon Warden" nameDescription="a dragon warden" race="blood" experience="4600" speed="320">
+	<health now="2800" max="2800" />
+	<look type="947" head="5" body="5" legs="8" feet="8" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,32 +16,24 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+		<attack name="fire" interval="2000" chance="17" length="8" spread="3" min="-150" max="-230">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<defenses armor="45" defense="35">
+		<defense name="healing" interval="2000" chance="9" min="70" max="300">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/dragon_wrath.xml b/data/monster/monsters/dragon_wrath.xml
index f0da8d9253..b01cd4252c 100644
--- a/data/monster/monsters/dragon_wrath.xml
+++ b/data/monster/monsters/dragon_wrath.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Dragon Wrath" nameDescription="a dragon wrath" experience="0" speed="0" manacost="0">
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Dragon Wrath" nameDescription="a dragon wrath" race="undead" experience="4600" speed="320">
+	<health now="7800" max="7800" />
+	<look type="351" corpse="11362" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,32 +16,44 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="ghastly dragon wave" interval="2000" chance="10" min="-50" max="-250" />
+		<attack name="ghastly dragon curse" interval="2000" chance="10" range="7" />
+		<attack name="poisoncondition" interval="2000" chance="10" range="7" min="-920" max="-1260">
+			<attribute key="shootEffect" value="death" />
+			<attribute key="areaEffect" value="smallclouds" />
+		</attack>
+		<attack name="ghastly dragon paralyze" interval="2000" chance="9" range="7" />
+		<attack name="lifedrain" interval="2000" chance="20" range="7" target="1" min="-90" max="-250">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
+		<attack name="death" interval="2000" chance="13" radius="4" target="0" min="-70" max="-180">
+			<attribute key="areaEffect" value="mortarea" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="45" defense="35">
+		<defense name="healing" interval="2000" chance="9" min="70" max="300">
+			<attribute key="areaEffect" value="greenshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="10" />
+		<element icePercent="50" />
+		<element physicalPercent="-10" />
+		<element holyPercent="-15" />
+		<element energyPercent="-10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
+		<immunity death="1" />
+		<immunity lifedrain="1" />
+		<immunity earth="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/dragonking_zyrtarch.xml b/data/monster/monsters/dragonking_zyrtarch.xml
index 80e111ff43..1fa7c0b9c6 100644
--- a/data/monster/monsters/dragonking_zyrtarch.xml
+++ b/data/monster/monsters/dragonking_zyrtarch.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Dragonking Zyrtarch" nameDescription="" experience="0" speed="0" manacost="0">
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Dragonking Zyrtarch" nameDescription="Dragonking Zyrtarch" race="fire" experience="1600" speed="280">
+	<health now="150000" max="150000" />
+	<look type="938" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,32 +16,45 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" skill="112" attack="85" />
+		<attack name="fire" interval="2000" chance="20" range="7" target="1" min="-110" max="-495">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="20" range="7" target="1" radius="4" min="-110" max="-495">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="physical" interval="2000" chance="20" radius="5" min="-110" max="-495">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
+		<attack name="firecondition" interval="2000" chance="15" radius="5" min="-1100" max="-1100">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" length="9" spread="4" min="-710" max="-895">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" length="9" spread="0" min="-710" max="-895">
+			<attribute key="areaEffect" value="fire" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="100" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<defenses armor="52" defense="64" />
 	<immunities>
+		<immunity fire="1" />
+		<immunity drown="1" />
+		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity energy="1" />
+		<immunity ice="1" />
+		<immunity earth="1" />
+		<immunity death="1" />
+		<immunity holy="1" />
+		<immunity physical="1" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/fallen_challenger.xml b/data/monster/monsters/fallen_challenger.xml
index 17e965ce39..6895f014c7 100644
--- a/data/monster/monsters/fallen_challenger.xml
+++ b/data/monster/monsters/fallen_challenger.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Fallen Challenger" nameDescription="a fallen challenger" experience="0" speed="0" manacost="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Fallen Challenger" nameDescription="a fallen challenger" race="undead" experience="0" speed="300">
 	<health now="9000" max="9000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="231" corpse="1397" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,32 +16,27 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+		<attack name="lifedrain" interval="1000" chance="13" radius="1" target="1" min="-400" max="-600" />
+		<attack name="death" interval="3000" chance="34" range="1" radius="1" target="1" min="-180" max="-500">
+			<attribute key="shootEffect" value="death" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<defenses armor="50" defense="55">
+		<defense name="healing" interval="5000" chance="25" min="60" max="100">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity invisible="1" />
+		<immunity energy="1" />
+		<immunity fire="1" />
+		<immunity poison="1" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/frozen_minion.xml b/data/monster/monsters/frozen_minion.xml
index d560131ef4..8d7af1e118 100644
--- a/data/monster/monsters/frozen_minion.xml
+++ b/data/monster/monsters/frozen_minion.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Frozen Minion" nameDescription="a frozen minion" experience="0" speed="0" manacost="0">
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Frozen Minion" nameDescription="a frozen minion" race="blood" experience="230" speed="200">
+	<health now="2200" max="2200" />
+	<look type="53" corpse="5998" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -16,32 +16,26 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-196" />
+		<attack name="ice" interval="2000" chance="15" target="1" min="-150" max="-200">
+			<attribute key="shootEffect" value="snowball" />
+		</attack>
+		<attack name="frozen minion wave" interval="2000" chance="25" />
+		<attack name="frozen minion beam" interval="2000" chance="25" />
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="7" defense="9">
+		<defense name="frozen minion heal" interval="2000" chance="15" />
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="50" />
+		<element holyPercent="10" />
+		<element earthPercent="-10" />
+		<element energyPercent="-10" />
+		<element deathPercent="-15" />
 	</elements>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/gelidrazah_the_frozen.xml b/data/monster/monsters/gelidrazah_the_frozen.xml
index 146dbbc75a..b82a8022fd 100644
--- a/data/monster/monsters/gelidrazah_the_frozen.xml
+++ b/data/monster/monsters/gelidrazah_the_frozen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Gelidrazah The Frozen" nameDescription="" experience="9000" speed="0" manacost="0">
+<monster name="Gelidrazah The Frozen" nameDescription="" experience="9000" speed="0" >
 	<health now="10000" max="10000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
@@ -67,4 +66,4 @@
 		<item id="7409" name="northern star" chance="823" />
 		<item id="2177" name="life crystal" chance="412" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/golden_servant_replica.xml b/data/monster/monsters/golden_servant_replica.xml
index b5fd07a570..3ed18a42e7 100644
--- a/data/monster/monsters/golden_servant_replica.xml
+++ b/data/monster/monsters/golden_servant_replica.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Golden Servant Replica" nameDescription="a golden servant replica" experience="450" speed="210" manacost="0">
+<monster name="Golden Servant Replica" nameDescription="a golden servant replica" experience="450" speed="210" >
 	<health now="2000" max="2000" />
 	<look type="396" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -56,4 +55,4 @@
 		<item id="13758" name="slime mould" chance="258" />
 		<item id="13938" name="golden can of oil" chance="43" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/haunted_dragon.xml b/data/monster/monsters/haunted_dragon.xml
index bb5222927e..f71bbf7a11 100644
--- a/data/monster/monsters/haunted_dragon.xml
+++ b/data/monster/monsters/haunted_dragon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Haunted Dragon" nameDescription="a haunted dragon" experience="6500" speed="280" manacost="0">
+<monster name="Haunted Dragon" nameDescription="a haunted dragon" experience="6500" speed="280" >
 	<health now="6500" max="6500" />
 	<look type="231" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
@@ -69,4 +68,4 @@
 		<item id="7402" name="dragon slayer" chance="513" />
 		<item id="8889" name="skullcracker armor" chance="192" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/ice_dragon.xml b/data/monster/monsters/ice_dragon.xml
index 3c3eb0f3db..207f32aa3b 100644
--- a/data/monster/monsters/ice_dragon.xml
+++ b/data/monster/monsters/ice_dragon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Ice Dragon" nameDescription="an ice dragon" experience="2300" speed="212" manacost="0">
+<monster name="Ice Dragon" nameDescription="an ice dragon" experience="2300" speed="212" >
 	<health now="2500" max="2500" />
 	<look type="947" head="0" body="9" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -64,4 +63,4 @@
 		<item id="2177" name="life crystal" chance="669" />
 		<item id="2492" name="dragon scale mail" chance="257" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/icicle_(creature).xml b/data/monster/monsters/icicle_(creature).xml
index d08d03d238..7146da30ea 100644
--- a/data/monster/monsters/icicle_(creature).xml
+++ b/data/monster/monsters/icicle_(creature).xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Icicle" nameDescription="an icicle" experience="0" speed="0" manacost="0">
+<monster name="Icicle" nameDescription="an icicle" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/iron_servant_replica.xml b/data/monster/monsters/iron_servant_replica.xml
index 70d752bc93..1184071ff5 100644
--- a/data/monster/monsters/iron_servant_replica.xml
+++ b/data/monster/monsters/iron_servant_replica.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Iron Servant Replica" nameDescription="an iron servant replica" experience="210" speed="190" manacost="0">
+<monster name="Iron Servant Replica" nameDescription="an iron servant replica" experience="210" speed="190" >
 	<health now="1000" max="1000" />
 	<look type="395" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -52,4 +51,4 @@
 		<item id="9808" name="heavily rusted armor" chance="489" />
 		<item id="13758" name="slime mould" chance="269" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/kalyassa.xml b/data/monster/monsters/kalyassa.xml
index 83c8cb8877..98691e84a6 100644
--- a/data/monster/monsters/kalyassa.xml
+++ b/data/monster/monsters/kalyassa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Kalyassa" nameDescription="" experience="9000" speed="0" manacost="0">
+<monster name="Kalyassa" nameDescription="" experience="9000" speed="0" >
 	<health now="10000" max="10000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="0" />
@@ -63,4 +62,4 @@
 		<item id="2492" name="dragon scale mail" chance="2793" />
 		<item id="2177" name="life crystal" chance="2793" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
index eb02085ec2..580a512c3b 100644
--- a/data/monster/monsters/lady_tenebris.xml
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Lady Tenebris" nameDescription="" experience="50000" speed="0" manacost="0">
+<monster name="Lady Tenebris" nameDescription="" experience="50000" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -86,4 +85,4 @@
 		<item id="27629" name="shadow mask" chance="1163" />
 		<item id="27630" name="shadow paint" chance="1163" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index 64a7c16d16..38edd7f4db 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Lloyd" nameDescription="" experience="50000" speed="0" manacost="0">
+<monster name="Lloyd" nameDescription="" experience="50000" speed="0" >
 	<health now="64000" max="64000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -63,4 +62,4 @@
 		<item id="9809" name="rusted armor" chance="33333" />
 		<item id="5909" name="white piece of cloth" chance="33333" countmax="3" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/lost_time.xml b/data/monster/monsters/lost_time.xml
index 59f55774de..9ab2f44378 100644
--- a/data/monster/monsters/lost_time.xml
+++ b/data/monster/monsters/lost_time.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Lost Time" nameDescription="" experience="0" speed="0" manacost="0">
+<monster name="Lost Time" nameDescription="" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -41,4 +40,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index a932f08666..75e3642a4e 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Melting Frozen Horror" nameDescription="a melting frozen horror" experience="0" speed="0" manacost="0">
+<monster name="Melting Frozen Horror" nameDescription="a melting frozen horror" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -47,4 +46,4 @@
 	<voices interval="5000" chance="10">
 		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />
 	</voices>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/mounted_thorn_knight.xml b/data/monster/monsters/mounted_thorn_knight.xml
index a59888fd00..80b878e361 100644
--- a/data/monster/monsters/mounted_thorn_knight.xml
+++ b/data/monster/monsters/mounted_thorn_knight.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Mounted Thorn Knight" nameDescription="" experience="15000" speed="0" manacost="0">
+<monster name="Mounted Thorn Knight" nameDescription="" experience="15000" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/orclops_doomhauler.xml b/data/monster/monsters/orclops_doomhauler.xml
index b841116af8..3ed45e46bf 100644
--- a/data/monster/monsters/orclops_doomhauler.xml
+++ b/data/monster/monsters/orclops_doomhauler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Orclops Doomhauler" nameDescription="an orclops doomhauler" experience="1200" speed="240" manacost="0">
+<monster name="Orclops Doomhauler" nameDescription="an orclops doomhauler" experience="1200" speed="240" >
 	<health now="1700" max="1700" />
 	<look type="934" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -70,4 +69,4 @@
 		<item id="11374" name="beetle necklace" chance="1002" />
 		<item id="3953" name="war drum" chance="947" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/orclops_ravager.xml b/data/monster/monsters/orclops_ravager.xml
index 86ed776f95..c0029d17db 100644
--- a/data/monster/monsters/orclops_ravager.xml
+++ b/data/monster/monsters/orclops_ravager.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Orclops Ravager" nameDescription="an orclops ravager" experience="1100" speed="260" manacost="0">
+<monster name="Orclops Ravager" nameDescription="an orclops ravager" experience="1100" speed="260" >
 	<health now="1200" max="1200" />
 	<look type="935" head="94" body="1" legs="80" feet="94" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
@@ -72,4 +71,4 @@
 		<item id="7439" name="berserk potion" chance="890" />
 		<item id="7419" name="dreaded cleaver" chance="12" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git "a/data/monster/monsters/pi\303\261ata_dragon.xml" "b/data/monster/monsters/pi\303\261ata_dragon.xml"
index 53c01426e7..cdc259ca53 100644
--- "a/data/monster/monsters/pi\303\261ata_dragon.xml"
+++ "b/data/monster/monsters/pi\303\261ata_dragon.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Piñata Dragon" nameDescription="a Piñata Dragon" experience="50" speed="0" manacost="0">
+<monster name="Piñata Dragon" nameDescription="a Piñata Dragon" experience="50" speed="0" >
 	<health now="10000" max="10000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -69,4 +68,4 @@
 		<item id="7487" name="toy mouse" chance="240" />
 		<item name="stuffed dragon" chance="192" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/possessed_tree.xml b/data/monster/monsters/possessed_tree.xml
index 1a1d488a8b..3a1876ba14 100644
--- a/data/monster/monsters/possessed_tree.xml
+++ b/data/monster/monsters/possessed_tree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Possessed Tree" nameDescription="a possessed tree" experience="1300" speed="0" manacost="0">
+<monster name="Possessed Tree" nameDescription="a possessed tree" experience="1300" speed="0" >
 	<health now="2500" max="2500" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/shadow_fiend.xml b/data/monster/monsters/shadow_fiend.xml
index 04de05d989..5b3407b1a4 100644
--- a/data/monster/monsters/shadow_fiend.xml
+++ b/data/monster/monsters/shadow_fiend.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Shadow Fiend" nameDescription="a shadow fiend" experience="0" speed="0" manacost="0">
+<monster name="Shadow Fiend" nameDescription="a shadow fiend" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/shadow_tentacle.xml b/data/monster/monsters/shadow_tentacle.xml
index af5ff4ea02..b2ffc0f343 100644
--- a/data/monster/monsters/shadow_tentacle.xml
+++ b/data/monster/monsters/shadow_tentacle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Shadow Tentacle" nameDescription="a shadow tentacle" experience="0" speed="0" manacost="0">
+<monster name="Shadow Tentacle" nameDescription="a shadow tentacle" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -46,4 +45,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/shaper_matriarch.xml b/data/monster/monsters/shaper_matriarch.xml
index a3efb84588..70c294d286 100644
--- a/data/monster/monsters/shaper_matriarch.xml
+++ b/data/monster/monsters/shaper_matriarch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Shaper Matriarch" nameDescription="a shaper matriarch" experience="1650" speed="260" manacost="0">
+<monster name="Shaper Matriarch" nameDescription="a shaper matriarch" experience="1650" speed="260" >
 	<health now="2000" max="2000" />
 	<look type="933" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="4" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -71,4 +70,4 @@
 		<item id="2214" name="ring of healing" chance="1248" />
 		<item id="8922" name="wand of voodoo" chance="780" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index 1497bdce85..8a9d8cb6c8 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Solid Frozen Horror" nameDescription="a solid frozen horror" experience="0" speed="0" manacost="0">
+<monster name="Solid Frozen Horror" nameDescription="a solid frozen horror" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -47,4 +46,4 @@
 	<voices interval="5000" chance="10">
 		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />
 	</voices>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/somewhat_beatable_dragon.xml b/data/monster/monsters/somewhat_beatable_dragon.xml
index 1c0c00e66b..462838ecbd 100644
--- a/data/monster/monsters/somewhat_beatable_dragon.xml
+++ b/data/monster/monsters/somewhat_beatable_dragon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Somewhat Beatable Dragon" nameDescription="a somewhat beatable dragon" experience="0" speed="0" manacost="0">
+<monster name="Somewhat Beatable Dragon" nameDescription="a somewhat beatable dragon" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
index a0b0533744..e21daa0ff8 100644
--- a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Soul Of Dragonking Zyrtarch" nameDescription="" experience="0" speed="0" manacost="0">
+<monster name="Soul Of Dragonking Zyrtarch" nameDescription="" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -84,4 +83,4 @@
 		<item id="27611" name="part of a rune (two)" chance="2326" />
 		<item id="12648" name="snake god's sceptre" chance="2326" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/soulcatcher.xml b/data/monster/monsters/soulcatcher.xml
index d4ab6560cc..c6b10cd9a6 100644
--- a/data/monster/monsters/soulcatcher.xml
+++ b/data/monster/monsters/soulcatcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Soulcatcher" nameDescription="a soulcatcher" experience="0" speed="0" manacost="0">
+<monster name="Soulcatcher" nameDescription="a soulcatcher" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -41,4 +41,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/spirit_of_fertility.xml b/data/monster/monsters/spirit_of_fertility.xml
index 00b869b4de..32ed31944d 100644
--- a/data/monster/monsters/spirit_of_fertility.xml
+++ b/data/monster/monsters/spirit_of_fertility.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Spirit Of Fertility" nameDescription="" experience="0" speed="0" manacost="0">
+<monster name="Spirit Of Fertility" nameDescription="" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
diff --git a/data/monster/monsters/stone_rhino.xml b/data/monster/monsters/stone_rhino.xml
index d0f7f9fc25..44248896dd 100644
--- a/data/monster/monsters/stone_rhino.xml
+++ b/data/monster/monsters/stone_rhino.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Stone Rhino" nameDescription="a stone rhino" experience="1800" speed="290" manacost="0">
+<monster name="Stone Rhino" nameDescription="a stone rhino" experience="1800" speed="290" >
 	<health now="3000" max="3000" />
 	<look type="936" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="1" />
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="0" />
@@ -56,4 +55,4 @@
 		<item id="27045" name="rhino horn" chance="4608" />
 		<item id="3973" name="tusk shield" chance="1378" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/sword_of_vengeance.xml b/data/monster/monsters/sword_of_vengeance.xml
index ffae813627..c11df76c46 100644
--- a/data/monster/monsters/sword_of_vengeance.xml
+++ b/data/monster/monsters/sword_of_vengeance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Sword Of Vengeance" nameDescription="a sword of vengeance" experience="0" speed="0" manacost="0">
+<monster name="Sword Of Vengeance" nameDescription="a sword of vengeance" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -46,4 +45,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/tazhadur.xml b/data/monster/monsters/tazhadur.xml
index 44ffe7cb5e..490ef743d0 100644
--- a/data/monster/monsters/tazhadur.xml
+++ b/data/monster/monsters/tazhadur.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Tazhadur" nameDescription="" experience="9000" speed="0" manacost="0">
+<monster name="Tazhadur" nameDescription="" experience="9000" speed="0" >
 	<health now="10000" max="10000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="1" />
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="1" />
@@ -64,4 +63,4 @@
 		<item id="7430" name="dragonbone staff" chance="935" />
 		<item id="2145" name="small diamond" chance="467" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/the_astral_source.xml b/data/monster/monsters/the_astral_source.xml
index 7e500f3b96..2373b9a313 100644
--- a/data/monster/monsters/the_astral_source.xml
+++ b/data/monster/monsters/the_astral_source.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="The Astral Source" nameDescription="" experience="0" speed="0" manacost="0">
+<monster name="The Astral Source" nameDescription="" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -46,4 +45,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/the_blazing_time_guardian.xml b/data/monster/monsters/the_blazing_time_guardian.xml
index 2fec92e4f7..af1f80bae7 100644
--- a/data/monster/monsters/the_blazing_time_guardian.xml
+++ b/data/monster/monsters/the_blazing_time_guardian.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="The Blazing Time Guardian" nameDescription="" experience="50000" speed="0" manacost="0">
+<monster name="The Blazing Time Guardian" nameDescription="" experience="50000" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -77,4 +76,4 @@
 		<item id="2147" name="small ruby" chance="7692" countmax="10" />
 		<item id="8904" name="spellscroll of prophecies" chance="7692" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/the_distorted_astral_source.xml b/data/monster/monsters/the_distorted_astral_source.xml
index c36c1b3316..0b0a434e7d 100644
--- a/data/monster/monsters/the_distorted_astral_source.xml
+++ b/data/monster/monsters/the_distorted_astral_source.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="The Distorted Astral Source" nameDescription="" experience="0" speed="0" manacost="0">
+<monster name="The Distorted Astral Source" nameDescription="" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/the_enraged_thorn_knight.xml b/data/monster/monsters/the_enraged_thorn_knight.xml
index cca69a57c8..e8b8a1af6d 100644
--- a/data/monster/monsters/the_enraged_thorn_knight.xml
+++ b/data/monster/monsters/the_enraged_thorn_knight.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="The Enraged Thorn Knight" nameDescription="" experience="30000" speed="0" manacost="0">
+<monster name="The Enraged Thorn Knight" nameDescription="" experience="30000" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -88,4 +87,4 @@
 		<item id="6553" name="ruthless axe" chance="1389" />
 		<item id="27621" name="thorn seed" chance="1389" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/the_first_dragon.xml b/data/monster/monsters/the_first_dragon.xml
index a850eb0f34..a9b6d9fa76 100644
--- a/data/monster/monsters/the_first_dragon.xml
+++ b/data/monster/monsters/the_first_dragon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="The First Dragon" nameDescription="" experience="0" speed="0" manacost="0">
+<monster name="The First Dragon" nameDescription="" experience="0" speed="0" >
 	<health now="50000" max="50000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -41,4 +40,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/the_freezing_time_guardian.xml b/data/monster/monsters/the_freezing_time_guardian.xml
index 846770c8f3..ecc7086142 100644
--- a/data/monster/monsters/the_freezing_time_guardian.xml
+++ b/data/monster/monsters/the_freezing_time_guardian.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="The Freezing Time Guardian" nameDescription="" experience="50000" speed="0" manacost="0">
+<monster name="The Freezing Time Guardian" nameDescription="" experience="50000" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -76,4 +75,4 @@
 		<item id="9970" name="small topaz" chance="9091" countmax="10" />
 		<item id="2153" name="violet gem" chance="9091" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index c472903c75..5d020a3330 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="The Last Lore Keeper" nameDescription="" experience="45000" speed="0" manacost="0">
+<monster name="The Last Lore Keeper" nameDescription="" experience="45000" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="4" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="1" />
 		<flag canwalkonfire="1" />
 		<flag canwalkonpoison="1" />
@@ -100,4 +99,4 @@
 		<item id="5809" name="soul stone" chance="373" />
 		<item id="22414" name="umbral hammer" chance="373" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/the_shielded_thorn_knight.xml b/data/monster/monsters/the_shielded_thorn_knight.xml
index 2dabac7fa8..aab9f20657 100644
--- a/data/monster/monsters/the_shielded_thorn_knight.xml
+++ b/data/monster/monsters/the_shielded_thorn_knight.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="The Shielded Thorn Knight" nameDescription="" experience="0" speed="0" manacost="0">
+<monster name="The Shielded Thorn Knight" nameDescription="" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
index cdc287619c..a05ceaf47b 100644
--- a/data/monster/monsters/the_time_guardian.xml
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="The Time Guardian" nameDescription="" experience="50000" speed="0" manacost="0">
+<monster name="The Time Guardian" nameDescription="" experience="50000" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -87,4 +86,4 @@
 		<item id="2539" name="phoenix shield" chance="4348" />
 		<item id="2153" name="violet gem" chance="4348" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/thorn_minion.xml b/data/monster/monsters/thorn_minion.xml
index 0fda10cf1c..053d624f15 100644
--- a/data/monster/monsters/thorn_minion.xml
+++ b/data/monster/monsters/thorn_minion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Thorn Minion" nameDescription="a thorn minion" experience="0" speed="0" manacost="0">
+<monster name="Thorn Minion" nameDescription="a thorn minion" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/time_keeper.xml b/data/monster/monsters/time_keeper.xml
index 44115e6f68..d2931436e5 100644
--- a/data/monster/monsters/time_keeper.xml
+++ b/data/monster/monsters/time_keeper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Time Keeper" nameDescription="a time keeper" experience="0" speed="0" manacost="0">
+<monster name="Time Keeper" nameDescription="a time keeper" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/time_waster.xml b/data/monster/monsters/time_waster.xml
index 14eb63f992..3aa95943d8 100644
--- a/data/monster/monsters/time_waster.xml
+++ b/data/monster/monsters/time_waster.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Time Waster" nameDescription="a Time Waster" experience="0" speed="0" manacost="0">
+<monster name="Time Waster" nameDescription="a Time Waster" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -41,4 +40,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/twisted_shaper.xml b/data/monster/monsters/twisted_shaper.xml
index d97e60e7f2..dbbaf54aa8 100644
--- a/data/monster/monsters/twisted_shaper.xml
+++ b/data/monster/monsters/twisted_shaper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Twisted Shaper" nameDescription="a twisted shaper" experience="1750" speed="280" manacost="0">
+<monster name="Twisted Shaper" nameDescription="a twisted shaper" experience="1750" speed="280" >
 	<health now="2500" max="2500" />
 	<look type="932" head="105" body="0" legs="0" feet="94" addons="1" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="1" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
@@ -71,4 +70,4 @@
 		<item id="2114" name="piggy bank" chance="180" />
 		<item id="11343" name="piece of marble rock" chance="55" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/unbeatable_dragon.xml b/data/monster/monsters/unbeatable_dragon.xml
index caaceb35fd..61234588ca 100644
--- a/data/monster/monsters/unbeatable_dragon.xml
+++ b/data/monster/monsters/unbeatable_dragon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbeatable Dragon" nameDescription="an unbeatable dragon" experience="0" speed="0" manacost="0">
+<monster name="Unbeatable Dragon" nameDescription="an unbeatable dragon" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/unbound_blightwalker.xml b/data/monster/monsters/unbound_blightwalker.xml
index d2638e994e..192ab6d4eb 100644
--- a/data/monster/monsters/unbound_blightwalker.xml
+++ b/data/monster/monsters/unbound_blightwalker.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbound Blightwalker" nameDescription="an unbound blightwalker" experience="0" speed="0" manacost="0">
+<monster name="Unbound Blightwalker" nameDescription="an unbound blightwalker" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/unbound_defiler.xml b/data/monster/monsters/unbound_defiler.xml
index 01b44023e3..5b9b8edb64 100644
--- a/data/monster/monsters/unbound_defiler.xml
+++ b/data/monster/monsters/unbound_defiler.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbound Defiler" nameDescription="an unbound defiler" experience="0" speed="0" manacost="0">
+<monster name="Unbound Defiler" nameDescription="an unbound defiler" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/unbound_demon.xml b/data/monster/monsters/unbound_demon.xml
index 6a2210ea4b..60d2a52755 100644
--- a/data/monster/monsters/unbound_demon.xml
+++ b/data/monster/monsters/unbound_demon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbound Demon" nameDescription="an unbound demon" experience="0" speed="0" manacost="0">
+<monster name="Unbound Demon" nameDescription="an unbound demon" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/unbound_demon_outcast.xml b/data/monster/monsters/unbound_demon_outcast.xml
index bdc77868ae..9171083d1e 100644
--- a/data/monster/monsters/unbound_demon_outcast.xml
+++ b/data/monster/monsters/unbound_demon_outcast.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbound Demon Outcast" nameDescription="an unbound demon outcast" experience="0" speed="0" manacost="0">
+<monster name="Unbound Demon Outcast" nameDescription="an unbound demon outcast" experience="0" speed="0" >
 	<health now="0" max="0" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
@@ -44,4 +43,4 @@
 		<immunity drunk="1" />
 		<immunity bleed="0" />
 	</immunities>
-</monster>
\ No newline at end of file
+</monster>
diff --git a/data/monster/monsters/zorvorax.xml b/data/monster/monsters/zorvorax.xml
index 9bb3085e98..37e4b3c7d7 100644
--- a/data/monster/monsters/zorvorax.xml
+++ b/data/monster/monsters/zorvorax.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Zorvorax" nameDescription="" experience="9000" speed="0" manacost="0">
+<monster name="Zorvorax" nameDescription="" experience="9000" speed="0" >
 	<health now="10000" max="10000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="1" />
@@ -65,4 +64,4 @@
 		<item id="2173" name="amulet of loss" chance="1571" />
 		<item id="13291" name="maxilla maximus" chance="1047" />
 	</loot>
-</monster>
\ No newline at end of file
+</monster>

From 73318bb8a5ff9ec3c00c0fd85db76eb8d06255f3 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 13:30:18 -0300
Subject: [PATCH 04/38] Partial monster fixes

---
 .../monsters/golden_servant_replica.xml       | 35 ++++++-----
 data/monster/monsters/haunted_dragon.xml      | 60 +++++++++++++------
 data/monster/monsters/ice_dragon.xml          | 27 ++++++---
 data/monster/monsters/icicle_(creature).xml   | 38 ++++++------
 .../monster/monsters/iron_servant_replica.xml | 29 ++++-----
 data/monster/monsters/kalyassa.xml            | 26 ++++++--
 data/monster/monsters/lady_tenebris.xml       | 45 ++++++++------
 data/monster/monsters/lloyd.xml               | 34 +++++------
 data/monster/monsters/lost_time.xml           | 26 +++-----
 .../monsters/melting_frozen_horror.xml        | 38 ++++++------
 10 files changed, 209 insertions(+), 149 deletions(-)

diff --git a/data/monster/monsters/golden_servant_replica.xml b/data/monster/monsters/golden_servant_replica.xml
index 3ed18a42e7..7cb498c18e 100644
--- a/data/monster/monsters/golden_servant_replica.xml
+++ b/data/monster/monsters/golden_servant_replica.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Golden Servant Replica" nameDescription="a golden servant replica" experience="450" speed="210" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Golden Servant Replica" nameDescription="a golden servant replica" race="energy" experience="450" speed="210">
 	<health now="2000" max="2000" />
-	<look type="396" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="396" corpse="13484" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,29 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="fire" interval="2000" chance="11" length="5" spread="1" min="-80" max="-110">
+			<attribute key="areaEffect" value="yellowenergy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" range="7" target="1" radius="4" min="-70" max="-110">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="purpleenergy" />
+		</attack>
 	</attacks>
-	<defenses armor="29" defense="29" />
+	<defenses armor="40" defense="45">
+		<defense name="healing" interval="2000" chance="13" min="40" max="70">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element earthPercent="80" />
+		<element firePercent="10" />
+		<element icePercent="-5" />
+		<element deathPercent="-5" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="85419" countmax="137" />
diff --git a/data/monster/monsters/haunted_dragon.xml b/data/monster/monsters/haunted_dragon.xml
index f71bbf7a11..8b69d83633 100644
--- a/data/monster/monsters/haunted_dragon.xml
+++ b/data/monster/monsters/haunted_dragon.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Haunted Dragon" nameDescription="a haunted dragon" experience="6500" speed="280" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Haunted Dragon" nameDescription="a haunted dragon" race="undead" experience="6500" speed="280">
 	<health now="6500" max="6500" />
-	<look type="231" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="231" corpse="6306" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -21,27 +21,51 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="-480" />
+		<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="mortarea" />
+			<attribute key="areaEffect" value="smallclouds" />
+		</attack>
+		<attack name="earth" interval="2000" chance="5" range="7" radius="4" target="1" min="-100" max="-390">
+			<attribute key="shootEffect" value="poison" />
+			<attribute key="areaEffect" value="poison" />
+		</attack>
+		<attack name="earth" interval="2000" chance="15" target="1" range="7" min="0" max="-180">
+			<attribute key="shootEffect" value="poison" />
+			<attribute key="areaEffect" value="poison" />
+		</attack>
+		<attack name="earth" interval="2000" chance="10" length="8" spread="3" min="-150" max="-690">
+			<attribute key="areaEffect" value="poison" />
+		</attack>
+		<attack name="lifedrain" interval="2000" chance="10" length="8" spread="3" min="-300" max="-700">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
+		<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="58" defense="58" />
+	<defenses armor="40" defense="40">
+		<defense name="healing" interval="2000" chance="15" min="200" max="250">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element physicalPercent="5" />
+		<element icePercent="50" />
+		<element holyPercent="-25" />
 	</elements>
 	<immunities>
+		<immunity fire="1" />
+		<immunity earth="1" />
+		<immunity death="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity drown="1" />
 	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="186" />
diff --git a/data/monster/monsters/ice_dragon.xml b/data/monster/monsters/ice_dragon.xml
index 207f32aa3b..c7f80ce62b 100644
--- a/data/monster/monsters/ice_dragon.xml
+++ b/data/monster/monsters/ice_dragon.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Ice Dragon" nameDescription="an ice dragon" experience="2300" speed="212" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Ice Dragon" nameDescription="an ice dragon" race="undead" experience="2300" speed="212">
 	<health now="2500" max="2500" />
-	<look type="947" head="0" body="9" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="947" body="9" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,9 +22,23 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
+		<attack name="speed" interval="2000" chance="18" range="7" radius="4" target="1" duration="20000" max="-400">
+			<attribute key="areaEffect" value="icetornado" />
+		</attack>
+		<attack name="ice" interval="2000" chance="15" range="7" radius="3" target="0" min="-50" max="-120">
+			<attribute key="areaEffect" value="icetornado" />
+		</attack>
+		<attack name="speed" interval="2000" chance="12" length="7" spread="3" duration="20000" max="-400">
+			<attribute key="areaEffect" value="iceattack" />
+		</attack>
+		<attack name="lifedrain" interval="2000" chance="12" length="8" spread="3" min="-150" max="-380">
+			<attribute key="areaEffect" value="poff" />
+		</attack>
 	</attacks>
 	<defenses armor="41" defense="41">
-		<defense name="healing" interval="2000" chance="20" min="100" max="200" />
+		<defense name="healing" interval="2000" chance="20" min="100" max="200">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
 	</defenses>
 	<elements>
 		<element physicalPercent="0" />
@@ -39,11 +53,10 @@
 		<element deathPercent="0" />
 	</elements>
 	<immunities>
+		<immunity fire="1" />
+		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="96552" countmax="219" />
diff --git a/data/monster/monsters/icicle_(creature).xml b/data/monster/monsters/icicle_(creature).xml
index 7146da30ea..72ab54b5a9 100644
--- a/data/monster/monsters/icicle_(creature).xml
+++ b/data/monster/monsters/icicle_(creature).xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Icicle" nameDescription="an icicle" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Icicle" nameDescription="an icicle" race="undead" experience="0" speed="0">
+	<health now="8200" max="8200" />
+	<look type="904" corpse="2253" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -23,24 +23,22 @@
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-219" />
 	</attacks>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<defenses armor="10" defense="5">
+		<defense name="icecle heal" interval="2000" chance="25" />
+	</defenses>
 	<immunities>
+		<immunity physical="1" />
+		<immunity energy="1" />
+		<immunity fire="1" />
+		<immunity poison="1" />
+		<immunity ice="1" />
+		<immunity holy="1" />
+		<immunity death="1" />
+		<immunity lifedrain="1" />
+		<immunity manadrain="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity outfit="1" />
+		<immunity invisible="1" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/iron_servant_replica.xml b/data/monster/monsters/iron_servant_replica.xml
index 1184071ff5..91b2a71b9e 100644
--- a/data/monster/monsters/iron_servant_replica.xml
+++ b/data/monster/monsters/iron_servant_replica.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Iron Servant Replica" nameDescription="an iron servant replica" experience="210" speed="190" >
+<monster name="Iron Servant Replica" nameDescription="an iron servant replica" race="energy" experience="210" speed="190">
 	<health now="1000" max="1000" />
-	<look type="395" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="395" corpse="13483" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,27 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-154" />
+		<attack name="physical" interval="2000" chance="12" range="7" min="0" max="-60">
+			<attribute key="shootEffect" value="explosion" />
+			<attribute key="areaEffect" value="explosionarea" />
+		</attack>
+		<attack name="drunk" interval="2000" chance="14" range="7" duration="2000">
+			<attribute key="shootEffect" value="explosion" />
+			<attribute key="areaEffect" value="stun" />
+		</attack>
 	</attacks>
 	<defenses armor="17" defense="17" />
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element earthPercent="-5" />
+		<element holyPercent="5" />
+		<element firePercent="10" />
+		<element energyPercent="5" />
+		<element deathPercent="-5" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="82462" countmax="55" />
diff --git a/data/monster/monsters/kalyassa.xml b/data/monster/monsters/kalyassa.xml
index 98691e84a6..baf1ee65a7 100644
--- a/data/monster/monsters/kalyassa.xml
+++ b/data/monster/monsters/kalyassa.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Kalyassa" nameDescription="" experience="9000" speed="0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Kalyassa" nameDescription="kalyassa" race="blood" experience="9000" speed="350">
 	<health now="10000" max="10000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="947" head="37" body="113" legs="38" feet="95" addons="3" corpse="5984" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,10 +22,28 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+		<attack name="fire" interval="2000" chance="20" range="7" target="1" radius="5" min="-110" max="-495">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" length="9" spread="4" min="-310" max="-495">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" length="9" spread="0" min="-710" max="-895">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="firefield" interval="2000" chance="10" range="7" radius="7" target="1">
+			<attribute key="shootEffect" value="fire" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="600" max="700" />
+		<defense name="healing" interval="2000" chance="20" min="600" max="700">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
 	</defenses>
+	<summons maxSummons="2">
+		<summon name="Dragon Lord" interval="2000" chance="20" max="2" />
+	</summons>
 	<elements>
 		<element physicalPercent="0" />
 		<element energyPercent="0" />
diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
index 580a512c3b..94ad7fd58d 100644
--- a/data/monster/monsters/lady_tenebris.xml
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Lady Tenebris" nameDescription="" experience="50000" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Lady Tenebris" nameDescription="Lady Tenebris" race="blood" experience="50000" speed="370">
+	<health now="150000" max="150000" />
+	<look type="433" head="57" body="95" legs="38" feet="94" addons="2" corpse="6560" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,37 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-1800" />
+		<attack name="death" interval="06000" chance="13" length="8" spread="0" min="-1200" max="-1500">
+			<attribute key="areaEffect" value="mortarea" />
+		</attack>
+		<attack name="death" interval="2000" chance="13" radius="4" target="1" min="-400" max="-600">
+			<attribute key="shootEffect" value="death" />
+			<attribute key="areaEffect" value="smallclouds" />
+		</attack>
+		<attack name="tenebris summon" interval="2000" chance="14" />
+		<attack name="tenebris ultimate" interval="2000" chance="30" />
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="3000" chance="25" min="600" max="2700">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+		<defense name="speed" interval="2000" chance="15" speedchange="320" duration="5000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="50" />
+		<element earthPercent="-10" />
+		<element energyPercent="50" />
+		<element deathPercent="80" />
+		<element physicalPercent="50" />
+		<element holyPercent="80" />
+		<element icePercent="50" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="May the embrace of darkness kill you!" yell="false" />
diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index 38edd7f4db..20c2162f5c 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Lloyd" nameDescription="" experience="50000" speed="0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Lloyd" nameDescription="Lloyd" race="energy" experience="50000" speed="400">
 	<health now="64000" max="64000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="940" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,26 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-1200" />
+		<attack name="energy" interval="2000" chance="12" length="6" spread="0" min="-130" max="-460">
+			<attribute key="areaEffect" value="purpleenergy" />
+		</attack>
+		<attack name="lloyd wave" interval="2000" chance="12" min="-430" max="-560" />
+		<attack name="lloyd wave2" interval="2000" chance="12" min="-230" max="-460" />
+		<attack name="lloyd wave3" interval="2000" chance="12" min="-430" max="-660" />
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="55" defense="55">
+		<defense name="healing" interval="2000" chance="15" min="180" max="250" />
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element deathPercent="50" />
+		<element holyPercent="50" />
 	</elements>
 	<immunities>
+		<immunity fire="1" />
+		<immunity drown="1" />
+		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="100" />
diff --git a/data/monster/monsters/lost_time.xml b/data/monster/monsters/lost_time.xml
index 9ab2f44378..accc67dbce 100644
--- a/data/monster/monsters/lost_time.xml
+++ b/data/monster/monsters/lost_time.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Lost Time" nameDescription="" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Lost Time" nameDescription="a lost time" race="undead" experience="0" speed="160">
+	<health now="2000" max="2000" />
+	<look typeex="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -20,24 +20,14 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
+	<attacks>
+		<attack name="melee" interval="2000" skill="50" attack="25" />
+		<attack name="white shade paralyze" interval="2000" chance="18" />
+	</attacks>
 	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index 75e3642a4e..3ce24f82be 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Melting Frozen Horror" nameDescription="a melting frozen horror" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Melting Frozen Horror" nameDescription="a melting frozen horror" race="undead" experience="0" speed="240">
+	<health now="70000" max="70000" />
+	<look type="261" corpse="7282" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,28 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="hirintror freeze" interval="2000" chance="15" />
+		<attack name="ice" interval="2000" chance="15" range="7" target="1" radius="3" min="-75" max="-150">
+			<attribute key="shootEffect" value="ice" />
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
+		<attack name="ice golem paralyze" interval="2000" chance="11" />
+		<attack name="hirintror skill reducer" interval="2000" chance="10" />
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="10" defense="5">
+		<defense name="healing" interval="2000" chance="20" radius="7" min="0" max="0">
+			<attribute key="areaEffect" value="yellowspark" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element deathPercent="-50" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
+		<immunity ice="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity lifedrain="1" />
+		<immunity invisible="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />

From 0f58f198d3475970f2060035b85ee6dbd547ad17 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 14:58:36 -0300
Subject: [PATCH 05/38] Partial monster fixes

---
 .../monster/monsters/mounted_thorn_knight.xml | 49 +++++++++------
 data/monster/monsters/orclops_doomhauler.xml  | 37 +++++++-----
 data/monster/monsters/orclops_ravager.xml     | 33 +++++-----
 .../monsters/pi\303\261ata_dragon.xml"        | 37 ++++++------
 data/monster/monsters/possessed_tree.xml      | 28 ++++-----
 data/monster/monsters/shadow_fiend.xml        | 41 +++++++------
 data/monster/monsters/shadow_tentacle.xml     | 44 ++++++++------
 data/monster/monsters/shaper_matriarch.xml    | 34 ++++++-----
 data/monster/monsters/solid_frozen_horror.xml | 45 +++++++-------
 .../monsters/somewhat_beatable_dragon.xml     | 52 ++++++++++------
 .../monsters/soul_of_dragonking_zyrtarch.xml  | 60 +++++++++++++------
 11 files changed, 267 insertions(+), 193 deletions(-)

diff --git a/data/monster/monsters/mounted_thorn_knight.xml b/data/monster/monsters/mounted_thorn_knight.xml
index 80b878e361..29d8bbc9d8 100644
--- a/data/monster/monsters/mounted_thorn_knight.xml
+++ b/data/monster/monsters/mounted_thorn_knight.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Mounted Thorn Knight" nameDescription="" experience="15000" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Mounted Thorn Knight" nameDescription="mounted thorn knight" race="blood" experience="15000" speed="430" manacost="290">
+	<health now="100000" max="100000" />
+	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" mount="626" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,25 +22,40 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-1032" />
+		<attack name="lifedrain" interval="2000" chance="12" length="4" spread="3" min="-400" max="-700">
+			<attribute key="areaEffect" value="poff" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="12" length="9" spread="0" min="-1400" max="-1700">
+			<attribute key="areaEffect" value="carniphila" />
+		</attack>
+		<attack name="death" interval="2000" chance="12" length="9" spread="0" min="-400" max="-700">
+			<attribute key="areaEffect" value="mortarea" />
+		</attack>
+		<attack name="physical" interval="2000" chance="20" radius="10" min="-200" max="-250">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="60" defense="60">
+		<defense name="thorn summon" interval="2000" chance="20" />
+		<defense name="healing" interval="2000" chance="20" min="1550" max="2550">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+		<defense name="speed" interval="1000" chance="12" speedchange="620" duration="4000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="80" />
+		<element holyPercent="80" />
+		<element earthPercent="100" />
+		<element deathPercent="80" />
+		<element firePercent="80" />
+		<element physicalPercent="80" />
+		<element icePercent="80" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/orclops_doomhauler.xml b/data/monster/monsters/orclops_doomhauler.xml
index 3ed45e46bf..4093c7e71b 100644
--- a/data/monster/monsters/orclops_doomhauler.xml
+++ b/data/monster/monsters/orclops_doomhauler.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Orclops Doomhauler" nameDescription="an orclops doomhauler" experience="1200" speed="240" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Orclops Doomhauler" nameDescription="an orclops doomhauler" race="blood" experience="1200" speed="240">
 	<health now="1700" max="1700" />
-	<look type="934" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="934" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,31 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-215" />
+		<attack name="physical" interval="2000" chance="35" range="7" target="1" min="-117" max="-220">
+			<attribute key="shootEffect" value="largerock" />
+		</attack>
+		<attack name="cursecondition" interval="2000" chance="50" radius="4" target="1" min="-100" max="-200">
+			<attribute key="shootEffect" value="whirlwindclub" />
+			<attribute key="areaEffect" value="explosionarea" />
+		</attack>
 	</attacks>
-	<defenses armor="35" defense="35" />
+	<defenses armor="35" defense="25">
+		<defense name="speed" interval="2000" chance="10" speedchange="336" duration="2000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element physicalPercent="10" />
+		<element icePercent="-10" />
+		<element deathPercent="10" />
+		<element firePercent="15" />
+		<element earthPercent="30" />
+		<element energyPercent="-10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Me mash!" yell="false" />
diff --git a/data/monster/monsters/orclops_ravager.xml b/data/monster/monsters/orclops_ravager.xml
index c0029d17db..5d500da82e 100644
--- a/data/monster/monsters/orclops_ravager.xml
+++ b/data/monster/monsters/orclops_ravager.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Orclops Ravager" nameDescription="an orclops ravager" experience="1100" speed="260" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Orclops Ravager" nameDescription="an orclops ravager" race="blood" experience="1100" speed="260">
 	<health now="1200" max="1200" />
-	<look type="935" head="94" body="1" legs="80" feet="94" addons="0" mount="0" corpse="0" />
+	<look type="935" head="94" body="1" legs="80" feet="94" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,28 +22,29 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-132" />
+		<attack name="physical" interval="2000" chance="35" range="7" target="1" min="-180" max="-220">
+			<attribute key="shootEffect" value="largerock" />
+		</attack>
 	</attacks>
 	<defenses armor="35" defense="35">
-		<defense name="healing" interval="2000" chance="20" min="0" max="119" />
+		<defense name="speed" interval="2000" chance="10" speedchange="336" duration="2000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+		<defense name="healing" interval="2000" chance="20" min="0" max="119">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element holyPercent="50" />
+		<element deathPercent="10" />
+		<element icePercent="20" />
+		<element firePercent="20" />
+		<element energyPercent="-10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Crushing! Smashing! Ripping! Yeah!!" yell="false" />
diff --git "a/data/monster/monsters/pi\303\261ata_dragon.xml" "b/data/monster/monsters/pi\303\261ata_dragon.xml"
index cdc259ca53..399342425e 100644
--- "a/data/monster/monsters/pi\303\261ata_dragon.xml"
+++ "b/data/monster/monsters/pi\303\261ata_dragon.xml"
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Piñata Dragon" nameDescription="a Piñata Dragon" experience="50" speed="0" >
+<monster name="Piñata Dragon" nameDescription="a piñata dragon" race="undead" experience="50" speed="0" >
 	<health now="10000" max="10000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
@@ -21,26 +21,25 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="130" max="170" />
+		<defense name="healing" interval="2000" chance="20" min="130" max="170">
+			<attribute key="areaEffect" value="mortarea" />
+		</defense>
 	</defenses>
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<summons maxSummons="3">
+		<summon name="Demon" interval="2000" chance="7" />
+	</summons>
 	<immunities>
-		<immunity paralyze="0" />
-		<immunity outfit="0" />
-		<immunity invisible="0" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity physical="1" />
+		<immunity energy="1" />
+		<immunity fire="1" />
+		<immunity poison="1" />
+		<immunity ice="1" />
+		<immunity holy="1" />
+		<immunity death="1" />
+		<immunity lifedrain="1" />
+		<immunity paralyze="1" />
+		<immunity drown="1" />
+		<immunity invisible="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="You can't have my treasures!" yell="false" />
diff --git a/data/monster/monsters/possessed_tree.xml b/data/monster/monsters/possessed_tree.xml
index 3a1876ba14..50ada79224 100644
--- a/data/monster/monsters/possessed_tree.xml
+++ b/data/monster/monsters/possessed_tree.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Possessed Tree" nameDescription="a possessed tree" experience="1300" speed="0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Possessed Tree" nameDescription="a possessed tree" race="undead" experience="1300" speed="0">
 	<health now="2500" max="2500" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="310" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,25 +22,19 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-162" />
+		<attack name="haunted treeling paralyze" interval="2000" chance="10" />
+		<attack name="poison" interval="2000" chance="9" target="1" radius="4" range="4" min="-86" max="-200">
+			<attribute key="shootEffect" value="poison" />
+			<attribute key="areaEffect" value="greenspark" />
+		</attack>
+		<attack name="poison" interval="2000" chance="9" length="4" spread="0" min="-286" max="-300">
+			<attribute key="areaEffect" value="carniphila" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/shadow_fiend.xml b/data/monster/monsters/shadow_fiend.xml
index 5b3407b1a4..405a961dec 100644
--- a/data/monster/monsters/shadow_fiend.xml
+++ b/data/monster/monsters/shadow_fiend.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Shadow Fiend" nameDescription="a shadow fiend" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Shadow Fiend" nameDescription="a shadow fiend" race="undead" experience="500" speed="360">
+	<health now="4000" max="4000" />
+	<look type="320" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,25 +22,32 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="nightstalker paralyze" interval="2000" chance="19" range="7" />
+		<attack name="lifedrain" interval="2000" chance="12" radius="5" min="-360" max="-470">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
+		<attack name="speed" range="6" interval="2000" radius="4" chance="20" speedchange="-600" duration="20000">
+			<attribute key="areaEffect" value="smallclouds" />
+		</attack>
+		<attack name="silencer skill reducer" range="4" interval="2000" chance="30">
+			<attribute key="areaEffect" value="poff" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="30" defense="35">
+		<defense name="healing" interval="2000" chance="13" min="160" max="230">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element physicalPercent="40" />
+		<element energyPercent="40" />
+		<element deathPercent="40" />
+		<element icePercent="40" />
+		<element holyPercent="40" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/shadow_tentacle.xml b/data/monster/monsters/shadow_tentacle.xml
index b2ffc0f343..11f98fb58f 100644
--- a/data/monster/monsters/shadow_tentacle.xml
+++ b/data/monster/monsters/shadow_tentacle.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Shadow Tentacle" nameDescription="a shadow tentacle" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Shadow Tentacle" nameDescription="a shadow tentacle" race="venom" experience="0" speed="350">
+	<health now="22500" max="22500" />
+	<look type="681" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,27 +22,35 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-330" />
+		<attack name="blightwalker curse" interval="2000" chance="10" />
+		<attack name="lifedrain" interval="2000" chance="14" radius="4" target="0" min="-65" max="-135">
+			<attribute key="areaEffect" value="greenshimmer" />
+		</attack>
+		<attack name="drunk" interval="2000" chance="20" duration="35000" radius="7" target="0">
+			<attribute key="areaEffect" value="greenspark" />
+		</attack>
+		<attack name="death" interval="2000" chance="14" legth="4" target="0" min="-165" max="-535">
+			<attribute key="areaEffect" value="mortarea" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
+		<defense name="healing" interval="2000" chance="20" min="225" max="850">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="50" />
+		<element energyPercent="20" />
+		<element icePercent="50" />
+		<element physicalPercent="-10" />
+		<element holyPercent="-30" />
 	</elements>
 	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
+		<immunity death="1" />
+		<immunity earth="1" />
+		<immunity lifedrain="1" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity paralyze="1" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/shaper_matriarch.xml b/data/monster/monsters/shaper_matriarch.xml
index 70c294d286..f08baa5f5f 100644
--- a/data/monster/monsters/shaper_matriarch.xml
+++ b/data/monster/monsters/shaper_matriarch.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Shaper Matriarch" nameDescription="a shaper matriarch" experience="1650" speed="260" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Shaper Matriarch" nameDescription="a shaper matriarch" experience="1650" speed="260">
 	<health now="2000" max="2000" />
-	<look type="933" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="933" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,28 +22,30 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-120" />
+		<attack name="physical" interval="2000" chance="35" range="7" min="-35" max="-160">
+			<attribute key="shootEffect" value="earth" />
+			<attribute key="areaEffect" value="poison" />
+		</attack>
+		<attack name="physical" interval="2000" chance="35" radius="3" min="-35" max="-160">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="physical" interval="2000" chance="35" length="6" spread="3" min="0" max="-400">
+			<attribute key="areaEffect" value="mortarea" />
+		</attack>
 	</attacks>
 	<defenses armor="40" defense="40">
-		<defense name="healing" interval="2000" chance="20" min="0" max="86" />
+		<defense name="healing" interval="2000" chance="15" min="400" max="500">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element earthPercent="40" />
+		<element icePercent="-20" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Tar Marra Zik Tazz!" yell="false" />
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index 8a9d8cb6c8..a39376dc93 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Solid Frozen Horror" nameDescription="a solid frozen horror" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Solid Frozen Horror" nameDescription="a solid frozen horror" race="undead" experience="0" speed="240">
+	<health now="70000" max="70000" />
+	<look type="261" corpse="7282" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,31 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-677" />
+		<attack name="hirintror freeze" interval="2000" chance="15" />
+		<attack name="ice" interval="2000" chance="15" range="7" target="1" radius="3" min="-75" max="-150">
+			<attribute key="shootEffect" value="ice" />
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
+		<attack name="ice golem paralyze" interval="2000" chance="11" />
+		<attack name="hirintror skill reducer" interval="2000" chance="10" />
 	</attacks>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="100" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<defenses armor="60" defense="60">
+		<defense name="healing" interval="2000" chance="20" radius="7" min="0" max="0">
+			<attribute key="areaEffect" value="yellowspark" />
+		</defense>
+	</defenses>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
+		<immunity ice="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity lifedrain="1" />
+		<immunity invisible="1" />
+		<immunity fire="1" />
+		<immunity physical="1" />
+		<immunity death="1" />
+		<immunity holy="1" />
+		<immunity energy="1" />
+		<immunity earth="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />
diff --git a/data/monster/monsters/somewhat_beatable_dragon.xml b/data/monster/monsters/somewhat_beatable_dragon.xml
index 462838ecbd..79ab056c24 100644
--- a/data/monster/monsters/somewhat_beatable_dragon.xml
+++ b/data/monster/monsters/somewhat_beatable_dragon.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Somewhat Beatable Dragon" nameDescription="a somewhat beatable dragon" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Somewhat Beatable Dragon" nameDescription="a somewhat beatable dragon" race="blood" experience="0" speed="200">
+	<health now="1900" max="1900" />
+	<look type="39" corpse="5984" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -15,32 +15,46 @@
 		<flag canpushitems="0" />
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
+		<flag runonhealth="300" />
 		<flag targetdistance="1" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" />
+		<attack name="melee" interval="2000" min="0" max="-230" />
+		<attack name="fire" interval="2000" chance="20" range="7" radius="4" target="1" min="-100" max="-200">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="firefield" interval="2000" chance="10" range="7" radius="4" target="1">
+			<attribute key="shootEffect" value="fire" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" length="8" spread="3" min="-150" max="-230">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="35" defense="35">
+		<defense name="healing" interval="2000" chance="15" min="57" max="93">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element earthPercent="80" />
+		<element energyPercent="20" />
+		<element icePercent="-10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
+		<immunity ice="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity lifedrain="1" />
+		<immunity invisible="1" />
+		<immunity fire="1" />
+		<immunity physical="1" />
+		<immunity death="1" />
+		<immunity holy="1" />
+		<immunity energy="1" />
+		<immunity earth="1" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
index e21daa0ff8..e657b2f84b 100644
--- a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Soul Of Dragonking Zyrtarch" nameDescription="" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Soul of Dragonking Zyrtarch" nameDescription="Soul of Dragonking Zyrtarch" race="fire" experience="70700" speed="500">
+	<health now="150000" max="150000" />
+	<look type="938" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -20,25 +20,49 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<defenses armor="10" defense="5" />
+	<attacks>
+		<attack name="melee" interval="2000" skill="112" attack="85" />
+		<attack name="fire" interval="2000" chance="20" range="7" target="1" min="-110" max="-495">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="20" range="7" target="1" radius="4" min="-110" max="-495">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="20" radius="8" min="-110" max="-495">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</attack>
+		<attack name="charged energy elemental electrify" interval="2000" chance="15" radius="5" min="-1100" max="-1100">
+			<attribute key="areaEffect" value="yellowenergy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" length="9" spread="4" min="-710" max="-895">
+			<attribute key="areaEffect" value="energyarea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" length="9" spread="4" min="-710" max="-895">
+			<attribute key="areaEffect" value="fire" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" length="9" spread="0" min="-710" max="-895">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+	</attacks>
+	<defenses armor="52" defense="64">
+		<defense name="healing" interval="2000" chance="15" min="450" max="550">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="20" />
+		<element holyPercent="1" />
+		<element earthPercent="-12" />
+		<element deathPercent="-10" />
 	</elements>
 	<immunities>
+		<immunity drown="1" />
+		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity earth="1" />
 	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="200" />

From b87cc8aadc4667d72bef552d6c4e14ac19157379 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 15:10:33 -0300
Subject: [PATCH 06/38] Name fixes and name descriptions

---
 data/monster/monsters/mounted_thorn_knight.xml        | 2 +-
 data/monster/monsters/soul_of_dragonking_zyrtarch.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/monster/monsters/mounted_thorn_knight.xml b/data/monster/monsters/mounted_thorn_knight.xml
index 29d8bbc9d8..3abb95e214 100644
--- a/data/monster/monsters/mounted_thorn_knight.xml
+++ b/data/monster/monsters/mounted_thorn_knight.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Mounted Thorn Knight" nameDescription="mounted thorn knight" race="blood" experience="15000" speed="430" manacost="290">
+<monster name="Mounted Thorn Knight" nameDescription="Mounted Thorn Knight" race="blood" experience="15000" speed="430" manacost="290">
 	<health now="100000" max="100000" />
 	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" mount="626" />
 	<targetchange interval="2000" chance="0" />
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
index e657b2f84b..cb32d07022 100644
--- a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Soul of Dragonking Zyrtarch" nameDescription="Soul of Dragonking Zyrtarch" race="fire" experience="70700" speed="500">
+<monster name="Soul Of Dragonking Zyrtarch" nameDescription="Soul Of Dragonking Zyrtarch" race="fire" experience="70700" speed="500">
 	<health now="150000" max="150000" />
 	<look type="938" corpse="0" />
 	<targetchange interval="2000" chance="0" />

From 66d8584a3f54c9e3b5169217cdd6ff79f2c53296 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 15:24:09 -0300
Subject: [PATCH 07/38] Partial monster fixes

---
 data/monster/monsters/soulcatcher.xml         | 44 +++++++++----------
 data/monster/monsters/spirit_of_fertility.xml | 34 ++++++--------
 data/monster/monsters/stone_rhino.xml         | 21 ++++-----
 data/monster/monsters/sword_of_vengeance.xml  | 27 +++++-------
 data/monster/monsters/tazhadur.xml            | 22 +++++++---
 data/monster/monsters/the_astral_source.xml   | 34 +++++++-------
 6 files changed, 87 insertions(+), 95 deletions(-)

diff --git a/data/monster/monsters/soulcatcher.xml b/data/monster/monsters/soulcatcher.xml
index c6b10cd9a6..438a56783a 100644
--- a/data/monster/monsters/soulcatcher.xml
+++ b/data/monster/monsters/soulcatcher.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Soulcatcher" nameDescription="a soulcatcher" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Soulcatcher" nameDescription="a soulcatcher" race="undead" experience="320" speed="0">
+	<health now="50000" max="50000" />
+	<look typeex="12009" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -21,24 +21,24 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<defenses armor="10" defense="5" />
+	<attacks>
+		<attack name="lifedrain" interval="2000" chance="25" radius="3" min="-300" max="-400">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
+	</attacks>
+	<defenses armor="50" defense="50">
+		<defense name="soulcatcher summon" interval="2000" chance="10" />
+		<defense name="healing" interval="2000" chance="25" min="100" max="145">
+			<attribute key="areaEffect" value="fire" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element holyPercent="90" />
+		<element physicalPercent="90" />
+		<element deathPercent="90" />
+		<element firePercent="90" />
+		<element icePercent="90" />
+		<element energyPercent="90" />
+		<element earthPercent="90" />
 	</elements>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
 </monster>
diff --git a/data/monster/monsters/spirit_of_fertility.xml b/data/monster/monsters/spirit_of_fertility.xml
index 32ed31944d..e727a8692c 100644
--- a/data/monster/monsters/spirit_of_fertility.xml
+++ b/data/monster/monsters/spirit_of_fertility.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Spirit Of Fertility" nameDescription="" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Spirit Of Fertility" nameDescription="a spirit of fertility" race="undead" experience="1100" speed="130">
+	<health now="1250" max="1250" />
+	<look type="11" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -21,26 +21,20 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" skill="70" attack="60" poison="300" />
+		<attack name="drown" interval="2000" chance="17" radius="5" target="1" min="-130" max="-250">
+			<attribute key="shootEffect" value="snowball" />
+			<attribute key="areaEffect" value="bluebubble" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<defenses armor="30" defense="30">
+		<defense name="healing" interval="2000" chance="15" min="60" max="75">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/stone_rhino.xml b/data/monster/monsters/stone_rhino.xml
index 44248896dd..0c5842e3d6 100644
--- a/data/monster/monsters/stone_rhino.xml
+++ b/data/monster/monsters/stone_rhino.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Stone Rhino" nameDescription="a stone rhino" experience="1800" speed="290" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Stone Rhino" nameDescription="a stone rhino" race="blood" experience="1800" speed="290">
 	<health now="3000" max="3000" />
-	<look type="936" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="936" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -25,18 +25,13 @@
 	</attacks>
 	<defenses armor="72" defense="72">
 		<defense name="healing" interval="2000" chance="20" min="0" max="195" />
+		<defense name="healing" interval="2000" chance="15" min="0" max="250">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element physicalPercent="20" />
+		<element icePercent="-10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
diff --git a/data/monster/monsters/sword_of_vengeance.xml b/data/monster/monsters/sword_of_vengeance.xml
index c11df76c46..883d8a79d9 100644
--- a/data/monster/monsters/sword_of_vengeance.xml
+++ b/data/monster/monsters/sword_of_vengeance.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Sword Of Vengeance" nameDescription="a sword of vengeance" experience="0" speed="0" >
-	<health now="0" max="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Sword Of Vengeance" nameDescription="a sword of vengeance" race="fire" experience="0" speed="360">
+	<health now="2000" max="2000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
@@ -22,27 +22,20 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
+		<attack name="manadrain" interval="2000" chance="20" radius="6" min="-40" max="-160">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</attack>
+		<attack name="berserk" interval="2000" chance="15" min="-40" max="-160" />
+		<attack name="energy" interval="2000" chance="15" length="4" spread="0" min="-40" max="-100">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
 		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
 	</defenses>
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/tazhadur.xml b/data/monster/monsters/tazhadur.xml
index 490ef743d0..a0f3c29697 100644
--- a/data/monster/monsters/tazhadur.xml
+++ b/data/monster/monsters/tazhadur.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Tazhadur" nameDescription="" experience="9000" speed="0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Tazhadur" nameDescription="Tazhadur" race="blood" experience="9000" speed="350">
 	<health now="10000" max="10000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="947" head="24" body="120" legs="38" feet="95" addons="3" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,9 +22,21 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
+		<attack name="fire" interval="2000" chance="20" range="7" target="1" radius="5" min="-110" max="-495">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" length="9" spread="4" min="-310" max="-495">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="15" length="9" spread="0" min="-710" max="-895">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="120" max="202" />
+		<defense name="healing" interval="2000" chance="20" min="120" max="202">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
 	</defenses>
 	<elements>
 		<element physicalPercent="0" />
@@ -40,10 +52,8 @@
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="27593" name="dragon blood" chance="100000" />
diff --git a/data/monster/monsters/the_astral_source.xml b/data/monster/monsters/the_astral_source.xml
index 2373b9a313..13d0f1438c 100644
--- a/data/monster/monsters/the_astral_source.xml
+++ b/data/monster/monsters/the_astral_source.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="The Astral Source" nameDescription="" experience="0" speed="0" >
-	<health now="0" max="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="The Astral Source" nameDescription="The Astral Source" race="energy" experience="3000" speed="0">
+	<health now="150000" max="150000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
@@ -22,27 +22,27 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-401" />
+		<attack name="energy" interval="2000" chance="15" range="7" radius="6" target="1" min="0" max="-500">
+			<attribute key="shootEffect" value="energyball" />
+			<attribute key="areaEffect" value="purpleenergy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" range="7" radius="6" target="1" min="0" max="-500">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" target="0" length="5" spread="3" min="0" max="-400">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="25" radius="5" min="-200" max="-400">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
 		<defense name="healing" interval="2000" chance="20" min="0" max="467" />
 	</defenses>
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>

From 040393204608e5366791d496ec5b1307d4e9439e Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 15:59:12 -0300
Subject: [PATCH 08/38] Partial monster fixes

---
 .../monsters/the_blazing_time_guardian.xml    | 47 ++++++++++------
 .../monsters/the_distorted_astral_source.xml  | 38 +++++++------
 .../monsters/the_enraged_thorn_knight.xml     | 55 +++++++++++--------
 data/monster/monsters/the_first_dragon.xml    | 47 +++++++++-------
 .../monsters/the_freezing_time_guardian.xml   | 47 ++++++++++------
 .../monster/monsters/the_last_lore_keeper.xml | 49 +++++++++++------
 .../monsters/the_shielded_thorn_knight.xml    | 50 +++++++++++------
 data/monster/monsters/the_time_guardian.xml   | 48 ++++++++++------
 data/monster/monsters/thorn_minion.xml        | 51 +++++++++--------
 9 files changed, 263 insertions(+), 169 deletions(-)

diff --git a/data/monster/monsters/the_blazing_time_guardian.xml b/data/monster/monsters/the_blazing_time_guardian.xml
index af1f80bae7..882bd02756 100644
--- a/data/monster/monsters/the_blazing_time_guardian.xml
+++ b/data/monster/monsters/the_blazing_time_guardian.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="The Blazing Time Guardian" nameDescription="" experience="50000" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="The Blazing Time Guardian" nameDescription="The Blazing Time Guardian" race="undead" experience="50000" speed="340">
+	<health now="150000" max="150000" />
+	<look type="944" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,39 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="death" interval="2000" chance="15" range="7" radius="4" target="1" min="-600" max="-780">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" length="9" spread="0" min="-600" max="-780">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" length="9" spread="3" min="-600" max="-780">
+			<attribute key="areaEffect" value="energyarea" />
+		</attack>
+		<attack name="energycondition" interval="2000" chance="20" radius="7" min="-2000" max="-2000">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
+		<attack name="bleedcondition" interval="2000" chance="20" length="9" spread="0" min="-2000" max="-2000">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="70" defense="70">
+		<defense name="time guardian lost time" interval="2000" chance="10" />
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element earthPercent="70" />
+		<element icePercent="-40" />
+		<element energyPercent="70" />
+		<element firePercent="70" />
+		<element holyPercent="70" />
+		<element deathPercent="70" />
+		<element physicalPercent="70" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="200" />
diff --git a/data/monster/monsters/the_distorted_astral_source.xml b/data/monster/monsters/the_distorted_astral_source.xml
index 0b0a434e7d..3a586771e1 100644
--- a/data/monster/monsters/the_distorted_astral_source.xml
+++ b/data/monster/monsters/the_distorted_astral_source.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="The Distorted Astral Source" nameDescription="" experience="0" speed="0" >
-	<health now="0" max="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="The Distorted Astral Source" nameDescription="The Distorted Astral Source" race="energy" experience="3000" speed="0">
+	<health now="10000000" max="10000000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
@@ -22,25 +22,27 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="energy" interval="2000" chance="15" range="7" radius="6" target="1" min="0" max="-500">
+			<attribute key="shootEffect" value="energyball" />
+			<attribute key="areaEffect" value="purpleenergy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" range="7" radius="6" target="1" min="0" max="-500">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" target="0" length="5" spread="3" min="0" max="-400">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="25" radius="5" min="-200" max="-400">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<defenses armor="55" defense="55">
+		<defense name="healing" interval="2000" chance="17" min="1000" max="1300" />
+	</defenses>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/the_enraged_thorn_knight.xml b/data/monster/monsters/the_enraged_thorn_knight.xml
index e8b8a1af6d..cc5b977d14 100644
--- a/data/monster/monsters/the_enraged_thorn_knight.xml
+++ b/data/monster/monsters/the_enraged_thorn_knight.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="The Enraged Thorn Knight" nameDescription="" experience="30000" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="The Enraged Thorn Knight" nameDescription="The Enraged Thorn Knight" race="blood" experience="30000" speed="350">
+	<health now="20000" max="20000" />
+	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" corpse="6080" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -21,28 +21,37 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="-600" max="-1000" />
+		<attack name="lifedrain" interval="2000" chance="12" length="4" spread="3" min="-400" max="-700">
+			<attribute key="areaEffect" value="poff" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="12" length="9" spread="0" min="-1400" max="-1700">
+			<attribute key="areaEffect" value="carniphila" />
+		</attack>
+		<attack name="death" interval="2000" chance="12" length="9" spread="0" min="-400" max="-700">
+			<attribute key="areaEffect" value="mortarea" />
+		</attack>
+		<attack name="physical" interval="2000" chance="20" radius="10" min="-200" max="-250">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="60" defense="60">
+		<defense name="healing" interval="2000" chance="20" min="1550" max="2550">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+		<defense name="speed" interval="1000" chance="12" speedchange="620" duration="4000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="80" />
+		<element holyPercent="80" />
+		<element earthPercent="100" />
+		<element deathPercent="80" />
+		<element firePercent="80" />
+		<element physicalPercent="80" />
+		<element icePercent="80" />
 	</elements>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="100" />
 		<item id="2430" name="knight axe" chance="100000" />
diff --git a/data/monster/monsters/the_first_dragon.xml b/data/monster/monsters/the_first_dragon.xml
index a9b6d9fa76..3fec2471d4 100644
--- a/data/monster/monsters/the_first_dragon.xml
+++ b/data/monster/monsters/the_first_dragon.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="The First Dragon" nameDescription="" experience="0" speed="0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="The First Dragon" nameDescription="The First Dragon" race="blood" experience="9000" speed="350">
 	<health now="50000" max="50000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="947" head="94" body="80" legs="120" feet="60" addons="3" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -20,24 +20,33 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<attacks>
+		<attack name="melee" interval="2000" skill="120" attack="130" />
+		<attack name="fire" interval="2000" chance="20" radius="5" target="1" range="5" min="-410" max="-695">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="speed" interval="2000" chance="20" radius="7" speedchange="-600" duration="10000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
+		<attack name="fire" interval="2000" chance="20" length="9" spread="3" min="-1010" max="-1995">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="20" radius="7" min="-410" max="-595">
+			<attribute key="areaEffect" value="fire" />
+		</attack>
+		<attack name="lifedrain" interval="2000" chance="20" radius="6" min="-150" max="-280">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
+	</attacks>
+	<defenses armor="52" defense="64">
+		<defense name="healing" interval="2000" chance="15" min="1500" max="4500">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<immunities>
+		<immunity drown="1" />
+		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/the_freezing_time_guardian.xml b/data/monster/monsters/the_freezing_time_guardian.xml
index ecc7086142..d422925cad 100644
--- a/data/monster/monsters/the_freezing_time_guardian.xml
+++ b/data/monster/monsters/the_freezing_time_guardian.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="The Freezing Time Guardian" nameDescription="" experience="50000" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="The Freezing Time Guardian" nameDescription="The Freezing Time Guardian" race="undead" experience="50000" speed="340">
+	<health now="150000" max="150000" />
+	<look type="943" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,39 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="death" interval="2000" chance="15" range="7" radius="4" target="1" min="-600" max="-780">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" length="9" spread="0" min="-600" max="-780">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" length="9" spread="3" min="-600" max="-780">
+			<attribute key="areaEffect" value="energyarea" />
+		</attack>
+		<attack name="energycondition" interval="2000" chance="20" radius="7" min="-2000" max="-2000">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
+		<attack name="bleedcondition" interval="2000" chance="20" length="9" spread="0" min="-2000" max="-2000">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="70" defense="70">
+		<defense name="time guardian lost time" interval="2000" chance="10" />
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element earthPercent="70" />
+		<element icePercent="70" />
+		<element energyPercent="70" />
+		<element firePercent="-40" />
+		<element holyPercent="70" />
+		<element deathPercent="70" />
+		<element physicalPercent="70" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="200" />
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index 5d020a3330..e3787b5b38 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="The Last Lore Keeper" nameDescription="" experience="45000" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="The Last Lore Keeper" nameDescription="The Last Lore Keeper" race="undead" experience="45000" speed="450">
+	<health now="750000" max="750000" />
+	<look type="939" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,41 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-1000" />
+		<attack name="physical" interval="2000" chance="7" length="8" spread="3" min="-650" max="-900">
+			<attribute key="areaEffect" value="explosionarea" />
+		</attack>
+		<attack name="lifedrain" interval="2000" chance="20" length="10" spread="0" min="-850" max="-2260">
+			<attribute key="areaeffect" value="redshimmer" />
+		</attack>
+		<attack name="lifedrain" interval="2000" chance="20" radius="5" min="-640" max="-800">
+			<attribute key="areaeffect" value="smallclouds" />
+		</attack>
+		<attack name="energy" interval="2000" chance="20" length="8" spread="0" min="-420" max="-954">
+			<attribute key="areaeffect" value="purpleenergy" />
+		</attack>
+		<attack name="earth" interval="2000" chance="20" radius="5" target="1" min="-640" max="-800">
+			<attribute key="areaeffect" value="stones" />
+		</attack>
+		<attack name="medusa paralyze" interval="2000" chance="20" />
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="50" defense="50">
+		<defense name="healing" interval="2000" chance="25" min="1500" max="3000">
+			<attribute key="areaEffect" value="greenshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element icePercent="20" />
+		<element firePercent="20" />
+		<element energyPercent="20" />
+		<element earthPercent="20" />
+		<element holyPercent="20" />
+		<element physicalPercent="20" />
+		<element deathPercent="20" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="You shall not pass!" yell="false" />
diff --git a/data/monster/monsters/the_shielded_thorn_knight.xml b/data/monster/monsters/the_shielded_thorn_knight.xml
index aab9f20657..d3f31b3e65 100644
--- a/data/monster/monsters/the_shielded_thorn_knight.xml
+++ b/data/monster/monsters/the_shielded_thorn_knight.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="The Shielded Thorn Knight" nameDescription="" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="The Shielded Thorn Knight" nameDescription="The Shielded Thorn Knight" race="blood" experience="0" speed="390">
+	<health now="70000" max="70000" />
+	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -21,26 +21,40 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="-600" max="-1000" />
+		<attack name="lifedrain" interval="2000" chance="12" length="4" spread="3" min="-400" max="-700">
+			<attribute key="areaEffect" value="poff" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="12" length="9" spread="0" min="-1400" max="-1700">
+			<attribute key="areaEffect" value="carniphila" />
+		</attack>
+		<attack name="death" interval="2000" chance="12" length="9" spread="0" min="-400" max="-700">
+			<attribute key="areaEffect" value="mortarea" />
+		</attack>
+		<attack name="physical" interval="2000" chance="20" radius="10" min="-200" max="-250">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="60" defense="60">
+		<defense name="healing" interval="2000" chance="20" min="1550" max="2550">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+		<defense name="speed" interval="1000" chance="12" speedchange="620" duration="4000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="80" />
+		<element holyPercent="80" />
+		<element earthPercent="100" />
+		<element deathPercent="80" />
+		<element firePercent="80" />
+		<element physicalPercent="80" />
+		<element icePercent="80" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
index a05ceaf47b..da9e29d30f 100644
--- a/data/monster/monsters/the_time_guardian.xml
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="The Time Guardian" nameDescription="" experience="50000" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="The Time Guardian" nameDescription="The Time Guardian" race="undead" experience="50000" speed="340">
+	<health now="150000" max="150000" />
+	<look type="945" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,26 +22,40 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-744" />
+		<attack name="death" interval="2000" chance="15" range="7" radius="4" target="1" min="-600" max="-780">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" length="9" spread="0" min="-600" max="-780">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="energy" interval="2000" chance="15" length="9" spread="3" min="-600" max="-780">
+			<attribute key="areaEffect" value="energyarea" />
+		</attack>
+		<attack name="energycondition" interval="2000" chance="20" radius="7" min="-2000" max="-2000">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
+		<attack name="bleedcondition" interval="2000" chance="20" length="9" spread="0" min="-2000" max="-2000">
+			<attribute key="areaEffect" value="yellowspark" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="70" defense="70">
+		<defense name="time guardian" interval="2000" chance="10" />
+		<defense name="time guardiann" interval="2000" chance="10" />
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element earthPercent="70" />
+		<element icePercent="70" />
+		<element energyPercent="70" />
+		<element firePercent="70" />
+		<element holyPercent="70" />
+		<element deathPercent="70" />
+		<element physicalPercent="70" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="This place is sacred!" yell="false" />
diff --git a/data/monster/monsters/thorn_minion.xml b/data/monster/monsters/thorn_minion.xml
index 053d624f15..41e5b4911d 100644
--- a/data/monster/monsters/thorn_minion.xml
+++ b/data/monster/monsters/thorn_minion.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Thorn Minion" nameDescription="a thorn minion" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Thorn Minion" nameDescription="a thorn minion" race="venom" experience="1600" speed="150" manacost="290">
+	<health now="3500" max="3500" />
+	<look type="717" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -21,26 +21,31 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-264" />
+		<attack name="melee" interval="2000" min="-60" max="-150" poison="500" />
+		<attack name="earth" interval="2000" chance="15" range="7" min="-100" max="-195">
+			<attribute key="shootEffect" value="poison" />
+			<attribute key="areaEffect" value="greenbubble" />
+		</attack>
+		<attack name="speed" interval="2000" chance="15" range="7" speedchange="-800" duration="30000">
+			<attribute key="shootEffect" value="poison" />
+			<attribute key="areaEffect" value="greenbubble" />
+		</attack>
+		<attack name="physical" interval="2000" chance="20" radius="4" target="0" min="-200" max="-280">
+			<attribute key="areaEffect" value="groundshaker" />
+		</attack>
+		<attack name="death" interval="2000" chance="10" length="4" spread="0" min="-200" max="-400">
+			<attribute key="areaEffect" value="carniphila" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="20" defense="20">
+		<defense name="speed" interval="2000" chance="30" speedchange="250" duration="4000">
+			<attribute key="areaEffect" value="greenshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="20" />
+		<element holyPercent="1" />
+		<element earthPercent="-12" />
+		<element deathPercent="-10" />
 	</elements>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
-	</immunities>
 </monster>

From 35e9e5424168963a06d44703ea92a375a18809e7 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 17:23:35 -0300
Subject: [PATCH 09/38] Partial monster fixes

---
 data/monster/monsters/time_keeper.xml         | 33 +++++------
 data/monster/monsters/time_waster.xml         | 39 +++++++------
 data/monster/monsters/twisted_shaper.xml      | 32 ++++++----
 data/monster/monsters/unbeatable_dragon.xml   | 45 +++++++-------
 .../monster/monsters/unbound_blightwalker.xml | 42 ++++++++------
 data/monster/monsters/unbound_defiler.xml     | 47 +++++++++------
 data/monster/monsters/unbound_demon.xml       | 58 +++++++++++++------
 .../monsters/unbound_demon_outcast.xml        | 52 +++++++++++------
 data/monster/monsters/zorvorax.xml            | 40 +++++++------
 9 files changed, 234 insertions(+), 154 deletions(-)

diff --git a/data/monster/monsters/time_keeper.xml b/data/monster/monsters/time_keeper.xml
index d2931436e5..e3d0b96702 100644
--- a/data/monster/monsters/time_keeper.xml
+++ b/data/monster/monsters/time_keeper.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Time Keeper" nameDescription="a time keeper" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Time Keeper" nameDescription="a time keeper" race="undead" experience="0" speed="160">
+	<health now="1000" max="1000" />
+	<look type="560" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,25 +22,24 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-113" />
+		<attack name="lifedrain" interval="2000" chance="17" range="7" min="-4" max="-6">
+			<attribute key="shootEffect" value="suddendeath" />
+			<attribute key="areaEffect" value="yalaharighost" />
+		</attack>
+		<attack name="white shade paralyze" interval="2000" chance="18" />
 	</attacks>
 	<defenses armor="10" defense="5" />
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element physicalPercent="90" />
+		<element holyPercent="-10" />
 	</elements>
 	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
+		<immunity death="1" />
+		<immunity lifedrain="1" />
+		<immunity earth="1" />
+		<immunity drown="1" />
 		<immunity invisible="1" />
+		<immunity paralyze="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/time_waster.xml b/data/monster/monsters/time_waster.xml
index 3aa95943d8..79a42e8fab 100644
--- a/data/monster/monsters/time_waster.xml
+++ b/data/monster/monsters/time_waster.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Time Waster" nameDescription="a Time Waster" experience="0" speed="0" >
-	<health now="0" max="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Time Waster" nameDescription="a time waster" race="undead" experience="0" speed="100">
+	<health now="1000" max="1000" />
 	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
@@ -20,24 +20,27 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
+	<attacks>
+		<attack name="melee" interval="2000" skill="100" attack="100" />
+		<attack name="lifedrain" interval="2000" chance="17" range="7" min="-40" max="-60">
+			<attribute key="shootEffect" value="suddendeath" />
+			<attribute key="areaEffect" value="yalaharighost" />
+		</attack>
+		<attack name="white shade paralyze" interval="2000" chance="18" />
+	</attacks>
 	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
+		<immunity death="1" />
+		<immunity lifedrain="1" />
+		<immunity earth="1" />
+		<immunity drown="1" />
 		<immunity invisible="1" />
+		<immunity paralyze="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity physical="1" />
+		<immunity energy="1" />
+		<immunity fire="1" />
+		<immunity ice="1" />
+		<immunity holy="1" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/twisted_shaper.xml b/data/monster/monsters/twisted_shaper.xml
index dbbaf54aa8..64e117a5a9 100644
--- a/data/monster/monsters/twisted_shaper.xml
+++ b/data/monster/monsters/twisted_shaper.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <monster name="Twisted Shaper" nameDescription="a twisted shaper" experience="1750" speed="280" >
 	<health now="2500" max="2500" />
 	<look type="932" head="105" body="0" legs="0" feet="94" addons="1" mount="0" corpse="0" />
@@ -22,21 +22,29 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-100" />
+		<attack name="physical" interval="2000" chance="10" range="7" target="1" min="-50" max="-100">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="lifedrain" interval="2000" chance="35" length="5" spread="0" min="0" max="-100">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="10" radius="7" min="-50" max="-100">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</attack>
+		<attack name="speed" interval="2000" chance="9" target="1" speedchange="-440" duration="7000">
+			<attribute key="areaEffect" value="giantice" />
+		</attack>
 	</attacks>
 	<defenses armor="35" defense="35">
-		<defense name="healing" interval="2000" chance="20" min="0" max="300" />
+		<defense name="healing" interval="2000" chance="20" min="0" max="300">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="-25" />
+		<element earthPercent="20" />
+		<element firePercent="-20" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
diff --git a/data/monster/monsters/unbeatable_dragon.xml b/data/monster/monsters/unbeatable_dragon.xml
index 61234588ca..567ffcb4f0 100644
--- a/data/monster/monsters/unbeatable_dragon.xml
+++ b/data/monster/monsters/unbeatable_dragon.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbeatable Dragon" nameDescription="an unbeatable dragon" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Unbeatable Dragon" nameDescription="an unbeatable dragon" race="blood" experience="2100" speed="200">
+	<health now="1900" max="1900" />
+	<look type="39" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,25 +22,28 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
+		<attack name="fire" interval="2000" chance="17" range="7" radius="4" target="1" min="-100" max="-200">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="fire" interval="2000" chance="17" length="8" spread="3" min="-150" max="-230">
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
+	<defenses armor="32" defense="48">
+		<defense name="healing" interval="2000" chance="25" min="55" max="95">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+	</defenses>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
-		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity fire="1" />
+		<immunity ice="1" />
+		<immunity energy="1" />
+		<immunity physical="1" />
+		<immunity earth="1" />
+		<immunity holy="1" />
+		<immunity death="1" />
+		<immunity lifedrain="1" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/unbound_blightwalker.xml b/data/monster/monsters/unbound_blightwalker.xml
index 192ab6d4eb..ad3106327a 100644
--- a/data/monster/monsters/unbound_blightwalker.xml
+++ b/data/monster/monsters/unbound_blightwalker.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbound Blightwalker" nameDescription="an unbound blightwalker" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Unbound Blightwalker" nameDescription="an unbound blightwalker" race="undead" experience="5850" speed="350">
+	<health now="7900" max="7900" />
+	<look type="246" corpse="6354" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,25 +22,33 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-99" />
+		<attack name="earth" interval="2000" chance="9" range="1" target="1" min="-220" max="-405">
+			<attribute key="shootEffect" value="poison" />
+			<attribute key="areaEffect" value="greenbubble" />
+		</attack>
+		<attack name="blightwalker curse" interval="2000" chance="10" />
+		<attack name="lifedrain" interval="2000" chance="14" radius="4" target="0" min="-65" max="-135">
+			<attribute key="areaEffect" value="greenshimmer" />
+		</attack>
+		<attack name="drunk" interval="2000" chance="12" duration="35000" radius="3" target="0">
+			<attribute key="areaEffect" value="greenspark" />
+		</attack>
+		<attack name="blightwalker paralyze" interval="2000" chance="15" range="7" />
 	</attacks>
 	<defenses armor="10" defense="5" />
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="50" />
+		<element energyPercent="20" />
+		<element icePercent="50" />
+		<element physicalPercent="-10" />
+		<element holyPercent="-30" />
 	</elements>
 	<immunities>
-		<immunity paralyze="1" />
-		<immunity outfit="0" />
+		<immunity death="1" />
+		<immunity earth="1" />
+		<immunity lifedrain="1" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity paralyze="1" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/unbound_defiler.xml b/data/monster/monsters/unbound_defiler.xml
index 5b9b8edb64..8dc8c14781 100644
--- a/data/monster/monsters/unbound_defiler.xml
+++ b/data/monster/monsters/unbound_defiler.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbound Defiler" nameDescription="an unbound defiler" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Unbound Defiler" nameDescription="an unbound defiler" race="venom" experience="3700" speed="160">
+	<health now="2650" max="2650" />
+	<look type="238" corpse="6532" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,25 +22,38 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="lifedrain" interval="2000" chance="13" target="1" range="7" min="-160" max="-295">
+			<attribute key="areaEffect" value="greenspark" />
+			<attribute key="shootEffect" value="poison" />
+		</attack>
+		<attack name="defiler paralyze 3" interval="2000" chance="9" />
+		<attack name="defiler paralyze 1" interval="2000" chance="6" />
+		<attack name="defiler paralyze 2" interval="2000" chance="8" />
+		<attack name="poisoncondition" interval="2000" chance="10" radius="8" target="0" start="32" min="-300" max="-500">
+			<attribute key="areaEffect" value="greenspark" />
+		</attack>
+		<attack name="poisoncondition" interval="2000" chance="10" length="8" spread="3" start="32" min="-400" max="-725">
+			<attribute key="areaEffect" value="smallplants" />
+		</attack>
+		<attack name="earth" interval="2000" chance="14" radius="3" target="0" min="-120" max="-170">
+			<attribute key="areaEffect" value="poison" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="15" defense="15">
+		<defense name="healing" interval="2000" chance="15" min="250" max="450">
+			<attribute key="areaEffect" value="greenshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="10" />
+		<element icePercent="20" />
+		<element firePercent="-25" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
+		<immunity earth="1" />
+		<immunity lifedrain="1" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/unbound_demon.xml b/data/monster/monsters/unbound_demon.xml
index 60d2a52755..182175838f 100644
--- a/data/monster/monsters/unbound_demon.xml
+++ b/data/monster/monsters/unbound_demon.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbound Demon" nameDescription="an unbound demon" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Unbound Demon" nameDescription="an unbound demon" race="fire" experience="5000" speed="256">
+	<health now="7200" max="7200" />
+	<look type="35" corpse="5995" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,25 +22,47 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="manadrain" interval="2000" chance="13" range="7" min="-60" max="-120">
+			<attribute key="shootEffect" value="suddendeath" />
+			<attribute key="areaEffect" value="smallclouds" />
+		</attack>
+		<attack name="fire" interval="2000" chance="33" range="7" radius="7" target="1" min="-150" max="-250">
+			<attribute key="shootEffect" value="fire" />
+			<attribute key="areaEffect" value="firearea" />
+		</attack>
+		<attack name="energy" interval="2000" chance="7" range="1" radius="1" target="1" min="-210" max="-300">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="firefield" interval="2000" chance="14" range="7" radius="1" target="1">
+			<attribute key="shootEffect" value="fire" />
+		</attack>
+		<attack name="demon paralyze" interval="2000" chance="10" range="7" />
+		<attack name="lifedrain" interval="2000" chance="10" length="8" spread="0" min="-300" max="-480">
+			<attribute key="areaEffect" value="purpleenergy" />
+		</attack>
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="40" defense="65">
+		<defense name="healing" interval="2000" chance="14" min="150" max="250">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+		<defense name="demon summon" interval="2000" chance="8" />
+		<defense name="speed" interval="2000" chance="10" speedchange="388" duration="4000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element physicalPercent="30" />
+		<element earthPercent="40" />
+		<element energyPercent="50" />
+		<element deathPercent="30" />
+		<element icePercent="-10" />
+		<element holyPercent="-10" />
 	</elements>
 	<immunities>
+		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
+		<immunity fire="1" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/unbound_demon_outcast.xml b/data/monster/monsters/unbound_demon_outcast.xml
index 9171083d1e..192e68a030 100644
--- a/data/monster/monsters/unbound_demon_outcast.xml
+++ b/data/monster/monsters/unbound_demon_outcast.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Unbound Demon Outcast" nameDescription="an unbound demon outcast" experience="0" speed="0" >
-	<health now="0" max="0" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Unbound Demon Outcast" nameDescription="an unbound demon outcast" race="fire" experience="6200" speed="300">
+	<health now="5900" max="5900" />
+	<look type="590" corpse="22549" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,25 +22,43 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="energy" interval="2000" chance="10" length="6" spread="0" target="1" min="-200" max="-300">
+			<attribute key="areaEffect" value="purpleenergy" />
+		</attack>
+		<attack name="lifedrain" interval="2000" chance="10" length="8" spread="0" target="1" min="-250" max="-350">
+			<attribute key="areaEffect" value="yellowenergy" />
+		</attack>
+		<attack name="physical" interval="2000" chance="20" radius="3" target="1" min="0" max="0">
+			<attribute key="shootEffect" value="energy" />
+			<attribute key="areaEffect" value="energy" />
+		</attack>
+		<attack name="manadrain" interval="2000" chance="9" range="7" target="1" min="-50" max="-100">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
+		<attack name="demon outcast skill reducer" range="5" interval="2000" chance="7" />
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="40" defense="40">
+		<defense name="healing" interval="2000" chance="15" min="100" max="200">
+			<attribute key="areaEffect" value="blueshimmer" />
+		</defense>
+		<defense name="speed" interval="2000" chance="10" speedchange="468" duration="7000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
+	<summons maxSummons="2">
+		<summon name="energy elemental" interval="2000" chance="10" />
+	</summons>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element physicalPercent="20" />
+		<element deathPercent="5" />
+		<element energyPercent="-8" />
+		<element icePercent="5" />
+		<element earthPercent="40" />
+		<element holyPercent="-5" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/zorvorax.xml b/data/monster/monsters/zorvorax.xml
index 37e4b3c7d7..55f7d7d7aa 100644
--- a/data/monster/monsters/zorvorax.xml
+++ b/data/monster/monsters/zorvorax.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Zorvorax" nameDescription="" experience="9000" speed="0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Zorvorax" nameDescription="Zorvorax" race="undead" experience="9000" speed="350">
 	<health now="10000" max="10000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="928" corpse="6306" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
@@ -22,28 +22,34 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
+		<attack name="death" interval="2000" chance="15" range="7" radius="5" target="1" min="-120" max="-650">
+			<attribute key="shootEffect" value="death" />
+			<attribute key="areaEffect" value="blacksmoke" />
+		</attack>
+		<attack name="fire" interval="2000" chance="11" range="7" min="-330" max="-805">
+			<attribute key="shootEffect" value="fire" />
+		</attack>
+		<attack name="undead dragon curse" interval="2000" chance="10" />
+		<attack name="death" interval="2000" chance="9" length="8" spread="3" min="-300" max="-780">
+			<attribute key="areaEffect" value="smallclouds" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="120" max="360" />
+		<defense name="healing" interval="2000" chance="20" min="120" max="360">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="100" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element holyPercent="-10" />
+		<element physicalPercent="10" />
+		<element icePercent="10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
-		<immunity bleed="0" />
+		<immunity death="1" />
+		<immunity earth="1" />
+		<immunity drown="1" />
 	</immunities>
 	<loot>
 		<item id="27598" name="bones of zorvorax" chance="100000" />

From c5d8ced65a0d2987e78121b6e3c979e65d7de598 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 19:37:21 -0300
Subject: [PATCH 10/38] File name corrections

---
 data/monster/monsters.xml                                   | 6 +++---
 .../monster/monsters/pinata_dragon.xml                      | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename "data/monster/monsters/pi\303\261ata_dragon.xml" => data/monster/monsters/pinata_dragon.xml (100%)

diff --git a/data/monster/monsters.xml b/data/monster/monsters.xml
index 15835e6417..c88238a54c 100644
--- a/data/monster/monsters.xml
+++ b/data/monster/monsters.xml
@@ -16,7 +16,7 @@
 	<monster name="Ancient Scarab" file="monsters/ancient_scarab.xml" />
 	<monster name="Angry Adventurer" file="monsters/angry_adventurer.xml" />
 	<monster name="Angry Plant" file="monsters/angry_plant.xml" />
-	<monster name="Animated Sword" file="monsters/angry_plant.xml" />
+	<monster name="Animated Sword" file="monsters/angry_sword.xml" />
 	<monster name="Annihilon" file="monsters/annihilon.xml" />
 	<monster name="Apocalypse" file="monsters/apocalypse.xml" />
 	<monster name="Apprentice Sheng" file="monsters/apprentice_sheng.xml" />
@@ -289,7 +289,7 @@
 	<monster name="Frost Giantess" file="monsters/frost_giantess.xml" />
 	<monster name="Frost Troll" file="monsters/frost_troll.xml" />
 	<monster name="Frostfur" file="monsters/frostfur.xml" />
-	<monster name="Frozen Minion" file="monsters/fallen_challenger.xml" />
+	<monster name="Frozen Minion" file="monsters/fallen_minion.xml" />
 	<monster name="Furious Orc Berserker" file="monsters/furious_orc_berserker.xml" />
 	<monster name="Furious Troll" file="monsters/furious_troll.xml" />
 	<monster name="Fury of the Emperor" file="monsters/fury_of_the_emperor.xml" />
@@ -559,7 +559,7 @@
 	<monster name="Pig" file="monsters/pig.xml" />
 	<monster name="Pigeon" file="monsters/pigeon.xml" />
 	<monster name="Pillar" file="monsters/pillar.xml" />
-	<monster name="Piñata Dragon" file="monsters/piñata_dragon.xml" />
+	<monster name="Pinata Dragon" file="monsters/pinata_dragon.xml" />
 	<monster name="Pirate Buccaneer" file="monsters/pirate_buccaneer.xml" />
 	<monster name="Pirate Corsair" file="monsters/pirate_corsair.xml" />
 	<monster name="Pirate Cutthroat" file="monsters/pirate_cutthroat.xml" />
diff --git "a/data/monster/monsters/pi\303\261ata_dragon.xml" b/data/monster/monsters/pinata_dragon.xml
similarity index 100%
rename from "data/monster/monsters/pi\303\261ata_dragon.xml"
rename to data/monster/monsters/pinata_dragon.xml

From 0582c34fc0a44fb437c5eef2ef81aa216c313b38 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 20:34:54 -0300
Subject: [PATCH 11/38] Partial corpses and looktype fixes

---
 data/monster/monsters.xml                     |   4 +-
 .../monsters/a_shielded_astral_glyph.xml      |   2 +-
 data/monster/monsters/an_astral_glyph.xml     |   2 +-
 data/monster/monsters/an_observer_eye.xml     |   2 +-
 data/monster/monsters/angry_plant.xml         |   2 +-
 data/monster/monsters/animated_sword.xml      |   2 +-
 .../monsters/baby_dragon_(creature).xml       |   2 +-
 data/monster/monsters/broken_shaper.xml       |   2 +-
 data/monster/monsters/cave_parrot.xml         |   2 +-
 data/monster/monsters/corrupted_soul.xml      | 108 +++++++++---------
 data/monster/monsters/dragon_wrath.xml        |   2 +-
 data/monster/monsters/fallen_challenger.xml   |   2 +-
 data/monster/monsters/frozen_minion.xml       |   2 +-
 .../monsters/gelidrazah_the_frozen.xml        |   2 +-
 data/monster/monsters/ice_dragon.xml          |   2 +-
 data/monster/monsters/icicle_(creature).xml   |   2 +-
 data/monster/monsters/lloyd.xml               |   2 +-
 .../monsters/melting_frozen_horror.xml        |   2 +-
 .../monster/monsters/mounted_thorn_knight.xml |   2 +-
 data/monster/monsters/orclops_doomhauler.xml  |   2 +-
 data/monster/monsters/orclops_ravager.xml     |   2 +-
 data/monster/monsters/pinata_dragon.xml       |   2 +-
 data/monster/monsters/shaper_matriarch.xml    |   2 +-
 data/monster/monsters/solid_frozen_horror.xml |   2 +-
 .../monsters/somewhat_beatable_dragon.xml     |   2 +-
 data/monster/monsters/stone_rhino.xml         |   2 +-
 data/monster/monsters/sword_of_vengeance.xml  |   2 +-
 data/monster/monsters/tazhadur.xml            |   2 +-
 data/monster/monsters/the_astral_source.xml   |   2 +-
 .../monsters/the_distorted_astral_source.xml  |   2 +-
 30 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/data/monster/monsters.xml b/data/monster/monsters.xml
index c88238a54c..126672b1c9 100644
--- a/data/monster/monsters.xml
+++ b/data/monster/monsters.xml
@@ -16,7 +16,7 @@
 	<monster name="Ancient Scarab" file="monsters/ancient_scarab.xml" />
 	<monster name="Angry Adventurer" file="monsters/angry_adventurer.xml" />
 	<monster name="Angry Plant" file="monsters/angry_plant.xml" />
-	<monster name="Animated Sword" file="monsters/angry_sword.xml" />
+	<monster name="Animated Sword" file="monsters/animated_sword.xml" />
 	<monster name="Annihilon" file="monsters/annihilon.xml" />
 	<monster name="Apocalypse" file="monsters/apocalypse.xml" />
 	<monster name="Apprentice Sheng" file="monsters/apprentice_sheng.xml" />
@@ -289,7 +289,7 @@
 	<monster name="Frost Giantess" file="monsters/frost_giantess.xml" />
 	<monster name="Frost Troll" file="monsters/frost_troll.xml" />
 	<monster name="Frostfur" file="monsters/frostfur.xml" />
-	<monster name="Frozen Minion" file="monsters/fallen_minion.xml" />
+	<monster name="Frozen Minion" file="monsters/frozen_minion.xml" />
 	<monster name="Furious Orc Berserker" file="monsters/furious_orc_berserker.xml" />
 	<monster name="Furious Troll" file="monsters/furious_troll.xml" />
 	<monster name="Fury of the Emperor" file="monsters/fury_of_the_emperor.xml" />
diff --git a/data/monster/monsters/a_shielded_astral_glyph.xml b/data/monster/monsters/a_shielded_astral_glyph.xml
index 3c61da7df6..1a1cb49027 100644
--- a/data/monster/monsters/a_shielded_astral_glyph.xml
+++ b/data/monster/monsters/a_shielded_astral_glyph.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="A Shielded Astral Glyph" nameDescription="a shielded astral glyph" race="undead" experience="0" speed="470">
 	<health now="50000" max="50000" />
-	<look typeex="26894" corpse="0" />
+	<look typeex="26882" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/an_astral_glyph.xml b/data/monster/monsters/an_astral_glyph.xml
index 2609863e1f..a03d25778b 100644
--- a/data/monster/monsters/an_astral_glyph.xml
+++ b/data/monster/monsters/an_astral_glyph.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="An Astral Glyph" nameDescription="an astral glyph" race="energy" experience="0" speed="470">
 	<health now="50000" max="50000" />
-	<look typeex="26893" corpse="0" />
+	<look typeex="26881" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/an_observer_eye.xml b/data/monster/monsters/an_observer_eye.xml
index 462c4bfa09..ddf83258bc 100644
--- a/data/monster/monsters/an_observer_eye.xml
+++ b/data/monster/monsters/an_observer_eye.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="An Observer Eye" nameDescription="An Observer Eye" race="blood" experience="0" speed="0" >
 	<health now="30000" max="30000" />
-	<look type="925" corpse="5995" />
+	<look type="925" corpse="27584" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/angry_plant.xml b/data/monster/monsters/angry_plant.xml
index 254e1e577a..dc4c39088e 100644
--- a/data/monster/monsters/angry_plant.xml
+++ b/data/monster/monsters/angry_plant.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Angry Plant" nameDescription="an angry plant" race="venom" experience="110" speed="0" >
 	<health now="10000" max="10000" />
-	<look type="120" corpse="9679" />
+	<look type="120" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/animated_sword.xml b/data/monster/monsters/animated_sword.xml
index e5d3ec3444..58a2f1ab0a 100644
--- a/data/monster/monsters/animated_sword.xml
+++ b/data/monster/monsters/animated_sword.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Animated Sword" nameDescription="an animated sword" race="fire" experience="0" speed="360" >
 	<health now="2000" max="2000" />
-	<look typeex="26895" corpse="0" />
+	<look typeex="26883" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/baby_dragon_(creature).xml b/data/monster/monsters/baby_dragon_(creature).xml
index 2ecc8efb9e..3f603b8b82 100644
--- a/data/monster/monsters/baby_dragon_(creature).xml
+++ b/data/monster/monsters/baby_dragon_(creature).xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Baby Dragon" nameDescription="a baby dragon" race="blood" experience="185" speed="176">
 	<health now="380" max="380" />
-	<look type="271" corpse="7621" />
+	<look type="271" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/broken_shaper.xml b/data/monster/monsters/broken_shaper.xml
index e32b8eb6e3..7f71b20029 100644
--- a/data/monster/monsters/broken_shaper.xml
+++ b/data/monster/monsters/broken_shaper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Broken Shaper" nameDescription="a broken shaper" race="blood" experience="1600" speed="310" manacost="290">
 	<health now="2200" max="2200" />
-	<look type="932" head="94" body="76" legs="0" feet="82" addons="1" mount="0" corpse="0" />
+	<look type="932" head="94" body="76" legs="0" feet="82" addons="1" corpse="27724" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/cave_parrot.xml b/data/monster/monsters/cave_parrot.xml
index 051bafd375..8a0a364f6f 100644
--- a/data/monster/monsters/cave_parrot.xml
+++ b/data/monster/monsters/cave_parrot.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <monster name="Cave Parrot" nameDescription="a cave parrot" experience="0" speed="320" manacost="250">
 	<health now="30" max="30" />
-	<look type="217" corpse="6056" />
+	<look type="217" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/corrupted_soul.xml b/data/monster/monsters/corrupted_soul.xml
index 11e665b06f..d8fb81afb2 100644
--- a/data/monster/monsters/corrupted_soul.xml
+++ b/data/monster/monsters/corrupted_soul.xml
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Corrupted Soul" nameDescription="a corrupted soul" race="undead" experience="1300" speed="210">
-    <health now="1100" max="1100" />
+	<health now="1100" max="1100" />
 	<look type="355" corpse="0" />
-    <targetchange interval="2000" chance="0" />
-    <flags>
-        <flag attackable="1" />
-        <flag hostile="1" />
-        <flag summonable="0" />
-        <flag convinceable="0" />
-        <flag illusionable="0" />
-        <flag isboss="0" />
-        <flag ignorespawnblock="0" />
-        <flag pushable="0" />
-        <flag canpushitems="0" />
-        <flag canpushcreatures="0" />
-        <flag staticattack="90" />
-        <flag targetdistance="1" />
-        <flag healthhidden="0" />
-        <flag canwalkonenergy="0" />
-        <flag canwalkonfire="0" />
-        <flag canwalkonpoison="0" />
-    </flags>
-    <attacks>
-        <attack name="melee" interval="2000" skill="60" attack="60" />
-        <attack name="souleater drown" interval="2000" chance="9" />
-        <attack name="ice" interval="2000" chance="8" radius="1" target="1" min="-50" max="-100">
-            <attribute key="shootEffect" value="ice" />
-            <attribute key="areaEffect" value="iceattack" />
-        </attack>
-        <attack name="lifedrain" interval="2000" chance="14" radius="4" target="0" min="-10" max="-60">
-            <attribute key="areaEffect" value="redshimmer" />
-        </attack>
-        <attack name="souleater wave" interval="2000" chance="12" min="-100" max="-210" />
-    </attacks>
-    <defenses armor="25" defense="20">
-        <defense name="invisible" interval="2000" chance="12" duration="4000">
-            <attribute key="areaEffect" value="poff" />
-        </defense>
-        <defense name="healing" interval="2000" chance="16" min="130" max="205">
-            <attribute key="areaEffect" value="redshimmer" />
-        </defense>
-    </defenses>
-    <elements>
-        <element holyPercent="-10" />
-        <element icePercent="50" />
-        <element firePercent="-10" />
-        <element energyPercent="-10" />
-        <element physicalPercent="70" />
-    </elements>
-    <immunities>
-        <immunity paralyze="1" />
-        <immunity invisible="1" />
-        <immunity lifedrain="1" />
-        <immunity drown="1" />
-        <immunity death="1" />
-    </immunities>
+	<targetchange interval="2000" chance="0" />
+	<flags>
+		<flag attackable="1" />
+		<flag hostile="1" />
+		<flag summonable="0" />
+		<flag convinceable="0" />
+		<flag illusionable="0" />
+		<flag isboss="0" />
+		<flag ignorespawnblock="0" />
+		<flag pushable="0" />
+		<flag canpushitems="0" />
+		<flag canpushcreatures="0" />
+		<flag staticattack="90" />
+		<flag targetdistance="1" />
+		<flag healthhidden="0" />
+		<flag canwalkonenergy="0" />
+		<flag canwalkonfire="0" />
+		<flag canwalkonpoison="0" />
+	</flags>
+	<attacks>
+		<attack name="melee" interval="2000" skill="60" attack="60" />
+		<attack name="souleater drown" interval="2000" chance="9" />
+		<attack name="ice" interval="2000" chance="8" radius="1" target="1" min="-50" max="-100">
+			<attribute key="shootEffect" value="ice" />
+			<attribute key="areaEffect" value="iceattack" />
+		</attack>
+		<attack name="lifedrain" interval="2000" chance="14" radius="4" target="0" min="-10" max="-60">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
+		<attack name="souleater wave" interval="2000" chance="12" min="-100" max="-210" />
+	</attacks>
+	<defenses armor="25" defense="20">
+		<defense name="invisible" interval="2000" chance="12" duration="4000">
+			<attribute key="areaEffect" value="poff" />
+		</defense>
+		<defense name="healing" interval="2000" chance="16" min="130" max="205">
+			<attribute key="areaEffect" value="redshimmer" />
+		</defense>
+	</defenses>
+	<elements>
+		<element holyPercent="-10" />
+		<element icePercent="50" />
+		<element firePercent="-10" />
+		<element energyPercent="-10" />
+		<element physicalPercent="70" />
+	</elements>
+	<immunities>
+		<immunity paralyze="1" />
+		<immunity invisible="1" />
+		<immunity lifedrain="1" />
+		<immunity drown="1" />
+		<immunity death="1" />
+	</immunities>
 </monster>
diff --git a/data/monster/monsters/dragon_wrath.xml b/data/monster/monsters/dragon_wrath.xml
index b01cd4252c..a3e81260bc 100644
--- a/data/monster/monsters/dragon_wrath.xml
+++ b/data/monster/monsters/dragon_wrath.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Dragon Wrath" nameDescription="a dragon wrath" race="undead" experience="4600" speed="320">
 	<health now="7800" max="7800" />
-	<look type="351" corpse="11362" />
+	<look type="351" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/fallen_challenger.xml b/data/monster/monsters/fallen_challenger.xml
index 6895f014c7..87bccbb112 100644
--- a/data/monster/monsters/fallen_challenger.xml
+++ b/data/monster/monsters/fallen_challenger.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Fallen Challenger" nameDescription="a fallen challenger" race="undead" experience="0" speed="300">
 	<health now="9000" max="9000" />
-	<look type="231" corpse="1397" />
+	<look type="231" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/frozen_minion.xml b/data/monster/monsters/frozen_minion.xml
index 8d7af1e118..45e90c35c3 100644
--- a/data/monster/monsters/frozen_minion.xml
+++ b/data/monster/monsters/frozen_minion.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Frozen Minion" nameDescription="a frozen minion" race="blood" experience="230" speed="200">
 	<health now="2200" max="2200" />
-	<look type="53" corpse="5998" />
+	<look type="53" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/gelidrazah_the_frozen.xml b/data/monster/monsters/gelidrazah_the_frozen.xml
index b82a8022fd..ebbf39b33e 100644
--- a/data/monster/monsters/gelidrazah_the_frozen.xml
+++ b/data/monster/monsters/gelidrazah_the_frozen.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <monster name="Gelidrazah The Frozen" nameDescription="" experience="9000" speed="0" >
 	<health now="10000" max="10000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look type="947" head="57" body="11" legs="38" feet="38" addons="3" corpse="27721" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/ice_dragon.xml b/data/monster/monsters/ice_dragon.xml
index c7f80ce62b..9d3d28749f 100644
--- a/data/monster/monsters/ice_dragon.xml
+++ b/data/monster/monsters/ice_dragon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Ice Dragon" nameDescription="an ice dragon" race="undead" experience="2300" speed="212">
 	<health now="2500" max="2500" />
-	<look type="947" body="9" corpse="0" />
+	<look type="947" body="9" corpse="27841" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/icicle_(creature).xml b/data/monster/monsters/icicle_(creature).xml
index 72ab54b5a9..4d06e74810 100644
--- a/data/monster/monsters/icicle_(creature).xml
+++ b/data/monster/monsters/icicle_(creature).xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Icicle" nameDescription="an icicle" race="undead" experience="0" speed="0">
 	<health now="8200" max="8200" />
-	<look type="904" corpse="2253" />
+	<look type="904" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index 20c2162f5c..f5f51969c8 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Lloyd" nameDescription="Lloyd" race="energy" experience="50000" speed="400">
 	<health now="64000" max="64000" />
-	<look type="940" corpse="0" />
+	<look type="940" corpse="27583" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index 3ce24f82be..10a2196105 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Melting Frozen Horror" nameDescription="a melting frozen horror" race="undead" experience="0" speed="240">
 	<health now="70000" max="70000" />
-	<look type="261" corpse="7282" />
+	<look type="261" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/mounted_thorn_knight.xml b/data/monster/monsters/mounted_thorn_knight.xml
index 3abb95e214..e4d178c7ba 100644
--- a/data/monster/monsters/mounted_thorn_knight.xml
+++ b/data/monster/monsters/mounted_thorn_knight.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Mounted Thorn Knight" nameDescription="Mounted Thorn Knight" race="blood" experience="15000" speed="430" manacost="290">
 	<health now="100000" max="100000" />
-	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" mount="626" />
+	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" mount="626" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/orclops_doomhauler.xml b/data/monster/monsters/orclops_doomhauler.xml
index 4093c7e71b..4ee821a304 100644
--- a/data/monster/monsters/orclops_doomhauler.xml
+++ b/data/monster/monsters/orclops_doomhauler.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Orclops Doomhauler" nameDescription="an orclops doomhauler" race="blood" experience="1200" speed="240">
 	<health now="1700" max="1700" />
-	<look type="934" corpse="0" />
+	<look type="934" corpse="27734" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/orclops_ravager.xml b/data/monster/monsters/orclops_ravager.xml
index 5d500da82e..76f16f7c59 100644
--- a/data/monster/monsters/orclops_ravager.xml
+++ b/data/monster/monsters/orclops_ravager.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Orclops Ravager" nameDescription="an orclops ravager" race="blood" experience="1100" speed="260">
 	<health now="1200" max="1200" />
-	<look type="935" head="94" body="1" legs="80" feet="94" corpse="0" />
+	<look type="935" head="94" body="1" legs="80" feet="94" corpse="27730" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/pinata_dragon.xml b/data/monster/monsters/pinata_dragon.xml
index 399342425e..f92fb0bd51 100644
--- a/data/monster/monsters/pinata_dragon.xml
+++ b/data/monster/monsters/pinata_dragon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <monster name="Piñata Dragon" nameDescription="a piñata dragon" race="undead" experience="50" speed="0" >
 	<health now="10000" max="10000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<<look typeex="27718" corpse="27719" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/shaper_matriarch.xml b/data/monster/monsters/shaper_matriarch.xml
index f08baa5f5f..bced9476af 100644
--- a/data/monster/monsters/shaper_matriarch.xml
+++ b/data/monster/monsters/shaper_matriarch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Shaper Matriarch" nameDescription="a shaper matriarch" experience="1650" speed="260">
 	<health now="2000" max="2000" />
-	<look type="933" corpse="0" />
+	<look type="933" corpse="27727" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index a39376dc93..8284946772 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Solid Frozen Horror" nameDescription="a solid frozen horror" race="undead" experience="0" speed="240">
 	<health now="70000" max="70000" />
-	<look type="261" corpse="7282" />
+	<look type="261" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/somewhat_beatable_dragon.xml b/data/monster/monsters/somewhat_beatable_dragon.xml
index 79ab056c24..182bd5d1f3 100644
--- a/data/monster/monsters/somewhat_beatable_dragon.xml
+++ b/data/monster/monsters/somewhat_beatable_dragon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Somewhat Beatable Dragon" nameDescription="a somewhat beatable dragon" race="blood" experience="0" speed="200">
 	<health now="1900" max="1900" />
-	<look type="39" corpse="5984" />
+	<look type="39" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/stone_rhino.xml b/data/monster/monsters/stone_rhino.xml
index 0c5842e3d6..4d3fa2a72e 100644
--- a/data/monster/monsters/stone_rhino.xml
+++ b/data/monster/monsters/stone_rhino.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Stone Rhino" nameDescription="a stone rhino" race="blood" experience="1800" speed="290">
 	<health now="3000" max="3000" />
-	<look type="936" corpse="0" />
+	<look type="936" corpse="27738" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/sword_of_vengeance.xml b/data/monster/monsters/sword_of_vengeance.xml
index 883d8a79d9..49fa47d179 100644
--- a/data/monster/monsters/sword_of_vengeance.xml
+++ b/data/monster/monsters/sword_of_vengeance.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Sword Of Vengeance" nameDescription="a sword of vengeance" race="fire" experience="0" speed="360">
 	<health now="2000" max="2000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look typeex="26883" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/tazhadur.xml b/data/monster/monsters/tazhadur.xml
index a0f3c29697..0460e9f675 100644
--- a/data/monster/monsters/tazhadur.xml
+++ b/data/monster/monsters/tazhadur.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Tazhadur" nameDescription="Tazhadur" race="blood" experience="9000" speed="350">
 	<health now="10000" max="10000" />
-	<look type="947" head="24" body="120" legs="38" feet="95" addons="3" corpse="0" />
+	<look type="947" head="24" body="120" legs="38" feet="95" addons="3" corpse="27849" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/the_astral_source.xml b/data/monster/monsters/the_astral_source.xml
index 13d0f1438c..e24ff0c0cc 100644
--- a/data/monster/monsters/the_astral_source.xml
+++ b/data/monster/monsters/the_astral_source.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="The Astral Source" nameDescription="The Astral Source" race="energy" experience="3000" speed="0">
 	<health now="150000" max="150000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look typeex="26884" corpse="27741" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/the_distorted_astral_source.xml b/data/monster/monsters/the_distorted_astral_source.xml
index 3a586771e1..f6d6a265ce 100644
--- a/data/monster/monsters/the_distorted_astral_source.xml
+++ b/data/monster/monsters/the_distorted_astral_source.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="The Distorted Astral Source" nameDescription="The Distorted Astral Source" race="energy" experience="3000" speed="0">
 	<health now="10000000" max="10000000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look typeex="26885" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />

From 3cba4b344e78ddd68a4e2ae02ee45d7795224d00 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 22:40:52 -0300
Subject: [PATCH 12/38] Partial corpses and looktype fixes

---
 data/monster/monsters/the_freezing_time_guardian.xml | 2 +-
 data/monster/monsters/the_time_guardian.xml          | 2 +-
 data/monster/monsters/time_waster.xml                | 2 +-
 data/monster/monsters/unbound_blightwalker.xml       | 2 +-
 data/monster/monsters/unbound_defiler.xml            | 2 +-
 data/monster/monsters/unbound_demon.xml              | 2 +-
 data/monster/monsters/unbound_demon_outcast.xml      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/monster/monsters/the_freezing_time_guardian.xml b/data/monster/monsters/the_freezing_time_guardian.xml
index d422925cad..01f361d989 100644
--- a/data/monster/monsters/the_freezing_time_guardian.xml
+++ b/data/monster/monsters/the_freezing_time_guardian.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="The Freezing Time Guardian" nameDescription="The Freezing Time Guardian" race="undead" experience="50000" speed="340">
 	<health now="150000" max="150000" />
-	<look type="943" corpse="0" />
+	<look type="943" corpse="27741" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
index da9e29d30f..3da57f65eb 100644
--- a/data/monster/monsters/the_time_guardian.xml
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="The Time Guardian" nameDescription="The Time Guardian" race="undead" experience="50000" speed="340">
 	<health now="150000" max="150000" />
-	<look type="945" corpse="0" />
+	<look type="945" corpse="27741" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/time_waster.xml b/data/monster/monsters/time_waster.xml
index 79a42e8fab..98534de1fd 100644
--- a/data/monster/monsters/time_waster.xml
+++ b/data/monster/monsters/time_waster.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Time Waster" nameDescription="a time waster" race="undead" experience="0" speed="100">
 	<health now="1000" max="1000" />
-	<look type="0" head="0" body="0" legs="0" feet="0" addons="0" mount="0" corpse="0" />
+	<look typeex="26385" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/unbound_blightwalker.xml b/data/monster/monsters/unbound_blightwalker.xml
index ad3106327a..8a41482683 100644
--- a/data/monster/monsters/unbound_blightwalker.xml
+++ b/data/monster/monsters/unbound_blightwalker.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Unbound Blightwalker" nameDescription="an unbound blightwalker" race="undead" experience="5850" speed="350">
 	<health now="7900" max="7900" />
-	<look type="246" corpse="6354" />
+	<look type="246" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/unbound_defiler.xml b/data/monster/monsters/unbound_defiler.xml
index 8dc8c14781..2b25ed3491 100644
--- a/data/monster/monsters/unbound_defiler.xml
+++ b/data/monster/monsters/unbound_defiler.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Unbound Defiler" nameDescription="an unbound defiler" race="venom" experience="3700" speed="160">
 	<health now="2650" max="2650" />
-	<look type="238" corpse="6532" />
+	<look type="238" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/unbound_demon.xml b/data/monster/monsters/unbound_demon.xml
index 182175838f..38ecef5988 100644
--- a/data/monster/monsters/unbound_demon.xml
+++ b/data/monster/monsters/unbound_demon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Unbound Demon" nameDescription="an unbound demon" race="fire" experience="5000" speed="256">
 	<health now="7200" max="7200" />
-	<look type="35" corpse="5995" />
+	<look type="35" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/unbound_demon_outcast.xml b/data/monster/monsters/unbound_demon_outcast.xml
index 192e68a030..e23267bb64 100644
--- a/data/monster/monsters/unbound_demon_outcast.xml
+++ b/data/monster/monsters/unbound_demon_outcast.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Unbound Demon Outcast" nameDescription="an unbound demon outcast" race="fire" experience="6200" speed="300">
 	<health now="5900" max="5900" />
-	<look type="590" corpse="22549" />
+	<look type="590" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />

From a448dbed71b7a7b7f13e4417e8b650361d2e9766 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 22:46:37 -0300
Subject: [PATCH 13/38] Remove healthhidden

---
 data/monster/monsters/corrupted_soul.xml        | 1 -
 data/monster/monsters/cosmic_energy_prism_a.xml | 1 -
 data/monster/monsters/cosmic_energy_prism_b.xml | 1 -
 data/monster/monsters/cosmic_energy_prism_c.xml | 1 -
 data/monster/monsters/cosmic_energy_prism_d.xml | 1 -
 data/monster/monsters/soulcatcher.xml           | 1 -
 6 files changed, 6 deletions(-)

diff --git a/data/monster/monsters/corrupted_soul.xml b/data/monster/monsters/corrupted_soul.xml
index d8fb81afb2..402f499bd7 100644
--- a/data/monster/monsters/corrupted_soul.xml
+++ b/data/monster/monsters/corrupted_soul.xml
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="0" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
diff --git a/data/monster/monsters/cosmic_energy_prism_a.xml b/data/monster/monsters/cosmic_energy_prism_a.xml
index 8af7e37b11..f2937e27d3 100644
--- a/data/monster/monsters/cosmic_energy_prism_a.xml
+++ b/data/monster/monsters/cosmic_energy_prism_a.xml
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="1" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
diff --git a/data/monster/monsters/cosmic_energy_prism_b.xml b/data/monster/monsters/cosmic_energy_prism_b.xml
index acb96268bf..339372043c 100644
--- a/data/monster/monsters/cosmic_energy_prism_b.xml
+++ b/data/monster/monsters/cosmic_energy_prism_b.xml
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="1" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
diff --git a/data/monster/monsters/cosmic_energy_prism_c.xml b/data/monster/monsters/cosmic_energy_prism_c.xml
index 5b448f7c72..78787d5e79 100644
--- a/data/monster/monsters/cosmic_energy_prism_c.xml
+++ b/data/monster/monsters/cosmic_energy_prism_c.xml
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="1" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
diff --git a/data/monster/monsters/cosmic_energy_prism_d.xml b/data/monster/monsters/cosmic_energy_prism_d.xml
index c93bb78bcb..59acf5d027 100644
--- a/data/monster/monsters/cosmic_energy_prism_d.xml
+++ b/data/monster/monsters/cosmic_energy_prism_d.xml
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="1" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
diff --git a/data/monster/monsters/soulcatcher.xml b/data/monster/monsters/soulcatcher.xml
index 438a56783a..74481b7b3c 100644
--- a/data/monster/monsters/soulcatcher.xml
+++ b/data/monster/monsters/soulcatcher.xml
@@ -16,7 +16,6 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag healthhidden="1" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />

From ec33318dd8b0224da809719adad9e6d48d90ccaf Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 2 May 2022 22:59:08 -0300
Subject: [PATCH 14/38] Partial corrections

---
 data/monster/monsters/gelidrazah_the_frozen.xml | 2 +-
 data/monster/monsters/pinata_dragon.xml         | 2 +-
 data/monster/monsters/the_astral_source.xml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/monster/monsters/gelidrazah_the_frozen.xml b/data/monster/monsters/gelidrazah_the_frozen.xml
index ebbf39b33e..e363549070 100644
--- a/data/monster/monsters/gelidrazah_the_frozen.xml
+++ b/data/monster/monsters/gelidrazah_the_frozen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<monster name="Gelidrazah The Frozen" nameDescription="" experience="9000" speed="0" >
+<monster name="Gelidrazah The Frozen" nameDescription="Gelidrazah The Frozen" race="blood" experience="9000" speed="350" >
 	<health now="10000" max="10000" />
 	<look type="947" head="57" body="11" legs="38" feet="38" addons="3" corpse="27721" />
 	<targetchange interval="2000" chance="0" />
diff --git a/data/monster/monsters/pinata_dragon.xml b/data/monster/monsters/pinata_dragon.xml
index f92fb0bd51..67aec9b66c 100644
--- a/data/monster/monsters/pinata_dragon.xml
+++ b/data/monster/monsters/pinata_dragon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <monster name="Piñata Dragon" nameDescription="a piñata dragon" race="undead" experience="50" speed="0" >
 	<health now="10000" max="10000" />
-	<<look typeex="27718" corpse="27719" />
+	<look typeex="27718" corpse="27719" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />
diff --git a/data/monster/monsters/the_astral_source.xml b/data/monster/monsters/the_astral_source.xml
index e24ff0c0cc..8d2684c2ad 100644
--- a/data/monster/monsters/the_astral_source.xml
+++ b/data/monster/monsters/the_astral_source.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="The Astral Source" nameDescription="The Astral Source" race="energy" experience="3000" speed="0">
 	<health now="150000" max="150000" />
-	<look typeex="26884" corpse="27741" />
+	<look typeex="26884" corpse="0" />
 	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag attackable="1" />

From 76c98613c4b50f44f7006dce3a20e542b7dd56ec Mon Sep 17 00:00:00 2001
From: Torresmon <70948057+torresmon@users.noreply.github.com>
Date: Tue, 3 May 2022 16:01:41 -0300
Subject: [PATCH 15/38] Immunity and element adjustments (#6)

---
 data/monster/monsters/an_astral_glyph.xml     | 15 +-------------
 data/monster/monsters/angry_plant.xml         | 14 -------------
 data/monster/monsters/broken_shaper.xml       |  2 --
 .../monsters/diamond_servant_replica.xml      |  6 +++---
 data/monster/monsters/dragon_essence.xml      |  5 +++--
 data/monster/monsters/fallen_challenger.xml   |  6 +++---
 data/monster/monsters/frozen_minion.xml       |  3 +++
 .../monsters/gelidrazah_the_frozen.xml        | 16 ++++-----------
 data/monster/monsters/ice_dragon.xml          | 15 ++++----------
 .../monster/monsters/iron_servant_replica.xml | 10 +++++-----
 data/monster/monsters/kalyassa.xml            | 16 ++++-----------
 data/monster/monsters/lady_tenebris.xml       | 20 +++++++++----------
 data/monster/monsters/lost_time.xml           |  2 +-
 data/monster/monsters/orclops_ravager.xml     |  1 +
 data/monster/monsters/shadow_fiend.xml        |  8 ++++----
 data/monster/monsters/shaper_matriarch.xml    |  8 ++++++--
 .../monsters/soul_of_dragonking_zyrtarch.xml  |  3 ++-
 data/monster/monsters/stone_rhino.xml         |  8 ++++----
 data/monster/monsters/sword_of_vengeance.xml  |  2 +-
 data/monster/monsters/tazhadur.xml            | 15 +++++---------
 data/monster/monsters/twisted_shaper.xml      |  2 --
 data/monster/monsters/zorvorax.xml            |  6 ++++--
 22 files changed, 67 insertions(+), 116 deletions(-)

diff --git a/data/monster/monsters/an_astral_glyph.xml b/data/monster/monsters/an_astral_glyph.xml
index a03d25778b..52ff9773f6 100644
--- a/data/monster/monsters/an_astral_glyph.xml
+++ b/data/monster/monsters/an_astral_glyph.xml
@@ -30,23 +30,10 @@
 		</attack>
 	</attacks>
 	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
+		<immunity energy="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/angry_plant.xml b/data/monster/monsters/angry_plant.xml
index dc4c39088e..85447a8929 100644
--- a/data/monster/monsters/angry_plant.xml
+++ b/data/monster/monsters/angry_plant.xml
@@ -24,23 +24,9 @@
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
 	</attacks>
 	<defenses armor="10" defense="5" />
-	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
-	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/broken_shaper.xml b/data/monster/monsters/broken_shaper.xml
index 7f71b20029..310c3e42c4 100644
--- a/data/monster/monsters/broken_shaper.xml
+++ b/data/monster/monsters/broken_shaper.xml
@@ -44,10 +44,8 @@
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="&lt;grunt&gt;" yell="false" />
diff --git a/data/monster/monsters/diamond_servant_replica.xml b/data/monster/monsters/diamond_servant_replica.xml
index 0fa771fcf5..6df2e75991 100644
--- a/data/monster/monsters/diamond_servant_replica.xml
+++ b/data/monster/monsters/diamond_servant_replica.xml
@@ -40,12 +40,12 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element earthPercent="80" />
+		<element earthPercent="75" />
 		<element firePercent="10" />
-		<element icePercent="-5" />
-		<element deathPercent="-5" />
+		<element holyPercent="-15" />
 	</elements>
 	<immunities>
+		<immunity energy="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
diff --git a/data/monster/monsters/dragon_essence.xml b/data/monster/monsters/dragon_essence.xml
index 43db389cac..1064ddfa42 100644
--- a/data/monster/monsters/dragon_essence.xml
+++ b/data/monster/monsters/dragon_essence.xml
@@ -41,11 +41,12 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element poisonPercent="10" />
-		<element energyPercent="10" />
+		<element poisonPercent="-10" />
+		<element energyPercent="-10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
+		<immunity ice="1" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
 	</immunities>
diff --git a/data/monster/monsters/fallen_challenger.xml b/data/monster/monsters/fallen_challenger.xml
index 87bccbb112..472dd6b90e 100644
--- a/data/monster/monsters/fallen_challenger.xml
+++ b/data/monster/monsters/fallen_challenger.xml
@@ -16,9 +16,9 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag canwalkonenergy="0" />
-		<flag canwalkonfire="0" />
-		<flag canwalkonpoison="0" />
+		<flag canwalkonenergy="1" />
+		<flag canwalkonfire="1" />
+		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
diff --git a/data/monster/monsters/frozen_minion.xml b/data/monster/monsters/frozen_minion.xml
index 45e90c35c3..551716b42b 100644
--- a/data/monster/monsters/frozen_minion.xml
+++ b/data/monster/monsters/frozen_minion.xml
@@ -38,4 +38,7 @@
 		<element energyPercent="-10" />
 		<element deathPercent="-15" />
 	</elements>
+	<immunities>
+		<immunity ice="1" />
+	</immunities>
 </monster>
diff --git a/data/monster/monsters/gelidrazah_the_frozen.xml b/data/monster/monsters/gelidrazah_the_frozen.xml
index e363549070..d143bb6b82 100644
--- a/data/monster/monsters/gelidrazah_the_frozen.xml
+++ b/data/monster/monsters/gelidrazah_the_frozen.xml
@@ -27,23 +27,15 @@
 		<defense name="healing" interval="2000" chance="20" min="180" max="240" />
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element firePercent="-20" />
+		<element deathPercent="10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
+		<immunity ice="1" />
+		<immunity earth="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="27593" name="dragon blood" chance="100000" />
diff --git a/data/monster/monsters/ice_dragon.xml b/data/monster/monsters/ice_dragon.xml
index 9d3d28749f..098b3d0e25 100644
--- a/data/monster/monsters/ice_dragon.xml
+++ b/data/monster/monsters/ice_dragon.xml
@@ -41,19 +41,12 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element physicalPercent="-5" />
+		<element earthPercent="50" />
+		<element firePercent="-30" />
 	</elements>
 	<immunities>
-		<immunity fire="1" />
+		<immunity ice="1" />
 		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
diff --git a/data/monster/monsters/iron_servant_replica.xml b/data/monster/monsters/iron_servant_replica.xml
index 91b2a71b9e..e936fac62a 100644
--- a/data/monster/monsters/iron_servant_replica.xml
+++ b/data/monster/monsters/iron_servant_replica.xml
@@ -33,11 +33,11 @@
 	</attacks>
 	<defenses armor="17" defense="17" />
 	<elements>
-		<element earthPercent="-5" />
-		<element holyPercent="5" />
-		<element firePercent="10" />
-		<element energyPercent="5" />
-		<element deathPercent="-5" />
+		<element earthPercent="-10" />
+		<element holyPercent="20" />
+		<element firePercent="25" />
+		<element energyPercent="25" />
+		<element deathPercent="-10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
diff --git a/data/monster/monsters/kalyassa.xml b/data/monster/monsters/kalyassa.xml
index baf1ee65a7..1915442ebd 100644
--- a/data/monster/monsters/kalyassa.xml
+++ b/data/monster/monsters/kalyassa.xml
@@ -45,23 +45,15 @@
 		<summon name="Dragon Lord" interval="2000" chance="20" max="2" />
 	</summons>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="70" />
+		<element earthPercent="50" />
+		<element holyPercent="-5" />
 	</elements>
 	<immunities>
+		<immunity fire="1" />
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<loot>
 		<item id="27593" name="dragon blood" chance="100000" />
diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
index 94ad7fd58d..9d6690f5ed 100644
--- a/data/monster/monsters/lady_tenebris.xml
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -16,13 +16,13 @@
 		<flag canpushcreatures="1" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag canwalkonenergy="0" />
-		<flag canwalkonfire="0" />
-		<flag canwalkonpoison="0" />
+		<flag canwalkonenergy="1" />
+		<flag canwalkonfire="1" />
+		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-1800" />
-		<attack name="death" interval="06000" chance="13" length="8" spread="0" min="-1200" max="-1500">
+		<attack name="death" interval="6000" chance="13" length="8" spread="0" min="-1200" max="-1500">
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
 		<attack name="death" interval="2000" chance="13" radius="4" target="1" min="-400" max="-600">
@@ -41,13 +41,11 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element firePercent="50" />
-		<element earthPercent="-10" />
-		<element energyPercent="50" />
-		<element deathPercent="80" />
-		<element physicalPercent="50" />
-		<element holyPercent="80" />
-		<element icePercent="50" />
+		<element firePercent="5" />
+		<element earthPercent="-30" />
+		<element deathPercent="5" />
+		<element physicalPercent="20" />
+		<element holyPercent="35" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
diff --git a/data/monster/monsters/lost_time.xml b/data/monster/monsters/lost_time.xml
index accc67dbce..db0f043853 100644
--- a/data/monster/monsters/lost_time.xml
+++ b/data/monster/monsters/lost_time.xml
@@ -16,7 +16,7 @@
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag canwalkonenergy="0" />
+		<flag canwalkonenergy="1" />
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
diff --git a/data/monster/monsters/orclops_ravager.xml b/data/monster/monsters/orclops_ravager.xml
index 76f16f7c59..f767b2a8d9 100644
--- a/data/monster/monsters/orclops_ravager.xml
+++ b/data/monster/monsters/orclops_ravager.xml
@@ -42,6 +42,7 @@
 		<element energyPercent="-10" />
 	</elements>
 	<immunities>
+		<immunity poison="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
diff --git a/data/monster/monsters/shadow_fiend.xml b/data/monster/monsters/shadow_fiend.xml
index 405a961dec..609b0c8de1 100644
--- a/data/monster/monsters/shadow_fiend.xml
+++ b/data/monster/monsters/shadow_fiend.xml
@@ -12,13 +12,13 @@
 		<flag isboss="0" />
 		<flag ignorespawnblock="0" />
 		<flag pushable="0" />
-		<flag canpushitems="0" />
+		<flag canpushitems="1" />
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
-		<flag canwalkonenergy="0" />
-		<flag canwalkonfire="0" />
-		<flag canwalkonpoison="0" />
+		<flag canwalkonenergy="1" />
+		<flag canwalkonfire="1" />
+		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
diff --git a/data/monster/monsters/shaper_matriarch.xml b/data/monster/monsters/shaper_matriarch.xml
index bced9476af..861ead4a58 100644
--- a/data/monster/monsters/shaper_matriarch.xml
+++ b/data/monster/monsters/shaper_matriarch.xml
@@ -18,7 +18,7 @@
 		<flag targetdistance="4" />
 		<flag canwalkonenergy="0" />
 		<flag canwalkonfire="0" />
-		<flag canwalkonpoison="0" />
+		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-120" />
@@ -39,8 +39,12 @@
 		</defense>
 	</defenses>
 	<elements>
+		<element physicalPercent="-5" />
+		<element energyPercent="-5" />
 		<element earthPercent="40" />
-		<element icePercent="-20" />
+		<element icePercent="20" />
+		<element holyPercent="30" />
+		<element deathPercent="15" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
index cb32d07022..ec269349c8 100644
--- a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -12,7 +12,7 @@
 		<flag isboss="1" />
 		<flag ignorespawnblock="0" />
 		<flag pushable="0" />
-		<flag canpushitems="0" />
+		<flag canpushitems="1" />
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
@@ -58,6 +58,7 @@
 		<element deathPercent="-10" />
 	</elements>
 	<immunities>
+		<immunity fire="1" />
 		<immunity drown="1" />
 		<immunity lifedrain="1" />
 		<immunity paralyze="1" />
diff --git a/data/monster/monsters/stone_rhino.xml b/data/monster/monsters/stone_rhino.xml
index 4d3fa2a72e..b79716567f 100644
--- a/data/monster/monsters/stone_rhino.xml
+++ b/data/monster/monsters/stone_rhino.xml
@@ -30,15 +30,15 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="20" />
-		<element icePercent="-10" />
+		<element physicalPercent="10" />
+		<element icePercent="10" />
+		<element earthPercent="20" />
+		<element firePercent="10" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="SNIFF!" yell="false" />
diff --git a/data/monster/monsters/sword_of_vengeance.xml b/data/monster/monsters/sword_of_vengeance.xml
index 49fa47d179..39ca096760 100644
--- a/data/monster/monsters/sword_of_vengeance.xml
+++ b/data/monster/monsters/sword_of_vengeance.xml
@@ -12,7 +12,7 @@
 		<flag isboss="0" />
 		<flag ignorespawnblock="0" />
 		<flag pushable="0" />
-		<flag canpushitems="0" />
+		<flag canpushitems="1" />
 		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
diff --git a/data/monster/monsters/tazhadur.xml b/data/monster/monsters/tazhadur.xml
index 0460e9f675..1a2407ae64 100644
--- a/data/monster/monsters/tazhadur.xml
+++ b/data/monster/monsters/tazhadur.xml
@@ -39,18 +39,13 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element physicalPercent="0" />
-		<element energyPercent="0" />
-		<element earthPercent="0" />
-		<element firePercent="0" />
-		<element lifedrainPercent="0" />
-		<element manadrainPercent="0" />
-		<element drownPercent="0" />
-		<element icePercent="0" />
-		<element holyPercent="0" />
-		<element deathPercent="0" />
+		<element energyPercent="20" />
+		<element earthPercent="50" />
+		<element icePercent="-10" />
+		<element holyPercent="-5" />
 	</elements>
 	<immunities>
+		<immunity fire="1" />
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
diff --git a/data/monster/monsters/twisted_shaper.xml b/data/monster/monsters/twisted_shaper.xml
index 64e117a5a9..b9e31f0897 100644
--- a/data/monster/monsters/twisted_shaper.xml
+++ b/data/monster/monsters/twisted_shaper.xml
@@ -48,10 +48,8 @@
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity outfit="0" />
 		<immunity invisible="1" />
 		<immunity drunk="1" />
-		<immunity bleed="0" />
 	</immunities>
 	<voices interval="5000" chance="10">
 		<voice sentence="Ti Jezz Kur Tar!" yell="false" />
diff --git a/data/monster/monsters/zorvorax.xml b/data/monster/monsters/zorvorax.xml
index 55f7d7d7aa..d1e3ed1e31 100644
--- a/data/monster/monsters/zorvorax.xml
+++ b/data/monster/monsters/zorvorax.xml
@@ -40,9 +40,11 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element holyPercent="-10" />
 		<element physicalPercent="10" />
-		<element icePercent="10" />
+		<element energyPercent="20" />
+		<element firePercent="20" />
+		<element icePercent="50" />
+		<element holyPercent="-35" />
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />

From 36d1e97cc5757e87024bf1f6beec114e0657a104 Mon Sep 17 00:00:00 2001
From: Torresmon <70948057+torresmon@users.noreply.github.com>
Date: Tue, 3 May 2022 17:25:58 -0300
Subject: [PATCH 16/38] Fixing Target Change Chance (#7)

---
 data/monster/monsters/a_shielded_astral_glyph.xml     | 2 +-
 data/monster/monsters/an_astral_glyph.xml             | 2 +-
 data/monster/monsters/an_observer_eye.xml             | 2 +-
 data/monster/monsters/angry_plant.xml                 | 2 +-
 data/monster/monsters/animated_sword.xml              | 2 +-
 data/monster/monsters/baby_dragon_(creature).xml      | 2 +-
 data/monster/monsters/big_boss_trolliver.xml          | 2 +-
 data/monster/monsters/bound_astral_power.xml          | 2 +-
 data/monster/monsters/broken_shaper.xml               | 2 +-
 data/monster/monsters/cave_parrot.xml                 | 2 +-
 data/monster/monsters/corrupted_soul.xml              | 2 +-
 data/monster/monsters/cosmic_energy_prism_a.xml       | 2 +-
 data/monster/monsters/cosmic_energy_prism_b.xml       | 2 +-
 data/monster/monsters/cosmic_energy_prism_c.xml       | 2 +-
 data/monster/monsters/cosmic_energy_prism_d.xml       | 2 +-
 data/monster/monsters/diamond_servant_replica.xml     | 2 +-
 data/monster/monsters/dragon_essence.xml              | 2 +-
 data/monster/monsters/dragon_warden.xml               | 2 +-
 data/monster/monsters/dragon_wrath.xml                | 2 +-
 data/monster/monsters/dragonking_zyrtarch.xml         | 2 +-
 data/monster/monsters/fallen_challenger.xml           | 2 +-
 data/monster/monsters/frozen_minion.xml               | 2 +-
 data/monster/monsters/gelidrazah_the_frozen.xml       | 2 +-
 data/monster/monsters/giant_spider_wyda.xml           | 2 +-
 data/monster/monsters/golden_servant_replica.xml      | 2 +-
 data/monster/monsters/haunted_dragon.xml              | 2 +-
 data/monster/monsters/hot_dog.xml                     | 2 +-
 data/monster/monsters/ice_dragon.xml                  | 2 +-
 data/monster/monsters/icicle_(creature).xml           | 2 +-
 data/monster/monsters/iron_servant_replica.xml        | 2 +-
 data/monster/monsters/kalyassa.xml                    | 2 +-
 data/monster/monsters/lady_tenebris.xml               | 2 +-
 data/monster/monsters/lloyd.xml                       | 2 +-
 data/monster/monsters/lost_time.xml                   | 2 +-
 data/monster/monsters/magic_pillar.xml                | 2 +-
 data/monster/monsters/melting_frozen_horror.xml       | 2 +-
 data/monster/monsters/morik_the_gladiator.xml         | 2 +-
 data/monster/monsters/mounted_thorn_knight.xml        | 2 +-
 data/monster/monsters/orclops_doomhauler.xml          | 2 +-
 data/monster/monsters/orclops_ravager.xml             | 2 +-
 data/monster/monsters/party_skeleton.xml              | 2 +-
 data/monster/monsters/pillar.xml                      | 2 +-
 data/monster/monsters/pinata_dragon.xml               | 2 +-
 data/monster/monsters/poodle.xml                      | 2 +-
 data/monster/monsters/possessed_tree.xml              | 2 +-
 data/monster/monsters/rottie_the_rotworm.xml          | 2 +-
 data/monster/monsters/shadow_fiend.xml                | 2 +-
 data/monster/monsters/shadow_tentacle.xml             | 2 +-
 data/monster/monsters/shaper_matriarch.xml            | 2 +-
 data/monster/monsters/solid_frozen_horror.xml         | 2 +-
 data/monster/monsters/somewhat_beatable_dragon.xml    | 2 +-
 data/monster/monsters/soul_of_dragonking_zyrtarch.xml | 2 +-
 data/monster/monsters/soulcatcher.xml                 | 2 +-
 data/monster/monsters/spirit_of_fertility.xml         | 2 +-
 data/monster/monsters/stone_rhino.xml                 | 2 +-
 data/monster/monsters/sword_of_vengeance.xml          | 2 +-
 data/monster/monsters/tazhadur.xml                    | 2 +-
 data/monster/monsters/the_astral_source.xml           | 2 +-
 data/monster/monsters/the_blazing_time_guardian.xml   | 2 +-
 data/monster/monsters/the_distorted_astral_source.xml | 2 +-
 data/monster/monsters/the_enraged_thorn_knight.xml    | 2 +-
 data/monster/monsters/the_first_dragon.xml            | 2 +-
 data/monster/monsters/the_freezing_time_guardian.xml  | 2 +-
 data/monster/monsters/the_last_lore_keeper.xml        | 2 +-
 data/monster/monsters/the_shielded_thorn_knight.xml   | 2 +-
 data/monster/monsters/the_time_guardian.xml           | 2 +-
 data/monster/monsters/thorn_minion.xml                | 2 +-
 data/monster/monsters/time_keeper.xml                 | 2 +-
 data/monster/monsters/time_waster.xml                 | 2 +-
 data/monster/monsters/twisted_shaper.xml              | 2 +-
 data/monster/monsters/unbeatable_dragon.xml           | 2 +-
 data/monster/monsters/unbound_blightwalker.xml        | 2 +-
 data/monster/monsters/unbound_defiler.xml             | 2 +-
 data/monster/monsters/unbound_demon.xml               | 2 +-
 data/monster/monsters/unbound_demon_outcast.xml       | 2 +-
 data/monster/monsters/vampire_pig.xml                 | 2 +-
 data/monster/monsters/wild_dog.xml                    | 2 +-
 data/monster/monsters/world_bug.xml                   | 2 +-
 data/monster/monsters/zorvorax.xml                    | 2 +-
 79 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/data/monster/monsters/a_shielded_astral_glyph.xml b/data/monster/monsters/a_shielded_astral_glyph.xml
index 1a1cb49027..939c25341e 100644
--- a/data/monster/monsters/a_shielded_astral_glyph.xml
+++ b/data/monster/monsters/a_shielded_astral_glyph.xml
@@ -2,7 +2,7 @@
 <monster name="A Shielded Astral Glyph" nameDescription="a shielded astral glyph" race="undead" experience="0" speed="470">
 	<health now="50000" max="50000" />
 	<look typeex="26882" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/an_astral_glyph.xml b/data/monster/monsters/an_astral_glyph.xml
index 52ff9773f6..04ff1d3d59 100644
--- a/data/monster/monsters/an_astral_glyph.xml
+++ b/data/monster/monsters/an_astral_glyph.xml
@@ -2,7 +2,7 @@
 <monster name="An Astral Glyph" nameDescription="an astral glyph" race="energy" experience="0" speed="470">
 	<health now="50000" max="50000" />
 	<look typeex="26881" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/an_observer_eye.xml b/data/monster/monsters/an_observer_eye.xml
index ddf83258bc..4b4f693660 100644
--- a/data/monster/monsters/an_observer_eye.xml
+++ b/data/monster/monsters/an_observer_eye.xml
@@ -2,7 +2,7 @@
 <monster name="An Observer Eye" nameDescription="An Observer Eye" race="blood" experience="0" speed="0" >
 	<health now="30000" max="30000" />
 	<look type="925" corpse="27584" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/angry_plant.xml b/data/monster/monsters/angry_plant.xml
index 85447a8929..d12c7cb564 100644
--- a/data/monster/monsters/angry_plant.xml
+++ b/data/monster/monsters/angry_plant.xml
@@ -2,7 +2,7 @@
 <monster name="Angry Plant" nameDescription="an angry plant" race="venom" experience="110" speed="0" >
 	<health now="10000" max="10000" />
 	<look type="120" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/animated_sword.xml b/data/monster/monsters/animated_sword.xml
index 58a2f1ab0a..e65b4b8c1b 100644
--- a/data/monster/monsters/animated_sword.xml
+++ b/data/monster/monsters/animated_sword.xml
@@ -2,7 +2,7 @@
 <monster name="Animated Sword" nameDescription="an animated sword" race="fire" experience="0" speed="360" >
 	<health now="2000" max="2000" />
 	<look typeex="26883" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/baby_dragon_(creature).xml b/data/monster/monsters/baby_dragon_(creature).xml
index 3f603b8b82..d20aea6652 100644
--- a/data/monster/monsters/baby_dragon_(creature).xml
+++ b/data/monster/monsters/baby_dragon_(creature).xml
@@ -2,7 +2,7 @@
 <monster name="Baby Dragon" nameDescription="a baby dragon" race="blood" experience="185" speed="176">
 	<health now="380" max="380" />
 	<look type="271" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/big_boss_trolliver.xml b/data/monster/monsters/big_boss_trolliver.xml
index 9d51b7dbcc..85d4a9079b 100644
--- a/data/monster/monsters/big_boss_trolliver.xml
+++ b/data/monster/monsters/big_boss_trolliver.xml
@@ -2,7 +2,7 @@
 <monster name="Big Boss Trolliver" nameDescription="Big Boss Trolliver" race="blood" experience="105" speed="140">
 	<health now="150" max="150" />
 	<look type="281" corpse="7926" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/bound_astral_power.xml b/data/monster/monsters/bound_astral_power.xml
index a57b59c116..2a5e14822f 100644
--- a/data/monster/monsters/bound_astral_power.xml
+++ b/data/monster/monsters/bound_astral_power.xml
@@ -2,7 +2,7 @@
 <monster name="Bound Astral Power" nameDescription="a bound astral power" race="energy" experience="0" speed="350">
 	<health now="70000" max="70000" />
 	<look type="879" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/broken_shaper.xml b/data/monster/monsters/broken_shaper.xml
index 310c3e42c4..f03244b872 100644
--- a/data/monster/monsters/broken_shaper.xml
+++ b/data/monster/monsters/broken_shaper.xml
@@ -2,7 +2,7 @@
 <monster name="Broken Shaper" nameDescription="a broken shaper" race="blood" experience="1600" speed="310" manacost="290">
 	<health now="2200" max="2200" />
 	<look type="932" head="94" body="76" legs="0" feet="82" addons="1" corpse="27724" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/cave_parrot.xml b/data/monster/monsters/cave_parrot.xml
index 8a0a364f6f..9457fe15ef 100644
--- a/data/monster/monsters/cave_parrot.xml
+++ b/data/monster/monsters/cave_parrot.xml
@@ -2,7 +2,7 @@
 <monster name="Cave Parrot" nameDescription="a cave parrot" experience="0" speed="320" manacost="250">
 	<health now="30" max="30" />
 	<look type="217" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/corrupted_soul.xml b/data/monster/monsters/corrupted_soul.xml
index 402f499bd7..0a9d40c8db 100644
--- a/data/monster/monsters/corrupted_soul.xml
+++ b/data/monster/monsters/corrupted_soul.xml
@@ -2,7 +2,7 @@
 <monster name="Corrupted Soul" nameDescription="a corrupted soul" race="undead" experience="1300" speed="210">
 	<health now="1100" max="1100" />
 	<look type="355" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/cosmic_energy_prism_a.xml b/data/monster/monsters/cosmic_energy_prism_a.xml
index f2937e27d3..5e13e91f5a 100644
--- a/data/monster/monsters/cosmic_energy_prism_a.xml
+++ b/data/monster/monsters/cosmic_energy_prism_a.xml
@@ -2,7 +2,7 @@
 <monster name="Cosmic Energy Prism A" nameDescription="cosmic energy prism A" race="energy" experience="840" speed="0">
 	<health now="1000" max="1000" />
 	<look typeex="1548" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/cosmic_energy_prism_b.xml b/data/monster/monsters/cosmic_energy_prism_b.xml
index 339372043c..c87c86ee2d 100644
--- a/data/monster/monsters/cosmic_energy_prism_b.xml
+++ b/data/monster/monsters/cosmic_energy_prism_b.xml
@@ -2,7 +2,7 @@
 <monster name="Cosmic Energy Prism B" nameDescription="cosmic energy prism B" race="energy" experience="840" speed="0">
 	<health now="1000" max="1000" />
 	<look typeex="1548" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/cosmic_energy_prism_c.xml b/data/monster/monsters/cosmic_energy_prism_c.xml
index 78787d5e79..0d816a4e57 100644
--- a/data/monster/monsters/cosmic_energy_prism_c.xml
+++ b/data/monster/monsters/cosmic_energy_prism_c.xml
@@ -2,7 +2,7 @@
 <monster name="Cosmic Energy Prism C" nameDescription="cosmic energy prism C" race="energy" experience="840" speed="0">
 	<health now="1000" max="1000" />
 	<look typeex="1548" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/cosmic_energy_prism_d.xml b/data/monster/monsters/cosmic_energy_prism_d.xml
index 59acf5d027..d8910c79f6 100644
--- a/data/monster/monsters/cosmic_energy_prism_d.xml
+++ b/data/monster/monsters/cosmic_energy_prism_d.xml
@@ -2,7 +2,7 @@
 <monster name="Cosmic Energy Prism D" nameDescription="cosmic energy prism D" race="undead" experience="840" speed="0">
 	<health now="1000" max="1000" />
 	<look typeex="1548" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/diamond_servant_replica.xml b/data/monster/monsters/diamond_servant_replica.xml
index 6df2e75991..1b8c46d833 100644
--- a/data/monster/monsters/diamond_servant_replica.xml
+++ b/data/monster/monsters/diamond_servant_replica.xml
@@ -2,7 +2,7 @@
 <monster name="Diamond Servant Replica" nameDescription="a diamond servant replica" experience="700" speed="172" >
 	<health now="2000" max="2000" />
 	<look type="397" corpse="13485" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/dragon_essence.xml b/data/monster/monsters/dragon_essence.xml
index 1064ddfa42..80c93f514d 100644
--- a/data/monster/monsters/dragon_essence.xml
+++ b/data/monster/monsters/dragon_essence.xml
@@ -2,7 +2,7 @@
 <monster name="Dragon Essence" nameDescription="a dragon essence" race="undead" experience="0" speed="250" >
 	<health now="30000" max="30000" />
 	<look type="248" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/dragon_warden.xml b/data/monster/monsters/dragon_warden.xml
index b0897d6de5..089ea68d7c 100644
--- a/data/monster/monsters/dragon_warden.xml
+++ b/data/monster/monsters/dragon_warden.xml
@@ -2,7 +2,7 @@
 <monster name="Dragon Warden" nameDescription="a dragon warden" race="blood" experience="4600" speed="320">
 	<health now="2800" max="2800" />
 	<look type="947" head="5" body="5" legs="8" feet="8" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/dragon_wrath.xml b/data/monster/monsters/dragon_wrath.xml
index a3e81260bc..ee399386cc 100644
--- a/data/monster/monsters/dragon_wrath.xml
+++ b/data/monster/monsters/dragon_wrath.xml
@@ -2,7 +2,7 @@
 <monster name="Dragon Wrath" nameDescription="a dragon wrath" race="undead" experience="4600" speed="320">
 	<health now="7800" max="7800" />
 	<look type="351" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/dragonking_zyrtarch.xml b/data/monster/monsters/dragonking_zyrtarch.xml
index 1fa7c0b9c6..3aa2d10842 100644
--- a/data/monster/monsters/dragonking_zyrtarch.xml
+++ b/data/monster/monsters/dragonking_zyrtarch.xml
@@ -2,7 +2,7 @@
 <monster name="Dragonking Zyrtarch" nameDescription="Dragonking Zyrtarch" race="fire" experience="1600" speed="280">
 	<health now="150000" max="150000" />
 	<look type="938" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/fallen_challenger.xml b/data/monster/monsters/fallen_challenger.xml
index 472dd6b90e..9a5ef3be24 100644
--- a/data/monster/monsters/fallen_challenger.xml
+++ b/data/monster/monsters/fallen_challenger.xml
@@ -2,7 +2,7 @@
 <monster name="Fallen Challenger" nameDescription="a fallen challenger" race="undead" experience="0" speed="300">
 	<health now="9000" max="9000" />
 	<look type="231" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/frozen_minion.xml b/data/monster/monsters/frozen_minion.xml
index 551716b42b..9792b52279 100644
--- a/data/monster/monsters/frozen_minion.xml
+++ b/data/monster/monsters/frozen_minion.xml
@@ -2,7 +2,7 @@
 <monster name="Frozen Minion" nameDescription="a frozen minion" race="blood" experience="230" speed="200">
 	<health now="2200" max="2200" />
 	<look type="53" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/gelidrazah_the_frozen.xml b/data/monster/monsters/gelidrazah_the_frozen.xml
index d143bb6b82..4620e73577 100644
--- a/data/monster/monsters/gelidrazah_the_frozen.xml
+++ b/data/monster/monsters/gelidrazah_the_frozen.xml
@@ -2,7 +2,7 @@
 <monster name="Gelidrazah The Frozen" nameDescription="Gelidrazah The Frozen" race="blood" experience="9000" speed="350" >
 	<health now="10000" max="10000" />
 	<look type="947" head="57" body="11" legs="38" feet="38" addons="3" corpse="27721" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/giant_spider_wyda.xml b/data/monster/monsters/giant_spider_wyda.xml
index c5c38808e8..01cb16f402 100644
--- a/data/monster/monsters/giant_spider_wyda.xml
+++ b/data/monster/monsters/giant_spider_wyda.xml
@@ -2,7 +2,7 @@
 <monster name="Giant Spider" nameDescription="a giant spider" race="venom" experience="12" speed="152">
 	<health now="20" max="20" />
 	<look type="38" corpse="5977" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/golden_servant_replica.xml b/data/monster/monsters/golden_servant_replica.xml
index 7cb498c18e..639b57940e 100644
--- a/data/monster/monsters/golden_servant_replica.xml
+++ b/data/monster/monsters/golden_servant_replica.xml
@@ -2,7 +2,7 @@
 <monster name="Golden Servant Replica" nameDescription="a golden servant replica" race="energy" experience="450" speed="210">
 	<health now="2000" max="2000" />
 	<look type="396" corpse="13484" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/haunted_dragon.xml b/data/monster/monsters/haunted_dragon.xml
index 8b69d83633..ec8f6440e0 100644
--- a/data/monster/monsters/haunted_dragon.xml
+++ b/data/monster/monsters/haunted_dragon.xml
@@ -2,7 +2,7 @@
 <monster name="Haunted Dragon" nameDescription="a haunted dragon" race="undead" experience="6500" speed="280">
 	<health now="6500" max="6500" />
 	<look type="231" corpse="6306" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/hot_dog.xml b/data/monster/monsters/hot_dog.xml
index f3921abef7..fec68fd3a5 100644
--- a/data/monster/monsters/hot_dog.xml
+++ b/data/monster/monsters/hot_dog.xml
@@ -2,7 +2,7 @@
 <monster name="Hot Dog" nameDescription="a hot dog" race="blood" experience="190" speed="300" manacost="220">
 	<health now="505" max="505" />
 	<look type="32" corpse="5971" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/ice_dragon.xml b/data/monster/monsters/ice_dragon.xml
index 098b3d0e25..1774ffcbef 100644
--- a/data/monster/monsters/ice_dragon.xml
+++ b/data/monster/monsters/ice_dragon.xml
@@ -2,7 +2,7 @@
 <monster name="Ice Dragon" nameDescription="an ice dragon" race="undead" experience="2300" speed="212">
 	<health now="2500" max="2500" />
 	<look type="947" body="9" corpse="27841" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/icicle_(creature).xml b/data/monster/monsters/icicle_(creature).xml
index 4d06e74810..7d7ddf05a6 100644
--- a/data/monster/monsters/icicle_(creature).xml
+++ b/data/monster/monsters/icicle_(creature).xml
@@ -2,7 +2,7 @@
 <monster name="Icicle" nameDescription="an icicle" race="undead" experience="0" speed="0">
 	<health now="8200" max="8200" />
 	<look type="904" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/iron_servant_replica.xml b/data/monster/monsters/iron_servant_replica.xml
index e936fac62a..084d4b4e29 100644
--- a/data/monster/monsters/iron_servant_replica.xml
+++ b/data/monster/monsters/iron_servant_replica.xml
@@ -2,7 +2,7 @@
 <monster name="Iron Servant Replica" nameDescription="an iron servant replica" race="energy" experience="210" speed="190">
 	<health now="1000" max="1000" />
 	<look type="395" corpse="13483" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/kalyassa.xml b/data/monster/monsters/kalyassa.xml
index 1915442ebd..413b5ecec0 100644
--- a/data/monster/monsters/kalyassa.xml
+++ b/data/monster/monsters/kalyassa.xml
@@ -2,7 +2,7 @@
 <monster name="Kalyassa" nameDescription="kalyassa" race="blood" experience="9000" speed="350">
 	<health now="10000" max="10000" />
 	<look type="947" head="37" body="113" legs="38" feet="95" addons="3" corpse="5984" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
index 9d6690f5ed..b9499cd33b 100644
--- a/data/monster/monsters/lady_tenebris.xml
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -2,7 +2,7 @@
 <monster name="Lady Tenebris" nameDescription="Lady Tenebris" race="blood" experience="50000" speed="370">
 	<health now="150000" max="150000" />
 	<look type="433" head="57" body="95" legs="38" feet="94" addons="2" corpse="6560" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index f5f51969c8..78ad28ca6c 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -2,7 +2,7 @@
 <monster name="Lloyd" nameDescription="Lloyd" race="energy" experience="50000" speed="400">
 	<health now="64000" max="64000" />
 	<look type="940" corpse="27583" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/lost_time.xml b/data/monster/monsters/lost_time.xml
index db0f043853..cb437ca92b 100644
--- a/data/monster/monsters/lost_time.xml
+++ b/data/monster/monsters/lost_time.xml
@@ -2,7 +2,7 @@
 <monster name="Lost Time" nameDescription="a lost time" race="undead" experience="0" speed="160">
 	<health now="2000" max="2000" />
 	<look typeex="0" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/magic_pillar.xml b/data/monster/monsters/magic_pillar.xml
index bc38e46a55..a3270ef0bd 100644
--- a/data/monster/monsters/magic_pillar.xml
+++ b/data/monster/monsters/magic_pillar.xml
@@ -2,7 +2,7 @@
 <monster name="Magic Pillar" nameDescription="a magic pillar" race="undead" experience="0" speed="0">
 	<health now="1" max="1" />
 	<look typeex="1551" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="0" />
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index 10a2196105..e0c8cc691f 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -2,7 +2,7 @@
 <monster name="Melting Frozen Horror" nameDescription="a melting frozen horror" race="undead" experience="0" speed="240">
 	<health now="70000" max="70000" />
 	<look type="261" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/morik_the_gladiator.xml b/data/monster/monsters/morik_the_gladiator.xml
index e2fe705328..b14bf64d4d 100644
--- a/data/monster/monsters/morik_the_gladiator.xml
+++ b/data/monster/monsters/morik_the_gladiator.xml
@@ -2,7 +2,7 @@
 <monster name="Morik The Gladiator" nameDescription="Morik The Gladiator" race="blood" experience="160" speed="200">
 	<health now="1235" max="1235" />
 	<look type="131" head="57" body="57" legs="57" feet="57" addons="1" corpse="20450" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/mounted_thorn_knight.xml b/data/monster/monsters/mounted_thorn_knight.xml
index e4d178c7ba..f7aa3c1d5d 100644
--- a/data/monster/monsters/mounted_thorn_knight.xml
+++ b/data/monster/monsters/mounted_thorn_knight.xml
@@ -2,7 +2,7 @@
 <monster name="Mounted Thorn Knight" nameDescription="Mounted Thorn Knight" race="blood" experience="15000" speed="430" manacost="290">
 	<health now="100000" max="100000" />
 	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" mount="626" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/orclops_doomhauler.xml b/data/monster/monsters/orclops_doomhauler.xml
index 4ee821a304..bd9f62b8a1 100644
--- a/data/monster/monsters/orclops_doomhauler.xml
+++ b/data/monster/monsters/orclops_doomhauler.xml
@@ -2,7 +2,7 @@
 <monster name="Orclops Doomhauler" nameDescription="an orclops doomhauler" race="blood" experience="1200" speed="240">
 	<health now="1700" max="1700" />
 	<look type="934" corpse="27734" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/orclops_ravager.xml b/data/monster/monsters/orclops_ravager.xml
index f767b2a8d9..61375e14d5 100644
--- a/data/monster/monsters/orclops_ravager.xml
+++ b/data/monster/monsters/orclops_ravager.xml
@@ -2,7 +2,7 @@
 <monster name="Orclops Ravager" nameDescription="an orclops ravager" race="blood" experience="1100" speed="260">
 	<health now="1200" max="1200" />
 	<look type="935" head="94" body="1" legs="80" feet="94" corpse="27730" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/party_skeleton.xml b/data/monster/monsters/party_skeleton.xml
index 06d61a3b18..35114e97fa 100644
--- a/data/monster/monsters/party_skeleton.xml
+++ b/data/monster/monsters/party_skeleton.xml
@@ -2,7 +2,7 @@
 <monster name="Party Skeleton" nameDescription="a party skeleton" race="undead" experience="0" speed="154" manacost="300">
 	<health now="40" max="40" />
 	<look type="33" corpse="5972" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="0" />
diff --git a/data/monster/monsters/pillar.xml b/data/monster/monsters/pillar.xml
index 52b512ba63..f310ca3b7a 100644
--- a/data/monster/monsters/pillar.xml
+++ b/data/monster/monsters/pillar.xml
@@ -2,7 +2,7 @@
 <monster name="Pillar" nameDescription="a pillar" race="undead" experience="0" speed="0">
 	<health now="100" max="100" />
 	<look typeex="1551" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="0" />
diff --git a/data/monster/monsters/pinata_dragon.xml b/data/monster/monsters/pinata_dragon.xml
index 67aec9b66c..7ed47ee5bc 100644
--- a/data/monster/monsters/pinata_dragon.xml
+++ b/data/monster/monsters/pinata_dragon.xml
@@ -2,7 +2,7 @@
 <monster name="Piñata Dragon" nameDescription="a piñata dragon" race="undead" experience="50" speed="0" >
 	<health now="10000" max="10000" />
 	<look typeex="27718" corpse="27719" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/poodle.xml b/data/monster/monsters/poodle.xml
index 530d6f4b01..d23e059dde 100644
--- a/data/monster/monsters/poodle.xml
+++ b/data/monster/monsters/poodle.xml
@@ -2,7 +2,7 @@
 <monster name="Poodle" nameDescription="a poodle" race="blood" experience="0" speed="200" manacost="220">
 	<health now="20" max="20" />
 	<look type="473" corpse="5971" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="1" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/possessed_tree.xml b/data/monster/monsters/possessed_tree.xml
index 50ada79224..42a08c1331 100644
--- a/data/monster/monsters/possessed_tree.xml
+++ b/data/monster/monsters/possessed_tree.xml
@@ -2,7 +2,7 @@
 <monster name="Possessed Tree" nameDescription="a possessed tree" race="undead" experience="1300" speed="0">
 	<health now="2500" max="2500" />
 	<look type="310" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/rottie_the_rotworm.xml b/data/monster/monsters/rottie_the_rotworm.xml
index d5d4aa7ace..473ca2e565 100644
--- a/data/monster/monsters/rottie_the_rotworm.xml
+++ b/data/monster/monsters/rottie_the_rotworm.xml
@@ -2,7 +2,7 @@
 <monster name="Rottie The Rotworm" nameDescription="Rottie The Rotworm" race="blood" experience="40" speed="180">
 	<health now="65" max="65" />
 	<look type="26" corpse="5967" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/shadow_fiend.xml b/data/monster/monsters/shadow_fiend.xml
index 609b0c8de1..b19217a6c3 100644
--- a/data/monster/monsters/shadow_fiend.xml
+++ b/data/monster/monsters/shadow_fiend.xml
@@ -2,7 +2,7 @@
 <monster name="Shadow Fiend" nameDescription="a shadow fiend" race="undead" experience="500" speed="360">
 	<health now="4000" max="4000" />
 	<look type="320" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/shadow_tentacle.xml b/data/monster/monsters/shadow_tentacle.xml
index 11f98fb58f..280d356fa1 100644
--- a/data/monster/monsters/shadow_tentacle.xml
+++ b/data/monster/monsters/shadow_tentacle.xml
@@ -2,7 +2,7 @@
 <monster name="Shadow Tentacle" nameDescription="a shadow tentacle" race="venom" experience="0" speed="350">
 	<health now="22500" max="22500" />
 	<look type="681" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/shaper_matriarch.xml b/data/monster/monsters/shaper_matriarch.xml
index 861ead4a58..8d5fac1d65 100644
--- a/data/monster/monsters/shaper_matriarch.xml
+++ b/data/monster/monsters/shaper_matriarch.xml
@@ -2,7 +2,7 @@
 <monster name="Shaper Matriarch" nameDescription="a shaper matriarch" experience="1650" speed="260">
 	<health now="2000" max="2000" />
 	<look type="933" corpse="27727" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index 8284946772..9e3e72799b 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -2,7 +2,7 @@
 <monster name="Solid Frozen Horror" nameDescription="a solid frozen horror" race="undead" experience="0" speed="240">
 	<health now="70000" max="70000" />
 	<look type="261" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/somewhat_beatable_dragon.xml b/data/monster/monsters/somewhat_beatable_dragon.xml
index 182bd5d1f3..6297bdd262 100644
--- a/data/monster/monsters/somewhat_beatable_dragon.xml
+++ b/data/monster/monsters/somewhat_beatable_dragon.xml
@@ -2,7 +2,7 @@
 <monster name="Somewhat Beatable Dragon" nameDescription="a somewhat beatable dragon" race="blood" experience="0" speed="200">
 	<health now="1900" max="1900" />
 	<look type="39" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
index ec269349c8..372a64720b 100644
--- a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -2,7 +2,7 @@
 <monster name="Soul Of Dragonking Zyrtarch" nameDescription="Soul Of Dragonking Zyrtarch" race="fire" experience="70700" speed="500">
 	<health now="150000" max="150000" />
 	<look type="938" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/soulcatcher.xml b/data/monster/monsters/soulcatcher.xml
index 74481b7b3c..41008326bb 100644
--- a/data/monster/monsters/soulcatcher.xml
+++ b/data/monster/monsters/soulcatcher.xml
@@ -2,7 +2,7 @@
 <monster name="Soulcatcher" nameDescription="a soulcatcher" race="undead" experience="320" speed="0">
 	<health now="50000" max="50000" />
 	<look typeex="12009" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/spirit_of_fertility.xml b/data/monster/monsters/spirit_of_fertility.xml
index e727a8692c..f468bfe339 100644
--- a/data/monster/monsters/spirit_of_fertility.xml
+++ b/data/monster/monsters/spirit_of_fertility.xml
@@ -2,7 +2,7 @@
 <monster name="Spirit Of Fertility" nameDescription="a spirit of fertility" race="undead" experience="1100" speed="130">
 	<health now="1250" max="1250" />
 	<look type="11" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/stone_rhino.xml b/data/monster/monsters/stone_rhino.xml
index b79716567f..95f5492fd5 100644
--- a/data/monster/monsters/stone_rhino.xml
+++ b/data/monster/monsters/stone_rhino.xml
@@ -2,7 +2,7 @@
 <monster name="Stone Rhino" nameDescription="a stone rhino" race="blood" experience="1800" speed="290">
 	<health now="3000" max="3000" />
 	<look type="936" corpse="27738" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/sword_of_vengeance.xml b/data/monster/monsters/sword_of_vengeance.xml
index 39ca096760..cc86d2189d 100644
--- a/data/monster/monsters/sword_of_vengeance.xml
+++ b/data/monster/monsters/sword_of_vengeance.xml
@@ -2,7 +2,7 @@
 <monster name="Sword Of Vengeance" nameDescription="a sword of vengeance" race="fire" experience="0" speed="360">
 	<health now="2000" max="2000" />
 	<look typeex="26883" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/tazhadur.xml b/data/monster/monsters/tazhadur.xml
index 1a2407ae64..ab9beb0f10 100644
--- a/data/monster/monsters/tazhadur.xml
+++ b/data/monster/monsters/tazhadur.xml
@@ -2,7 +2,7 @@
 <monster name="Tazhadur" nameDescription="Tazhadur" race="blood" experience="9000" speed="350">
 	<health now="10000" max="10000" />
 	<look type="947" head="24" body="120" legs="38" feet="95" addons="3" corpse="27849" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/the_astral_source.xml b/data/monster/monsters/the_astral_source.xml
index 8d2684c2ad..b4837ec3a8 100644
--- a/data/monster/monsters/the_astral_source.xml
+++ b/data/monster/monsters/the_astral_source.xml
@@ -2,7 +2,7 @@
 <monster name="The Astral Source" nameDescription="The Astral Source" race="energy" experience="3000" speed="0">
 	<health now="150000" max="150000" />
 	<look typeex="26884" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/the_blazing_time_guardian.xml b/data/monster/monsters/the_blazing_time_guardian.xml
index 882bd02756..040f0b9e92 100644
--- a/data/monster/monsters/the_blazing_time_guardian.xml
+++ b/data/monster/monsters/the_blazing_time_guardian.xml
@@ -2,7 +2,7 @@
 <monster name="The Blazing Time Guardian" nameDescription="The Blazing Time Guardian" race="undead" experience="50000" speed="340">
 	<health now="150000" max="150000" />
 	<look type="944" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/the_distorted_astral_source.xml b/data/monster/monsters/the_distorted_astral_source.xml
index f6d6a265ce..2a3b6bffc0 100644
--- a/data/monster/monsters/the_distorted_astral_source.xml
+++ b/data/monster/monsters/the_distorted_astral_source.xml
@@ -2,7 +2,7 @@
 <monster name="The Distorted Astral Source" nameDescription="The Distorted Astral Source" race="energy" experience="3000" speed="0">
 	<health now="10000000" max="10000000" />
 	<look typeex="26885" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/the_enraged_thorn_knight.xml b/data/monster/monsters/the_enraged_thorn_knight.xml
index cc5b977d14..4ad09bd74c 100644
--- a/data/monster/monsters/the_enraged_thorn_knight.xml
+++ b/data/monster/monsters/the_enraged_thorn_knight.xml
@@ -2,7 +2,7 @@
 <monster name="The Enraged Thorn Knight" nameDescription="The Enraged Thorn Knight" race="blood" experience="30000" speed="350">
 	<health now="20000" max="20000" />
 	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" corpse="6080" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/the_first_dragon.xml b/data/monster/monsters/the_first_dragon.xml
index 3fec2471d4..a88161def8 100644
--- a/data/monster/monsters/the_first_dragon.xml
+++ b/data/monster/monsters/the_first_dragon.xml
@@ -2,7 +2,7 @@
 <monster name="The First Dragon" nameDescription="The First Dragon" race="blood" experience="9000" speed="350">
 	<health now="50000" max="50000" />
 	<look type="947" head="94" body="80" legs="120" feet="60" addons="3" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/the_freezing_time_guardian.xml b/data/monster/monsters/the_freezing_time_guardian.xml
index 01f361d989..9826dd3021 100644
--- a/data/monster/monsters/the_freezing_time_guardian.xml
+++ b/data/monster/monsters/the_freezing_time_guardian.xml
@@ -2,7 +2,7 @@
 <monster name="The Freezing Time Guardian" nameDescription="The Freezing Time Guardian" race="undead" experience="50000" speed="340">
 	<health now="150000" max="150000" />
 	<look type="943" corpse="27741" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index e3787b5b38..911b0f33d4 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -2,7 +2,7 @@
 <monster name="The Last Lore Keeper" nameDescription="The Last Lore Keeper" race="undead" experience="45000" speed="450">
 	<health now="750000" max="750000" />
 	<look type="939" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/the_shielded_thorn_knight.xml b/data/monster/monsters/the_shielded_thorn_knight.xml
index d3f31b3e65..9b617e4a2d 100644
--- a/data/monster/monsters/the_shielded_thorn_knight.xml
+++ b/data/monster/monsters/the_shielded_thorn_knight.xml
@@ -2,7 +2,7 @@
 <monster name="The Shielded Thorn Knight" nameDescription="The Shielded Thorn Knight" race="blood" experience="0" speed="390">
 	<health now="70000" max="70000" />
 	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
index 3da57f65eb..53bcd07213 100644
--- a/data/monster/monsters/the_time_guardian.xml
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -2,7 +2,7 @@
 <monster name="The Time Guardian" nameDescription="The Time Guardian" race="undead" experience="50000" speed="340">
 	<health now="150000" max="150000" />
 	<look type="945" corpse="27741" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/thorn_minion.xml b/data/monster/monsters/thorn_minion.xml
index 41e5b4911d..7fc3c0a13c 100644
--- a/data/monster/monsters/thorn_minion.xml
+++ b/data/monster/monsters/thorn_minion.xml
@@ -2,7 +2,7 @@
 <monster name="Thorn Minion" nameDescription="a thorn minion" race="venom" experience="1600" speed="150" manacost="290">
 	<health now="3500" max="3500" />
 	<look type="717" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/time_keeper.xml b/data/monster/monsters/time_keeper.xml
index e3d0b96702..f090aee7bf 100644
--- a/data/monster/monsters/time_keeper.xml
+++ b/data/monster/monsters/time_keeper.xml
@@ -2,7 +2,7 @@
 <monster name="Time Keeper" nameDescription="a time keeper" race="undead" experience="0" speed="160">
 	<health now="1000" max="1000" />
 	<look type="560" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/time_waster.xml b/data/monster/monsters/time_waster.xml
index 98534de1fd..cad4351597 100644
--- a/data/monster/monsters/time_waster.xml
+++ b/data/monster/monsters/time_waster.xml
@@ -2,7 +2,7 @@
 <monster name="Time Waster" nameDescription="a time waster" race="undead" experience="0" speed="100">
 	<health now="1000" max="1000" />
 	<look typeex="26385" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/twisted_shaper.xml b/data/monster/monsters/twisted_shaper.xml
index b9e31f0897..da2c9acaef 100644
--- a/data/monster/monsters/twisted_shaper.xml
+++ b/data/monster/monsters/twisted_shaper.xml
@@ -2,7 +2,7 @@
 <monster name="Twisted Shaper" nameDescription="a twisted shaper" experience="1750" speed="280" >
 	<health now="2500" max="2500" />
 	<look type="932" head="105" body="0" legs="0" feet="94" addons="1" mount="0" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/unbeatable_dragon.xml b/data/monster/monsters/unbeatable_dragon.xml
index 567ffcb4f0..14c440e6b3 100644
--- a/data/monster/monsters/unbeatable_dragon.xml
+++ b/data/monster/monsters/unbeatable_dragon.xml
@@ -2,7 +2,7 @@
 <monster name="Unbeatable Dragon" nameDescription="an unbeatable dragon" race="blood" experience="2100" speed="200">
 	<health now="1900" max="1900" />
 	<look type="39" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/unbound_blightwalker.xml b/data/monster/monsters/unbound_blightwalker.xml
index 8a41482683..4f85d7bf3d 100644
--- a/data/monster/monsters/unbound_blightwalker.xml
+++ b/data/monster/monsters/unbound_blightwalker.xml
@@ -2,7 +2,7 @@
 <monster name="Unbound Blightwalker" nameDescription="an unbound blightwalker" race="undead" experience="5850" speed="350">
 	<health now="7900" max="7900" />
 	<look type="246" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/unbound_defiler.xml b/data/monster/monsters/unbound_defiler.xml
index 2b25ed3491..a8e06d2b23 100644
--- a/data/monster/monsters/unbound_defiler.xml
+++ b/data/monster/monsters/unbound_defiler.xml
@@ -2,7 +2,7 @@
 <monster name="Unbound Defiler" nameDescription="an unbound defiler" race="venom" experience="3700" speed="160">
 	<health now="2650" max="2650" />
 	<look type="238" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/unbound_demon.xml b/data/monster/monsters/unbound_demon.xml
index 38ecef5988..ca153f4b39 100644
--- a/data/monster/monsters/unbound_demon.xml
+++ b/data/monster/monsters/unbound_demon.xml
@@ -2,7 +2,7 @@
 <monster name="Unbound Demon" nameDescription="an unbound demon" race="fire" experience="5000" speed="256">
 	<health now="7200" max="7200" />
 	<look type="35" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/unbound_demon_outcast.xml b/data/monster/monsters/unbound_demon_outcast.xml
index e23267bb64..ec2fc367bc 100644
--- a/data/monster/monsters/unbound_demon_outcast.xml
+++ b/data/monster/monsters/unbound_demon_outcast.xml
@@ -2,7 +2,7 @@
 <monster name="Unbound Demon Outcast" nameDescription="an unbound demon outcast" race="fire" experience="6200" speed="300">
 	<health now="5900" max="5900" />
 	<look type="590" corpse="0" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
diff --git a/data/monster/monsters/vampire_pig.xml b/data/monster/monsters/vampire_pig.xml
index cea52b54d1..2604feb0ca 100644
--- a/data/monster/monsters/vampire_pig.xml
+++ b/data/monster/monsters/vampire_pig.xml
@@ -2,7 +2,7 @@
 <monster name="Vampire Pig" nameDescription="a vampire pig" race="blood" experience="165" speed="300">
 	<health now="305" max="305" />
 	<look type="60" corpse="6000" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/wild_dog.xml b/data/monster/monsters/wild_dog.xml
index e933a69278..650cf94e5a 100644
--- a/data/monster/monsters/wild_dog.xml
+++ b/data/monster/monsters/wild_dog.xml
@@ -2,7 +2,7 @@
 <monster name="Wild Dog" nameDescription="a wild dog" race="blood" experience="0" speed="200" manacost="220">
 	<health now="1000000" max="1000000" />
 	<look type="32" head="20" body="30" legs="40" feet="50" corpse="5971" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="0" />
diff --git a/data/monster/monsters/world_bug.xml b/data/monster/monsters/world_bug.xml
index 630bc4e8f4..46954e2b6b 100644
--- a/data/monster/monsters/world_bug.xml
+++ b/data/monster/monsters/world_bug.xml
@@ -2,7 +2,7 @@
 <monster name="World Bug" namedescription="a world bug" race="venom" experience="50" speed="240">
 	<health now="270" max="270" />
 	<look type="45" corpse="5990" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/zorvorax.xml b/data/monster/monsters/zorvorax.xml
index d1e3ed1e31..56d1440b62 100644
--- a/data/monster/monsters/zorvorax.xml
+++ b/data/monster/monsters/zorvorax.xml
@@ -2,7 +2,7 @@
 <monster name="Zorvorax" nameDescription="Zorvorax" race="undead" experience="9000" speed="350">
 	<health now="10000" max="10000" />
 	<look type="928" corpse="6306" />
-	<targetchange interval="2000" chance="0" />
+	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />

From 1cfedecbef20e8aadde91caea2fdd9bf149e4136 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Tue, 3 May 2022 18:31:48 -0300
Subject: [PATCH 17/38] Reverting changes that are not part of the update

---
 data/monster/monsters/big_boss_trolliver.xml  | 2 +-
 data/monster/monsters/giant_spider_wyda.xml   | 2 +-
 data/monster/monsters/hot_dog.xml             | 2 +-
 data/monster/monsters/magic_pillar.xml        | 2 +-
 data/monster/monsters/morik_the_gladiator.xml | 2 +-
 data/monster/monsters/party_skeleton.xml      | 2 +-
 data/monster/monsters/pillar.xml              | 2 +-
 data/monster/monsters/rottie_the_rotworm.xml  | 2 +-
 data/monster/monsters/vampire_pig.xml         | 2 +-
 data/monster/monsters/wild_dog.xml            | 2 +-
 data/monster/monsters/world_bug.xml           | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/monster/monsters/big_boss_trolliver.xml b/data/monster/monsters/big_boss_trolliver.xml
index 85d4a9079b..9d51b7dbcc 100644
--- a/data/monster/monsters/big_boss_trolliver.xml
+++ b/data/monster/monsters/big_boss_trolliver.xml
@@ -2,7 +2,7 @@
 <monster name="Big Boss Trolliver" nameDescription="Big Boss Trolliver" race="blood" experience="105" speed="140">
 	<health now="150" max="150" />
 	<look type="281" corpse="7926" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/giant_spider_wyda.xml b/data/monster/monsters/giant_spider_wyda.xml
index 01cb16f402..c5c38808e8 100644
--- a/data/monster/monsters/giant_spider_wyda.xml
+++ b/data/monster/monsters/giant_spider_wyda.xml
@@ -2,7 +2,7 @@
 <monster name="Giant Spider" nameDescription="a giant spider" race="venom" experience="12" speed="152">
 	<health now="20" max="20" />
 	<look type="38" corpse="5977" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/hot_dog.xml b/data/monster/monsters/hot_dog.xml
index fec68fd3a5..f3921abef7 100644
--- a/data/monster/monsters/hot_dog.xml
+++ b/data/monster/monsters/hot_dog.xml
@@ -2,7 +2,7 @@
 <monster name="Hot Dog" nameDescription="a hot dog" race="blood" experience="190" speed="300" manacost="220">
 	<health now="505" max="505" />
 	<look type="32" corpse="5971" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/magic_pillar.xml b/data/monster/monsters/magic_pillar.xml
index a3270ef0bd..bc38e46a55 100644
--- a/data/monster/monsters/magic_pillar.xml
+++ b/data/monster/monsters/magic_pillar.xml
@@ -2,7 +2,7 @@
 <monster name="Magic Pillar" nameDescription="a magic pillar" race="undead" experience="0" speed="0">
 	<health now="1" max="1" />
 	<look typeex="1551" corpse="0" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="0" />
diff --git a/data/monster/monsters/morik_the_gladiator.xml b/data/monster/monsters/morik_the_gladiator.xml
index b14bf64d4d..e2fe705328 100644
--- a/data/monster/monsters/morik_the_gladiator.xml
+++ b/data/monster/monsters/morik_the_gladiator.xml
@@ -2,7 +2,7 @@
 <monster name="Morik The Gladiator" nameDescription="Morik The Gladiator" race="blood" experience="160" speed="200">
 	<health now="1235" max="1235" />
 	<look type="131" head="57" body="57" legs="57" feet="57" addons="1" corpse="20450" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/party_skeleton.xml b/data/monster/monsters/party_skeleton.xml
index 35114e97fa..06d61a3b18 100644
--- a/data/monster/monsters/party_skeleton.xml
+++ b/data/monster/monsters/party_skeleton.xml
@@ -2,7 +2,7 @@
 <monster name="Party Skeleton" nameDescription="a party skeleton" race="undead" experience="0" speed="154" manacost="300">
 	<health now="40" max="40" />
 	<look type="33" corpse="5972" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="0" />
diff --git a/data/monster/monsters/pillar.xml b/data/monster/monsters/pillar.xml
index f310ca3b7a..52b512ba63 100644
--- a/data/monster/monsters/pillar.xml
+++ b/data/monster/monsters/pillar.xml
@@ -2,7 +2,7 @@
 <monster name="Pillar" nameDescription="a pillar" race="undead" experience="0" speed="0">
 	<health now="100" max="100" />
 	<look typeex="1551" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="0" />
diff --git a/data/monster/monsters/rottie_the_rotworm.xml b/data/monster/monsters/rottie_the_rotworm.xml
index 473ca2e565..d5d4aa7ace 100644
--- a/data/monster/monsters/rottie_the_rotworm.xml
+++ b/data/monster/monsters/rottie_the_rotworm.xml
@@ -2,7 +2,7 @@
 <monster name="Rottie The Rotworm" nameDescription="Rottie The Rotworm" race="blood" experience="40" speed="180">
 	<health now="65" max="65" />
 	<look type="26" corpse="5967" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/vampire_pig.xml b/data/monster/monsters/vampire_pig.xml
index 2604feb0ca..cea52b54d1 100644
--- a/data/monster/monsters/vampire_pig.xml
+++ b/data/monster/monsters/vampire_pig.xml
@@ -2,7 +2,7 @@
 <monster name="Vampire Pig" nameDescription="a vampire pig" race="blood" experience="165" speed="300">
 	<health now="305" max="305" />
 	<look type="60" corpse="6000" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />
diff --git a/data/monster/monsters/wild_dog.xml b/data/monster/monsters/wild_dog.xml
index 650cf94e5a..e933a69278 100644
--- a/data/monster/monsters/wild_dog.xml
+++ b/data/monster/monsters/wild_dog.xml
@@ -2,7 +2,7 @@
 <monster name="Wild Dog" nameDescription="a wild dog" race="blood" experience="0" speed="200" manacost="220">
 	<health now="1000000" max="1000000" />
 	<look type="32" head="20" body="30" legs="40" feet="50" corpse="5971" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="0" />
diff --git a/data/monster/monsters/world_bug.xml b/data/monster/monsters/world_bug.xml
index 46954e2b6b..630bc4e8f4 100644
--- a/data/monster/monsters/world_bug.xml
+++ b/data/monster/monsters/world_bug.xml
@@ -2,7 +2,7 @@
 <monster name="World Bug" namedescription="a world bug" race="venom" experience="50" speed="240">
 	<health now="270" max="270" />
 	<look type="45" corpse="5990" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="0" />
 		<flag attackable="1" />

From e35d63040033a57bf0e69e6fc82b609e4d629852 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Tue, 3 May 2022 18:32:34 -0300
Subject: [PATCH 18/38] Missing it

---
 data/monster/monsters/poodle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/monster/monsters/poodle.xml b/data/monster/monsters/poodle.xml
index d23e059dde..530d6f4b01 100644
--- a/data/monster/monsters/poodle.xml
+++ b/data/monster/monsters/poodle.xml
@@ -2,7 +2,7 @@
 <monster name="Poodle" nameDescription="a poodle" race="blood" experience="0" speed="200" manacost="220">
 	<health now="20" max="20" />
 	<look type="473" corpse="5971" />
-	<targetchange interval="2000" chance="5" />
+	<targetchange interval="2000" chance="0" />
 	<flags>
 		<flag summonable="1" />
 		<flag attackable="1" />

From 6314da2ca08eb7eeced1eeca4d300283abb2fe95 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Tue, 3 May 2022 19:09:37 -0300
Subject: [PATCH 19/38] Initial additions of missing spells

---
 data/monster/monsters/lady_tenebris.xml       |  2 --
 data/monster/monsters/lloyd.xml               |  6 ++--
 .../scripts/monster/frozen_minion_heal.lua    | 22 +++++++++++++
 .../scripts/monster/frozen_minion_wave.lua    | 31 +++++++++++++++++++
 data/spells/scripts/monster/icecle_heal.lua   | 22 +++++++++++++
 data/spells/scripts/monster/lloyd_wave_1.lua  | 18 +++++++++++
 data/spells/scripts/monster/lloyd_wave_2.lua  | 18 +++++++++++
 data/spells/scripts/monster/lloyd_wave_3.lua  | 18 +++++++++++
 .../spells/scripts/monster/souleater_wave.lua | 15 +++++++++
 .../scripts/monster/white_shade_paralyze.lua  | 13 ++++++++
 data/spells/scripts/monster/wyrm_wave.lua     | 17 ++++++++++
 data/spells/spells.xml                        |  9 ++++++
 12 files changed, 186 insertions(+), 5 deletions(-)
 create mode 100644 data/spells/scripts/monster/frozen_minion_heal.lua
 create mode 100644 data/spells/scripts/monster/frozen_minion_wave.lua
 create mode 100644 data/spells/scripts/monster/icecle_heal.lua
 create mode 100644 data/spells/scripts/monster/lloyd_wave_1.lua
 create mode 100644 data/spells/scripts/monster/lloyd_wave_2.lua
 create mode 100644 data/spells/scripts/monster/lloyd_wave_3.lua
 create mode 100644 data/spells/scripts/monster/souleater_wave.lua
 create mode 100644 data/spells/scripts/monster/white_shade_paralyze.lua
 create mode 100644 data/spells/scripts/monster/wyrm_wave.lua

diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
index b9499cd33b..e813bc4cfa 100644
--- a/data/monster/monsters/lady_tenebris.xml
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -29,8 +29,6 @@
 			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="smallclouds" />
 		</attack>
-		<attack name="tenebris summon" interval="2000" chance="14" />
-		<attack name="tenebris ultimate" interval="2000" chance="30" />
 	</attacks>
 	<defenses armor="10" defense="5">
 		<defense name="healing" interval="3000" chance="25" min="600" max="2700">
diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index 78ad28ca6c..0f139c9ea2 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -25,9 +25,9 @@
 		<attack name="energy" interval="2000" chance="12" length="6" spread="0" min="-130" max="-460">
 			<attribute key="areaEffect" value="purpleenergy" />
 		</attack>
-		<attack name="lloyd wave" interval="2000" chance="12" min="-430" max="-560" />
-		<attack name="lloyd wave2" interval="2000" chance="12" min="-230" max="-460" />
-		<attack name="lloyd wave3" interval="2000" chance="12" min="-430" max="-660" />
+		<attack name="lloyd wave 1" interval="2000" chance="12" min="-430" max="-560" />
+		<attack name="lloyd wave 2" interval="2000" chance="12" min="-230" max="-460" />
+		<attack name="lloyd wave 3" interval="2000" chance="12" min="-430" max="-660" />
 	</attacks>
 	<defenses armor="55" defense="55">
 		<defense name="healing" interval="2000" chance="15" min="180" max="250" />
diff --git a/data/spells/scripts/monster/frozen_minion_heal.lua b/data/spells/scripts/monster/frozen_minion_heal.lua
new file mode 100644
index 0000000000..19163a5128
--- /dev/null
+++ b/data/spells/scripts/monster/frozen_minion_heal.lua
@@ -0,0 +1,22 @@
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_MAGIC_BLUE)
+combat:setParameter(COMBAT_PARAM_AGGRESSIVE, 0)
+combat:setArea(createCombatArea(AREA_CIRCLE2X2))
+
+function onTargetCreature(creature, target)
+	local min = 100
+	local max = 200
+	local master = target:getMaster()
+	if target:isPlayer() and not master or master and master:isPlayer() then
+		return true
+	end
+
+	doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
+	return true
+end
+
+combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature")
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/frozen_minion_wave.lua b/data/spells/scripts/monster/frozen_minion_wave.lua
new file mode 100644
index 0000000000..e1ab67db12
--- /dev/null
+++ b/data/spells/scripts/monster/frozen_minion_wave.lua
@@ -0,0 +1,31 @@
+area = {
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0}
+}
+
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_POFF)
+combat:setParameter(COMBAT_PARAM_AGGRESSIVE, 0)
+combat:setArea(createCombatArea(area))
+
+function onTargetCreature(creature, target)
+	local min = 200
+	local max = 700
+	local master = target:getMaster()
+	if target:isPlayer() and not master or master and master:isPlayer() then
+		doTargetCombatHealth(0, target, COMBAT_ICEDAMAGE, min, max, CONST_ME_NONE)
+		return true
+	end
+
+	doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
+	return true
+end
+
+combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature")
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/icecle_heal.lua b/data/spells/scripts/monster/icecle_heal.lua
new file mode 100644
index 0000000000..4d3578af8e
--- /dev/null
+++ b/data/spells/scripts/monster/icecle_heal.lua
@@ -0,0 +1,22 @@
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_MAGIC_BLUE)
+combat:setParameter(COMBAT_PARAM_AGGRESSIVE, 0)
+combat:setArea(createCombatArea(AREA_CIRCLE3X3))
+
+function onTargetCreature(creature, target)
+	local min = 400
+	local max = 600
+	local master = target:getMaster()
+	if target:isPlayer() and not master or master and master:isPlayer() then
+		return true
+	end
+
+	doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
+	return true
+end
+
+combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature")
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/lloyd_wave_1.lua b/data/spells/scripts/monster/lloyd_wave_1.lua
new file mode 100644
index 0000000000..259457b49c
--- /dev/null
+++ b/data/spells/scripts/monster/lloyd_wave_1.lua
@@ -0,0 +1,18 @@
+area = {
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0},
+	{0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0},
+	{0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+}
+
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
+combat:setParameter(COMBAT_PARAM_EFFECT, 179)
+combat:setArea(createCombatArea(area))
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/lloyd_wave_2.lua b/data/spells/scripts/monster/lloyd_wave_2.lua
new file mode 100644
index 0000000000..34f0a8fd01
--- /dev/null
+++ b/data/spells/scripts/monster/lloyd_wave_2.lua
@@ -0,0 +1,18 @@
+area = {
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+}
+
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
+combat:setParameter(COMBAT_PARAM_EFFECT, 179)
+combat:setArea(createCombatArea(area))
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/lloyd_wave_3.lua b/data/spells/scripts/monster/lloyd_wave_3.lua
new file mode 100644
index 0000000000..3a9ef323d2
--- /dev/null
+++ b/data/spells/scripts/monster/lloyd_wave_3.lua
@@ -0,0 +1,18 @@
+area = {
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+}
+
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
+combat:setParameter(COMBAT_PARAM_EFFECT, 179)
+combat:setArea(createCombatArea(area))
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/souleater_wave.lua b/data/spells/scripts/monster/souleater_wave.lua
new file mode 100644
index 0000000000..451433c8a8
--- /dev/null
+++ b/data/spells/scripts/monster/souleater_wave.lua
@@ -0,0 +1,15 @@
+area = {
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0}
+}
+
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_LIFEDRAINDAMAGE)
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_SOUND_RED)
+combat:setArea(createCombatArea(area))
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/white_shade_paralyze.lua b/data/spells/scripts/monster/white_shade_paralyze.lua
new file mode 100644
index 0000000000..87cc578c50
--- /dev/null
+++ b/data/spells/scripts/monster/white_shade_paralyze.lua
@@ -0,0 +1,13 @@
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_HITAREA)
+combat:addCondition(condition)
+combat:setArea(createCombatArea(AREA_CIRCLE2X2))
+combat:addCondition(condition)
+
+local condition = Condition(CONDITION_PARALYZE)
+condition:setParameter(CONDITION_PARAM_TICKS, 20000)
+condition:setFormula(-0.3, 0, -0.45, 0)
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/wyrm_wave.lua b/data/spells/scripts/monster/wyrm_wave.lua
new file mode 100644
index 0000000000..b9d29bc19d
--- /dev/null
+++ b/data/spells/scripts/monster/wyrm_wave.lua
@@ -0,0 +1,17 @@
+area = {
+	{0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0},
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0}
+}
+
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PURPLEENERGY)
+combat:setArea(createCombatArea(area))
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/spells.xml b/data/spells/spells.xml
index 484790794d..93f0ed7b9d 100644
--- a/data/spells/spells.xml
+++ b/data/spells/spells.xml
@@ -823,4 +823,13 @@
 	<instant name="root branchy" words="###53" blockwalls="1" needtarget="1" needlearn="1" script="monster/root_branchy.lua" />
 	<instant name="explosion wave" words="###54" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/explosion_wave.lua" />
 	<instant name="wave t" words="###55" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/wave_t.lua" />
+	<instant name="souleater wave" words="###56" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/souleater_wave.lua"/>
+	<instant name="wyrm wave" words="###57" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/wyrm_wave.lua"/>
+	<instant name="frozen minion wave" words="###58" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/frozen_minion_wave.lua"/>
+	<instant name="frozen minion heal" words="###59" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/frozen_minion_heal.lua"/>
+	<instant name="icecle heal" words="###60" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/icecle_heal.lua"/>
+	<instant name="lloyd wave 1" words="###61" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_1.lua"/>
+	<instant name="lloyd wave 2" words="###62" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_2.lua"/>
+	<instant name="lloyd wave 3" words="###63" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/lloyd_wave_3.lua"/>
+	<instant name="white shade paralyze" words="###64" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/white_shade_paralyze.lua"/>
 </spells>

From 23cfff317700dffb73efa60cc8e2a76d27f104db Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Tue, 3 May 2022 19:17:15 -0300
Subject: [PATCH 20/38] Resolve conversations

---
 data/monster/monsters.xml                                     | 4 ++--
 data/monster/monsters/a_shielded_astral_glyph.xml             | 2 +-
 .../monsters/{baby_dragon_(creature).xml => baby_dragon.xml}  | 0
 data/monster/monsters/{icicle_(creature).xml => icicle.xml}   | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename data/monster/monsters/{baby_dragon_(creature).xml => baby_dragon.xml} (100%)
 rename data/monster/monsters/{icicle_(creature).xml => icicle.xml} (100%)

diff --git a/data/monster/monsters.xml b/data/monster/monsters.xml
index 126672b1c9..bfdc158373 100644
--- a/data/monster/monsters.xml
+++ b/data/monster/monsters.xml
@@ -32,7 +32,7 @@
 	<monster name="Axeitus Headbanger" file="monsters/axeitus_headbanger.xml" />
 	<monster name="Azerus" file="monsters/azerus.xml" />
 	<monster name="Azure Frog" file="monsters/azure_frog.xml" />
-	<monster name="Baby Dragon" file="monsters/baby_dragon_(creature).xml" />
+	<monster name="Baby Dragon" file="monsters/baby_dragon.xml" />
 	<monster name="Bad Dream" file="monsters/bad_dream.xml" />
 	<monster name="Badger" file="monsters/badger.xml" />
 	<monster name="Bandit" file="monsters/bandit.xml" />
@@ -380,7 +380,7 @@
 	<monster name="Ice Golem" file="monsters/ice_golem.xml" />
 	<monster name="Ice Overlord" file="monsters/ice_overlord.xml" />
 	<monster name="Ice Witch" file="monsters/ice_witch.xml" />
-	<monster name="Icicle" file="monsters/icicle_(creature).xml" />
+	<monster name="Icicle" file="monsters/icicle.xml" />
 	<monster name="Incineron" file="monsters/incineron.xml" />
 	<monster name="Incredibly Old Witch" file="monsters/incredibly_old_witch.xml" />
 	<monster name="Infected Weeper" file="monsters/infected_weeper.xml" />
diff --git a/data/monster/monsters/a_shielded_astral_glyph.xml b/data/monster/monsters/a_shielded_astral_glyph.xml
index 939c25341e..0863681172 100644
--- a/data/monster/monsters/a_shielded_astral_glyph.xml
+++ b/data/monster/monsters/a_shielded_astral_glyph.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" skill="90" attack="100" />
+		<attack name="melee" interval="2000" min="0" max="-780" />
 		<attack name="energy" interval="2000" chance="25" radius="3" target="0" min="-200" max="-400">
 			<attribute key="areaEffect" value="yellowspark" />
 		</attack>
diff --git a/data/monster/monsters/baby_dragon_(creature).xml b/data/monster/monsters/baby_dragon.xml
similarity index 100%
rename from data/monster/monsters/baby_dragon_(creature).xml
rename to data/monster/monsters/baby_dragon.xml
diff --git a/data/monster/monsters/icicle_(creature).xml b/data/monster/monsters/icicle.xml
similarity index 100%
rename from data/monster/monsters/icicle_(creature).xml
rename to data/monster/monsters/icicle.xml

From c3142f6e205646a94b0055ec61787bb3585b24dc Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Tue, 3 May 2022 19:29:38 -0300
Subject: [PATCH 21/38] Fix: White shade paralyze

---
 data/spells/scripts/monster/white_shade_paralyze.lua | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/data/spells/scripts/monster/white_shade_paralyze.lua b/data/spells/scripts/monster/white_shade_paralyze.lua
index 87cc578c50..44ea5f76ca 100644
--- a/data/spells/scripts/monster/white_shade_paralyze.lua
+++ b/data/spells/scripts/monster/white_shade_paralyze.lua
@@ -1,13 +1,12 @@
+local condition = Condition(CONDITION_PARALYZE)
+condition:setParameter(CONDITION_PARAM_TICKS, 20000)
+condition:setFormula(-0.3, 0, -0.45, 0)
+
 local combat = Combat()
 combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_HITAREA)
-combat:addCondition(condition)
 combat:setArea(createCombatArea(AREA_CIRCLE2X2))
 combat:addCondition(condition)
 
-local condition = Condition(CONDITION_PARALYZE)
-condition:setParameter(CONDITION_PARAM_TICKS, 20000)
-condition:setFormula(-0.3, 0, -0.45, 0)
-
 function onCastSpell(creature, var)
 	return combat:execute(creature, var)
 end

From 621801379134c7b1b75884b9d28dd4c2719a4a24 Mon Sep 17 00:00:00 2001
From: Torresmon <70948057+torresmon@users.noreply.github.com>
Date: Tue, 3 May 2022 21:10:35 -0300
Subject: [PATCH 22/38] Fix: Spells and elements

---
 data/monster/monsters/baby_dragon.xml                 | 5 -----
 data/monster/monsters/melting_frozen_horror.xml       | 4 +++-
 data/monster/monsters/possessed_tree.xml              | 4 +++-
 data/monster/monsters/shadow_fiend.xml                | 4 +++-
 data/monster/monsters/solid_frozen_horror.xml         | 4 +++-
 data/monster/monsters/somewhat_beatable_dragon.xml    | 6 ------
 data/monster/monsters/soul_of_dragonking_zyrtarch.xml | 8 +-------
 data/monster/monsters/the_last_lore_keeper.xml        | 4 +++-
 data/monster/monsters/unbound_blightwalker.xml        | 4 +++-
 data/monster/monsters/unbound_defiler.xml             | 6 +++---
 data/monster/monsters/unbound_demon.xml               | 8 ++++++--
 11 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/data/monster/monsters/baby_dragon.xml b/data/monster/monsters/baby_dragon.xml
index d20aea6652..9beedbaf30 100644
--- a/data/monster/monsters/baby_dragon.xml
+++ b/data/monster/monsters/baby_dragon.xml
@@ -35,11 +35,6 @@
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
 	</defenses>
-	<elements>
-		<element earthPercent="75" />
-		<element icePercent="-10" />
-		<element energyPercent="-5" />
-	</elements>
 	<immunities>
 		<immunity paralyze="1" />
 		<immunity fire="1" />
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index e0c8cc691f..a71294fe9a 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -27,7 +27,9 @@
 			<attribute key="shootEffect" value="ice" />
 			<attribute key="areaEffect" value="yellowspark" />
 		</attack>
-		<attack name="ice golem paralyze" interval="2000" chance="11" />
+		<attack name="speed" interval="1000" chance="13" length="8" spread="0" speedchange="-800" duration="20000">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
 		<attack name="hirintror skill reducer" interval="2000" chance="10" />
 	</attacks>
 	<defenses armor="10" defense="5">
diff --git a/data/monster/monsters/possessed_tree.xml b/data/monster/monsters/possessed_tree.xml
index 42a08c1331..17e64bb384 100644
--- a/data/monster/monsters/possessed_tree.xml
+++ b/data/monster/monsters/possessed_tree.xml
@@ -22,7 +22,9 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-162" />
-		<attack name="haunted treeling paralyze" interval="2000" chance="10" />
+		<attack name="speed" interval="2000" chance="15" length="5" spread="0" duration="15000" speedchange="-700">
+			<attribute key="areaEffect" value="smallplants" />
+		</attack>
 		<attack name="poison" interval="2000" chance="9" target="1" radius="4" range="4" min="-86" max="-200">
 			<attribute key="shootEffect" value="poison" />
 			<attribute key="areaEffect" value="greenspark" />
diff --git a/data/monster/monsters/shadow_fiend.xml b/data/monster/monsters/shadow_fiend.xml
index b19217a6c3..c5e180bfaf 100644
--- a/data/monster/monsters/shadow_fiend.xml
+++ b/data/monster/monsters/shadow_fiend.xml
@@ -22,7 +22,9 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-		<attack name="nightstalker paralyze" interval="2000" chance="19" range="7" />
+		<attack name="speed" interval="2000" chance="15" target="1" speedchange="-600" duration="15000">
+			<attribute key="areaEffect" value="sleep" />
+		</attack>
 		<attack name="lifedrain" interval="2000" chance="12" radius="5" min="-360" max="-470">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index 9e3e72799b..642b8e97bf 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -27,7 +27,9 @@
 			<attribute key="shootEffect" value="ice" />
 			<attribute key="areaEffect" value="yellowspark" />
 		</attack>
-		<attack name="ice golem paralyze" interval="2000" chance="11" />
+		<attack name="speed" interval="1000" chance="13" length="8" spread="0" speedchange="-800" duration="20000">
+			<attribute key="areaEffect" value="energy" />
+		</attack>
 		<attack name="hirintror skill reducer" interval="2000" chance="10" />
 	</attacks>
 	<defenses armor="60" defense="60">
diff --git a/data/monster/monsters/somewhat_beatable_dragon.xml b/data/monster/monsters/somewhat_beatable_dragon.xml
index 6297bdd262..34710f76d6 100644
--- a/data/monster/monsters/somewhat_beatable_dragon.xml
+++ b/data/monster/monsters/somewhat_beatable_dragon.xml
@@ -46,15 +46,9 @@
 	</elements>
 	<immunities>
 		<immunity paralyze="1" />
-		<immunity ice="1" />
 		<immunity drunk="1" />
 		<immunity lifedrain="1" />
 		<immunity invisible="1" />
 		<immunity fire="1" />
-		<immunity physical="1" />
-		<immunity death="1" />
-		<immunity holy="1" />
-		<immunity energy="1" />
-		<immunity earth="1" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
index 372a64720b..290fc7eb14 100644
--- a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -33,7 +33,7 @@
 		<attack name="manadrain" interval="2000" chance="20" radius="8" min="-110" max="-495">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</attack>
-		<attack name="charged energy elemental electrify" interval="2000" chance="15" radius="5" min="-1100" max="-1100">
+		<attack name="energycondition" interval="2000" chance="15" radius="5" min="-1100" max="-1100">
 			<attribute key="areaEffect" value="yellowenergy" />
 		</attack>
 		<attack name="energy" interval="2000" chance="15" length="9" spread="4" min="-710" max="-895">
@@ -51,12 +51,6 @@
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
 	</defenses>
-	<elements>
-		<element energyPercent="20" />
-		<element holyPercent="1" />
-		<element earthPercent="-12" />
-		<element deathPercent="-10" />
-	</elements>
 	<immunities>
 		<immunity fire="1" />
 		<immunity drown="1" />
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index 911b0f33d4..62fc4e23c9 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -37,7 +37,9 @@
 		<attack name="earth" interval="2000" chance="20" radius="5" target="1" min="-640" max="-800">
 			<attribute key="areaeffect" value="stones" />
 		</attack>
-		<attack name="medusa paralyze" interval="2000" chance="20" />
+		<attack name="speed" interval="2000" chance="25" radius="7" target="1" speedchange="-900">
+			<attribute key="areaEffect" value="poff" />
+		</attack>
 	</attacks>
 	<defenses armor="50" defense="50">
 		<defense name="healing" interval="2000" chance="25" min="1500" max="3000">
diff --git a/data/monster/monsters/unbound_blightwalker.xml b/data/monster/monsters/unbound_blightwalker.xml
index 4f85d7bf3d..0b8bf030a2 100644
--- a/data/monster/monsters/unbound_blightwalker.xml
+++ b/data/monster/monsters/unbound_blightwalker.xml
@@ -33,7 +33,9 @@
 		<attack name="drunk" interval="2000" chance="12" duration="35000" radius="3" target="0">
 			<attribute key="areaEffect" value="greenspark" />
 		</attack>
-		<attack name="blightwalker paralyze" interval="2000" chance="15" range="7" />
+		<attack name="speed" interval="2000" chance="15" target="1" range="7" speedchange="-300" duration="30000">
+			<attribute key="shootEffect" value="poison" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5" />
 	<elements>
diff --git a/data/monster/monsters/unbound_defiler.xml b/data/monster/monsters/unbound_defiler.xml
index a8e06d2b23..dcf1b9ec18 100644
--- a/data/monster/monsters/unbound_defiler.xml
+++ b/data/monster/monsters/unbound_defiler.xml
@@ -26,9 +26,9 @@
 			<attribute key="areaEffect" value="greenspark" />
 			<attribute key="shootEffect" value="poison" />
 		</attack>
-		<attack name="defiler paralyze 3" interval="2000" chance="9" />
-		<attack name="defiler paralyze 1" interval="2000" chance="6" />
-		<attack name="defiler paralyze 2" interval="2000" chance="8" />
+		<attack name="speed" interval="2000" chance="15" length="8" spread="3" speedchange="-700" duration="15000">
+			<attribute key="areaEffect" value="smallclouds" />
+		</attack>
 		<attack name="poisoncondition" interval="2000" chance="10" radius="8" target="0" start="32" min="-300" max="-500">
 			<attribute key="areaEffect" value="greenspark" />
 		</attack>
diff --git a/data/monster/monsters/unbound_demon.xml b/data/monster/monsters/unbound_demon.xml
index ca153f4b39..5027dc2f22 100644
--- a/data/monster/monsters/unbound_demon.xml
+++ b/data/monster/monsters/unbound_demon.xml
@@ -37,16 +37,17 @@
 		<attack name="firefield" interval="2000" chance="14" range="7" radius="1" target="1">
 			<attribute key="shootEffect" value="fire" />
 		</attack>
-		<attack name="demon paralyze" interval="2000" chance="10" range="7" />
 		<attack name="lifedrain" interval="2000" chance="10" length="8" spread="0" min="-300" max="-480">
 			<attribute key="areaEffect" value="purpleenergy" />
 		</attack>
+		<attack name="speed" interval="2000" chance="15" range="7" radius="1" target="1" speedchange="-700" duration="30000">
+			<attribute key="areaEffect" value="redshimmer" />
+		</attack>
 	</attacks>
 	<defenses armor="40" defense="65">
 		<defense name="healing" interval="2000" chance="14" min="150" max="250">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
-		<defense name="demon summon" interval="2000" chance="8" />
 		<defense name="speed" interval="2000" chance="10" speedchange="388" duration="4000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
@@ -65,4 +66,7 @@
 		<immunity fire="1" />
 		<immunity invisible="1" />
 	</immunities>
+	<summons maxSummons="1">
+		<summon name="fire elemental" interval="2000" chance="10" />
+	</summons>
 </monster>

From b00ece938500b303e828b679366d6902176288ac Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Tue, 3 May 2022 21:21:12 -0300
Subject: [PATCH 23/38] Partial corrections

---
 data/monster/monsters/mounted_thorn_knight.xml       | 1 -
 data/monster/monsters/soulcatcher.xml                | 1 -
 data/monster/monsters/the_freezing_time_guardian.xml | 4 +---
 data/monster/monsters/the_time_guardian.xml          | 5 +----
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/data/monster/monsters/mounted_thorn_knight.xml b/data/monster/monsters/mounted_thorn_knight.xml
index f7aa3c1d5d..57d1ca45e0 100644
--- a/data/monster/monsters/mounted_thorn_knight.xml
+++ b/data/monster/monsters/mounted_thorn_knight.xml
@@ -36,7 +36,6 @@
 		</attack>
 	</attacks>
 	<defenses armor="60" defense="60">
-		<defense name="thorn summon" interval="2000" chance="20" />
 		<defense name="healing" interval="2000" chance="20" min="1550" max="2550">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
diff --git a/data/monster/monsters/soulcatcher.xml b/data/monster/monsters/soulcatcher.xml
index 41008326bb..de6477a501 100644
--- a/data/monster/monsters/soulcatcher.xml
+++ b/data/monster/monsters/soulcatcher.xml
@@ -26,7 +26,6 @@
 		</attack>
 	</attacks>
 	<defenses armor="50" defense="50">
-		<defense name="soulcatcher summon" interval="2000" chance="10" />
 		<defense name="healing" interval="2000" chance="25" min="100" max="145">
 			<attribute key="areaEffect" value="fire" />
 		</defense>
diff --git a/data/monster/monsters/the_freezing_time_guardian.xml b/data/monster/monsters/the_freezing_time_guardian.xml
index 9826dd3021..79cec5a366 100644
--- a/data/monster/monsters/the_freezing_time_guardian.xml
+++ b/data/monster/monsters/the_freezing_time_guardian.xml
@@ -39,9 +39,7 @@
 			<attribute key="areaEffect" value="yellowspark" />
 		</attack>
 	</attacks>
-	<defenses armor="70" defense="70">
-		<defense name="time guardian lost time" interval="2000" chance="10" />
-	</defenses>
+	<defenses armor="70" defense="70" />
 	<elements>
 		<element earthPercent="70" />
 		<element icePercent="70" />
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
index 53bcd07213..15fff9e459 100644
--- a/data/monster/monsters/the_time_guardian.xml
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -39,10 +39,7 @@
 			<attribute key="areaEffect" value="yellowspark" />
 		</attack>
 	</attacks>
-	<defenses armor="70" defense="70">
-		<defense name="time guardian" interval="2000" chance="10" />
-		<defense name="time guardiann" interval="2000" chance="10" />
-	</defenses>
+	<defenses armor="70" defense="70" />
 	<elements>
 		<element earthPercent="70" />
 		<element icePercent="70" />

From 06209d4c57feb17945705c5c68b1960a6d7f3e76 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Tue, 3 May 2022 21:24:29 -0300
Subject: [PATCH 24/38] Add missing spells

---
 .../scripts/monster/hirintror_freeze.lua      | 29 +++++++++++++++++++
 .../monster/hirintror_skill_reducer.lua       | 21 ++++++++++++++
 data/spells/spells.xml                        |  2 ++
 3 files changed, 52 insertions(+)
 create mode 100644 data/spells/scripts/monster/hirintror_freeze.lua
 create mode 100644 data/spells/scripts/monster/hirintror_skill_reducer.lua

diff --git a/data/spells/scripts/monster/hirintror_freeze.lua b/data/spells/scripts/monster/hirintror_freeze.lua
new file mode 100644
index 0000000000..ff13be7de7
--- /dev/null
+++ b/data/spells/scripts/monster/hirintror_freeze.lua
@@ -0,0 +1,29 @@
+area = {
+	{0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+	{0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0},
+	{0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0},
+	{0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0},
+	{1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1},
+	{0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0},
+	{0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0},
+	{0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0},
+	{0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0},
+	{0, 0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}
+}
+
+local condition = Condition(CONDITION_FREEZING)
+condition:setParameter(CONDITION_PARAM_DELAYED, 1)
+condition:addDamage(25, 8000, -8)
+
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_ICETORNADO)
+combat:addCondition(condition)
+combat:setArea(createCombatArea(area))
+combat:addCondition(condition)
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/hirintror_skill_reducer.lua b/data/spells/scripts/monster/hirintror_skill_reducer.lua
new file mode 100644
index 0000000000..7681e9752b
--- /dev/null
+++ b/data/spells/scripts/monster/hirintror_skill_reducer.lua
@@ -0,0 +1,21 @@
+local combat = {}
+
+for i = 20, 40 do
+	combat[i] = Combat()
+	combat[i]:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_HITAREA)
+
+	local condition = Condition(CONDITION_ATTRIBUTES)
+	condition:setParameter(CONDITION_PARAM_TICKS, 15000)
+	condition:setParameter(CONDITION_PARAM_SKILL_MELEEPERCENT, i)
+	condition:setParameter(CONDITION_PARAM_SKILL_FISTPERCENT, i)
+	condition:setParameter(CONDITION_PARAM_SKILL_DISTANCEPERCENT, i)
+	condition:setParameter(CONDITION_PARAM_SKILL_SHIELDPERCENT, i)
+
+	local area = createCombatArea(AREA_SQUARE1X1)
+	combat[i]:setArea(area)
+	combat[i]:addCondition(condition)
+end
+
+function onCastSpell(creature, var)
+	return combat[math.random(20, 40)]:execute(creature, var)
+end
diff --git a/data/spells/spells.xml b/data/spells/spells.xml
index 93f0ed7b9d..028372fabc 100644
--- a/data/spells/spells.xml
+++ b/data/spells/spells.xml
@@ -832,4 +832,6 @@
 	<instant name="lloyd wave 2" words="###62" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_2.lua"/>
 	<instant name="lloyd wave 3" words="###63" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/lloyd_wave_3.lua"/>
 	<instant name="white shade paralyze" words="###64" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/white_shade_paralyze.lua"/>
+	<instant name="hirintror skill reducer" words="###65" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_skill_reducer.lua"/>
+	<instant name="hirintror freeze" words="###66" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_freeze.lua"/>
 </spells>

From 8ef058ed5f4b07ce216ca102b2df434a2c83a583 Mon Sep 17 00:00:00 2001
From: torresmon <70948057+torresmon@users.noreply.github.com>
Date: Thu, 5 May 2022 17:19:15 -0300
Subject: [PATCH 25/38] Spells Fixes (#10)

---
 data/monster/monsters/melting_frozen_horror.xml | 2 +-
 data/monster/monsters/possessed_tree.xml        | 2 +-
 data/monster/monsters/shadow_fiend.xml          | 2 +-
 data/monster/monsters/solid_frozen_horror.xml   | 2 +-
 data/monster/monsters/the_last_lore_keeper.xml  | 2 +-
 data/monster/monsters/unbound_demon.xml         | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index a71294fe9a..1bb78b47ab 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -27,7 +27,7 @@
 			<attribute key="shootEffect" value="ice" />
 			<attribute key="areaEffect" value="yellowspark" />
 		</attack>
-		<attack name="speed" interval="1000" chance="13" length="8" spread="0" speedchange="-800" duration="20000">
+		<attack name="speed" interval="2000" chance="11" length="8" spread="0" speedchange="-800" duration="20000">
 			<attribute key="areaEffect" value="energy" />
 		</attack>
 		<attack name="hirintror skill reducer" interval="2000" chance="10" />
diff --git a/data/monster/monsters/possessed_tree.xml b/data/monster/monsters/possessed_tree.xml
index 17e64bb384..03ab152dca 100644
--- a/data/monster/monsters/possessed_tree.xml
+++ b/data/monster/monsters/possessed_tree.xml
@@ -22,7 +22,7 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="-162" />
-		<attack name="speed" interval="2000" chance="15" length="5" spread="0" duration="15000" speedchange="-700">
+		<attack name="speed" interval="2000" chance="10" length="5" spread="0" duration="15000" speedchange="-700">
 			<attribute key="areaEffect" value="smallplants" />
 		</attack>
 		<attack name="poison" interval="2000" chance="9" target="1" radius="4" range="4" min="-86" max="-200">
diff --git a/data/monster/monsters/shadow_fiend.xml b/data/monster/monsters/shadow_fiend.xml
index c5e180bfaf..b9e4496b52 100644
--- a/data/monster/monsters/shadow_fiend.xml
+++ b/data/monster/monsters/shadow_fiend.xml
@@ -22,7 +22,7 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
-		<attack name="speed" interval="2000" chance="15" target="1" speedchange="-600" duration="15000">
+		<attack name="speed" interval="2000" chance="19" target="1" range="7" speedchange="-600" duration="15000">
 			<attribute key="areaEffect" value="sleep" />
 		</attack>
 		<attack name="lifedrain" interval="2000" chance="12" radius="5" min="-360" max="-470">
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index 642b8e97bf..0e7369a94e 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -27,7 +27,7 @@
 			<attribute key="shootEffect" value="ice" />
 			<attribute key="areaEffect" value="yellowspark" />
 		</attack>
-		<attack name="speed" interval="1000" chance="13" length="8" spread="0" speedchange="-800" duration="20000">
+		<attack name="speed" interval="1000" chance="11" length="8" spread="0" speedchange="-800" duration="20000">
 			<attribute key="areaEffect" value="energy" />
 		</attack>
 		<attack name="hirintror skill reducer" interval="2000" chance="10" />
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index 62fc4e23c9..8f03014fb9 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -37,7 +37,7 @@
 		<attack name="earth" interval="2000" chance="20" radius="5" target="1" min="-640" max="-800">
 			<attribute key="areaeffect" value="stones" />
 		</attack>
-		<attack name="speed" interval="2000" chance="25" radius="7" target="1" speedchange="-900">
+		<attack name="speed" interval="2000" chance="20" radius="7" target="1" speedchange="-900">
 			<attribute key="areaEffect" value="poff" />
 		</attack>
 	</attacks>
diff --git a/data/monster/monsters/unbound_demon.xml b/data/monster/monsters/unbound_demon.xml
index 5027dc2f22..e2f54b64f1 100644
--- a/data/monster/monsters/unbound_demon.xml
+++ b/data/monster/monsters/unbound_demon.xml
@@ -40,7 +40,7 @@
 		<attack name="lifedrain" interval="2000" chance="10" length="8" spread="0" min="-300" max="-480">
 			<attribute key="areaEffect" value="purpleenergy" />
 		</attack>
-		<attack name="speed" interval="2000" chance="15" range="7" radius="1" target="1" speedchange="-700" duration="30000">
+		<attack name="speed" interval="2000" chance="10" range="7" radius="1" target="1" speedchange="-700" duration="30000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
 	</attacks>
@@ -67,6 +67,6 @@
 		<immunity invisible="1" />
 	</immunities>
 	<summons maxSummons="1">
-		<summon name="fire elemental" interval="2000" chance="10" />
+		<summon name="fire elemental" interval="2000" chance="8" />
 	</summons>
 </monster>

From c73d1458c822716a95e155708489fbb65bfb58c7 Mon Sep 17 00:00:00 2001
From: torresmon <70948057+torresmon@users.noreply.github.com>
Date: Fri, 6 May 2022 12:45:25 -0300
Subject: [PATCH 26/38] Resolve conversations (#11)

---
 data/monster/monsters/an_astral_glyph.xml     |  2 +-
 data/monster/monsters/angry_plant.xml         |  8 ++--
 data/monster/monsters/animated_sword.xml      |  8 ++--
 data/monster/monsters/baby_dragon.xml         | 26 ----------
 data/monster/monsters/bound_astral_power.xml  |  4 +-
 data/monster/monsters/broken_shaper.xml       |  8 ++--
 data/monster/monsters/cave_parrot.xml         | 12 ++---
 data/monster/monsters/corrupted_soul.xml      | 20 +-------
 .../monsters/cosmic_energy_prism_a.xml        |  6 +--
 .../monsters/cosmic_energy_prism_b.xml        |  6 +--
 .../monsters/cosmic_energy_prism_c.xml        |  6 +--
 .../monsters/cosmic_energy_prism_d.xml        |  6 +--
 .../monsters/diamond_servant_replica.xml      |  4 +-
 data/monster/monsters/dragon_essence.xml      |  4 +-
 data/monster/monsters/dragon_warden.xml       |  2 +-
 data/monster/monsters/dragon_wrath.xml        |  2 +-
 data/monster/monsters/fallen_challenger.xml   |  2 +-
 data/monster/monsters/frozen_minion.xml       |  2 +-
 .../monsters/gelidrazah_the_frozen.xml        |  6 +--
 .../monsters/golden_servant_replica.xml       |  2 +-
 data/monster/monsters/ice_dragon.xml          |  2 +-
 data/monster/monsters/icicle.xml              |  2 +-
 .../monster/monsters/iron_servant_replica.xml |  4 +-
 data/monster/monsters/kalyassa.xml            |  2 +-
 data/monster/monsters/lady_tenebris.xml       |  2 +-
 data/monster/monsters/lloyd.xml               |  2 +-
 .../monsters/melting_frozen_horror.xml        |  2 +-
 .../monster/monsters/mounted_thorn_knight.xml |  4 +-
 data/monster/monsters/orclops_doomhauler.xml  |  2 +-
 data/monster/monsters/orclops_ravager.xml     |  2 +-
 data/monster/monsters/pinata_dragon.xml       | 47 +++++++++----------
 data/monster/monsters/possessed_tree.xml      |  4 +-
 data/monster/monsters/shadow_fiend.xml        |  4 +-
 data/monster/monsters/shadow_tentacle.xml     |  2 +-
 data/monster/monsters/shaper_matriarch.xml    |  4 +-
 data/monster/monsters/solid_frozen_horror.xml |  2 +-
 .../monsters/soul_of_dragonking_zyrtarch.xml  |  8 ++--
 data/monster/monsters/spirit_of_fertility.xml |  4 +-
 data/monster/monsters/stone_rhino.xml         |  5 +-
 data/monster/monsters/sword_of_vengeance.xml  |  2 +-
 data/monster/monsters/tazhadur.xml            |  2 +-
 data/monster/monsters/the_astral_source.xml   |  2 +-
 .../monsters/the_blazing_time_guardian.xml    |  8 ++--
 .../monsters/the_distorted_astral_source.xml  |  2 +-
 .../monsters/the_enraged_thorn_knight.xml     |  7 ++-
 data/monster/monsters/the_first_dragon.xml    |  4 +-
 .../monsters/the_freezing_time_guardian.xml   |  4 +-
 .../monster/monsters/the_last_lore_keeper.xml |  8 ++--
 .../monsters/the_shielded_thorn_knight.xml    |  2 +-
 data/monster/monsters/the_time_guardian.xml   |  4 +-
 data/monster/monsters/thorn_minion.xml        | 13 +++--
 data/monster/monsters/time_keeper.xml         |  2 +-
 data/monster/monsters/twisted_shaper.xml      |  6 +--
 data/monster/monsters/unbeatable_dragon.xml   |  2 +-
 .../monster/monsters/unbound_blightwalker.xml |  2 +-
 data/monster/monsters/unbound_defiler.xml     |  2 +-
 data/monster/monsters/unbound_demon.xml       |  2 +-
 .../monsters/unbound_demon_outcast.xml        |  2 +-
 data/monster/monsters/zorvorax.xml            |  2 +-
 59 files changed, 137 insertions(+), 181 deletions(-)

diff --git a/data/monster/monsters/an_astral_glyph.xml b/data/monster/monsters/an_astral_glyph.xml
index 04ff1d3d59..fdec4bc6d1 100644
--- a/data/monster/monsters/an_astral_glyph.xml
+++ b/data/monster/monsters/an_astral_glyph.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" skill="90" attack="100" />
+		<attack name="melee" interval="2000" min="0" max="-780" />
 		<attack name="energy" interval="2000" chance="25" radius="3" target="0" min="-200" max="-400">
 			<attribute key="areaEffect" value="yellowspark" />
 		</attack>
diff --git a/data/monster/monsters/angry_plant.xml b/data/monster/monsters/angry_plant.xml
index d12c7cb564..7b2165af0e 100644
--- a/data/monster/monsters/angry_plant.xml
+++ b/data/monster/monsters/angry_plant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Angry Plant" nameDescription="an angry plant" race="venom" experience="110" speed="0" >
+<monster name="Angry Plant" nameDescription="an angry plant" race="venom" experience="150" speed="110">
 	<health now="10000" max="10000" />
 	<look type="120" corpse="0" />
 	<targetchange interval="2000" chance="5" />
@@ -21,12 +21,12 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="-100" poison="100" />
 	</attacks>
-	<defenses armor="10" defense="5" />
+	<defenses armor="22" defense="22" />
 	<immunities>
 		<immunity paralyze="1" />
 		<immunity invisible="1" />
-		<immunity drunk="1" />
+		<immunity earth="1" />
 	</immunities>
 </monster>
diff --git a/data/monster/monsters/animated_sword.xml b/data/monster/monsters/animated_sword.xml
index e65b4b8c1b..aa89ccb4c2 100644
--- a/data/monster/monsters/animated_sword.xml
+++ b/data/monster/monsters/animated_sword.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Animated Sword" nameDescription="an animated sword" race="fire" experience="0" speed="360" >
-	<health now="2000" max="2000" />
+<monster name="Animated Sword" nameDescription="an animated sword" race="fire" experience="0" speed="360">
+	<health now="10000" max="10000" />
 	<look typeex="26883" corpse="0" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
+		<attack name="melee" interval="2000" min="0" max="-242" />
 		<attack name="manadrain" interval="2000" chance="20" radius="6" min="-40" max="-160">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</attack>
@@ -31,7 +31,7 @@
 		</attack>
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="0" max="0" />
+		<defense name="healing" interval="2000" chance="20" min="5" max="150" />
 	</defenses>
 	<immunities>
 		<immunity lifedrain="1" />
diff --git a/data/monster/monsters/baby_dragon.xml b/data/monster/monsters/baby_dragon.xml
index 9beedbaf30..8453b562bd 100644
--- a/data/monster/monsters/baby_dragon.xml
+++ b/data/monster/monsters/baby_dragon.xml
@@ -20,30 +20,4 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
-	<attacks>
-		<attack name="melee" interval="2000" skill="45" attack="20" />
-		<attack name="fire" interval="2000" chance="12" length="8" spread="3" min="-60" max="-90">
-			<attribute key="areaEffect" value="firearea" />
-		</attack>
-		<attack name="fire" interval="2000" chance="14" radius="4" target="1" range="7" min="-30" max="-55">
-			<attribute key="shootEffect" value="fire" />
-			<attribute key="areaEffect" value="firearea" />
-		</attack>
-	</attacks>
-	<defenses armor="25" defense="38">
-		<defense name="healing" interval="2000" chance="13" min="5" max="35">
-			<attribute key="areaEffect" value="blueshimmer" />
-		</defense>
-	</defenses>
-	<immunities>
-		<immunity paralyze="1" />
-		<immunity fire="1" />
-		<immunity energy="1" />
-		<immunity death="1" />
-		<immunity ice="1" />
-		<immunity earth="1" />
-		<immunity holy="1" />
-		<immunity physical="1" />
-		<immunity invisible="1" />
-	</immunities>
 </monster>
diff --git a/data/monster/monsters/bound_astral_power.xml b/data/monster/monsters/bound_astral_power.xml
index 2a5e14822f..6c6f25a5db 100644
--- a/data/monster/monsters/bound_astral_power.xml
+++ b/data/monster/monsters/bound_astral_power.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <monster name="Bound Astral Power" nameDescription="a bound astral power" race="energy" experience="0" speed="350">
 	<health now="70000" max="70000" />
 	<look type="879" corpse="0" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-349" />
+		<attack name="melee" interval="2000" min="0" max="-349" />
 		<attack name="energy" interval="2000" chance="15" length="6" spread="2" min="-400" max="-500">
 			<attribute key="areaEffect" value="energy" />
 		</attack>
diff --git a/data/monster/monsters/broken_shaper.xml b/data/monster/monsters/broken_shaper.xml
index f03244b872..5d436ddaad 100644
--- a/data/monster/monsters/broken_shaper.xml
+++ b/data/monster/monsters/broken_shaper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Broken Shaper" nameDescription="a broken shaper" race="blood" experience="1600" speed="310" manacost="290">
+<monster name="Broken Shaper" nameDescription="a broken shaper" race="blood" experience="1600" speed="310">
 	<health now="2200" max="2200" />
-	<look type="932" head="94" body="76" legs="0" feet="82" addons="1" corpse="27724" />
+	<look type="932" head="94" body="76" legs="0" feet="82" corpse="27724" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-200" />
+		<attack name="melee" interval="2000" min="0" max="-200" />
 		<attack name="physical" interval="2000" chance="35" range="7" target="1" min="0" max="-150">
 			<attribute key="shootEffect" value="smallstone" />
 		</attack>
@@ -33,7 +33,7 @@
 		<defense name="healing" interval="2000" chance="20" min="0" max="327">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
-		<defense name="speed" interval="2000" chance="15" minspeedchange="300" maxspeedchange="300" duration="7000">
+		<defense name="speed" interval="2000" chance="15" speedchange="360" duration="7000">
 			<attribute key="areaEffect" value="redshimmer" />
 		</defense>
 	</defenses>
diff --git a/data/monster/monsters/cave_parrot.xml b/data/monster/monsters/cave_parrot.xml
index 9457fe15ef..699527c815 100644
--- a/data/monster/monsters/cave_parrot.xml
+++ b/data/monster/monsters/cave_parrot.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Cave Parrot" nameDescription="a cave parrot" experience="0" speed="320" manacost="250">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Cave Parrot" nameDescription="a cave parrot" race="blood" experience="0" speed="320" manacost="250">
 	<health now="30" max="30" />
-	<look type="217" corpse="0" />
+	<look type="217" corpse="6056" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
 		<flag hostile="1" />
-		<flag summonable="1" />
+		<flag summonable="0" />
 		<flag convinceable="1" />
 		<flag illusionable="0" />
 		<flag isboss="0" />
 		<flag ignorespawnblock="0" />
 		<flag pushable="1" />
 		<flag canpushitems="1" />
-		<flag canpushcreatures="1" />
+		<flag canpushcreatures="0" />
 		<flag staticattack="90" />
 		<flag targetdistance="1" />
 		<flag canwalkonenergy="0" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" />
+		<attack name="melee" interval="2000" min="0" max="-5" />
 	</attacks>
 	<defenses armor="2" defense="2" />
 	<immunities>
diff --git a/data/monster/monsters/corrupted_soul.xml b/data/monster/monsters/corrupted_soul.xml
index 0a9d40c8db..d64e89bd1e 100644
--- a/data/monster/monsters/corrupted_soul.xml
+++ b/data/monster/monsters/corrupted_soul.xml
@@ -21,25 +21,9 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" skill="60" attack="60" />
-		<attack name="souleater drown" interval="2000" chance="9" />
-		<attack name="ice" interval="2000" chance="8" radius="1" target="1" min="-50" max="-100">
-			<attribute key="shootEffect" value="ice" />
-			<attribute key="areaEffect" value="iceattack" />
-		</attack>
-		<attack name="lifedrain" interval="2000" chance="14" radius="4" target="0" min="-10" max="-60">
-			<attribute key="areaEffect" value="redshimmer" />
-		</attack>
-		<attack name="souleater wave" interval="2000" chance="12" min="-100" max="-210" />
+		<attack name="melee" interval="2000" min="0" max="-200" />
 	</attacks>
-	<defenses armor="25" defense="20">
-		<defense name="invisible" interval="2000" chance="12" duration="4000">
-			<attribute key="areaEffect" value="poff" />
-		</defense>
-		<defense name="healing" interval="2000" chance="16" min="130" max="205">
-			<attribute key="areaEffect" value="redshimmer" />
-		</defense>
-	</defenses>
+	<defenses armor="25" defense="20" />
 	<elements>
 		<element holyPercent="-10" />
 		<element icePercent="50" />
diff --git a/data/monster/monsters/cosmic_energy_prism_a.xml b/data/monster/monsters/cosmic_energy_prism_a.xml
index 5e13e91f5a..51d619797a 100644
--- a/data/monster/monsters/cosmic_energy_prism_a.xml
+++ b/data/monster/monsters/cosmic_energy_prism_a.xml
@@ -21,10 +21,10 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+		<attack name="melee" interval="2000" min="0" max="-71" />
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+		<defense name="healing" interval="2000" chance="20" min="1000" max="1000" />
 	</defenses>
 	<elements>
 		<element firePercent="50" />
@@ -41,6 +41,6 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="*Zap!*" yell="false" />
+		<voice sentence="*Zap!*" />
 	</voices>
 </monster>
diff --git a/data/monster/monsters/cosmic_energy_prism_b.xml b/data/monster/monsters/cosmic_energy_prism_b.xml
index c87c86ee2d..ab618daf8d 100644
--- a/data/monster/monsters/cosmic_energy_prism_b.xml
+++ b/data/monster/monsters/cosmic_energy_prism_b.xml
@@ -21,10 +21,10 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+		<attack name="melee" interval="2000" min="0" max="-71" />
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+		<defense name="healing" interval="2000" chance="20" min="1000" max="1000" />
 	</defenses>
 	<elements>
 		<element firePercent="50" />
@@ -41,6 +41,6 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="*Zap!*" yell="false" />
+		<voice sentence="*Zap!*" />
 	</voices>
 </monster>
diff --git a/data/monster/monsters/cosmic_energy_prism_c.xml b/data/monster/monsters/cosmic_energy_prism_c.xml
index 0d816a4e57..e1939e43d6 100644
--- a/data/monster/monsters/cosmic_energy_prism_c.xml
+++ b/data/monster/monsters/cosmic_energy_prism_c.xml
@@ -21,10 +21,10 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+		<attack name="melee" interval="2000" min="0" max="-71" />
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+		<defense name="healing" interval="2000" chance="20" min="1000" max="1000" />
 	</defenses>
 	<elements>
 		<element firePercent="50" />
@@ -41,6 +41,6 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="*Zap!*" yell="false" />
+		<voice sentence="*Zap!*" />
 	</voices>
 </monster>
diff --git a/data/monster/monsters/cosmic_energy_prism_d.xml b/data/monster/monsters/cosmic_energy_prism_d.xml
index d8910c79f6..675c56ffc8 100644
--- a/data/monster/monsters/cosmic_energy_prism_d.xml
+++ b/data/monster/monsters/cosmic_energy_prism_d.xml
@@ -21,10 +21,10 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-71" />
+		<attack name="melee" interval="2000" min="0" max="-71" />
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" min="100" max="250" />
+		<defense name="healing" interval="2000" chance="20" min="1000" max="1000" />
 	</defenses>
 	<elements>
 		<element firePercent="50" />
@@ -41,6 +41,6 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="*Zap!*" yell="false" />
+		<voice sentence="*Zap!*" />
 	</voices>
 </monster>
diff --git a/data/monster/monsters/diamond_servant_replica.xml b/data/monster/monsters/diamond_servant_replica.xml
index 1b8c46d833..dc6f73ae6b 100644
--- a/data/monster/monsters/diamond_servant_replica.xml
+++ b/data/monster/monsters/diamond_servant_replica.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Diamond Servant Replica" nameDescription="a diamond servant replica" experience="700" speed="172" >
+<monster name="Diamond Servant Replica" nameDescription="a diamond servant replica" experience="700" speed="172">
 	<health now="2000" max="2000" />
 	<look type="397" corpse="13485" />
 	<targetchange interval="2000" chance="5" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="-100" />
 		<attack name="energy" interval="2000" chance="11" radius="3" min="-100" max="-210">
 			<attribute key="areaEffect" value="yellowenergy" />
 		</attack>
diff --git a/data/monster/monsters/dragon_essence.xml b/data/monster/monsters/dragon_essence.xml
index 80c93f514d..ed517333b1 100644
--- a/data/monster/monsters/dragon_essence.xml
+++ b/data/monster/monsters/dragon_essence.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Dragon Essence" nameDescription="a dragon essence" race="undead" experience="0" speed="250" >
+<monster name="Dragon Essence" nameDescription="a dragon essence" race="undead" experience="0" speed="250">
 	<health now="30000" max="30000" />
 	<look type="248" corpse="0" />
 	<targetchange interval="2000" chance="5" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" />
+		<attack name="melee" interval="2000" min="0" max="-500" />
 		<attack name="fire" interval="2000" chance="18" length="8" spread="0" min="-850" max="-1250">
 			<attribute key="areaEffect" value="icearea" />
 		</attack>
diff --git a/data/monster/monsters/dragon_warden.xml b/data/monster/monsters/dragon_warden.xml
index 089ea68d7c..06ff67ab0a 100644
--- a/data/monster/monsters/dragon_warden.xml
+++ b/data/monster/monsters/dragon_warden.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+		<attack name="melee" interval="2000" min="0" max="-500" />
 		<attack name="fire" interval="2000" chance="17" length="8" spread="3" min="-150" max="-230">
 			<attribute key="areaEffect" value="firearea" />
 		</attack>
diff --git a/data/monster/monsters/dragon_wrath.xml b/data/monster/monsters/dragon_wrath.xml
index ee399386cc..f217c2634f 100644
--- a/data/monster/monsters/dragon_wrath.xml
+++ b/data/monster/monsters/dragon_wrath.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="-500" />
 		<attack name="ghastly dragon wave" interval="2000" chance="10" min="-50" max="-250" />
 		<attack name="ghastly dragon curse" interval="2000" chance="10" range="7" />
 		<attack name="poisoncondition" interval="2000" chance="10" range="7" min="-920" max="-1260">
diff --git a/data/monster/monsters/fallen_challenger.xml b/data/monster/monsters/fallen_challenger.xml
index 9a5ef3be24..ece5c54e4a 100644
--- a/data/monster/monsters/fallen_challenger.xml
+++ b/data/monster/monsters/fallen_challenger.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+		<attack name="melee" interval="2000" min="0" max="-500" />
 		<attack name="lifedrain" interval="1000" chance="13" radius="1" target="1" min="-400" max="-600" />
 		<attack name="death" interval="3000" chance="34" range="1" radius="1" target="1" min="-180" max="-500">
 			<attribute key="shootEffect" value="death" />
diff --git a/data/monster/monsters/frozen_minion.xml b/data/monster/monsters/frozen_minion.xml
index 9792b52279..34589972c0 100644
--- a/data/monster/monsters/frozen_minion.xml
+++ b/data/monster/monsters/frozen_minion.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-196" />
+		<attack name="melee" interval="2000" min="0" max="-196" />
 		<attack name="ice" interval="2000" chance="15" target="1" min="-150" max="-200">
 			<attribute key="shootEffect" value="snowball" />
 		</attack>
diff --git a/data/monster/monsters/gelidrazah_the_frozen.xml b/data/monster/monsters/gelidrazah_the_frozen.xml
index 4620e73577..adcdca544a 100644
--- a/data/monster/monsters/gelidrazah_the_frozen.xml
+++ b/data/monster/monsters/gelidrazah_the_frozen.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Gelidrazah The Frozen" nameDescription="Gelidrazah The Frozen" race="blood" experience="9000" speed="350" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Gelidrazah The Frozen" nameDescription="Gelidrazah The Frozen" race="blood" experience="9000" speed="350">
 	<health now="10000" max="10000" />
 	<look type="947" head="57" body="11" legs="38" feet="38" addons="3" corpse="27721" />
 	<targetchange interval="2000" chance="5" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-380" />
+		<attack name="melee" interval="2000" min="0" max="-380" />
 	</attacks>
 	<defenses armor="10" defense="5">
 		<defense name="healing" interval="2000" chance="20" min="180" max="240" />
diff --git a/data/monster/monsters/golden_servant_replica.xml b/data/monster/monsters/golden_servant_replica.xml
index 639b57940e..0f0a895ff8 100644
--- a/data/monster/monsters/golden_servant_replica.xml
+++ b/data/monster/monsters/golden_servant_replica.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="-220" />
 		<attack name="fire" interval="2000" chance="11" length="5" spread="1" min="-80" max="-110">
 			<attribute key="areaEffect" value="yellowenergy" />
 		</attack>
diff --git a/data/monster/monsters/ice_dragon.xml b/data/monster/monsters/ice_dragon.xml
index 1774ffcbef..89e672f5ab 100644
--- a/data/monster/monsters/ice_dragon.xml
+++ b/data/monster/monsters/ice_dragon.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
+		<attack name="melee" interval="2000" min="0" max="-300" />
 		<attack name="speed" interval="2000" chance="18" range="7" radius="4" target="1" duration="20000" max="-400">
 			<attribute key="areaEffect" value="icetornado" />
 		</attack>
diff --git a/data/monster/monsters/icicle.xml b/data/monster/monsters/icicle.xml
index 7d7ddf05a6..3f9070c0f2 100644
--- a/data/monster/monsters/icicle.xml
+++ b/data/monster/monsters/icicle.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-219" />
+		<attack name="melee" interval="2000" min="0" max="-219" />
 	</attacks>
 	<defenses armor="10" defense="5">
 		<defense name="icecle heal" interval="2000" chance="25" />
diff --git a/data/monster/monsters/iron_servant_replica.xml b/data/monster/monsters/iron_servant_replica.xml
index 084d4b4e29..30581ff56e 100644
--- a/data/monster/monsters/iron_servant_replica.xml
+++ b/data/monster/monsters/iron_servant_replica.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <monster name="Iron Servant Replica" nameDescription="an iron servant replica" race="energy" experience="210" speed="190">
 	<health now="1000" max="1000" />
 	<look type="395" corpse="13483" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-154" />
+		<attack name="melee" interval="2000" min="0" max="-154" />
 		<attack name="physical" interval="2000" chance="12" range="7" min="0" max="-60">
 			<attribute key="shootEffect" value="explosion" />
 			<attribute key="areaEffect" value="explosionarea" />
diff --git a/data/monster/monsters/kalyassa.xml b/data/monster/monsters/kalyassa.xml
index 413b5ecec0..93e6acf943 100644
--- a/data/monster/monsters/kalyassa.xml
+++ b/data/monster/monsters/kalyassa.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-500" />
+		<attack name="melee" interval="2000" min="0" max="-500" />
 		<attack name="fire" interval="2000" chance="20" range="7" target="1" radius="5" min="-110" max="-495">
 			<attribute key="shootEffect" value="fire" />
 			<attribute key="areaEffect" value="firearea" />
diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
index e813bc4cfa..fa8bcd1184 100644
--- a/data/monster/monsters/lady_tenebris.xml
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-1800" />
+		<attack name="melee" interval="2000" min="0" max="-1800" />
 		<attack name="death" interval="6000" chance="13" length="8" spread="0" min="-1200" max="-1500">
 			<attribute key="areaEffect" value="mortarea" />
 		</attack>
diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index 0f139c9ea2..20821b3e11 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-1200" />
+		<attack name="melee" interval="2000" min="0" max="-1200" />
 		<attack name="energy" interval="2000" chance="12" length="6" spread="0" min="-130" max="-460">
 			<attribute key="areaEffect" value="purpleenergy" />
 		</attack>
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index 1bb78b47ab..79db94c927 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="0" />
 		<attack name="hirintror freeze" interval="2000" chance="15" />
 		<attack name="ice" interval="2000" chance="15" range="7" target="1" radius="3" min="-75" max="-150">
 			<attribute key="shootEffect" value="ice" />
diff --git a/data/monster/monsters/mounted_thorn_knight.xml b/data/monster/monsters/mounted_thorn_knight.xml
index 57d1ca45e0..929df2401f 100644
--- a/data/monster/monsters/mounted_thorn_knight.xml
+++ b/data/monster/monsters/mounted_thorn_knight.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Mounted Thorn Knight" nameDescription="Mounted Thorn Knight" race="blood" experience="15000" speed="430" manacost="290">
+<monster name="Mounted Thorn Knight" nameDescription="Mounted Thorn Knight" race="blood" experience="15000" speed="430">
 	<health now="100000" max="100000" />
 	<look type="512" addons="3" head="81" body="121" legs="121" feet="121" mount="626" corpse="0" />
 	<targetchange interval="2000" chance="5" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-1032" />
+		<attack name="melee" interval="2000" min="0" max="-1032" />
 		<attack name="lifedrain" interval="2000" chance="12" length="4" spread="3" min="-400" max="-700">
 			<attribute key="areaEffect" value="poff" />
 		</attack>
diff --git a/data/monster/monsters/orclops_doomhauler.xml b/data/monster/monsters/orclops_doomhauler.xml
index bd9f62b8a1..78a0d7a2fa 100644
--- a/data/monster/monsters/orclops_doomhauler.xml
+++ b/data/monster/monsters/orclops_doomhauler.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-215" />
+		<attack name="melee" interval="2000" min="0" max="-215" />
 		<attack name="physical" interval="2000" chance="35" range="7" target="1" min="-117" max="-220">
 			<attribute key="shootEffect" value="largerock" />
 		</attack>
diff --git a/data/monster/monsters/orclops_ravager.xml b/data/monster/monsters/orclops_ravager.xml
index 61375e14d5..ed60a88e6b 100644
--- a/data/monster/monsters/orclops_ravager.xml
+++ b/data/monster/monsters/orclops_ravager.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-132" />
+		<attack name="melee" interval="2000" min="0" max="-132" />
 		<attack name="physical" interval="2000" chance="35" range="7" target="1" min="-180" max="-220">
 			<attribute key="shootEffect" value="largerock" />
 		</attack>
diff --git a/data/monster/monsters/pinata_dragon.xml b/data/monster/monsters/pinata_dragon.xml
index 7ed47ee5bc..01b95a6522 100644
--- a/data/monster/monsters/pinata_dragon.xml
+++ b/data/monster/monsters/pinata_dragon.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<monster name="Piñata Dragon" nameDescription="a piñata dragon" race="undead" experience="50" speed="0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Piñata Dragon" nameDescription="a piñata dragon" race="undead" experience="50" speed="0">
 	<health now="10000" max="10000" />
 	<look typeex="27718" corpse="27719" />
 	<targetchange interval="2000" chance="5" />
@@ -20,38 +20,33 @@
 		<flag canwalkonfire="0" />
 		<flag canwalkonpoison="0" />
 	</flags>
+	<attacks>
+		<attack name="outfit" interval="2000" chance="10" target="1" range="3" monster="chicken" duration="3000" />
+		<attack name="lifedrain" interval="2000" chance="10" target="1" range="4" min="0" max="-40">
+			<attribute key="shootEffect" value="cake" />
+			<attribute key="areaEffect" value="cake" />
+		</attack>
+	</attacks>
 	<defenses armor="10" defense="5">
 		<defense name="healing" interval="2000" chance="20" min="130" max="170">
 			<attribute key="areaEffect" value="mortarea" />
 		</defense>
 	</defenses>
-	<summons maxSummons="3">
-		<summon name="Demon" interval="2000" chance="7" />
-	</summons>
-	<immunities>
-		<immunity physical="1" />
-		<immunity energy="1" />
-		<immunity fire="1" />
-		<immunity poison="1" />
-		<immunity ice="1" />
-		<immunity holy="1" />
-		<immunity death="1" />
-		<immunity lifedrain="1" />
-		<immunity paralyze="1" />
-		<immunity drown="1" />
-		<immunity invisible="1" />
-	</immunities>
+	<elements>
+		<element physicalPercent="-30" />
+	</elements>
 	<voices interval="5000" chance="10">
-		<voice sentence="You can't have my treasures!" yell="false" />
-		<voice sentence="Hit me one more time!" yell="false" />
-		<voice sentence="Na Nana Naaa Naaa!" yell="false" />
-		<voice sentence="You'll never get my stuff!" yell="false" />
-		<voice sentence="Do you really want to hurt me?" yell="false" />
-		<voice sentence="Bring it on!" yell="false" />
+		<voice sentence="You can't have my treasures!" />
+		<voice sentence="Hit me one more time!" />
+		<voice sentence="Na Nana Naaa Naaa!" />
+		<voice sentence="You'll never get my stuff!" />
+		<voice sentence="Do you really want to hurt me?" />
+		<voice sentence="Bring it on!" />
 	</voices>
 	<loot>
 		<item id="6569" name="candy" chance="100000" countmax="3" />
-		<item name="surprise bag" chance="52950" countmax="2" />
+		<item id="6570" name="surprise bag" chance="26475" countmax="2" />
+		<item id="6571" name="surprise bag" chance="26475" countmax="2" />
 		<item id="2687" name="cookie" chance="50552" countmax="5" />
 		<item id="32858" name="winterberry liquor" chance="13909" />
 		<item id="32854" name="meringue cake" chance="11127" />
@@ -65,6 +60,6 @@
 		<item id="2110" name="doll" chance="1487" />
 		<item id="32973" name="ferumbras puppet" chance="240" />
 		<item id="7487" name="toy mouse" chance="240" />
-		<item name="stuffed dragon" chance="192" />
+		<item id="6566" name="stuffed dragon" chance="192" />
 	</loot>
 </monster>
diff --git a/data/monster/monsters/possessed_tree.xml b/data/monster/monsters/possessed_tree.xml
index 03ab152dca..fe24dc8fee 100644
--- a/data/monster/monsters/possessed_tree.xml
+++ b/data/monster/monsters/possessed_tree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Possessed Tree" nameDescription="a possessed tree" race="undead" experience="1300" speed="0">
+<monster name="Possessed Tree" nameDescription="a possessed tree" race="undead" experience="1300" speed="230">
 	<health now="2500" max="2500" />
 	<look type="310" corpse="0" />
 	<targetchange interval="2000" chance="5" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-162" />
+		<attack name="melee" interval="2000" min="0" max="-162" />
 		<attack name="speed" interval="2000" chance="10" length="5" spread="0" duration="15000" speedchange="-700">
 			<attribute key="areaEffect" value="smallplants" />
 		</attack>
diff --git a/data/monster/monsters/shadow_fiend.xml b/data/monster/monsters/shadow_fiend.xml
index b9e4496b52..02d15f3f47 100644
--- a/data/monster/monsters/shadow_fiend.xml
+++ b/data/monster/monsters/shadow_fiend.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Shadow Fiend" nameDescription="a shadow fiend" race="undead" experience="500" speed="360">
+<monster name="Shadow Fiend" nameDescription="a shadow fiend" race="undead" experience="500" speed="260">
 	<health now="4000" max="4000" />
 	<look type="320" corpse="0" />
 	<targetchange interval="2000" chance="5" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="-90" poison="80" />
 		<attack name="speed" interval="2000" chance="19" target="1" range="7" speedchange="-600" duration="15000">
 			<attribute key="areaEffect" value="sleep" />
 		</attack>
diff --git a/data/monster/monsters/shadow_tentacle.xml b/data/monster/monsters/shadow_tentacle.xml
index 280d356fa1..c7c6de845a 100644
--- a/data/monster/monsters/shadow_tentacle.xml
+++ b/data/monster/monsters/shadow_tentacle.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-330" />
+		<attack name="melee" interval="2000" min="0" max="-330" />
 		<attack name="blightwalker curse" interval="2000" chance="10" />
 		<attack name="lifedrain" interval="2000" chance="14" radius="4" target="0" min="-65" max="-135">
 			<attribute key="areaEffect" value="greenshimmer" />
diff --git a/data/monster/monsters/shaper_matriarch.xml b/data/monster/monsters/shaper_matriarch.xml
index 8d5fac1d65..90b8d5170e 100644
--- a/data/monster/monsters/shaper_matriarch.xml
+++ b/data/monster/monsters/shaper_matriarch.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Shaper Matriarch" nameDescription="a shaper matriarch" experience="1650" speed="260">
+<monster name="Shaper Matriarch" nameDescription="a shaper matriarch" race="blood" experience="1650" speed="260">
 	<health now="2000" max="2000" />
 	<look type="933" corpse="27727" />
 	<targetchange interval="2000" chance="5" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-120" />
+		<attack name="melee" interval="2000" min="0" max="-120" />
 		<attack name="physical" interval="2000" chance="35" range="7" min="-35" max="-160">
 			<attribute key="shootEffect" value="earth" />
 			<attribute key="areaEffect" value="poison" />
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index 0e7369a94e..75bb42ef35 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-677" />
+		<attack name="melee" interval="2000" min="0" max="-677" />
 		<attack name="hirintror freeze" interval="2000" chance="15" />
 		<attack name="ice" interval="2000" chance="15" range="7" target="1" radius="3" min="-75" max="-150">
 			<attribute key="shootEffect" value="ice" />
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
index 290fc7eb14..f0a393066a 100644
--- a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Soul Of Dragonking Zyrtarch" nameDescription="Soul Of Dragonking Zyrtarch" race="fire" experience="70700" speed="500">
+<monster name="Soul Of Dragonking Zyrtarch" nameDescription="Soul Of Dragonking Zyrtarch" race="fire" experience="70700" speed="400">
 	<health now="150000" max="150000" />
-	<look type="938" corpse="0" />
+	<look type="938" corpse="27787" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" skill="112" attack="85" />
+		<attack name="melee" interval="2000" min="0" max="-1200" />
 		<attack name="fire" interval="2000" chance="20" range="7" target="1" min="-110" max="-495">
 			<attribute key="shootEffect" value="fire" />
 			<attribute key="areaEffect" value="firearea" />
@@ -83,7 +83,7 @@
 		<item id="2145" name="small diamond" chance="18605" countmax="10" />
 		<item id="8902" name="spellbook of mind control" chance="18605" />
 		<item id="9980" name="crystal of power" chance="16279" />
-		<item name="giant shimmering pearl" chance="16279" />
+		<item id="7632" name="giant shimmering pearl" chance="16279" />
 		<item id="2150" name="small amethyst" chance="16279" countmax="10" />
 		<item id="12608" name="broken key ring" chance="13953" />
 		<item id="9809" name="rusted armor" chance="13953" />
diff --git a/data/monster/monsters/spirit_of_fertility.xml b/data/monster/monsters/spirit_of_fertility.xml
index f468bfe339..574abd9320 100644
--- a/data/monster/monsters/spirit_of_fertility.xml
+++ b/data/monster/monsters/spirit_of_fertility.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Spirit Of Fertility" nameDescription="a spirit of fertility" race="undead" experience="1100" speed="130">
+<monster name="Spirit Of Fertility" nameDescription="a spirit of fertility" race="undead" experience="1100" speed="280">
 	<health now="1250" max="1250" />
 	<look type="11" corpse="0" />
 	<targetchange interval="2000" chance="5" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" skill="70" attack="60" poison="300" />
+		<attack name="melee" interval="2000" min="0" max="-220" poison="300" />
 		<attack name="drown" interval="2000" chance="17" radius="5" target="1" min="-130" max="-250">
 			<attribute key="shootEffect" value="snowball" />
 			<attribute key="areaEffect" value="bluebubble" />
diff --git a/data/monster/monsters/stone_rhino.xml b/data/monster/monsters/stone_rhino.xml
index 95f5492fd5..587460aa47 100644
--- a/data/monster/monsters/stone_rhino.xml
+++ b/data/monster/monsters/stone_rhino.xml
@@ -21,11 +21,10 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-400" />
+		<attack name="melee" interval="2000" min="0" max="-400" />
 	</attacks>
 	<defenses armor="72" defense="72">
-		<defense name="healing" interval="2000" chance="20" min="0" max="195" />
-		<defense name="healing" interval="2000" chance="15" min="0" max="250">
+		<defense name="healing" interval="2000" chance="15" min="0" max="195">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</defense>
 	</defenses>
diff --git a/data/monster/monsters/sword_of_vengeance.xml b/data/monster/monsters/sword_of_vengeance.xml
index cc86d2189d..d29f05bfd5 100644
--- a/data/monster/monsters/sword_of_vengeance.xml
+++ b/data/monster/monsters/sword_of_vengeance.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-242" />
+		<attack name="melee" interval="2000" min="0" max="-242" />
 		<attack name="manadrain" interval="2000" chance="20" radius="6" min="-40" max="-160">
 			<attribute key="areaEffect" value="blueshimmer" />
 		</attack>
diff --git a/data/monster/monsters/tazhadur.xml b/data/monster/monsters/tazhadur.xml
index ab9beb0f10..f0b26c69a2 100644
--- a/data/monster/monsters/tazhadur.xml
+++ b/data/monster/monsters/tazhadur.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
+		<attack name="melee" interval="2000" min="0" max="-385" />
 		<attack name="fire" interval="2000" chance="20" range="7" target="1" radius="5" min="-110" max="-495">
 			<attribute key="shootEffect" value="fire" />
 			<attribute key="areaEffect" value="firearea" />
diff --git a/data/monster/monsters/the_astral_source.xml b/data/monster/monsters/the_astral_source.xml
index b4837ec3a8..86a29b6c6d 100644
--- a/data/monster/monsters/the_astral_source.xml
+++ b/data/monster/monsters/the_astral_source.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-401" />
+		<attack name="melee" interval="2000" min="0" max="-401" />
 		<attack name="energy" interval="2000" chance="15" range="7" radius="6" target="1" min="0" max="-500">
 			<attribute key="shootEffect" value="energyball" />
 			<attribute key="areaEffect" value="purpleenergy" />
diff --git a/data/monster/monsters/the_blazing_time_guardian.xml b/data/monster/monsters/the_blazing_time_guardian.xml
index 040f0b9e92..e676186ba9 100644
--- a/data/monster/monsters/the_blazing_time_guardian.xml
+++ b/data/monster/monsters/the_blazing_time_guardian.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="-800" />
 		<attack name="death" interval="2000" chance="15" range="7" radius="4" target="1" min="-600" max="-780">
 			<attribute key="shootEffect" value="energy" />
 			<attribute key="areaEffect" value="energy" />
@@ -39,9 +39,7 @@
 			<attribute key="areaEffect" value="yellowspark" />
 		</attack>
 	</attacks>
-	<defenses armor="70" defense="70">
-		<defense name="time guardian lost time" interval="2000" chance="10" />
-	</defenses>
+	<defenses armor="70" defense="70" />
 	<elements>
 		<element earthPercent="70" />
 		<element icePercent="-40" />
@@ -74,7 +72,7 @@
 		<item id="2155" name="green gem" chance="30769" />
 		<item id="25172" name="silver token" chance="30769" />
 		<item id="7387" name="diamond sceptre" chance="23077" />
-		<item name="giant shimmering pearl" chance="23077" />
+		<item id="7632" name="giant shimmering pearl" chance="23077" />
 		<item id="22396" name="cluster of solace" chance="15385" />
 		<item id="25377" name="gold token" chance="15385" />
 		<item id="5892" name="huge chunk of crude iron" chance="15385" />
diff --git a/data/monster/monsters/the_distorted_astral_source.xml b/data/monster/monsters/the_distorted_astral_source.xml
index 2a3b6bffc0..c3073e5157 100644
--- a/data/monster/monsters/the_distorted_astral_source.xml
+++ b/data/monster/monsters/the_distorted_astral_source.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="-900" />
 		<attack name="energy" interval="2000" chance="15" range="7" radius="6" target="1" min="0" max="-500">
 			<attribute key="shootEffect" value="energyball" />
 			<attribute key="areaEffect" value="purpleenergy" />
diff --git a/data/monster/monsters/the_enraged_thorn_knight.xml b/data/monster/monsters/the_enraged_thorn_knight.xml
index 4ad09bd74c..1cb8dc3119 100644
--- a/data/monster/monsters/the_enraged_thorn_knight.xml
+++ b/data/monster/monsters/the_enraged_thorn_knight.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" min="-600" max="-1000" />
+		<attack name="melee" interval="2000" min="0" max="-1000" />
 		<attack name="lifedrain" interval="2000" chance="12" length="4" spread="3" min="-400" max="-700">
 			<attribute key="areaEffect" value="poff" />
 		</attack>
@@ -52,6 +52,9 @@
 		<element physicalPercent="80" />
 		<element icePercent="80" />
 	</elements>
+	<immunities>
+		<immunity invisible="1" />
+	</immunities>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="100" />
 		<item id="2430" name="knight axe" chance="100000" />
@@ -73,7 +76,7 @@
 		<item id="2150" name="small amethyst" chance="23611" countmax="10" />
 		<item id="25377" name="gold token" chance="22222" />
 		<item id="2158" name="blue gem" chance="20833" />
-		<item name="giant shimmering pearl" chance="19444" />
+		<item id="7632" name="giant shimmering pearl" chance="19444" />
 		<item id="5910" name="green piece of cloth" chance="19444" countmax="3" />
 		<item id="9809" name="rusted armor" chance="18056" />
 		<item id="25172" name="silver token" chance="18056" />
diff --git a/data/monster/monsters/the_first_dragon.xml b/data/monster/monsters/the_first_dragon.xml
index a88161def8..2abe9da601 100644
--- a/data/monster/monsters/the_first_dragon.xml
+++ b/data/monster/monsters/the_first_dragon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="The First Dragon" nameDescription="The First Dragon" race="blood" experience="9000" speed="350">
 	<health now="50000" max="50000" />
-	<look type="947" head="94" body="80" legs="120" feet="60" addons="3" corpse="0" />
+	<look type="947" head="94" body="80" legs="120" feet="60" addons="3" corpse="27787" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" skill="120" attack="130" />
+		<attack name="melee" interval="2000" min="0" max="-1200" />
 		<attack name="fire" interval="2000" chance="20" radius="5" target="1" range="5" min="-410" max="-695">
 			<attribute key="areaEffect" value="firearea" />
 		</attack>
diff --git a/data/monster/monsters/the_freezing_time_guardian.xml b/data/monster/monsters/the_freezing_time_guardian.xml
index 79cec5a366..f452584484 100644
--- a/data/monster/monsters/the_freezing_time_guardian.xml
+++ b/data/monster/monsters/the_freezing_time_guardian.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="-500" />
 		<attack name="death" interval="2000" chance="15" range="7" radius="4" target="1" min="-600" max="-780">
 			<attribute key="shootEffect" value="energy" />
 			<attribute key="areaEffect" value="energy" />
@@ -68,7 +68,7 @@
 		<item id="18413" name="blue crystal shard" chance="36364" countmax="3" />
 		<item id="2145" name="small diamond" chance="36364" countmax="10" />
 		<item id="2197" name="stone skin amulet" chance="36364" />
-		<item name="giant shimmering pearl" chance="27273" />
+		<item id="7632" name="giant shimmering pearl" chance="27273" />
 		<item id="25377" name="gold token" chance="27273" />
 		<item id="8472" name="great spirit potion" chance="27273" countmax="10" />
 		<item id="2156" name="red gem" chance="27273" />
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index 8f03014fb9..d2245c647d 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-1000" />
+		<attack name="melee" interval="2000" min="0" max="-1000" />
 		<attack name="physical" interval="2000" chance="7" length="8" spread="3" min="-650" max="-900">
 			<attribute key="areaEffect" value="explosionarea" />
 		</attack>
@@ -89,18 +89,18 @@
 		<item id="24850" name="opal" chance="17164" countmax="2" />
 		<item id="10577" name="mystical hourglass" chance="16791" />
 		<item id="9970" name="small topaz" chance="16418" countmax="20" />
-		<item name="giant shimmering pearl" chance="15672" />
+		<item id="7632" name="giant shimmering pearl" chance="15672" />
 		<item id="2155" name="green gem" chance="15672" />
 		<item id="5909" name="white piece of cloth" chance="14925" countmax="4" />
 		<item id="5904" name="magic sulphur" chance="14552" />
 		<item id="2150" name="small amethyst" chance="14179" countmax="20" />
 		<item id="2147" name="small ruby" chance="14179" countmax="20" />
-		<item name="ring of red plasma" chance="12687" />
+		<item id="26189" name="ring of red plasma" chance="12687" />
 		<item id="5891" name="enchanted chicken wing" chance="11567" />
 		<item id="2436" name="skull staff" chance="11194" />
 		<item id="2153" name="violet gem" chance="10821" />
 		<item id="7437" name="sapphire hammer" chance="9701" />
-		<item name="part of a rune" chance="5597" />
+		<item id="27610" name="part of a rune" chance="5597" />
 		<item id="8857" name="silkweaver bow" chance="3731" />
 		<item id="8879" name="voltage armor" chance="2985" />
 		<item id="3972" name="bonelord helmet" chance="1866" />
diff --git a/data/monster/monsters/the_shielded_thorn_knight.xml b/data/monster/monsters/the_shielded_thorn_knight.xml
index 9b617e4a2d..122050ce5d 100644
--- a/data/monster/monsters/the_shielded_thorn_knight.xml
+++ b/data/monster/monsters/the_shielded_thorn_knight.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" min="-600" max="-1000" />
+		<attack name="melee" interval="2000" min="0" max="-1000" />
 		<attack name="lifedrain" interval="2000" chance="12" length="4" spread="3" min="-400" max="-700">
 			<attribute key="areaEffect" value="poff" />
 		</attack>
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
index 15fff9e459..675f3600d9 100644
--- a/data/monster/monsters/the_time_guardian.xml
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-744" />
+		<attack name="melee" interval="2000" min="0" max="-744" />
 		<attack name="death" interval="2000" chance="15" range="7" radius="4" target="1" min="-600" max="-780">
 			<attribute key="shootEffect" value="energy" />
 			<attribute key="areaEffect" value="energy" />
@@ -84,7 +84,7 @@
 		<item id="11240" name="guardian boots" chance="13043" />
 		<item id="2145" name="small diamond" chance="13043" countmax="10" />
 		<item id="2147" name="small ruby" chance="13043" countmax="10" />
-		<item name="giant shimmering pearl" chance="8696" />
+		<item id="7632" name="giant shimmering pearl" chance="8696" />
 		<item id="2156" name="red gem" chance="8696" />
 		<item id="2150" name="small amethyst" chance="8696" countmax="10" />
 		<item id="5809" name="soul stone" chance="8696" />
diff --git a/data/monster/monsters/thorn_minion.xml b/data/monster/monsters/thorn_minion.xml
index 7fc3c0a13c..d1151c527b 100644
--- a/data/monster/monsters/thorn_minion.xml
+++ b/data/monster/monsters/thorn_minion.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Thorn Minion" nameDescription="a thorn minion" race="venom" experience="1600" speed="150" manacost="290">
+<monster name="Thorn Minion" nameDescription="a thorn minion" race="venom" experience="1600" speed="210">
 	<health now="3500" max="3500" />
 	<look type="717" corpse="0" />
 	<targetchange interval="2000" chance="5" />
@@ -43,9 +43,12 @@
 		</defense>
 	</defenses>
 	<elements>
-		<element energyPercent="20" />
-		<element holyPercent="1" />
-		<element earthPercent="-12" />
-		<element deathPercent="-10" />
+		<element energyPercent="10" />
+		<element deathPercent="20" />
+		<element firePercent="-10" />
+		<element icePercent="20" />
 	</elements>
+	<immunities>
+		<immunity earth="1" />
+	</immunities>
 </monster>
diff --git a/data/monster/monsters/time_keeper.xml b/data/monster/monsters/time_keeper.xml
index f090aee7bf..5823b722d1 100644
--- a/data/monster/monsters/time_keeper.xml
+++ b/data/monster/monsters/time_keeper.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-113" />
+		<attack name="melee" interval="2000" min="0" max="-113" />
 		<attack name="lifedrain" interval="2000" chance="17" range="7" min="-4" max="-6">
 			<attribute key="shootEffect" value="suddendeath" />
 			<attribute key="areaEffect" value="yalaharighost" />
diff --git a/data/monster/monsters/twisted_shaper.xml b/data/monster/monsters/twisted_shaper.xml
index da2c9acaef..bed532be71 100644
--- a/data/monster/monsters/twisted_shaper.xml
+++ b/data/monster/monsters/twisted_shaper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Twisted Shaper" nameDescription="a twisted shaper" experience="1750" speed="280" >
+<monster name="Twisted Shaper" nameDescription="a twisted shaper" race="blood" experience="1750" speed="280">
 	<health now="2500" max="2500" />
-	<look type="932" head="105" body="0" legs="0" feet="94" addons="1" mount="0" corpse="0" />
+	<look type="932" head="105" body="0" legs="0" feet="94" corpse="27724" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-100" />
+		<attack name="melee" interval="2000" min="0" max="-100" />
 		<attack name="physical" interval="2000" chance="10" range="7" target="1" min="-50" max="-100">
 			<attribute key="shootEffect" value="energy" />
 			<attribute key="areaEffect" value="energy" />
diff --git a/data/monster/monsters/unbeatable_dragon.xml b/data/monster/monsters/unbeatable_dragon.xml
index 14c440e6b3..db53697875 100644
--- a/data/monster/monsters/unbeatable_dragon.xml
+++ b/data/monster/monsters/unbeatable_dragon.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-300" />
+		<attack name="melee" interval="2000" min="0" max="-300" />
 		<attack name="fire" interval="2000" chance="17" range="7" radius="4" target="1" min="-100" max="-200">
 			<attribute key="shootEffect" value="fire" />
 			<attribute key="areaEffect" value="firearea" />
diff --git a/data/monster/monsters/unbound_blightwalker.xml b/data/monster/monsters/unbound_blightwalker.xml
index 0b8bf030a2..c70e4a6357 100644
--- a/data/monster/monsters/unbound_blightwalker.xml
+++ b/data/monster/monsters/unbound_blightwalker.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-99" />
+		<attack name="melee" interval="2000" min="0" max="-99" />
 		<attack name="earth" interval="2000" chance="9" range="1" target="1" min="-220" max="-405">
 			<attribute key="shootEffect" value="poison" />
 			<attribute key="areaEffect" value="greenbubble" />
diff --git a/data/monster/monsters/unbound_defiler.xml b/data/monster/monsters/unbound_defiler.xml
index dcf1b9ec18..17e9a494a2 100644
--- a/data/monster/monsters/unbound_defiler.xml
+++ b/data/monster/monsters/unbound_defiler.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="0" />
 		<attack name="lifedrain" interval="2000" chance="13" target="1" range="7" min="-160" max="-295">
 			<attribute key="areaEffect" value="greenspark" />
 			<attribute key="shootEffect" value="poison" />
diff --git a/data/monster/monsters/unbound_demon.xml b/data/monster/monsters/unbound_demon.xml
index e2f54b64f1..282777bc65 100644
--- a/data/monster/monsters/unbound_demon.xml
+++ b/data/monster/monsters/unbound_demon.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="0" />
 		<attack name="manadrain" interval="2000" chance="13" range="7" min="-60" max="-120">
 			<attribute key="shootEffect" value="suddendeath" />
 			<attribute key="areaEffect" value="smallclouds" />
diff --git a/data/monster/monsters/unbound_demon_outcast.xml b/data/monster/monsters/unbound_demon_outcast.xml
index ec2fc367bc..ccbe0cb380 100644
--- a/data/monster/monsters/unbound_demon_outcast.xml
+++ b/data/monster/monsters/unbound_demon_outcast.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="0" />
+		<attack name="melee" interval="2000" min="0" max="0" />
 		<attack name="energy" interval="2000" chance="10" length="6" spread="0" target="1" min="-200" max="-300">
 			<attribute key="areaEffect" value="purpleenergy" />
 		</attack>
diff --git a/data/monster/monsters/zorvorax.xml b/data/monster/monsters/zorvorax.xml
index 56d1440b62..3e51761de4 100644
--- a/data/monster/monsters/zorvorax.xml
+++ b/data/monster/monsters/zorvorax.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="1" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" chance="100" min="0" max="-385" />
+		<attack name="melee" interval="2000" min="0" max="-385" />
 		<attack name="death" interval="2000" chance="15" range="7" radius="5" target="1" min="-120" max="-650">
 			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="blacksmoke" />

From 589eb80f943a49b8249f507b6a7875d048d4b697 Mon Sep 17 00:00:00 2001
From: torresmon <70948057+torresmon@users.noreply.github.com>
Date: Sat, 7 May 2022 14:44:48 -0300
Subject: [PATCH 27/38] Change requests (#13)

---
 data/monster/monsters/cave_parrot.xml         |  2 +-
 data/monster/monsters/lady_tenebris.xml       |  3 +-
 data/monster/monsters/lloyd.xml               | 55 +++++++++++++------
 data/monster/monsters/pinata_dragon.xml       |  2 +-
 .../monsters/soul_of_dragonking_zyrtarch.xml  |  3 +-
 .../monsters/the_blazing_time_guardian.xml    |  3 +-
 .../monsters/the_enraged_thorn_knight.xml     |  3 +-
 .../monsters/the_freezing_time_guardian.xml   |  3 +-
 .../monster/monsters/the_last_lore_keeper.xml |  3 +-
 data/monster/monsters/the_time_guardian.xml   |  3 +-
 10 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/data/monster/monsters/cave_parrot.xml b/data/monster/monsters/cave_parrot.xml
index 699527c815..663ccdcf78 100644
--- a/data/monster/monsters/cave_parrot.xml
+++ b/data/monster/monsters/cave_parrot.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Cave Parrot" nameDescription="a cave parrot" race="blood" experience="0" speed="320" manacost="250">
+<monster name="Cave Parrot" nameDescription="a cave parrot" race="blood" experience="0" speed="320">
 	<health now="30" max="30" />
 	<look type="217" corpse="6056" />
 	<targetchange interval="2000" chance="5" />
diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
index fa8bcd1184..850d89a76c 100644
--- a/data/monster/monsters/lady_tenebris.xml
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -74,7 +74,8 @@
 		<item id="2156" name="red gem" chance="19767" />
 		<item id="2150" name="small amethyst" chance="19767" countmax="10" />
 		<item id="2145" name="small diamond" chance="19767" countmax="10" />
-		<item name="giant shimmering pearl" chance="18605" />
+		<item id="7632" name="giant shimmering pearl" chance="9302" />
+		<item id="7633" name="giant shimmering pearl" chance="9302" />
 		<item id="2123" name="ring of the sky" chance="17442" />
 		<item id="18390" name="wand of defiance" chance="16279" />
 		<item id="2155" name="green gem" chance="13953" />
diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index 20821b3e11..cdfadcfb16 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -44,22 +44,43 @@
 		<immunity invisible="1" />
 	</immunities>
 	<loot>
-		<item id="2148" name="gold coin" chance="100000" countmax="100" />
-		<item id="9970" name="small topaz" chance="100000" countmax="10" />
-		<item id="8920" name="wand of starstorm" chance="100000" />
-		<item id="18413" name="blue crystal shard" chance="66667" countmax="3" />
-		<item name="collar of blue plasma" chance="66667" />
-		<item id="18415" name="green crystal shard" chance="66667" countmax="3" />
-		<item id="18414" name="violet crystal shard" chance="66667" countmax="3" />
-		<item id="5891" name="enchanted chicken wing" chance="33333" />
-		<item name="giant shimmering pearl" chance="33333" />
-		<item id="7590" name="great mana potion" chance="33333" countmax="5" />
-		<item id="8472" name="great spirit potion" chance="33333" countmax="5" />
-		<item id="2155" name="green gem" chance="33333" />
-		<item id="12410" name="luminous orb" chance="33333" />
-		<item id="7440" name="mastermind potion" chance="33333" />
-		<item id="2156" name="red gem" chance="33333" />
-		<item id="9809" name="rusted armor" chance="33333" />
-		<item id="5909" name="white piece of cloth" chance="33333" countmax="3" />
+		<item id="2148" name="Gold Coin" chance="100000" countmax="200" />
+		<item id="7440" name="Mastermind Potion" chance="100000" />
+		<item id="2152" name="Platinum Coin" chance="100000" countmax="35" />
+		<item id="2214" name="Ring of Healing" chance="100000" />
+		<item id="8920" name="Wand of Starstorm" chance="100000" />
+		<item id="18415" name="Green Crystal Shard" chance="71250" countmax="3" />
+		<item id="18413" name="Blue Crystal Shard" chance="68750" countmax="3" />
+		<item id="18414" name="Violet Crystal Shard" chance="61250" countmax="3" />
+		<item id="8473" name="Ultimate Health Potion" chance="58750" countmax="10" />
+		<item id="8472" name="Great Spirit Potion" chance="57500" countmax="10" />
+		<item id="7590" name="Great Mana Potion" chance="51250" countmax="10" />
+		<item id="26182" name="Collar of Blue Plasma" chance="47500" />
+		<item id="12410" name="Luminous Orb" chance="47500" />
+		<item id="25377" name="Gold Token" chance="38750" />
+		<item id="2156" name="Red Gem" chance="26250" />
+		<item id="2145" name="Small Diamond" chance="25000" countmax="10" />
+		<item id="2149" name="Small Emerald" chance="22500" countmax="10" />
+		<item id="2158" name="Blue Gem" chance="21250" />
+		<item id="5888" name="Piece of Hell Steel" chance="21250" countmax="2" />
+		<item id="2150" name="Small Amethyst" chance="21250" countmax="10" />
+		<item id="7632" name="giant shimmering pearl" chance="8750" />
+		<item id="7633" name="giant shimmering pearl" chance="8750" />
+		<item id="9970" name="Small Topaz" chance="17500" countmax="10" />
+		<item id="2155" name="Green Gem" chance="15000" />
+		<item id="2147" name="Small Ruby" chance="13750" countmax="10" />
+		<item id="2154" name="Yellow Gem" chance="13750" />
+		<item id="9809" name="Rusted Armor" chance="12500" />
+		<item id="25172" name="Silver Token" chance="12500" />
+		<item id="5909" name="White Piece of Cloth" chance="10000" countmax="3" />
+		<item id="8901" name="Spellbook of Warding" chance="8750" />
+		<item id="5904" name="Magic Sulphur" chance="7500" />
+		<item id="11355" name="Spellweaver's Robe" chance="6250" />
+		<item id="2153" name="Violet Gem" chance="6250" />
+		<item id="7895" name="Lightning Legs" chance="3750" />
+		<item id="5887" name="Piece of Royal Steel" chance="3750" countmax="2" />
+		<item id="2195" name="Boots of Haste" chance="2500" />
+		<item id="27049" name="Pillow Backpack" chance="2500" />
+		<item id="5891" name="Enchanted Chicken Wing" chance="1250" />
 	</loot>
 </monster>
diff --git a/data/monster/monsters/pinata_dragon.xml b/data/monster/monsters/pinata_dragon.xml
index 01b95a6522..cbbc0ec6ba 100644
--- a/data/monster/monsters/pinata_dragon.xml
+++ b/data/monster/monsters/pinata_dragon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Piñata Dragon" nameDescription="a piñata dragon" race="undead" experience="50" speed="0">
+<monster name="Pinata Dragon" nameDescription="a pinata dragon" race="undead" experience="50" speed="0">
 	<health now="10000" max="10000" />
 	<look typeex="27718" corpse="27719" />
 	<targetchange interval="2000" chance="5" />
diff --git a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
index f0a393066a..2c79d31a77 100644
--- a/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
+++ b/data/monster/monsters/soul_of_dragonking_zyrtarch.xml
@@ -83,7 +83,8 @@
 		<item id="2145" name="small diamond" chance="18605" countmax="10" />
 		<item id="8902" name="spellbook of mind control" chance="18605" />
 		<item id="9980" name="crystal of power" chance="16279" />
-		<item id="7632" name="giant shimmering pearl" chance="16279" />
+		<item id="7632" name="giant shimmering pearl" chance="8139" />
+		<item id="7633" name="giant shimmering pearl" chance="8139" />
 		<item id="2150" name="small amethyst" chance="16279" countmax="10" />
 		<item id="12608" name="broken key ring" chance="13953" />
 		<item id="9809" name="rusted armor" chance="13953" />
diff --git a/data/monster/monsters/the_blazing_time_guardian.xml b/data/monster/monsters/the_blazing_time_guardian.xml
index e676186ba9..70115113d1 100644
--- a/data/monster/monsters/the_blazing_time_guardian.xml
+++ b/data/monster/monsters/the_blazing_time_guardian.xml
@@ -72,7 +72,8 @@
 		<item id="2155" name="green gem" chance="30769" />
 		<item id="25172" name="silver token" chance="30769" />
 		<item id="7387" name="diamond sceptre" chance="23077" />
-		<item id="7632" name="giant shimmering pearl" chance="23077" />
+		<item id="7632" name="giant shimmering pearl" chance="11538" />
+		<item id="7633" name="giant shimmering pearl" chance="11538" />
 		<item id="22396" name="cluster of solace" chance="15385" />
 		<item id="25377" name="gold token" chance="15385" />
 		<item id="5892" name="huge chunk of crude iron" chance="15385" />
diff --git a/data/monster/monsters/the_enraged_thorn_knight.xml b/data/monster/monsters/the_enraged_thorn_knight.xml
index 1cb8dc3119..2a6265f544 100644
--- a/data/monster/monsters/the_enraged_thorn_knight.xml
+++ b/data/monster/monsters/the_enraged_thorn_knight.xml
@@ -76,7 +76,8 @@
 		<item id="2150" name="small amethyst" chance="23611" countmax="10" />
 		<item id="25377" name="gold token" chance="22222" />
 		<item id="2158" name="blue gem" chance="20833" />
-		<item id="7632" name="giant shimmering pearl" chance="19444" />
+		<item id="7632" name="giant shimmering pearl" chance="9722" />
+		<item id="7633" name="giant shimmering pearl" chance="9722" />
 		<item id="5910" name="green piece of cloth" chance="19444" countmax="3" />
 		<item id="9809" name="rusted armor" chance="18056" />
 		<item id="25172" name="silver token" chance="18056" />
diff --git a/data/monster/monsters/the_freezing_time_guardian.xml b/data/monster/monsters/the_freezing_time_guardian.xml
index f452584484..dadd7c7082 100644
--- a/data/monster/monsters/the_freezing_time_guardian.xml
+++ b/data/monster/monsters/the_freezing_time_guardian.xml
@@ -68,7 +68,8 @@
 		<item id="18413" name="blue crystal shard" chance="36364" countmax="3" />
 		<item id="2145" name="small diamond" chance="36364" countmax="10" />
 		<item id="2197" name="stone skin amulet" chance="36364" />
-		<item id="7632" name="giant shimmering pearl" chance="27273" />
+		<item id="7632" name="giant shimmering pearl" chance="13636" />
+		<item id="7633" name="giant shimmering pearl" chance="13636" />
 		<item id="25377" name="gold token" chance="27273" />
 		<item id="8472" name="great spirit potion" chance="27273" countmax="10" />
 		<item id="2156" name="red gem" chance="27273" />
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index d2245c647d..0d33818859 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -89,7 +89,8 @@
 		<item id="24850" name="opal" chance="17164" countmax="2" />
 		<item id="10577" name="mystical hourglass" chance="16791" />
 		<item id="9970" name="small topaz" chance="16418" countmax="20" />
-		<item id="7632" name="giant shimmering pearl" chance="15672" />
+		<item id="7632" name="giant shimmering pearl" chance="7836" />
+		<item id="7633" name="giant shimmering pearl" chance="7836" />
 		<item id="2155" name="green gem" chance="15672" />
 		<item id="5909" name="white piece of cloth" chance="14925" countmax="4" />
 		<item id="5904" name="magic sulphur" chance="14552" />
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
index 675f3600d9..fce22161ea 100644
--- a/data/monster/monsters/the_time_guardian.xml
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -84,7 +84,8 @@
 		<item id="11240" name="guardian boots" chance="13043" />
 		<item id="2145" name="small diamond" chance="13043" countmax="10" />
 		<item id="2147" name="small ruby" chance="13043" countmax="10" />
-		<item id="7632" name="giant shimmering pearl" chance="8696" />
+		<item id="7632" name="giant shimmering pearl" chance="4348" />
+		<item id="7633" name="giant shimmering pearl" chance="4348" />
 		<item id="2156" name="red gem" chance="8696" />
 		<item id="2150" name="small amethyst" chance="8696" countmax="10" />
 		<item id="5809" name="soul stone" chance="8696" />

From 7ffe4e6acf93dc52d8adc9c6b6b9d6561296246e Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Sat, 7 May 2022 14:46:08 -0300
Subject: [PATCH 28/38] Change lloyd loot to lowcase

---
 data/monster/monsters/lloyd.xml | 72 ++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index cdfadcfb16..74ebcfc977 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -44,43 +44,43 @@
 		<immunity invisible="1" />
 	</immunities>
 	<loot>
-		<item id="2148" name="Gold Coin" chance="100000" countmax="200" />
-		<item id="7440" name="Mastermind Potion" chance="100000" />
-		<item id="2152" name="Platinum Coin" chance="100000" countmax="35" />
-		<item id="2214" name="Ring of Healing" chance="100000" />
-		<item id="8920" name="Wand of Starstorm" chance="100000" />
-		<item id="18415" name="Green Crystal Shard" chance="71250" countmax="3" />
-		<item id="18413" name="Blue Crystal Shard" chance="68750" countmax="3" />
-		<item id="18414" name="Violet Crystal Shard" chance="61250" countmax="3" />
-		<item id="8473" name="Ultimate Health Potion" chance="58750" countmax="10" />
-		<item id="8472" name="Great Spirit Potion" chance="57500" countmax="10" />
-		<item id="7590" name="Great Mana Potion" chance="51250" countmax="10" />
-		<item id="26182" name="Collar of Blue Plasma" chance="47500" />
-		<item id="12410" name="Luminous Orb" chance="47500" />
-		<item id="25377" name="Gold Token" chance="38750" />
-		<item id="2156" name="Red Gem" chance="26250" />
-		<item id="2145" name="Small Diamond" chance="25000" countmax="10" />
-		<item id="2149" name="Small Emerald" chance="22500" countmax="10" />
-		<item id="2158" name="Blue Gem" chance="21250" />
-		<item id="5888" name="Piece of Hell Steel" chance="21250" countmax="2" />
-		<item id="2150" name="Small Amethyst" chance="21250" countmax="10" />
+		<item id="2148" name="gold coin" chance="100000" countmax="200" />
+		<item id="7440" name="mastermind potion" chance="100000" />
+		<item id="2152" name="platinum coin" chance="100000" countmax="35" />
+		<item id="2214" name="ring of healing" chance="100000" />
+		<item id="8920" name="wand of starstorm" chance="100000" />
+		<item id="18415" name="green crystal shard" chance="71250" countmax="3" />
+		<item id="18413" name="blue crystal shard" chance="68750" countmax="3" />
+		<item id="18414" name="violet crystal shard" chance="61250" countmax="3" />
+		<item id="8473" name="ultimate health potion" chance="58750" countmax="10" />
+		<item id="8472" name="great spirit potion" chance="57500" countmax="10" />
+		<item id="7590" name="great mana potion" chance="51250" countmax="10" />
+		<item id="26182" name="collar of blue plasma" chance="47500" />
+		<item id="12410" name="luminous orb" chance="47500" />
+		<item id="25377" name="gold token" chance="38750" />
+		<item id="2156" name="red gem" chance="26250" />
+		<item id="2145" name="small diamond" chance="25000" countmax="10" />
+		<item id="2149" name="small emerald" chance="22500" countmax="10" />
+		<item id="2158" name="blue gem" chance="21250" />
+		<item id="5888" name="piece of hell steel" chance="21250" countmax="2" />
+		<item id="2150" name="small amethyst" chance="21250" countmax="10" />
 		<item id="7632" name="giant shimmering pearl" chance="8750" />
 		<item id="7633" name="giant shimmering pearl" chance="8750" />
-		<item id="9970" name="Small Topaz" chance="17500" countmax="10" />
-		<item id="2155" name="Green Gem" chance="15000" />
-		<item id="2147" name="Small Ruby" chance="13750" countmax="10" />
-		<item id="2154" name="Yellow Gem" chance="13750" />
-		<item id="9809" name="Rusted Armor" chance="12500" />
-		<item id="25172" name="Silver Token" chance="12500" />
-		<item id="5909" name="White Piece of Cloth" chance="10000" countmax="3" />
-		<item id="8901" name="Spellbook of Warding" chance="8750" />
-		<item id="5904" name="Magic Sulphur" chance="7500" />
-		<item id="11355" name="Spellweaver's Robe" chance="6250" />
-		<item id="2153" name="Violet Gem" chance="6250" />
-		<item id="7895" name="Lightning Legs" chance="3750" />
-		<item id="5887" name="Piece of Royal Steel" chance="3750" countmax="2" />
-		<item id="2195" name="Boots of Haste" chance="2500" />
-		<item id="27049" name="Pillow Backpack" chance="2500" />
-		<item id="5891" name="Enchanted Chicken Wing" chance="1250" />
+		<item id="9970" name="small topaz" chance="17500" countmax="10" />
+		<item id="2155" name="green gem" chance="15000" />
+		<item id="2147" name="small ruby" chance="13750" countmax="10" />
+		<item id="2154" name="yellow gem" chance="13750" />
+		<item id="9809" name="rusted armor" chance="12500" />
+		<item id="25172" name="silver token" chance="12500" />
+		<item id="5909" name="white piece of cloth" chance="10000" countmax="3" />
+		<item id="8901" name="spellbook of warding" chance="8750" />
+		<item id="5904" name="magic sulphur" chance="7500" />
+		<item id="11355" name="spellweaver's robe" chance="6250" />
+		<item id="2153" name="violet gem" chance="6250" />
+		<item id="7895" name="lightning legs" chance="3750" />
+		<item id="5887" name="piece of royal steel" chance="3750" countmax="2" />
+		<item id="2195" name="boots of haste" chance="2500" />
+		<item id="27049" name="pillow backpack" chance="2500" />
+		<item id="5891" name="enchanted chicken wing" chance="1250" />
 	</loot>
 </monster>

From 919235ba14b99440022721ff064b272df17be2b6 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Sat, 7 May 2022 15:08:36 -0300
Subject: [PATCH 29/38] Resolve conversations

---
 data/monster/monsters/angry_plant.xml           | 11 +++++++++++
 data/monster/monsters/broken_shaper.xml         |  4 ++--
 data/monster/monsters/lady_tenebris.xml         |  2 +-
 data/monster/monsters/melting_frozen_horror.xml |  2 +-
 data/monster/monsters/orclops_doomhauler.xml    |  8 ++++----
 data/monster/monsters/orclops_ravager.xml       |  4 ++--
 data/monster/monsters/shaper_matriarch.xml      |  2 +-
 data/monster/monsters/solid_frozen_horror.xml   |  2 +-
 data/monster/monsters/stone_rhino.xml           |  2 +-
 data/monster/monsters/the_last_lore_keeper.xml  |  6 +++---
 data/monster/monsters/the_time_guardian.xml     |  2 +-
 data/monster/monsters/twisted_shaper.xml        |  2 +-
 12 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/data/monster/monsters/angry_plant.xml b/data/monster/monsters/angry_plant.xml
index 7b2165af0e..a18e104161 100644
--- a/data/monster/monsters/angry_plant.xml
+++ b/data/monster/monsters/angry_plant.xml
@@ -22,6 +22,17 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" min="0" max="-100" poison="100" />
+		<attack name="earth" interval="2000" chance="15" range="7" min="-60" max="-95">
+			<attribute key="shootEffect" value="poison" />
+			<attribute key="areaEffect" value="greenbubble" />
+		</attack>
+		<attack name="speed" interval="2000" chance="15" range="7" speedchange="-800" duration="30000">
+			<attribute key="shootEffect" value="poison" />
+			<attribute key="areaEffect" value="greenbubble" />
+		</attack>
+		<attack name="earth" interval="2000" chance="10" radius="3" target="0" min="-40" max="-130">
+			<attribute key="areaEffect" value="poison" />
+		</attack>
 	</attacks>
 	<defenses armor="22" defense="22" />
 	<immunities>
diff --git a/data/monster/monsters/broken_shaper.xml b/data/monster/monsters/broken_shaper.xml
index 5d436ddaad..c6a54a3511 100644
--- a/data/monster/monsters/broken_shaper.xml
+++ b/data/monster/monsters/broken_shaper.xml
@@ -48,8 +48,8 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="&lt;grunt&gt;" yell="false" />
-		<voice sentence="Raar!!" yell="false" />
+		<voice sentence="&lt;grunt&gt;" />
+		<voice sentence="Raar!!" />
 	</voices>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="173" />
diff --git a/data/monster/monsters/lady_tenebris.xml b/data/monster/monsters/lady_tenebris.xml
index 850d89a76c..93a8108adb 100644
--- a/data/monster/monsters/lady_tenebris.xml
+++ b/data/monster/monsters/lady_tenebris.xml
@@ -51,7 +51,7 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="May the embrace of darkness kill you!" yell="false" />
+		<voice sentence="May the embrace of darkness kill you!" />
 	</voices>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="200" />
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index 79db94c927..150c18e12d 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -48,6 +48,6 @@
 		<immunity invisible="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />
+		<voice sentence="Chrrrrrk! Chrrrk!" />
 	</voices>
 </monster>
diff --git a/data/monster/monsters/orclops_doomhauler.xml b/data/monster/monsters/orclops_doomhauler.xml
index 78a0d7a2fa..0ab80eda8b 100644
--- a/data/monster/monsters/orclops_doomhauler.xml
+++ b/data/monster/monsters/orclops_doomhauler.xml
@@ -49,10 +49,10 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="Me mash!" yell="false" />
-		<voice sentence="GRRRRR!" yell="false" />
-		<voice sentence="Muhahaha!" yell="false" />
-		<voice sentence="Me strong, you weak!" yell="false" />
+		<voice sentence="Me mash!" />
+		<voice sentence="GRRRRR!" />
+		<voice sentence="Muhahaha!" />
+		<voice sentence="Me strong, you weak!" />
 	</voices>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="184" />
diff --git a/data/monster/monsters/orclops_ravager.xml b/data/monster/monsters/orclops_ravager.xml
index ed60a88e6b..53560f3742 100644
--- a/data/monster/monsters/orclops_ravager.xml
+++ b/data/monster/monsters/orclops_ravager.xml
@@ -48,8 +48,8 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="Crushing! Smashing! Ripping! Yeah!!" yell="false" />
-		<voice sentence="It's clobberin time!" yell="false" />
+		<voice sentence="Crushing! Smashing! Ripping! Yeah!!" />
+		<voice sentence="It's clobberin time!" />
 	</voices>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="120" />
diff --git a/data/monster/monsters/shaper_matriarch.xml b/data/monster/monsters/shaper_matriarch.xml
index 90b8d5170e..502566b6c5 100644
--- a/data/monster/monsters/shaper_matriarch.xml
+++ b/data/monster/monsters/shaper_matriarch.xml
@@ -52,7 +52,7 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="Tar Marra Zik Tazz!" yell="false" />
+		<voice sentence="Tar Marra Zik Tazz!" />
 	</voices>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="138" />
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index 75bb42ef35..89625145ce 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -51,6 +51,6 @@
 		<immunity earth="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="Chrrrrrk! Chrrrk!" yell="false" />
+		<voice sentence="Chrrrrrk! Chrrrk!" />
 	</voices>
 </monster>
diff --git a/data/monster/monsters/stone_rhino.xml b/data/monster/monsters/stone_rhino.xml
index 587460aa47..04706e757e 100644
--- a/data/monster/monsters/stone_rhino.xml
+++ b/data/monster/monsters/stone_rhino.xml
@@ -40,7 +40,7 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="SNIFF!" yell="false" />
+		<voice sentence="SNIFF!" />
 	</voices>
 	<loot>
 		<item id="24842" name="raw meat" chance="17625" />
diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index 0d33818859..2f831a35d5 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -61,9 +61,9 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="You shall not pass!" yell="false" />
-		<voice sentence="You are not worthy!" yell="false" />
-		<voice sentence="This knowledge is forbidden!" yell="false" />
+		<voice sentence="You shall not pass!" />
+		<voice sentence="You are not worthy!" />
+		<voice sentence="This knowledge is forbidden!" />
 	</voices>
 	<loot>
 		<item id="10549" name="ancient stone" chance="100000" />
diff --git a/data/monster/monsters/the_time_guardian.xml b/data/monster/monsters/the_time_guardian.xml
index fce22161ea..28498013b6 100644
--- a/data/monster/monsters/the_time_guardian.xml
+++ b/data/monster/monsters/the_time_guardian.xml
@@ -55,7 +55,7 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="This place is sacred!" yell="false" />
+		<voice sentence="This place is sacred!" />
 	</voices>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="200" />
diff --git a/data/monster/monsters/twisted_shaper.xml b/data/monster/monsters/twisted_shaper.xml
index bed532be71..d39a7bbae5 100644
--- a/data/monster/monsters/twisted_shaper.xml
+++ b/data/monster/monsters/twisted_shaper.xml
@@ -52,7 +52,7 @@
 		<immunity drunk="1" />
 	</immunities>
 	<voices interval="5000" chance="10">
-		<voice sentence="Ti Jezz Kur Tar!" yell="false" />
+		<voice sentence="Ti Jezz Kur Tar!" />
 	</voices>
 	<loot>
 		<item id="2148" name="gold coin" chance="100000" countmax="175" />

From 9afa5ea11b6cab1c4d5d0605c8f5f600b3ff55cc Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Sat, 7 May 2022 15:46:54 -0300
Subject: [PATCH 30/38] Fix: Pinata Dragon

---
 data/monster/monsters/pinata_dragon.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/monster/monsters/pinata_dragon.xml b/data/monster/monsters/pinata_dragon.xml
index cbbc0ec6ba..d28964b05a 100644
--- a/data/monster/monsters/pinata_dragon.xml
+++ b/data/monster/monsters/pinata_dragon.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<monster name="Pinata Dragon" nameDescription="a pinata dragon" race="undead" experience="50" speed="0">
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<monster name="Pi�ata Dragon" nameDescription="a pi�ata dragon" race="undead" experience="50" speed="0">
 	<health now="10000" max="10000" />
 	<look typeex="27718" corpse="27719" />
 	<targetchange interval="2000" chance="5" />

From a8209adbc3719a7887fa2a053f8aa85228bbb1ea Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Sat, 7 May 2022 15:59:02 -0300
Subject: [PATCH 31/38] Fix: console logs

---
 data/monster/monsters/cave_parrot.xml         |  2 +-
 .../scripts/monster/frozen_minion_beam.lua    | 23 +++++++++++++++++
 .../monster/ghastly_dragon_paralyze.lua       | 11 ++++++++
 .../scripts/monster/ghastly_dragon_wave.lua   | 16 ++++++++++++
 data/spells/spells.xml                        | 25 +++++++++++--------
 5 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 data/spells/scripts/monster/frozen_minion_beam.lua
 create mode 100644 data/spells/scripts/monster/ghastly_dragon_paralyze.lua
 create mode 100644 data/spells/scripts/monster/ghastly_dragon_wave.lua

diff --git a/data/monster/monsters/cave_parrot.xml b/data/monster/monsters/cave_parrot.xml
index 663ccdcf78..8547c8db11 100644
--- a/data/monster/monsters/cave_parrot.xml
+++ b/data/monster/monsters/cave_parrot.xml
@@ -7,7 +7,7 @@
 		<flag attackable="1" />
 		<flag hostile="1" />
 		<flag summonable="0" />
-		<flag convinceable="1" />
+		<flag convinceable="0" />
 		<flag illusionable="0" />
 		<flag isboss="0" />
 		<flag ignorespawnblock="0" />
diff --git a/data/spells/scripts/monster/frozen_minion_beam.lua b/data/spells/scripts/monster/frozen_minion_beam.lua
new file mode 100644
index 0000000000..18a5aa3dad
--- /dev/null
+++ b/data/spells/scripts/monster/frozen_minion_beam.lua
@@ -0,0 +1,23 @@
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_POFF)
+combat:setParameter(COMBAT_PARAM_AGGRESSIVE, 0)
+combat:setArea(createCombatArea(AREA_BEAM7))
+
+function onTargetCreature(creature, target)
+	local min = 200
+	local max = 700
+	local master = target:getMaster()
+	if target:isPlayer() and not master or master and master:isPlayer() then
+		doTargetCombatHealth(0, target, COMBAT_ICEDAMAGE, min, max, CONST_ME_NONE)
+		return true
+	end
+
+	doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
+	return true
+end
+
+combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature")
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/ghastly_dragon_paralyze.lua b/data/spells/scripts/monster/ghastly_dragon_paralyze.lua
new file mode 100644
index 0000000000..ff27d6be7c
--- /dev/null
+++ b/data/spells/scripts/monster/ghastly_dragon_paralyze.lua
@@ -0,0 +1,11 @@
+local condition = Condition(CONDITION_PARALYZE)
+condition:setParameter(CONDITION_PARAM_TICKS, 20000)
+condition:setFormula(-0.8, 0, -0.9, 0)
+
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_BATS)
+combat:addCondition(condition)
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/scripts/monster/ghastly_dragon_wave.lua b/data/spells/scripts/monster/ghastly_dragon_wave.lua
new file mode 100644
index 0000000000..b4856530c6
--- /dev/null
+++ b/data/spells/scripts/monster/ghastly_dragon_wave.lua
@@ -0,0 +1,16 @@
+area = {
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0},
+	{0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0}
+}
+
+local combat = Combat()
+combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_DEATHDAMAGE)
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_LOSEENERGY)
+combat:setArea(createCombatArea(area))
+
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
+end
diff --git a/data/spells/spells.xml b/data/spells/spells.xml
index 028372fabc..30a02ec3d3 100644
--- a/data/spells/spells.xml
+++ b/data/spells/spells.xml
@@ -823,15 +823,18 @@
 	<instant name="root branchy" words="###53" blockwalls="1" needtarget="1" needlearn="1" script="monster/root_branchy.lua" />
 	<instant name="explosion wave" words="###54" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/explosion_wave.lua" />
 	<instant name="wave t" words="###55" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/wave_t.lua" />
-	<instant name="souleater wave" words="###56" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/souleater_wave.lua"/>
-	<instant name="wyrm wave" words="###57" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/wyrm_wave.lua"/>
-	<instant name="frozen minion wave" words="###58" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/frozen_minion_wave.lua"/>
-	<instant name="frozen minion heal" words="###59" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/frozen_minion_heal.lua"/>
-	<instant name="icecle heal" words="###60" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/icecle_heal.lua"/>
-	<instant name="lloyd wave 1" words="###61" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_1.lua"/>
-	<instant name="lloyd wave 2" words="###62" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_2.lua"/>
-	<instant name="lloyd wave 3" words="###63" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/lloyd_wave_3.lua"/>
-	<instant name="white shade paralyze" words="###64" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/white_shade_paralyze.lua"/>
-	<instant name="hirintror skill reducer" words="###65" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_skill_reducer.lua"/>
-	<instant name="hirintror freeze" words="###66" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_freeze.lua"/>
+	<instant name="souleater wave" words="###56" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/souleater_wave.lua" />
+	<instant name="wyrm wave" words="###57" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/wyrm_wave.lua" />
+	<instant name="frozen minion wave" words="###58" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/frozen_minion_wave.lua" />
+	<instant name="frozen minion heal" words="###59" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/frozen_minion_heal.lua" />
+	<instant name="frozen minion beam" words="###60" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/frozen_minion_beam.lua" />
+	<instant name="icecle heal" words="###61" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/icecle_heal.lua" />
+	<instant name="lloyd wave 1" words="###62" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_1.lua" />
+	<instant name="lloyd wave 2" words="###63" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_2.lua" />
+	<instant name="lloyd wave 3" words="###64" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/lloyd_wave_3.lua" />
+	<instant name="white shade paralyze" words="###65" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/white_shade_paralyze.lua" />
+	<instant name="hirintror skill reducer" words="###66" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_skill_reducer.lua" />
+	<instant name="hirintror freeze" words="###67" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_freeze.lua" />
+	<instant name="ghastly dragon paralyze" words="###68" aggressive="1" blockwalls="1" needtarget="1" needlearn="1" script="monster/ghastly_dragon_paralyze.lua" />
+	<instant name="ghastly dragon wave" words="###69" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/ghastly_dragon_wave.lua" />
 </spells>

From b6ef21d0beaa6db971e18273103fadf1a375d325 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 9 May 2022 21:23:37 -0300
Subject: [PATCH 32/38] Resolve conversations

---
 .../monsters/diamond_servant_replica.xml      |  8 ++++---
 data/monster/monsters/dragon_wrath.xml        |  8 +++++--
 data/monster/monsters/dragonking_zyrtarch.xml |  2 +-
 data/monster/monsters/icicle.xml              |  2 +-
 data/monster/monsters/kalyassa.xml            |  4 ++--
 data/monster/monsters/lost_time.xml           |  6 +++--
 .../monsters/melting_frozen_horror.xml        |  6 +----
 data/monster/monsters/solid_frozen_horror.xml |  6 +----
 data/monster/monsters/thorn_minion.xml        |  2 +-
 data/monster/monsters/time_keeper.xml         |  4 +++-
 data/monster/monsters/time_waster.xml         |  4 +++-
 .../scripts/monster/frozen_minion_beam.lua    |  8 +++----
 .../scripts/monster/frozen_minion_heal.lua    |  6 ++---
 .../scripts/monster/frozen_minion_wave.lua    |  8 +++----
 .../monster/ghastly_dragon_paralyze.lua       | 11 ---------
 .../scripts/monster/ghastly_dragon_wave.lua   | 16 -------------
 .../scripts/monster/hirintror_freeze.lua      |  5 ++--
 .../monster/hirintror_skill_reducer.lua       |  4 ++--
 .../{icecle_heal.lua => icicle_heal.lua}      |  6 ++---
 data/spells/scripts/monster/lloyd_wave_1.lua  |  6 ++---
 data/spells/scripts/monster/lloyd_wave_2.lua  |  6 ++---
 data/spells/scripts/monster/lloyd_wave_3.lua  |  6 ++---
 data/spells/scripts/monster/root_branchy.lua  |  4 ++--
 .../spells/scripts/monster/souleater_wave.lua | 15 ------------
 .../scripts/monster/white_shade_paralyze.lua  |  4 ++--
 data/spells/scripts/monster/wyrm_wave.lua     | 17 --------------
 data/spells/spells.xml                        | 23 ++++++++-----------
 27 files changed, 68 insertions(+), 129 deletions(-)
 delete mode 100644 data/spells/scripts/monster/ghastly_dragon_paralyze.lua
 delete mode 100644 data/spells/scripts/monster/ghastly_dragon_wave.lua
 rename data/spells/scripts/monster/{icecle_heal.lua => icicle_heal.lua} (76%)
 delete mode 100644 data/spells/scripts/monster/souleater_wave.lua
 delete mode 100644 data/spells/scripts/monster/wyrm_wave.lua

diff --git a/data/monster/monsters/diamond_servant_replica.xml b/data/monster/monsters/diamond_servant_replica.xml
index dc6f73ae6b..4d30d1278c 100644
--- a/data/monster/monsters/diamond_servant_replica.xml
+++ b/data/monster/monsters/diamond_servant_replica.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Diamond Servant Replica" nameDescription="a diamond servant replica" experience="700" speed="172">
+<monster name="Diamond Servant Replica" nameDescription="a diamond servant replica" race="energy" experience="700" speed="172">
 	<health now="2000" max="2000" />
 	<look type="397" corpse="13485" />
 	<targetchange interval="2000" chance="5" />
@@ -29,7 +29,9 @@
 			<attribute key="shootEffect" value="energy" />
 			<attribute key="areaEffect" value="energy" />
 		</attack>
-		<attack name="wyrm wave" interval="2000" chance="9" min="-70" max="-120" />
+		<attack name="energy" interval="2000" chance="9" length="5" spread="2" min="-70" max="-120">
+			<attribute key="areaEffect" value="purpleenergy" />
+		</attack>
 	</attacks>
 	<defenses armor="40" defense="45">
 		<defense name="healing" interval="2000" chance="11" min="50" max="150">
@@ -58,7 +60,7 @@
 		<item id="7588" name="strong health potion" chance="6066" />
 		<item id="9690" name="gear wheel" chance="5697" />
 		<item id="10572" name="gear crystal" chance="5205" />
-		<item name="crystal pedestal" chance="4303" />
+		<item id="9978" name="crystal pedestal" chance="4303" />
 		<item id="2164" name="might ring" chance="984" />
 		<item id="7889" name="lightning pendant" chance="820" />
 		<item id="13758" name="slime mould" chance="574" />
diff --git a/data/monster/monsters/dragon_wrath.xml b/data/monster/monsters/dragon_wrath.xml
index f217c2634f..2b3c584207 100644
--- a/data/monster/monsters/dragon_wrath.xml
+++ b/data/monster/monsters/dragon_wrath.xml
@@ -22,13 +22,17 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" min="0" max="-500" />
-		<attack name="ghastly dragon wave" interval="2000" chance="10" min="-50" max="-250" />
+		<attack name="death" interval="2000" chance="10" length="8" spread="3" min="-50" max="-250">
+			<attribute key="areaEffect" value="bluebubble" />
+		</attack>
 		<attack name="ghastly dragon curse" interval="2000" chance="10" range="7" />
 		<attack name="poisoncondition" interval="2000" chance="10" range="7" min="-920" max="-1260">
 			<attribute key="shootEffect" value="death" />
 			<attribute key="areaEffect" value="smallclouds" />
 		</attack>
-		<attack name="ghastly dragon paralyze" interval="2000" chance="9" range="7" />
+		<attack name="speed" interval="2000" chance="20" range="9" target="1" speedchange="-800" duration="20000">
+			<attribute key="areaEffect" value="smallclouds" />
+		</attack>
 		<attack name="lifedrain" interval="2000" chance="20" range="7" target="1" min="-90" max="-250">
 			<attribute key="areaEffect" value="redshimmer" />
 		</attack>
diff --git a/data/monster/monsters/dragonking_zyrtarch.xml b/data/monster/monsters/dragonking_zyrtarch.xml
index 3aa2d10842..9029ba1c15 100644
--- a/data/monster/monsters/dragonking_zyrtarch.xml
+++ b/data/monster/monsters/dragonking_zyrtarch.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" skill="112" attack="85" />
+		<attack name="melee" interval="2000" min="0" max="-1000" />
 		<attack name="fire" interval="2000" chance="20" range="7" target="1" min="-110" max="-495">
 			<attribute key="shootEffect" value="fire" />
 			<attribute key="areaEffect" value="firearea" />
diff --git a/data/monster/monsters/icicle.xml b/data/monster/monsters/icicle.xml
index 3f9070c0f2..706ba36af8 100644
--- a/data/monster/monsters/icicle.xml
+++ b/data/monster/monsters/icicle.xml
@@ -24,7 +24,7 @@
 		<attack name="melee" interval="2000" min="0" max="-219" />
 	</attacks>
 	<defenses armor="10" defense="5">
-		<defense name="icecle heal" interval="2000" chance="25" />
+		<defense name="icicle heal" interval="2000" chance="25" />
 	</defenses>
 	<immunities>
 		<immunity physical="1" />
diff --git a/data/monster/monsters/kalyassa.xml b/data/monster/monsters/kalyassa.xml
index 93e6acf943..784574aad8 100644
--- a/data/monster/monsters/kalyassa.xml
+++ b/data/monster/monsters/kalyassa.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<monster name="Kalyassa" nameDescription="kalyassa" race="blood" experience="9000" speed="350">
+<monster name="Kalyassa" nameDescription="Kalyassa" race="blood" experience="9000" speed="350">
 	<health now="10000" max="10000" />
 	<look type="947" head="37" body="113" legs="38" feet="95" addons="3" corpse="5984" />
 	<targetchange interval="2000" chance="5" />
@@ -42,7 +42,7 @@
 		</defense>
 	</defenses>
 	<summons maxSummons="2">
-		<summon name="Dragon Lord" interval="2000" chance="20" max="2" />
+		<summon name="Dragon Lord" interval="2000" chance="20" />
 	</summons>
 	<elements>
 		<element energyPercent="70" />
diff --git a/data/monster/monsters/lost_time.xml b/data/monster/monsters/lost_time.xml
index cb437ca92b..0f4e434639 100644
--- a/data/monster/monsters/lost_time.xml
+++ b/data/monster/monsters/lost_time.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="Lost Time" nameDescription="a lost time" race="undead" experience="0" speed="160">
 	<health now="2000" max="2000" />
-	<look typeex="0" corpse="0" />
+	<look typeex="26385" corpse="0" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />
@@ -22,7 +22,9 @@
 	</flags>
 	<attacks>
 		<attack name="melee" interval="2000" skill="50" attack="25" />
-		<attack name="white shade paralyze" interval="2000" chance="18" />
+		<attack name="speed" interval="2000" chance="18" target="1" radius="2" speedchange="-450" duration="20000">
+			<attribute key="areaEffect" value="blackspark" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5" />
 	<immunities>
diff --git a/data/monster/monsters/melting_frozen_horror.xml b/data/monster/monsters/melting_frozen_horror.xml
index 150c18e12d..dd78adc3be 100644
--- a/data/monster/monsters/melting_frozen_horror.xml
+++ b/data/monster/monsters/melting_frozen_horror.xml
@@ -32,11 +32,7 @@
 		</attack>
 		<attack name="hirintror skill reducer" interval="2000" chance="10" />
 	</attacks>
-	<defenses armor="10" defense="5">
-		<defense name="healing" interval="2000" chance="20" radius="7" min="0" max="0">
-			<attribute key="areaEffect" value="yellowspark" />
-		</defense>
-	</defenses>
+	<defenses armor="10" defense="5" />
 	<elements>
 		<element deathPercent="-50" />
 	</elements>
diff --git a/data/monster/monsters/solid_frozen_horror.xml b/data/monster/monsters/solid_frozen_horror.xml
index 89625145ce..b3e1c0aef6 100644
--- a/data/monster/monsters/solid_frozen_horror.xml
+++ b/data/monster/monsters/solid_frozen_horror.xml
@@ -32,11 +32,7 @@
 		</attack>
 		<attack name="hirintror skill reducer" interval="2000" chance="10" />
 	</attacks>
-	<defenses armor="60" defense="60">
-		<defense name="healing" interval="2000" chance="20" radius="7" min="0" max="0">
-			<attribute key="areaEffect" value="yellowspark" />
-		</defense>
-	</defenses>
+	<defenses armor="60" defense="60" />
 	<immunities>
 		<immunity paralyze="1" />
 		<immunity ice="1" />
diff --git a/data/monster/monsters/thorn_minion.xml b/data/monster/monsters/thorn_minion.xml
index d1151c527b..ee98788200 100644
--- a/data/monster/monsters/thorn_minion.xml
+++ b/data/monster/monsters/thorn_minion.xml
@@ -21,7 +21,7 @@
 		<flag canwalkonpoison="0" />
 	</flags>
 	<attacks>
-		<attack name="melee" interval="2000" min="-60" max="-150" poison="500" />
+		<attack name="melee" interval="2000" min="0" max="-150" poison="500" />
 		<attack name="earth" interval="2000" chance="15" range="7" min="-100" max="-195">
 			<attribute key="shootEffect" value="poison" />
 			<attribute key="areaEffect" value="greenbubble" />
diff --git a/data/monster/monsters/time_keeper.xml b/data/monster/monsters/time_keeper.xml
index 5823b722d1..6cb719abc4 100644
--- a/data/monster/monsters/time_keeper.xml
+++ b/data/monster/monsters/time_keeper.xml
@@ -26,7 +26,9 @@
 			<attribute key="shootEffect" value="suddendeath" />
 			<attribute key="areaEffect" value="yalaharighost" />
 		</attack>
-		<attack name="white shade paralyze" interval="2000" chance="18" />
+		<attack name="speed" interval="2000" chance="18" target="1" radius="2" speedchange="-450" duration="20000">
+			<attribute key="areaEffect" value="blackspark" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5" />
 	<elements>
diff --git a/data/monster/monsters/time_waster.xml b/data/monster/monsters/time_waster.xml
index cad4351597..c0b6e4f03b 100644
--- a/data/monster/monsters/time_waster.xml
+++ b/data/monster/monsters/time_waster.xml
@@ -26,7 +26,9 @@
 			<attribute key="shootEffect" value="suddendeath" />
 			<attribute key="areaEffect" value="yalaharighost" />
 		</attack>
-		<attack name="white shade paralyze" interval="2000" chance="18" />
+		<attack name="speed" interval="2000" chance="18" target="1" radius="2" speedchange="-450" duration="20000">
+			<attribute key="areaEffect" value="blackspark" />
+		</attack>
 	</attacks>
 	<defenses armor="10" defense="5" />
 	<immunities>
diff --git a/data/spells/scripts/monster/frozen_minion_beam.lua b/data/spells/scripts/monster/frozen_minion_beam.lua
index 18a5aa3dad..5d776b0e04 100644
--- a/data/spells/scripts/monster/frozen_minion_beam.lua
+++ b/data/spells/scripts/monster/frozen_minion_beam.lua
@@ -8,16 +8,16 @@ function onTargetCreature(creature, target)
 	local max = 700
 	local master = target:getMaster()
 	if target:isPlayer() and not master or master and master:isPlayer() then
-		doTargetCombatHealth(0, target, COMBAT_ICEDAMAGE, min, max, CONST_ME_NONE)
+		doTargetCombat(0, target, COMBAT_ICEDAMAGE, min, max, CONST_ME_NONE)
 		return true
 	end
 
-	doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
+	doTargetCombat(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
 	return true
 end
 
 combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature")
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/frozen_minion_heal.lua b/data/spells/scripts/monster/frozen_minion_heal.lua
index 19163a5128..e70674f387 100644
--- a/data/spells/scripts/monster/frozen_minion_heal.lua
+++ b/data/spells/scripts/monster/frozen_minion_heal.lua
@@ -11,12 +11,12 @@ function onTargetCreature(creature, target)
 		return true
 	end
 
-	doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
+	doTargetCombat(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
 	return true
 end
 
 combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature")
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/frozen_minion_wave.lua b/data/spells/scripts/monster/frozen_minion_wave.lua
index e1ab67db12..5fd4740400 100644
--- a/data/spells/scripts/monster/frozen_minion_wave.lua
+++ b/data/spells/scripts/monster/frozen_minion_wave.lua
@@ -16,16 +16,16 @@ function onTargetCreature(creature, target)
 	local max = 700
 	local master = target:getMaster()
 	if target:isPlayer() and not master or master and master:isPlayer() then
-		doTargetCombatHealth(0, target, COMBAT_ICEDAMAGE, min, max, CONST_ME_NONE)
+		doTargetCombat(0, target, COMBAT_ICEDAMAGE, min, max, CONST_ME_NONE)
 		return true
 	end
 
-	doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
+	doTargetCombat(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
 	return true
 end
 
 combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature")
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/ghastly_dragon_paralyze.lua b/data/spells/scripts/monster/ghastly_dragon_paralyze.lua
deleted file mode 100644
index ff27d6be7c..0000000000
--- a/data/spells/scripts/monster/ghastly_dragon_paralyze.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-local condition = Condition(CONDITION_PARALYZE)
-condition:setParameter(CONDITION_PARAM_TICKS, 20000)
-condition:setFormula(-0.8, 0, -0.9, 0)
-
-local combat = Combat()
-combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_BATS)
-combat:addCondition(condition)
-
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
-end
diff --git a/data/spells/scripts/monster/ghastly_dragon_wave.lua b/data/spells/scripts/monster/ghastly_dragon_wave.lua
deleted file mode 100644
index b4856530c6..0000000000
--- a/data/spells/scripts/monster/ghastly_dragon_wave.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-area = {
-	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
-	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0}
-}
-
-local combat = Combat()
-combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_DEATHDAMAGE)
-combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_LOSEENERGY)
-combat:setArea(createCombatArea(area))
-
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
-end
diff --git a/data/spells/scripts/monster/hirintror_freeze.lua b/data/spells/scripts/monster/hirintror_freeze.lua
index ff13be7de7..e29e75c404 100644
--- a/data/spells/scripts/monster/hirintror_freeze.lua
+++ b/data/spells/scripts/monster/hirintror_freeze.lua
@@ -22,8 +22,7 @@ local combat = Combat()
 combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_ICETORNADO)
 combat:addCondition(condition)
 combat:setArea(createCombatArea(area))
-combat:addCondition(condition)
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/hirintror_skill_reducer.lua b/data/spells/scripts/monster/hirintror_skill_reducer.lua
index 7681e9752b..a71c20bbe9 100644
--- a/data/spells/scripts/monster/hirintror_skill_reducer.lua
+++ b/data/spells/scripts/monster/hirintror_skill_reducer.lua
@@ -16,6 +16,6 @@ for i = 20, 40 do
 	combat[i]:addCondition(condition)
 end
 
-function onCastSpell(creature, var)
-	return combat[math.random(20, 40)]:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat[math.random(20, 40)]:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/icecle_heal.lua b/data/spells/scripts/monster/icicle_heal.lua
similarity index 76%
rename from data/spells/scripts/monster/icecle_heal.lua
rename to data/spells/scripts/monster/icicle_heal.lua
index 4d3578af8e..0be63c9cd2 100644
--- a/data/spells/scripts/monster/icecle_heal.lua
+++ b/data/spells/scripts/monster/icicle_heal.lua
@@ -11,12 +11,12 @@ function onTargetCreature(creature, target)
 		return true
 	end
 
-	doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
+	doTargetCombat(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE)
 	return true
 end
 
 combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature")
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/lloyd_wave_1.lua b/data/spells/scripts/monster/lloyd_wave_1.lua
index 259457b49c..367693b5c1 100644
--- a/data/spells/scripts/monster/lloyd_wave_1.lua
+++ b/data/spells/scripts/monster/lloyd_wave_1.lua
@@ -10,9 +10,9 @@ area = {
 
 local combat = Combat()
 combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
-combat:setParameter(COMBAT_PARAM_EFFECT, 179)
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PURPLECHAIN)
 combat:setArea(createCombatArea(area))
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/lloyd_wave_2.lua b/data/spells/scripts/monster/lloyd_wave_2.lua
index 34f0a8fd01..dda669add4 100644
--- a/data/spells/scripts/monster/lloyd_wave_2.lua
+++ b/data/spells/scripts/monster/lloyd_wave_2.lua
@@ -10,9 +10,9 @@ area = {
 
 local combat = Combat()
 combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
-combat:setParameter(COMBAT_PARAM_EFFECT, 179)
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PURPLECHAIN)
 combat:setArea(createCombatArea(area))
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/lloyd_wave_3.lua b/data/spells/scripts/monster/lloyd_wave_3.lua
index 3a9ef323d2..6896a27b25 100644
--- a/data/spells/scripts/monster/lloyd_wave_3.lua
+++ b/data/spells/scripts/monster/lloyd_wave_3.lua
@@ -10,9 +10,9 @@ area = {
 
 local combat = Combat()
 combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
-combat:setParameter(COMBAT_PARAM_EFFECT, 179)
+combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PURPLECHAIN)
 combat:setArea(createCombatArea(area))
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/root_branchy.lua b/data/spells/scripts/monster/root_branchy.lua
index f89976c032..63f8a5ec86 100644
--- a/data/spells/scripts/monster/root_branchy.lua
+++ b/data/spells/scripts/monster/root_branchy.lua
@@ -6,6 +6,6 @@ local condition = Condition(CONDITION_ROOT)
 condition:setParameter(CONDITION_PARAM_TICKS, 3000)
 combat:addCondition(condition)
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/souleater_wave.lua b/data/spells/scripts/monster/souleater_wave.lua
deleted file mode 100644
index 451433c8a8..0000000000
--- a/data/spells/scripts/monster/souleater_wave.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-area = {
-	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
-	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0}
-}
-
-local combat = Combat()
-combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_LIFEDRAINDAMAGE)
-combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_SOUND_RED)
-combat:setArea(createCombatArea(area))
-
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
-end
diff --git a/data/spells/scripts/monster/white_shade_paralyze.lua b/data/spells/scripts/monster/white_shade_paralyze.lua
index 44ea5f76ca..b51c9bae3c 100644
--- a/data/spells/scripts/monster/white_shade_paralyze.lua
+++ b/data/spells/scripts/monster/white_shade_paralyze.lua
@@ -7,6 +7,6 @@ combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_HITAREA)
 combat:setArea(createCombatArea(AREA_CIRCLE2X2))
 combat:addCondition(condition)
 
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
+function onCastSpell(creature, variant)
+	return combat:execute(creature, variant)
 end
diff --git a/data/spells/scripts/monster/wyrm_wave.lua b/data/spells/scripts/monster/wyrm_wave.lua
deleted file mode 100644
index b9d29bc19d..0000000000
--- a/data/spells/scripts/monster/wyrm_wave.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-area = {
-	{0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0},
-	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
-	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
-	{0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0}
-}
-
-local combat = Combat()
-combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
-combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PURPLEENERGY)
-combat:setArea(createCombatArea(area))
-
-function onCastSpell(creature, var)
-	return combat:execute(creature, var)
-end
diff --git a/data/spells/spells.xml b/data/spells/spells.xml
index 30a02ec3d3..59fa080664 100644
--- a/data/spells/spells.xml
+++ b/data/spells/spells.xml
@@ -823,18 +823,13 @@
 	<instant name="root branchy" words="###53" blockwalls="1" needtarget="1" needlearn="1" script="monster/root_branchy.lua" />
 	<instant name="explosion wave" words="###54" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/explosion_wave.lua" />
 	<instant name="wave t" words="###55" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/wave_t.lua" />
-	<instant name="souleater wave" words="###56" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/souleater_wave.lua" />
-	<instant name="wyrm wave" words="###57" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/wyrm_wave.lua" />
-	<instant name="frozen minion wave" words="###58" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/frozen_minion_wave.lua" />
-	<instant name="frozen minion heal" words="###59" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/frozen_minion_heal.lua" />
-	<instant name="frozen minion beam" words="###60" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/frozen_minion_beam.lua" />
-	<instant name="icecle heal" words="###61" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/icecle_heal.lua" />
-	<instant name="lloyd wave 1" words="###62" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_1.lua" />
-	<instant name="lloyd wave 2" words="###63" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_2.lua" />
-	<instant name="lloyd wave 3" words="###64" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/lloyd_wave_3.lua" />
-	<instant name="white shade paralyze" words="###65" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/white_shade_paralyze.lua" />
-	<instant name="hirintror skill reducer" words="###66" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_skill_reducer.lua" />
-	<instant name="hirintror freeze" words="###67" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_freeze.lua" />
-	<instant name="ghastly dragon paralyze" words="###68" aggressive="1" blockwalls="1" needtarget="1" needlearn="1" script="monster/ghastly_dragon_paralyze.lua" />
-	<instant name="ghastly dragon wave" words="###69" direction="1" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/ghastly_dragon_wave.lua" />
+	<instant name="frozen minion wave" words="###56" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/frozen_minion_wave.lua" />
+	<instant name="frozen minion heal" words="###57" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/frozen_minion_heal.lua" />
+	<instant name="frozen minion beam" words="###58" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/frozen_minion_beam.lua" />
+	<instant name="icicle heal" words="###59" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/icicle_heal.lua" />
+	<instant name="lloyd wave 1" words="###60" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_1.lua" />
+	<instant name="lloyd wave 2" words="###61" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_2.lua" />
+	<instant name="lloyd wave 3" words="###62" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/lloyd_wave_3.lua" />
+	<instant name="hirintror skill reducer" words="###63" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_skill_reducer.lua" />
+	<instant name="hirintror freeze" words="###64" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_freeze.lua" />
 </spells>

From 0bffed081aa10de522f23686a9a7e5949edfc427 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 9 May 2022 21:24:36 -0300
Subject: [PATCH 33/38] Revert: root_branchy chages

---
 data/spells/scripts/monster/root_branchy.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/spells/scripts/monster/root_branchy.lua b/data/spells/scripts/monster/root_branchy.lua
index 63f8a5ec86..f89976c032 100644
--- a/data/spells/scripts/monster/root_branchy.lua
+++ b/data/spells/scripts/monster/root_branchy.lua
@@ -6,6 +6,6 @@ local condition = Condition(CONDITION_ROOT)
 condition:setParameter(CONDITION_PARAM_TICKS, 3000)
 combat:addCondition(condition)
 
-function onCastSpell(creature, variant)
-	return combat:execute(creature, variant)
+function onCastSpell(creature, var)
+	return combat:execute(creature, var)
 end

From c2a8a0b226e09016f8dcbd69ccc9d26635cd7da4 Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Mon, 9 May 2022 22:08:59 -0300
Subject: [PATCH 34/38] Fix: Pinata Dragon

---
 data/monster/monsters/pinata_dragon.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/monster/monsters/pinata_dragon.xml b/data/monster/monsters/pinata_dragon.xml
index d28964b05a..cbbc0ec6ba 100644
--- a/data/monster/monsters/pinata_dragon.xml
+++ b/data/monster/monsters/pinata_dragon.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<monster name="Pi�ata Dragon" nameDescription="a pi�ata dragon" race="undead" experience="50" speed="0">
+<?xml version="1.0" encoding="UTF-8"?>
+<monster name="Pinata Dragon" nameDescription="a pinata dragon" race="undead" experience="50" speed="0">
 	<health now="10000" max="10000" />
 	<look typeex="27718" corpse="27719" />
 	<targetchange interval="2000" chance="5" />

From 33c7ba05f55b054611f8c2ac0df349dbec62dc3c Mon Sep 17 00:00:00 2001
From: Evil Puncker <EPuncker@users.noreply.github.com>
Date: Mon, 9 May 2022 23:50:38 -0300
Subject: [PATCH 35/38] Update data/monster/monsters/the_last_lore_keeper.xml

---
 data/monster/monsters/the_last_lore_keeper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index 2f831a35d5..52fc7a5f81 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="The Last Lore Keeper" nameDescription="The Last Lore Keeper" race="undead" experience="45000" speed="450">
 	<health now="750000" max="750000" />
-	<look type="939" corpse="0" />
+	<look type="27741" corpse="0" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />

From 55519dfd40e520bb930a1160fbb01a13d8c21f98 Mon Sep 17 00:00:00 2001
From: Evil Puncker <EPuncker@users.noreply.github.com>
Date: Tue, 10 May 2022 00:00:24 -0300
Subject: [PATCH 36/38] Update data/monster/monsters/the_last_lore_keeper.xml

---
 data/monster/monsters/the_last_lore_keeper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index 52fc7a5f81..70865b5e18 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="The Last Lore Keeper" nameDescription="The Last Lore Keeper" race="undead" experience="45000" speed="450">
 	<health now="750000" max="750000" />
-	<look type="27741" corpse="0" />
+	<look type="27741" corpse="27741" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />

From dccb95c8e76c08a1de269cb65c2b1e37020eeaaa Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Tue, 10 May 2022 00:06:08 -0300
Subject: [PATCH 37/38] Resolve conversations

---
 data/monster/monsters/lloyd.xml                |  4 +++-
 data/spells/scripts/monster/lloyd_wave_3.lua   | 18 ------------------
 .../scripts/monster/white_shade_paralyze.lua   | 12 ------------
 data/spells/spells.xml                         |  3 +--
 4 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 data/spells/scripts/monster/lloyd_wave_3.lua
 delete mode 100644 data/spells/scripts/monster/white_shade_paralyze.lua

diff --git a/data/monster/monsters/lloyd.xml b/data/monster/monsters/lloyd.xml
index 74ebcfc977..e99c71f9d4 100644
--- a/data/monster/monsters/lloyd.xml
+++ b/data/monster/monsters/lloyd.xml
@@ -25,9 +25,11 @@
 		<attack name="energy" interval="2000" chance="12" length="6" spread="0" min="-130" max="-460">
 			<attribute key="areaEffect" value="purpleenergy" />
 		</attack>
+		<attack name="energy" interval="2000" chance="15" radius="2" target="0" min="-430" max="-660">
+			<attribute key="areaEffect" value="purplechain" />
+		</attack>
 		<attack name="lloyd wave 1" interval="2000" chance="12" min="-430" max="-560" />
 		<attack name="lloyd wave 2" interval="2000" chance="12" min="-230" max="-460" />
-		<attack name="lloyd wave 3" interval="2000" chance="12" min="-430" max="-660" />
 	</attacks>
 	<defenses armor="55" defense="55">
 		<defense name="healing" interval="2000" chance="15" min="180" max="250" />
diff --git a/data/spells/scripts/monster/lloyd_wave_3.lua b/data/spells/scripts/monster/lloyd_wave_3.lua
deleted file mode 100644
index 6896a27b25..0000000000
--- a/data/spells/scripts/monster/lloyd_wave_3.lua
+++ /dev/null
@@ -1,18 +0,0 @@
-area = {
-	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 1, 2, 1, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-}
-
-local combat = Combat()
-combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
-combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PURPLECHAIN)
-combat:setArea(createCombatArea(area))
-
-function onCastSpell(creature, variant)
-	return combat:execute(creature, variant)
-end
diff --git a/data/spells/scripts/monster/white_shade_paralyze.lua b/data/spells/scripts/monster/white_shade_paralyze.lua
deleted file mode 100644
index b51c9bae3c..0000000000
--- a/data/spells/scripts/monster/white_shade_paralyze.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-local condition = Condition(CONDITION_PARALYZE)
-condition:setParameter(CONDITION_PARAM_TICKS, 20000)
-condition:setFormula(-0.3, 0, -0.45, 0)
-
-local combat = Combat()
-combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_HITAREA)
-combat:setArea(createCombatArea(AREA_CIRCLE2X2))
-combat:addCondition(condition)
-
-function onCastSpell(creature, variant)
-	return combat:execute(creature, variant)
-end
diff --git a/data/spells/spells.xml b/data/spells/spells.xml
index 59fa080664..bf483b970f 100644
--- a/data/spells/spells.xml
+++ b/data/spells/spells.xml
@@ -829,7 +829,6 @@
 	<instant name="icicle heal" words="###59" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/icicle_heal.lua" />
 	<instant name="lloyd wave 1" words="###60" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_1.lua" />
 	<instant name="lloyd wave 2" words="###61" aggressive="1" blockwalls="1" needlearn="1" direction="1" script="monster/lloyd_wave_2.lua" />
-	<instant name="lloyd wave 3" words="###62" aggressive="1" blockwalls="1" needlearn="1" selftarget="1" script="monster/lloyd_wave_3.lua" />
+	<instant name="hirintror freeze" words="###62" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_freeze.lua" />
 	<instant name="hirintror skill reducer" words="###63" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_skill_reducer.lua" />
-	<instant name="hirintror freeze" words="###64" aggressive="1" blockwalls="1" needtarget="0" needlearn="1" script="monster/hirintror_freeze.lua" />
 </spells>

From c8b4a4bd50f4b3afc66382233a9c7cfea5ed068e Mon Sep 17 00:00:00 2001
From: Marco Oliveira <marcomoa@hotmail.com>
Date: Tue, 10 May 2022 00:24:46 -0300
Subject: [PATCH 38/38] Fix: The Last Lore Keeper

---
 data/monster/monsters/the_last_lore_keeper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml
index 70865b5e18..930ba0a1ec 100644
--- a/data/monster/monsters/the_last_lore_keeper.xml
+++ b/data/monster/monsters/the_last_lore_keeper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <monster name="The Last Lore Keeper" nameDescription="The Last Lore Keeper" race="undead" experience="45000" speed="450">
 	<health now="750000" max="750000" />
-	<look type="27741" corpse="27741" />
+	<look type="939" corpse="27741" />
 	<targetchange interval="2000" chance="5" />
 	<flags>
 		<flag attackable="1" />