From b19663a57a83609a5adf517f774f44aba48f39dc Mon Sep 17 00:00:00 2001 From: Marco Oliveira Date: Tue, 3 Jan 2023 23:43:14 -0300 Subject: [PATCH 1/3] 11.40 - Monsters --- data/monster/monsters.xml | 76 ++++++++++++++++++ data/monster/monsters/animated_clomp.xml | 30 +++++++ data/monster/monsters/animated_cyclops.xml | 31 ++++++++ data/monster/monsters/animated_feather.xml | 61 ++++++++++++++ data/monster/monsters/animated_guzzlemaw.xml | 72 +++++++++++++++++ data/monster/monsters/animated_moohtant.xml | 55 +++++++++++++ data/monster/monsters/animated_mummy.xml | 43 ++++++++++ data/monster/monsters/animated_ogre_brute.xml | 49 ++++++++++++ .../monster/monsters/animated_ogre_savage.xml | 41 ++++++++++ .../monster/monsters/animated_ogre_shaman.xml | 51 ++++++++++++ data/monster/monsters/animated_rotworm.xml | 34 ++++++++ data/monster/monsters/animated_skunk.xml | 29 +++++++ data/monster/monsters/animated_snowman.xml | 47 +++++++++++ data/monster/monsters/barkless_fanatic.xml | 48 +++++++++++ data/monster/monsters/boogy.xml | 69 ++++++++++++++++ data/monster/monsters/containment_crystal.xml | 30 +++++++ data/monster/monsters/containment_machine.xml | 22 ++++++ data/monster/monsters/cult_believer.xml | 50 ++++++++++++ data/monster/monsters/cult_enforcer.xml | 54 +++++++++++++ data/monster/monsters/cult_scholar.xml | 56 +++++++++++++ data/monster/monsters/dark_faun.xml | 72 +++++++++++++++++ data/monster/monsters/dark_soul.xml | 33 ++++++++ data/monster/monsters/dread_minion.xml | 36 +++++++++ data/monster/monsters/enfeebled_silencer.xml | 66 ++++++++++++++++ data/monster/monsters/enraged_sand_brood.xml | 26 ++++++ data/monster/monsters/essence_of_malice.xml | 51 ++++++++++++ data/monster/monsters/faun.xml | 72 +++++++++++++++++ data/monster/monsters/freed_soul.xml | 25 ++++++ data/monster/monsters/goldhanded_cultist.xml | 60 ++++++++++++++ .../monsters/goldhanded_cultist_bride.xml | 58 ++++++++++++++ data/monster/monsters/kroazur.xml | 60 ++++++++++++++ data/monster/monsters/leiden.xml | 32 ++++++++ data/monster/monsters/mezlon_the_defiler.xml | 29 +++++++ .../monsters/minotaur_cult_follower.xml | 66 ++++++++++++++++ .../monsters/minotaur_cult_prophet.xml | 69 ++++++++++++++++ .../monster/monsters/minotaur_cult_zealot.xml | 57 +++++++++++++ data/monster/monsters/minotaur_idol.xml | 33 ++++++++ data/monster/monsters/misguided_bully.xml | 44 +++++++++++ data/monster/monsters/misguided_shadow.xml | 43 ++++++++++ data/monster/monsters/misguided_thief.xml | 53 +++++++++++++ data/monster/monsters/museum_stone_golem.xml | 32 ++++++++ data/monster/monsters/museum_stone_rhino.xml | 32 ++++++++ data/monster/monsters/nymph.xml | 71 +++++++++++++++++ data/monster/monsters/orc_cult_fanatic.xml | 52 ++++++++++++ data/monster/monsters/orc_cult_minion.xml | 46 +++++++++++ data/monster/monsters/orc_cult_priest.xml | 62 +++++++++++++++ data/monster/monsters/orc_cultist.xml | 55 +++++++++++++ data/monster/monsters/pillar_of_death.xml | 23 ++++++ data/monster/monsters/pillar_of_draining.xml | 23 ++++++ data/monster/monsters/pillar_of_healing.xml | 25 ++++++ .../monster/monsters/pillar_of_protection.xml | 23 ++++++ data/monster/monsters/pillar_of_summoning.xml | 26 ++++++ data/monster/monsters/pixie.xml | 73 +++++++++++++++++ data/monster/monsters/pooka.xml | 64 +++++++++++++++ data/monster/monsters/putrid_mummy.xml | 60 ++++++++++++++ data/monster/monsters/ravenous_hunger.xml | 33 ++++++++ data/monster/monsters/sand_brood.xml | 26 ++++++ data/monster/monsters/sand_vortex.xml | 33 ++++++++ data/monster/monsters/security_golem.xml | 31 ++++++++ data/monster/monsters/sphere_of_wrath.xml | 33 ++++++++ data/monster/monsters/stolen_soul.xml | 22 ++++++ data/monster/monsters/swan_maiden.xml | 73 +++++++++++++++++ .../monster/monsters/the_armored_voidborn.xml | 41 ++++++++++ .../monsters/the_corruptor_of_souls.xml | 48 +++++++++++ data/monster/monsters/the_false_god.xml | 56 +++++++++++++ .../monsters/the_remorseless_corruptor.xml | 48 +++++++++++ data/monster/monsters/the_sandking.xml | 47 +++++++++++ .../monsters/the_sinister_hermit_blue.xml | 53 +++++++++++++ .../monsters/the_sinister_hermit_yellow.xml | 45 +++++++++++ data/monster/monsters/the_souldespoiler.xml | 59 ++++++++++++++ .../monsters/the_source_of_corruption.xml | 44 +++++++++++ .../monsters/the_unarmored_voidborn.xml | 52 ++++++++++++ data/monster/monsters/twisted_pooka.xml | 68 ++++++++++++++++ data/monster/monsters/vermin_swarm.xml | 28 +++++++ data/monster/monsters/voidshard.xml | 33 ++++++++ data/monster/monsters/weakened_frazzlemaw.xml | 79 +++++++++++++++++++ data/monster/monsters/zarcorix_of_yalahar.xml | 23 ++++++ .../scripts/monster/freed_soul_spell.lua | 42 ++++++++++ data/spells/scripts/monster/heal_monsters.lua | 28 +++++++ .../scripts/monster/heal_monsters_9x9.lua | 28 +++++++ .../scripts/monster/pixie_skill_reducer.lua | 17 ++++ .../scripts/monster/remorseless_wave.lua | 44 +++++++++++ .../monster/source_of_corruption_wave.lua | 36 +++++++++ data/spells/spells.xml | 6 ++ 84 files changed, 3776 insertions(+) create mode 100644 data/monster/monsters/animated_clomp.xml create mode 100644 data/monster/monsters/animated_cyclops.xml create mode 100644 data/monster/monsters/animated_feather.xml create mode 100644 data/monster/monsters/animated_guzzlemaw.xml create mode 100644 data/monster/monsters/animated_moohtant.xml create mode 100644 data/monster/monsters/animated_mummy.xml create mode 100644 data/monster/monsters/animated_ogre_brute.xml create mode 100644 data/monster/monsters/animated_ogre_savage.xml create mode 100644 data/monster/monsters/animated_ogre_shaman.xml create mode 100644 data/monster/monsters/animated_rotworm.xml create mode 100644 data/monster/monsters/animated_skunk.xml create mode 100644 data/monster/monsters/animated_snowman.xml create mode 100644 data/monster/monsters/barkless_fanatic.xml create mode 100644 data/monster/monsters/boogy.xml create mode 100644 data/monster/monsters/containment_crystal.xml create mode 100644 data/monster/monsters/containment_machine.xml create mode 100644 data/monster/monsters/cult_believer.xml create mode 100644 data/monster/monsters/cult_enforcer.xml create mode 100644 data/monster/monsters/cult_scholar.xml create mode 100644 data/monster/monsters/dark_faun.xml create mode 100644 data/monster/monsters/dark_soul.xml create mode 100644 data/monster/monsters/dread_minion.xml create mode 100644 data/monster/monsters/enfeebled_silencer.xml create mode 100644 data/monster/monsters/enraged_sand_brood.xml create mode 100644 data/monster/monsters/essence_of_malice.xml create mode 100644 data/monster/monsters/faun.xml create mode 100644 data/monster/monsters/freed_soul.xml create mode 100644 data/monster/monsters/goldhanded_cultist.xml create mode 100644 data/monster/monsters/goldhanded_cultist_bride.xml create mode 100644 data/monster/monsters/kroazur.xml create mode 100644 data/monster/monsters/leiden.xml create mode 100644 data/monster/monsters/mezlon_the_defiler.xml create mode 100644 data/monster/monsters/minotaur_cult_follower.xml create mode 100644 data/monster/monsters/minotaur_cult_prophet.xml create mode 100644 data/monster/monsters/minotaur_cult_zealot.xml create mode 100644 data/monster/monsters/minotaur_idol.xml create mode 100644 data/monster/monsters/misguided_bully.xml create mode 100644 data/monster/monsters/misguided_shadow.xml create mode 100644 data/monster/monsters/misguided_thief.xml create mode 100644 data/monster/monsters/museum_stone_golem.xml create mode 100644 data/monster/monsters/museum_stone_rhino.xml create mode 100644 data/monster/monsters/nymph.xml create mode 100644 data/monster/monsters/orc_cult_fanatic.xml create mode 100644 data/monster/monsters/orc_cult_minion.xml create mode 100644 data/monster/monsters/orc_cult_priest.xml create mode 100644 data/monster/monsters/orc_cultist.xml create mode 100644 data/monster/monsters/pillar_of_death.xml create mode 100644 data/monster/monsters/pillar_of_draining.xml create mode 100644 data/monster/monsters/pillar_of_healing.xml create mode 100644 data/monster/monsters/pillar_of_protection.xml create mode 100644 data/monster/monsters/pillar_of_summoning.xml create mode 100644 data/monster/monsters/pixie.xml create mode 100644 data/monster/monsters/pooka.xml create mode 100644 data/monster/monsters/putrid_mummy.xml create mode 100644 data/monster/monsters/ravenous_hunger.xml create mode 100644 data/monster/monsters/sand_brood.xml create mode 100644 data/monster/monsters/sand_vortex.xml create mode 100644 data/monster/monsters/security_golem.xml create mode 100644 data/monster/monsters/sphere_of_wrath.xml create mode 100644 data/monster/monsters/stolen_soul.xml create mode 100644 data/monster/monsters/swan_maiden.xml create mode 100644 data/monster/monsters/the_armored_voidborn.xml create mode 100644 data/monster/monsters/the_corruptor_of_souls.xml create mode 100644 data/monster/monsters/the_false_god.xml create mode 100644 data/monster/monsters/the_remorseless_corruptor.xml create mode 100644 data/monster/monsters/the_sandking.xml create mode 100644 data/monster/monsters/the_sinister_hermit_blue.xml create mode 100644 data/monster/monsters/the_sinister_hermit_yellow.xml create mode 100644 data/monster/monsters/the_souldespoiler.xml create mode 100644 data/monster/monsters/the_source_of_corruption.xml create mode 100644 data/monster/monsters/the_unarmored_voidborn.xml create mode 100644 data/monster/monsters/twisted_pooka.xml create mode 100644 data/monster/monsters/vermin_swarm.xml create mode 100644 data/monster/monsters/voidshard.xml create mode 100644 data/monster/monsters/weakened_frazzlemaw.xml create mode 100644 data/monster/monsters/zarcorix_of_yalahar.xml create mode 100644 data/spells/scripts/monster/freed_soul_spell.lua create mode 100644 data/spells/scripts/monster/heal_monsters.lua create mode 100644 data/spells/scripts/monster/heal_monsters_9x9.lua create mode 100644 data/spells/scripts/monster/pixie_skill_reducer.lua create mode 100644 data/spells/scripts/monster/remorseless_wave.lua create mode 100644 data/spells/scripts/monster/source_of_corruption_wave.lua diff --git a/data/monster/monsters.xml b/data/monster/monsters.xml index 05888b8da6..758c10082e 100644 --- a/data/monster/monsters.xml +++ b/data/monster/monsters.xml @@ -17,6 +17,18 @@ + + + + + + + + + + + + @@ -46,6 +58,7 @@ + @@ -78,6 +91,7 @@ + @@ -117,6 +131,8 @@ + + @@ -141,6 +157,9 @@ + + + @@ -152,11 +171,13 @@ + + @@ -229,6 +250,7 @@ + @@ -268,8 +290,10 @@ + + @@ -277,6 +301,7 @@ + @@ -287,6 +312,7 @@ + @@ -315,6 +341,7 @@ + @@ -368,6 +395,8 @@ + + @@ -460,6 +489,7 @@ + @@ -469,6 +499,7 @@ + @@ -538,6 +569,7 @@ + @@ -547,12 +579,19 @@ + + + + + + + @@ -570,6 +609,8 @@ + + @@ -590,6 +631,7 @@ + @@ -601,6 +643,10 @@ + + + + @@ -627,6 +673,11 @@ + + + + + @@ -635,6 +686,7 @@ + @@ -642,6 +694,7 @@ + @@ -649,6 +702,7 @@ + @@ -667,6 +721,7 @@ + @@ -701,6 +756,8 @@ + + @@ -710,6 +767,7 @@ + @@ -761,6 +819,7 @@ + @@ -780,6 +839,7 @@ + @@ -791,6 +851,7 @@ + @@ -809,6 +870,7 @@ + @@ -817,12 +879,14 @@ + + @@ -846,11 +910,18 @@ + + + + + + + @@ -874,6 +945,7 @@ + @@ -902,12 +974,14 @@ + + @@ -919,6 +993,7 @@ + @@ -962,6 +1037,7 @@ + diff --git a/data/monster/monsters/animated_clomp.xml b/data/monster/monsters/animated_clomp.xml new file mode 100644 index 0000000000..0582c6081e --- /dev/null +++ b/data/monster/monsters/animated_clomp.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_cyclops.xml b/data/monster/monsters/animated_cyclops.xml new file mode 100644 index 0000000000..ce91147542 --- /dev/null +++ b/data/monster/monsters/animated_cyclops.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_feather.xml b/data/monster/monsters/animated_feather.xml new file mode 100644 index 0000000000..462938cce4 --- /dev/null +++ b/data/monster/monsters/animated_feather.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_guzzlemaw.xml b/data/monster/monsters/animated_guzzlemaw.xml new file mode 100644 index 0000000000..f28974ea9a --- /dev/null +++ b/data/monster/monsters/animated_guzzlemaw.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_moohtant.xml b/data/monster/monsters/animated_moohtant.xml new file mode 100644 index 0000000000..adc1179d8b --- /dev/null +++ b/data/monster/monsters/animated_moohtant.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_mummy.xml b/data/monster/monsters/animated_mummy.xml new file mode 100644 index 0000000000..8c3b0533f6 --- /dev/null +++ b/data/monster/monsters/animated_mummy.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_ogre_brute.xml b/data/monster/monsters/animated_ogre_brute.xml new file mode 100644 index 0000000000..aa54aac6ab --- /dev/null +++ b/data/monster/monsters/animated_ogre_brute.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_ogre_savage.xml b/data/monster/monsters/animated_ogre_savage.xml new file mode 100644 index 0000000000..f5bc8ab43b --- /dev/null +++ b/data/monster/monsters/animated_ogre_savage.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_ogre_shaman.xml b/data/monster/monsters/animated_ogre_shaman.xml new file mode 100644 index 0000000000..8239af09c6 --- /dev/null +++ b/data/monster/monsters/animated_ogre_shaman.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_rotworm.xml b/data/monster/monsters/animated_rotworm.xml new file mode 100644 index 0000000000..7706110db3 --- /dev/null +++ b/data/monster/monsters/animated_rotworm.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_skunk.xml b/data/monster/monsters/animated_skunk.xml new file mode 100644 index 0000000000..76e91cc5e7 --- /dev/null +++ b/data/monster/monsters/animated_skunk.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/animated_snowman.xml b/data/monster/monsters/animated_snowman.xml new file mode 100644 index 0000000000..f3dba08a0c --- /dev/null +++ b/data/monster/monsters/animated_snowman.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/barkless_fanatic.xml b/data/monster/monsters/barkless_fanatic.xml new file mode 100644 index 0000000000..9c57dbf390 --- /dev/null +++ b/data/monster/monsters/barkless_fanatic.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/boogy.xml b/data/monster/monsters/boogy.xml new file mode 100644 index 0000000000..97f9ece1b5 --- /dev/null +++ b/data/monster/monsters/boogy.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/containment_crystal.xml b/data/monster/monsters/containment_crystal.xml new file mode 100644 index 0000000000..fdc665a2d7 --- /dev/null +++ b/data/monster/monsters/containment_crystal.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/containment_machine.xml b/data/monster/monsters/containment_machine.xml new file mode 100644 index 0000000000..a0846cff67 --- /dev/null +++ b/data/monster/monsters/containment_machine.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/cult_believer.xml b/data/monster/monsters/cult_believer.xml new file mode 100644 index 0000000000..71a883a3ab --- /dev/null +++ b/data/monster/monsters/cult_believer.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/cult_enforcer.xml b/data/monster/monsters/cult_enforcer.xml new file mode 100644 index 0000000000..62c8349afa --- /dev/null +++ b/data/monster/monsters/cult_enforcer.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/cult_scholar.xml b/data/monster/monsters/cult_scholar.xml new file mode 100644 index 0000000000..e28bc63db5 --- /dev/null +++ b/data/monster/monsters/cult_scholar.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/dark_faun.xml b/data/monster/monsters/dark_faun.xml new file mode 100644 index 0000000000..48070fcc19 --- /dev/null +++ b/data/monster/monsters/dark_faun.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/dark_soul.xml b/data/monster/monsters/dark_soul.xml new file mode 100644 index 0000000000..3df51f5862 --- /dev/null +++ b/data/monster/monsters/dark_soul.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/dread_minion.xml b/data/monster/monsters/dread_minion.xml new file mode 100644 index 0000000000..c766dd616d --- /dev/null +++ b/data/monster/monsters/dread_minion.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/enfeebled_silencer.xml b/data/monster/monsters/enfeebled_silencer.xml new file mode 100644 index 0000000000..b55f5bc4f2 --- /dev/null +++ b/data/monster/monsters/enfeebled_silencer.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/enraged_sand_brood.xml b/data/monster/monsters/enraged_sand_brood.xml new file mode 100644 index 0000000000..4317e79774 --- /dev/null +++ b/data/monster/monsters/enraged_sand_brood.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/essence_of_malice.xml b/data/monster/monsters/essence_of_malice.xml new file mode 100644 index 0000000000..22166853b5 --- /dev/null +++ b/data/monster/monsters/essence_of_malice.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/faun.xml b/data/monster/monsters/faun.xml new file mode 100644 index 0000000000..84a8ac0bda --- /dev/null +++ b/data/monster/monsters/faun.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/freed_soul.xml b/data/monster/monsters/freed_soul.xml new file mode 100644 index 0000000000..f51c816802 --- /dev/null +++ b/data/monster/monsters/freed_soul.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/goldhanded_cultist.xml b/data/monster/monsters/goldhanded_cultist.xml new file mode 100644 index 0000000000..1957c171b9 --- /dev/null +++ b/data/monster/monsters/goldhanded_cultist.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/goldhanded_cultist_bride.xml b/data/monster/monsters/goldhanded_cultist_bride.xml new file mode 100644 index 0000000000..c9ee5540f8 --- /dev/null +++ b/data/monster/monsters/goldhanded_cultist_bride.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/kroazur.xml b/data/monster/monsters/kroazur.xml new file mode 100644 index 0000000000..131183814c --- /dev/null +++ b/data/monster/monsters/kroazur.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/leiden.xml b/data/monster/monsters/leiden.xml new file mode 100644 index 0000000000..6d3d91cc34 --- /dev/null +++ b/data/monster/monsters/leiden.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/mezlon_the_defiler.xml b/data/monster/monsters/mezlon_the_defiler.xml new file mode 100644 index 0000000000..a6fbc09981 --- /dev/null +++ b/data/monster/monsters/mezlon_the_defiler.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/minotaur_cult_follower.xml b/data/monster/monsters/minotaur_cult_follower.xml new file mode 100644 index 0000000000..d8028cff79 --- /dev/null +++ b/data/monster/monsters/minotaur_cult_follower.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/minotaur_cult_prophet.xml b/data/monster/monsters/minotaur_cult_prophet.xml new file mode 100644 index 0000000000..11770cebba --- /dev/null +++ b/data/monster/monsters/minotaur_cult_prophet.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/minotaur_cult_zealot.xml b/data/monster/monsters/minotaur_cult_zealot.xml new file mode 100644 index 0000000000..48700848b2 --- /dev/null +++ b/data/monster/monsters/minotaur_cult_zealot.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/minotaur_idol.xml b/data/monster/monsters/minotaur_idol.xml new file mode 100644 index 0000000000..bbd76c8f14 --- /dev/null +++ b/data/monster/monsters/minotaur_idol.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/misguided_bully.xml b/data/monster/monsters/misguided_bully.xml new file mode 100644 index 0000000000..458deef26f --- /dev/null +++ b/data/monster/monsters/misguided_bully.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/misguided_shadow.xml b/data/monster/monsters/misguided_shadow.xml new file mode 100644 index 0000000000..ec7549d80b --- /dev/null +++ b/data/monster/monsters/misguided_shadow.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/misguided_thief.xml b/data/monster/monsters/misguided_thief.xml new file mode 100644 index 0000000000..681a28e2e7 --- /dev/null +++ b/data/monster/monsters/misguided_thief.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/museum_stone_golem.xml b/data/monster/monsters/museum_stone_golem.xml new file mode 100644 index 0000000000..88533f5bf3 --- /dev/null +++ b/data/monster/monsters/museum_stone_golem.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/museum_stone_rhino.xml b/data/monster/monsters/museum_stone_rhino.xml new file mode 100644 index 0000000000..5710dea5e0 --- /dev/null +++ b/data/monster/monsters/museum_stone_rhino.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/nymph.xml b/data/monster/monsters/nymph.xml new file mode 100644 index 0000000000..43a7d46e00 --- /dev/null +++ b/data/monster/monsters/nymph.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/orc_cult_fanatic.xml b/data/monster/monsters/orc_cult_fanatic.xml new file mode 100644 index 0000000000..3733832a47 --- /dev/null +++ b/data/monster/monsters/orc_cult_fanatic.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/orc_cult_minion.xml b/data/monster/monsters/orc_cult_minion.xml new file mode 100644 index 0000000000..5796b1fc0c --- /dev/null +++ b/data/monster/monsters/orc_cult_minion.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/orc_cult_priest.xml b/data/monster/monsters/orc_cult_priest.xml new file mode 100644 index 0000000000..eff085ee58 --- /dev/null +++ b/data/monster/monsters/orc_cult_priest.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/orc_cultist.xml b/data/monster/monsters/orc_cultist.xml new file mode 100644 index 0000000000..2550971355 --- /dev/null +++ b/data/monster/monsters/orc_cultist.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/pillar_of_death.xml b/data/monster/monsters/pillar_of_death.xml new file mode 100644 index 0000000000..fea8d291af --- /dev/null +++ b/data/monster/monsters/pillar_of_death.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/pillar_of_draining.xml b/data/monster/monsters/pillar_of_draining.xml new file mode 100644 index 0000000000..91861432cc --- /dev/null +++ b/data/monster/monsters/pillar_of_draining.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/pillar_of_healing.xml b/data/monster/monsters/pillar_of_healing.xml new file mode 100644 index 0000000000..fdec55b62d --- /dev/null +++ b/data/monster/monsters/pillar_of_healing.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/pillar_of_protection.xml b/data/monster/monsters/pillar_of_protection.xml new file mode 100644 index 0000000000..518a6912d9 --- /dev/null +++ b/data/monster/monsters/pillar_of_protection.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/pillar_of_summoning.xml b/data/monster/monsters/pillar_of_summoning.xml new file mode 100644 index 0000000000..d65aa54e4b --- /dev/null +++ b/data/monster/monsters/pillar_of_summoning.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/pixie.xml b/data/monster/monsters/pixie.xml new file mode 100644 index 0000000000..f26a346aed --- /dev/null +++ b/data/monster/monsters/pixie.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/pooka.xml b/data/monster/monsters/pooka.xml new file mode 100644 index 0000000000..a5bff8e97c --- /dev/null +++ b/data/monster/monsters/pooka.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/putrid_mummy.xml b/data/monster/monsters/putrid_mummy.xml new file mode 100644 index 0000000000..0dbfc3e96c --- /dev/null +++ b/data/monster/monsters/putrid_mummy.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/ravenous_hunger.xml b/data/monster/monsters/ravenous_hunger.xml new file mode 100644 index 0000000000..dbc8e86473 --- /dev/null +++ b/data/monster/monsters/ravenous_hunger.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/sand_brood.xml b/data/monster/monsters/sand_brood.xml new file mode 100644 index 0000000000..44739fca41 --- /dev/null +++ b/data/monster/monsters/sand_brood.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/sand_vortex.xml b/data/monster/monsters/sand_vortex.xml new file mode 100644 index 0000000000..a7573c992e --- /dev/null +++ b/data/monster/monsters/sand_vortex.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/security_golem.xml b/data/monster/monsters/security_golem.xml new file mode 100644 index 0000000000..5bd57c929c --- /dev/null +++ b/data/monster/monsters/security_golem.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/sphere_of_wrath.xml b/data/monster/monsters/sphere_of_wrath.xml new file mode 100644 index 0000000000..f1d22ab46b --- /dev/null +++ b/data/monster/monsters/sphere_of_wrath.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/stolen_soul.xml b/data/monster/monsters/stolen_soul.xml new file mode 100644 index 0000000000..85b12894d5 --- /dev/null +++ b/data/monster/monsters/stolen_soul.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/swan_maiden.xml b/data/monster/monsters/swan_maiden.xml new file mode 100644 index 0000000000..da3b06346d --- /dev/null +++ b/data/monster/monsters/swan_maiden.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_armored_voidborn.xml b/data/monster/monsters/the_armored_voidborn.xml new file mode 100644 index 0000000000..c2ef96d24f --- /dev/null +++ b/data/monster/monsters/the_armored_voidborn.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_corruptor_of_souls.xml b/data/monster/monsters/the_corruptor_of_souls.xml new file mode 100644 index 0000000000..97e7d37bef --- /dev/null +++ b/data/monster/monsters/the_corruptor_of_souls.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_false_god.xml b/data/monster/monsters/the_false_god.xml new file mode 100644 index 0000000000..8f45cb6dba --- /dev/null +++ b/data/monster/monsters/the_false_god.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_remorseless_corruptor.xml b/data/monster/monsters/the_remorseless_corruptor.xml new file mode 100644 index 0000000000..78db06a420 --- /dev/null +++ b/data/monster/monsters/the_remorseless_corruptor.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_sandking.xml b/data/monster/monsters/the_sandking.xml new file mode 100644 index 0000000000..78bfbb488f --- /dev/null +++ b/data/monster/monsters/the_sandking.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_sinister_hermit_blue.xml b/data/monster/monsters/the_sinister_hermit_blue.xml new file mode 100644 index 0000000000..9526878f59 --- /dev/null +++ b/data/monster/monsters/the_sinister_hermit_blue.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_sinister_hermit_yellow.xml b/data/monster/monsters/the_sinister_hermit_yellow.xml new file mode 100644 index 0000000000..8edc0c15b9 --- /dev/null +++ b/data/monster/monsters/the_sinister_hermit_yellow.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_souldespoiler.xml b/data/monster/monsters/the_souldespoiler.xml new file mode 100644 index 0000000000..d88d655fd1 --- /dev/null +++ b/data/monster/monsters/the_souldespoiler.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_source_of_corruption.xml b/data/monster/monsters/the_source_of_corruption.xml new file mode 100644 index 0000000000..2d95ef6aba --- /dev/null +++ b/data/monster/monsters/the_source_of_corruption.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/the_unarmored_voidborn.xml b/data/monster/monsters/the_unarmored_voidborn.xml new file mode 100644 index 0000000000..f9bc7f9aff --- /dev/null +++ b/data/monster/monsters/the_unarmored_voidborn.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/twisted_pooka.xml b/data/monster/monsters/twisted_pooka.xml new file mode 100644 index 0000000000..24d66ea91f --- /dev/null +++ b/data/monster/monsters/twisted_pooka.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/vermin_swarm.xml b/data/monster/monsters/vermin_swarm.xml new file mode 100644 index 0000000000..3355ca3af1 --- /dev/null +++ b/data/monster/monsters/vermin_swarm.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/voidshard.xml b/data/monster/monsters/voidshard.xml new file mode 100644 index 0000000000..68aa6cd692 --- /dev/null +++ b/data/monster/monsters/voidshard.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/weakened_frazzlemaw.xml b/data/monster/monsters/weakened_frazzlemaw.xml new file mode 100644 index 0000000000..fd97ee8776 --- /dev/null +++ b/data/monster/monsters/weakened_frazzlemaw.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/monster/monsters/zarcorix_of_yalahar.xml b/data/monster/monsters/zarcorix_of_yalahar.xml new file mode 100644 index 0000000000..e20786394b --- /dev/null +++ b/data/monster/monsters/zarcorix_of_yalahar.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/spells/scripts/monster/freed_soul_spell.lua b/data/spells/scripts/monster/freed_soul_spell.lua new file mode 100644 index 0000000000..62753ba36b --- /dev/null +++ b/data/spells/scripts/monster/freed_soul_spell.lua @@ -0,0 +1,42 @@ +local combat = Combat() +combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE) +combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PURPLEENERGY) + +combat:setArea( + createCombatArea( + { + {0, 0, 1, 1, 1, 0, 0}, + {0, 1, 1, 1, 1, 1, 0}, + {1, 1, 1, 1, 1, 1, 1}, + {1, 1, 1, 3, 1, 1, 1}, + {1, 1, 1, 1, 1, 1, 1}, + {0, 1, 1, 1, 1, 1, 0}, + {0, 0, 1, 1, 1, 0, 0} + } + ) +) + +function spellCallback(param) + local tile = Tile(Position(param.pos)) + if tile then + if tile:getTopCreature() and tile:getTopCreature():isMonster() then + if tile:getTopCreature():getName():lower() == "the souldespoiler" then + tile:getTopCreature():addHealth(-math.random(500, 2000)) + end + end + end +end + +function onTargetTile(cid, pos) + local param = {} + param.cid = cid + param.pos = pos + param.count = 0 + spellCallback(param) +end + +setCombatCallback(combat, CALLBACK_PARAM_TARGETTILE, "onTargetTile") + +function onCastSpell(creature, var) + return combat:execute(creature, var) +end diff --git a/data/spells/scripts/monster/heal_monsters.lua b/data/spells/scripts/monster/heal_monsters.lua new file mode 100644 index 0000000000..c99251acbe --- /dev/null +++ b/data/spells/scripts/monster/heal_monsters.lua @@ -0,0 +1,28 @@ +function onTargetCreature(creature, target) + local player = creature:getPlayer() + local min = 100 + local max = 300 + local master = target:getMaster() + + if target:isPlayer() then + return true + end + + if master then + return true + end + + doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE) + return true +end + +local combat = Combat() +combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_MAGIC_BLUE) +combat:setParameter(COMBAT_PARAM_AGGRESSIVE, 0) +combat:setParameter(COMBAT_PARAM_DISPEL, CONDITION_PARALYZE) +combat:setArea(createCombatArea(AREA_CIRCLE3X3)) +combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature") + +function onCastSpell(creature, var) + return combat:execute(creature, var) +end diff --git a/data/spells/scripts/monster/heal_monsters_9x9.lua b/data/spells/scripts/monster/heal_monsters_9x9.lua new file mode 100644 index 0000000000..e7ae35c793 --- /dev/null +++ b/data/spells/scripts/monster/heal_monsters_9x9.lua @@ -0,0 +1,28 @@ +function onTargetCreature(creature, target) + local player = creature:getPlayer() + local min = 0 + local max = 1000 + local master = target:getMaster() + + if target:isPlayer() then + return true + end + + if master then + return true + end + + doTargetCombatHealth(0, target, COMBAT_HEALING, min, max, CONST_ME_NONE) + return true +end + +local combat = Combat() +combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_MAGIC_BLUE) +combat:setParameter(COMBAT_PARAM_AGGRESSIVE, 0) +combat:setParameter(COMBAT_PARAM_DISPEL, CONDITION_PARALYZE) +combat:setArea(createCombatArea(AREA_CIRCLE6X6)) +combat:setCallback(CALLBACK_PARAM_TARGETCREATURE, "onTargetCreature") + +function onCastSpell(creature, var) + return combat:execute(creature, var) +end diff --git a/data/spells/scripts/monster/pixie_skill_reducer.lua b/data/spells/scripts/monster/pixie_skill_reducer.lua new file mode 100644 index 0000000000..fa9cfd5644 --- /dev/null +++ b/data/spells/scripts/monster/pixie_skill_reducer.lua @@ -0,0 +1,17 @@ +local combat = Combat() +combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PIXIE_EXPLOSION) + +local condition = Condition(CONDITION_ATTRIBUTES) +condition:setParameter(CONDITION_PARAM_TICKS, 6000) +condition:setParameter(CONDITION_PARAM_SKILL_DISTANCEPERCENT, 30) +condition:setParameter(CONDITION_PARAM_SKILL_SHIELDPERCENT, 30) +condition:setParameter(CONDITION_PARAM_SKILL_MELEEPERCENT, 30) + +local area = createCombatArea(AREA_CIRCLE2X2) + +combat:setArea(area) +combat:addCondition(condition) + +function onCastSpell(creature, var) + return combat:execute(creature, var) +end diff --git a/data/spells/scripts/monster/remorseless_wave.lua b/data/spells/scripts/monster/remorseless_wave.lua new file mode 100644 index 0000000000..4224ac8f01 --- /dev/null +++ b/data/spells/scripts/monster/remorseless_wave.lua @@ -0,0 +1,44 @@ +local combat = Combat() +combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_DEATHDAMAGE) +combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_BLACKSMOKE) + +combat:setArea(createCombatArea({ + {0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0}, + {0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0}, + {0, 0, 0, 1, 1, 1, 1, 1, 0, 0, 0}, + {0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0}, + {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0}, + {1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1}, + {0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0}, + {0, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0}, + {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, 0, 1, 0, 0, 0, 0, 0} +})) + +function spellCallback(param) + local tile = Tile(Position(param.pos)) + if tile then + if tile:getTopCreature() and tile:getTopCreature():isPlayer() then + tile:getTopCreature():addHealth( - math.random(0, 600)) + elseif tile:getTopCreature() and tile:getTopCreature():isMonster() then + if tile:getTopCreature():getName():lower() == "stolen soul" then + tile:getTopCreature():addHealth( - math.random(700, 1500)) + end + end + end +end + +function onTargetTile(cid, pos) + local param = {} + param.cid = cid + param.pos = pos + param.count = 0 + spellCallback(param) +end + +setCombatCallback(combat, CALLBACK_PARAM_TARGETTILE, "onTargetTile") + +function onCastSpell(creature, var) + return combat:execute(creature, var) +end diff --git a/data/spells/scripts/monster/source_of_corruption_wave.lua b/data/spells/scripts/monster/source_of_corruption_wave.lua new file mode 100644 index 0000000000..1568ac1e62 --- /dev/null +++ b/data/spells/scripts/monster/source_of_corruption_wave.lua @@ -0,0 +1,36 @@ +local combat = Combat() +combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE) +combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PURPLEENERGY) + +combat:setArea(createCombatArea({ + {0, 0, 0, 0, 0}, + {0, 1, 3, 1, 0}, + {0, 0, 0, 0, 0} +})) + +function spellCallback(param) + local tile = Tile(Position(param.pos)) + if tile then + if tile:getTopCreature() and tile:getTopCreature():isPlayer() then + tile:getTopCreature():addHealth( - math.random(0, 600)) + elseif tile:getTopCreature() and tile:getTopCreature():isMonster() then + if tile:getTopCreature():getName():lower() == "stolen soul" then + tile:getTopCreature():addHealth( - math.random(700, 1500)) + end + end + end +end + +function onTargetTile(cid, pos) + local param = {} + param.cid = cid + param.pos = pos + param.count = 0 + spellCallback(param) +end + +setCombatCallback(combat, CALLBACK_PARAM_TARGETTILE, "onTargetTile") + +function onCastSpell(creature, var) + return combat:execute(creature, var) +end diff --git a/data/spells/spells.xml b/data/spells/spells.xml index f941733622..6f3ccaf5a5 100644 --- a/data/spells/spells.xml +++ b/data/spells/spells.xml @@ -836,4 +836,10 @@ + + + + + + From 5297cd1ecfaaf0b9a34a69eb7d4891334e223352 Mon Sep 17 00:00:00 2001 From: Marco Oliveira Date: Thu, 5 Jan 2023 16:32:16 -0300 Subject: [PATCH 2/3] Resolve conversations --- data/monster/monsters/animated_moohtant.xml | 2 +- data/monster/monsters/animated_ogre_brute.xml | 4 +-- .../monster/monsters/animated_ogre_savage.xml | 2 +- .../monster/monsters/animated_ogre_shaman.xml | 3 +-- data/monster/monsters/boogy.xml | 2 +- data/monster/monsters/containment_crystal.xml | 2 +- data/monster/monsters/cult_believer.xml | 1 - data/monster/monsters/cult_enforcer.xml | 1 - data/monster/monsters/dark_faun.xml | 2 +- data/monster/monsters/diamond_servant.xml | 1 - data/monster/monsters/dread_minion.xml | 2 +- data/monster/monsters/dworc_voodoomaster.xml | 16 ++++++------ data/monster/monsters/enfeebled_silencer.xml | 2 +- data/monster/monsters/faun.xml | 2 +- data/monster/monsters/feverish_citizen.xml | 2 +- data/monster/monsters/glooth_battery.xml | 2 +- data/monster/monsters/kroazur.xml | 4 +-- .../monsters/minotaur_cult_follower.xml | 2 +- data/monster/monsters/misguided_bully.xml | 3 +-- data/monster/monsters/misguided_shadow.xml | 2 +- data/monster/monsters/misguided_thief.xml | 3 +-- data/monster/monsters/mutated_bat.xml | 2 +- data/monster/monsters/mutated_human.xml | 2 +- data/monster/monsters/nomad.xml | 2 +- data/monster/monsters/oodok_witchmaster.xml | 16 ++++++------ data/monster/monsters/pillar_of_healing.xml | 2 +- data/monster/monsters/sphere_of_wrath.xml | 1 - data/monster/monsters/swan_maiden.xml | 2 +- data/monster/monsters/the_false_god.xml | 2 +- .../monster/monsters/the_last_lore_keeper.xml | 8 +++--- data/monster/monsters/the_pale_count.xml | 2 +- data/monster/monsters/the_sandking.xml | 2 +- .../monsters/the_source_of_corruption.xml | 2 +- .../monsters/the_unarmored_voidborn.xml | 2 +- data/monster/monsters/werewolf.xml | 2 +- .../scripts/monster/freed_soul_spell.lua | 26 ++++++++----------- data/spells/scripts/monster/heal_monsters.lua | 4 +-- .../scripts/monster/heal_monsters_9x9.lua | 4 +-- .../scripts/monster/pixie_skill_reducer.lua | 4 +-- .../scripts/monster/remorseless_wave.lua | 6 ++--- data/spells/scripts/monster/root_branchy.lua | 4 +-- .../monster/source_of_corruption_wave.lua | 6 ++--- 42 files changed, 75 insertions(+), 86 deletions(-) diff --git a/data/monster/monsters/animated_moohtant.xml b/data/monster/monsters/animated_moohtant.xml index adc1179d8b..025912e2cd 100644 --- a/data/monster/monsters/animated_moohtant.xml +++ b/data/monster/monsters/animated_moohtant.xml @@ -14,7 +14,7 @@ - + diff --git a/data/monster/monsters/animated_ogre_brute.xml b/data/monster/monsters/animated_ogre_brute.xml index aa54aac6ab..3ff9d08e81 100644 --- a/data/monster/monsters/animated_ogre_brute.xml +++ b/data/monster/monsters/animated_ogre_brute.xml @@ -14,13 +14,13 @@ - + - + diff --git a/data/monster/monsters/animated_ogre_savage.xml b/data/monster/monsters/animated_ogre_savage.xml index f5bc8ab43b..7d92fbf9e4 100644 --- a/data/monster/monsters/animated_ogre_savage.xml +++ b/data/monster/monsters/animated_ogre_savage.xml @@ -14,7 +14,7 @@ - + diff --git a/data/monster/monsters/animated_ogre_shaman.xml b/data/monster/monsters/animated_ogre_shaman.xml index 8239af09c6..7c9d587357 100644 --- a/data/monster/monsters/animated_ogre_shaman.xml +++ b/data/monster/monsters/animated_ogre_shaman.xml @@ -14,12 +14,11 @@ - - + diff --git a/data/monster/monsters/boogy.xml b/data/monster/monsters/boogy.xml index 97f9ece1b5..97155fc254 100644 --- a/data/monster/monsters/boogy.xml +++ b/data/monster/monsters/boogy.xml @@ -15,7 +15,7 @@ - + diff --git a/data/monster/monsters/containment_crystal.xml b/data/monster/monsters/containment_crystal.xml index fdc665a2d7..195a0ea505 100644 --- a/data/monster/monsters/containment_crystal.xml +++ b/data/monster/monsters/containment_crystal.xml @@ -20,7 +20,7 @@ - + diff --git a/data/monster/monsters/cult_believer.xml b/data/monster/monsters/cult_believer.xml index 71a883a3ab..6fcd58df57 100644 --- a/data/monster/monsters/cult_believer.xml +++ b/data/monster/monsters/cult_believer.xml @@ -24,7 +24,6 @@ - diff --git a/data/monster/monsters/cult_enforcer.xml b/data/monster/monsters/cult_enforcer.xml index 62c8349afa..5a622a8c2f 100644 --- a/data/monster/monsters/cult_enforcer.xml +++ b/data/monster/monsters/cult_enforcer.xml @@ -20,7 +20,6 @@ - diff --git a/data/monster/monsters/dark_faun.xml b/data/monster/monsters/dark_faun.xml index 48070fcc19..e90e7343ad 100644 --- a/data/monster/monsters/dark_faun.xml +++ b/data/monster/monsters/dark_faun.xml @@ -66,7 +66,7 @@ - + diff --git a/data/monster/monsters/diamond_servant.xml b/data/monster/monsters/diamond_servant.xml index 391a9bf227..6672a9ca55 100644 --- a/data/monster/monsters/diamond_servant.xml +++ b/data/monster/monsters/diamond_servant.xml @@ -36,7 +36,6 @@ - diff --git a/data/monster/monsters/dread_minion.xml b/data/monster/monsters/dread_minion.xml index c766dd616d..7d83287c76 100644 --- a/data/monster/monsters/dread_minion.xml +++ b/data/monster/monsters/dread_minion.xml @@ -14,7 +14,7 @@ - + diff --git a/data/monster/monsters/dworc_voodoomaster.xml b/data/monster/monsters/dworc_voodoomaster.xml index 60634de5fa..7133791c0e 100644 --- a/data/monster/monsters/dworc_voodoomaster.xml +++ b/data/monster/monsters/dworc_voodoomaster.xml @@ -21,20 +21,20 @@ - + - + - + - + - + @@ -42,13 +42,13 @@ - + - + - + diff --git a/data/monster/monsters/enfeebled_silencer.xml b/data/monster/monsters/enfeebled_silencer.xml index b55f5bc4f2..2e59aea1db 100644 --- a/data/monster/monsters/enfeebled_silencer.xml +++ b/data/monster/monsters/enfeebled_silencer.xml @@ -14,7 +14,7 @@ - + diff --git a/data/monster/monsters/faun.xml b/data/monster/monsters/faun.xml index 84a8ac0bda..baec0abe1f 100644 --- a/data/monster/monsters/faun.xml +++ b/data/monster/monsters/faun.xml @@ -66,7 +66,7 @@ - + diff --git a/data/monster/monsters/feverish_citizen.xml b/data/monster/monsters/feverish_citizen.xml index bbb6ed520c..109016e664 100644 --- a/data/monster/monsters/feverish_citizen.xml +++ b/data/monster/monsters/feverish_citizen.xml @@ -27,7 +27,7 @@ - + diff --git a/data/monster/monsters/glooth_battery.xml b/data/monster/monsters/glooth_battery.xml index fe22797dfb..91e294ec74 100644 --- a/data/monster/monsters/glooth_battery.xml +++ b/data/monster/monsters/glooth_battery.xml @@ -16,7 +16,7 @@ - + diff --git a/data/monster/monsters/kroazur.xml b/data/monster/monsters/kroazur.xml index 131183814c..ccdd05ea41 100644 --- a/data/monster/monsters/kroazur.xml +++ b/data/monster/monsters/kroazur.xml @@ -15,8 +15,8 @@ - - + + diff --git a/data/monster/monsters/minotaur_cult_follower.xml b/data/monster/monsters/minotaur_cult_follower.xml index d8028cff79..8955942e39 100644 --- a/data/monster/monsters/minotaur_cult_follower.xml +++ b/data/monster/monsters/minotaur_cult_follower.xml @@ -20,7 +20,7 @@ - + diff --git a/data/monster/monsters/misguided_bully.xml b/data/monster/monsters/misguided_bully.xml index 458deef26f..107c3c8ade 100644 --- a/data/monster/monsters/misguided_bully.xml +++ b/data/monster/monsters/misguided_bully.xml @@ -1,7 +1,7 @@ - + @@ -32,7 +32,6 @@ - diff --git a/data/monster/monsters/misguided_shadow.xml b/data/monster/monsters/misguided_shadow.xml index ec7549d80b..65f1438c6a 100644 --- a/data/monster/monsters/misguided_shadow.xml +++ b/data/monster/monsters/misguided_shadow.xml @@ -1,7 +1,7 @@ - + diff --git a/data/monster/monsters/misguided_thief.xml b/data/monster/monsters/misguided_thief.xml index 681a28e2e7..8d8d5743e6 100644 --- a/data/monster/monsters/misguided_thief.xml +++ b/data/monster/monsters/misguided_thief.xml @@ -1,7 +1,7 @@ - + @@ -35,7 +35,6 @@ - diff --git a/data/monster/monsters/mutated_bat.xml b/data/monster/monsters/mutated_bat.xml index e46e90ff25..6313062672 100644 --- a/data/monster/monsters/mutated_bat.xml +++ b/data/monster/monsters/mutated_bat.xml @@ -28,7 +28,7 @@ - + diff --git a/data/monster/monsters/mutated_human.xml b/data/monster/monsters/mutated_human.xml index 176f35a386..af49007c4e 100644 --- a/data/monster/monsters/mutated_human.xml +++ b/data/monster/monsters/mutated_human.xml @@ -23,7 +23,7 @@ - + diff --git a/data/monster/monsters/nomad.xml b/data/monster/monsters/nomad.xml index 93effbfe78..e97e6be30f 100644 --- a/data/monster/monsters/nomad.xml +++ b/data/monster/monsters/nomad.xml @@ -22,7 +22,7 @@ - + diff --git a/data/monster/monsters/oodok_witchmaster.xml b/data/monster/monsters/oodok_witchmaster.xml index 05699636d9..aab2e33391 100644 --- a/data/monster/monsters/oodok_witchmaster.xml +++ b/data/monster/monsters/oodok_witchmaster.xml @@ -23,20 +23,20 @@ - + - + - + - + - + @@ -44,13 +44,13 @@ - + - + - + diff --git a/data/monster/monsters/pillar_of_healing.xml b/data/monster/monsters/pillar_of_healing.xml index fdec55b62d..98ae6ea2cb 100644 --- a/data/monster/monsters/pillar_of_healing.xml +++ b/data/monster/monsters/pillar_of_healing.xml @@ -15,7 +15,7 @@ - + diff --git a/data/monster/monsters/sphere_of_wrath.xml b/data/monster/monsters/sphere_of_wrath.xml index f1d22ab46b..0d077ffc18 100644 --- a/data/monster/monsters/sphere_of_wrath.xml +++ b/data/monster/monsters/sphere_of_wrath.xml @@ -28,6 +28,5 @@ - diff --git a/data/monster/monsters/swan_maiden.xml b/data/monster/monsters/swan_maiden.xml index da3b06346d..6307bbb857 100644 --- a/data/monster/monsters/swan_maiden.xml +++ b/data/monster/monsters/swan_maiden.xml @@ -1,7 +1,7 @@ - + diff --git a/data/monster/monsters/the_false_god.xml b/data/monster/monsters/the_false_god.xml index 8f45cb6dba..34f4bdb7a6 100644 --- a/data/monster/monsters/the_false_god.xml +++ b/data/monster/monsters/the_false_god.xml @@ -43,7 +43,7 @@ - + diff --git a/data/monster/monsters/the_last_lore_keeper.xml b/data/monster/monsters/the_last_lore_keeper.xml index 930ba0a1ec..d981fcff71 100644 --- a/data/monster/monsters/the_last_lore_keeper.xml +++ b/data/monster/monsters/the_last_lore_keeper.xml @@ -26,16 +26,16 @@ - + - + - + - + diff --git a/data/monster/monsters/the_pale_count.xml b/data/monster/monsters/the_pale_count.xml index 6bad84b74a..a4f7c0d6d0 100644 --- a/data/monster/monsters/the_pale_count.xml +++ b/data/monster/monsters/the_pale_count.xml @@ -27,7 +27,7 @@ - + diff --git a/data/monster/monsters/the_sandking.xml b/data/monster/monsters/the_sandking.xml index 78bfbb488f..f1d0410fc8 100644 --- a/data/monster/monsters/the_sandking.xml +++ b/data/monster/monsters/the_sandking.xml @@ -31,7 +31,7 @@ - + diff --git a/data/monster/monsters/the_source_of_corruption.xml b/data/monster/monsters/the_source_of_corruption.xml index 2d95ef6aba..88a7389730 100644 --- a/data/monster/monsters/the_source_of_corruption.xml +++ b/data/monster/monsters/the_source_of_corruption.xml @@ -27,7 +27,7 @@ - + diff --git a/data/monster/monsters/the_unarmored_voidborn.xml b/data/monster/monsters/the_unarmored_voidborn.xml index f9bc7f9aff..a232c58221 100644 --- a/data/monster/monsters/the_unarmored_voidborn.xml +++ b/data/monster/monsters/the_unarmored_voidborn.xml @@ -1,7 +1,7 @@ - + diff --git a/data/monster/monsters/werewolf.xml b/data/monster/monsters/werewolf.xml index bd3871aa69..bb3c892eaf 100644 --- a/data/monster/monsters/werewolf.xml +++ b/data/monster/monsters/werewolf.xml @@ -20,7 +20,7 @@ - + diff --git a/data/spells/scripts/monster/freed_soul_spell.lua b/data/spells/scripts/monster/freed_soul_spell.lua index 62753ba36b..f26d7e1c99 100644 --- a/data/spells/scripts/monster/freed_soul_spell.lua +++ b/data/spells/scripts/monster/freed_soul_spell.lua @@ -2,19 +2,15 @@ local combat = Combat() combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE) combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_PURPLEENERGY) -combat:setArea( - createCombatArea( - { - {0, 0, 1, 1, 1, 0, 0}, - {0, 1, 1, 1, 1, 1, 0}, - {1, 1, 1, 1, 1, 1, 1}, - {1, 1, 1, 3, 1, 1, 1}, - {1, 1, 1, 1, 1, 1, 1}, - {0, 1, 1, 1, 1, 1, 0}, - {0, 0, 1, 1, 1, 0, 0} - } - ) -) +combat:setArea(createCombatArea({ + {0, 0, 1, 1, 1, 0, 0}, + {0, 1, 1, 1, 1, 1, 0}, + {1, 1, 1, 1, 1, 1, 1}, + {1, 1, 1, 3, 1, 1, 1}, + {1, 1, 1, 1, 1, 1, 1}, + {0, 1, 1, 1, 1, 1, 0}, + {0, 0, 1, 1, 1, 0, 0} +})) function spellCallback(param) local tile = Tile(Position(param.pos)) @@ -37,6 +33,6 @@ end setCombatCallback(combat, CALLBACK_PARAM_TARGETTILE, "onTargetTile") -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/heal_monsters.lua b/data/spells/scripts/monster/heal_monsters.lua index c99251acbe..d907111a3a 100644 --- a/data/spells/scripts/monster/heal_monsters.lua +++ b/data/spells/scripts/monster/heal_monsters.lua @@ -23,6 +23,6 @@ combat:setParameter(COMBAT_PARAM_DISPEL, CONDITION_PARALYZE) combat:setArea(createCombatArea(AREA_CIRCLE3X3)) 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/heal_monsters_9x9.lua b/data/spells/scripts/monster/heal_monsters_9x9.lua index e7ae35c793..fe1b310711 100644 --- a/data/spells/scripts/monster/heal_monsters_9x9.lua +++ b/data/spells/scripts/monster/heal_monsters_9x9.lua @@ -23,6 +23,6 @@ combat:setParameter(COMBAT_PARAM_DISPEL, CONDITION_PARALYZE) combat:setArea(createCombatArea(AREA_CIRCLE6X6)) 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/pixie_skill_reducer.lua b/data/spells/scripts/monster/pixie_skill_reducer.lua index fa9cfd5644..8e548aff8b 100644 --- a/data/spells/scripts/monster/pixie_skill_reducer.lua +++ b/data/spells/scripts/monster/pixie_skill_reducer.lua @@ -12,6 +12,6 @@ local area = createCombatArea(AREA_CIRCLE2X2) combat:setArea(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/remorseless_wave.lua b/data/spells/scripts/monster/remorseless_wave.lua index 4224ac8f01..c139687e58 100644 --- a/data/spells/scripts/monster/remorseless_wave.lua +++ b/data/spells/scripts/monster/remorseless_wave.lua @@ -20,7 +20,7 @@ function spellCallback(param) local tile = Tile(Position(param.pos)) if tile then if tile:getTopCreature() and tile:getTopCreature():isPlayer() then - tile:getTopCreature():addHealth( - math.random(0, 600)) + tile:getTopCreature():addHealth(-math.random(0, 600)) elseif tile:getTopCreature() and tile:getTopCreature():isMonster() then if tile:getTopCreature():getName():lower() == "stolen soul" then tile:getTopCreature():addHealth( - math.random(700, 1500)) @@ -39,6 +39,6 @@ end setCombatCallback(combat, CALLBACK_PARAM_TARGETTILE, "onTargetTile") -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/source_of_corruption_wave.lua b/data/spells/scripts/monster/source_of_corruption_wave.lua index 1568ac1e62..089201b495 100644 --- a/data/spells/scripts/monster/source_of_corruption_wave.lua +++ b/data/spells/scripts/monster/source_of_corruption_wave.lua @@ -12,7 +12,7 @@ function spellCallback(param) local tile = Tile(Position(param.pos)) if tile then if tile:getTopCreature() and tile:getTopCreature():isPlayer() then - tile:getTopCreature():addHealth( - math.random(0, 600)) + tile:getTopCreature():addHealth(-math.random(0, 600)) elseif tile:getTopCreature() and tile:getTopCreature():isMonster() then if tile:getTopCreature():getName():lower() == "stolen soul" then tile:getTopCreature():addHealth( - math.random(700, 1500)) @@ -31,6 +31,6 @@ end setCombatCallback(combat, CALLBACK_PARAM_TARGETTILE, "onTargetTile") -function onCastSpell(creature, var) - return combat:execute(creature, var) +function onCastSpell(creature, variant) + return combat:execute(creature, variant) end From 11c4db659d0776fe008401a4aaa956350c031562 Mon Sep 17 00:00:00 2001 From: Marco Oliveira Date: Thu, 5 Jan 2023 19:40:28 -0300 Subject: [PATCH 3/3] Resolve conversations --- data/monster/monsters/dread_minion.xml | 2 +- data/monster/monsters/enfeebled_silencer.xml | 2 +- data/spells/scripts/monster/remorseless_wave.lua | 2 +- data/spells/scripts/monster/source_of_corruption_wave.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/monster/monsters/dread_minion.xml b/data/monster/monsters/dread_minion.xml index 7d83287c76..1889f17493 100644 --- a/data/monster/monsters/dread_minion.xml +++ b/data/monster/monsters/dread_minion.xml @@ -14,7 +14,7 @@ - + diff --git a/data/monster/monsters/enfeebled_silencer.xml b/data/monster/monsters/enfeebled_silencer.xml index 2e59aea1db..dede2c616e 100644 --- a/data/monster/monsters/enfeebled_silencer.xml +++ b/data/monster/monsters/enfeebled_silencer.xml @@ -14,7 +14,7 @@ - + diff --git a/data/spells/scripts/monster/remorseless_wave.lua b/data/spells/scripts/monster/remorseless_wave.lua index c139687e58..c6939e3270 100644 --- a/data/spells/scripts/monster/remorseless_wave.lua +++ b/data/spells/scripts/monster/remorseless_wave.lua @@ -23,7 +23,7 @@ function spellCallback(param) tile:getTopCreature():addHealth(-math.random(0, 600)) elseif tile:getTopCreature() and tile:getTopCreature():isMonster() then if tile:getTopCreature():getName():lower() == "stolen soul" then - tile:getTopCreature():addHealth( - math.random(700, 1500)) + tile:getTopCreature():addHealth(-math.random(700, 1500)) end end end diff --git a/data/spells/scripts/monster/source_of_corruption_wave.lua b/data/spells/scripts/monster/source_of_corruption_wave.lua index 089201b495..009e65e118 100644 --- a/data/spells/scripts/monster/source_of_corruption_wave.lua +++ b/data/spells/scripts/monster/source_of_corruption_wave.lua @@ -15,7 +15,7 @@ function spellCallback(param) tile:getTopCreature():addHealth(-math.random(0, 600)) elseif tile:getTopCreature() and tile:getTopCreature():isMonster() then if tile:getTopCreature():getName():lower() == "stolen soul" then - tile:getTopCreature():addHealth( - math.random(700, 1500)) + tile:getTopCreature():addHealth(-math.random(700, 1500)) end end end