Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add monsters and bosses from 11.02 update #4112

Merged
39 commits merged into from
May 10, 2022
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
0e86227
Adding monsters bases
omarcopires May 1, 2022
1bc3845
Following TFS code style (#5)
torresmon May 2, 2022
690e9e9
Partial monster fixes
omarcopires May 2, 2022
73318bb
Partial monster fixes
omarcopires May 2, 2022
0f58f19
Partial monster fixes
omarcopires May 2, 2022
b87cc8a
Name fixes and name descriptions
omarcopires May 2, 2022
66d8584
Partial monster fixes
omarcopires May 2, 2022
0403932
Partial monster fixes
omarcopires May 2, 2022
35e9e54
Partial monster fixes
omarcopires May 2, 2022
c5d8ced
File name corrections
omarcopires May 2, 2022
0582c34
Partial corpses and looktype fixes
omarcopires May 2, 2022
3cba4b3
Partial corpses and looktype fixes
omarcopires May 3, 2022
a448dbe
Remove healthhidden
omarcopires May 3, 2022
ec33318
Partial corrections
omarcopires May 3, 2022
76c9861
Immunity and element adjustments (#6)
torresmon May 3, 2022
36d1e97
Fixing Target Change Chance (#7)
torresmon May 3, 2022
1cfedec
Reverting changes that are not part of the update
omarcopires May 3, 2022
e35d630
Missing it
omarcopires May 3, 2022
6314da2
Initial additions of missing spells
omarcopires May 3, 2022
23cfff3
Resolve conversations
omarcopires May 3, 2022
caafd82
Merge branch 'master' into 1102-monsters
omarcopires May 3, 2022
c3142f6
Fix: White shade paralyze
omarcopires May 3, 2022
6218013
Fix: Spells and elements
torresmon May 4, 2022
b00ece9
Partial corrections
omarcopires May 4, 2022
06209d4
Add missing spells
omarcopires May 4, 2022
8ef058e
Spells Fixes (#10)
torresmon May 5, 2022
c73d145
Resolve conversations (#11)
torresmon May 6, 2022
589eb80
Change requests (#13)
torresmon May 7, 2022
7ffe4e6
Change lloyd loot to lowcase
omarcopires May 7, 2022
919235b
Resolve conversations
omarcopires May 7, 2022
9afa5ea
Fix: Pinata Dragon
omarcopires May 7, 2022
a8209ad
Fix: console logs
omarcopires May 7, 2022
b6ef21d
Resolve conversations
omarcopires May 10, 2022
0bffed0
Revert: root_branchy chages
omarcopires May 10, 2022
c2a8a0b
Fix: Pinata Dragon
omarcopires May 10, 2022
33c7ba0
Update data/monster/monsters/the_last_lore_keeper.xml
May 10, 2022
55519df
Update data/monster/monsters/the_last_lore_keeper.xml
May 10, 2022
dccb95c
Resolve conversations
omarcopires May 10, 2022
c8b4a4b
Fix: The Last Lore Keeper
omarcopires May 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolve conversations
  • Loading branch information
omarcopires committed May 10, 2022
commit b6ef21d0beaa6db971e18273103fadf1a375d325
8 changes: 5 additions & 3 deletions data/monster/monsters/diamond_servant_replica.xml
Original file line number Diff line number Diff line change
@@ -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" />
8 changes: 6 additions & 2 deletions data/monster/monsters/dragon_wrath.xml
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion data/monster/monsters/dragonking_zyrtarch.xml
Original file line number Diff line number Diff line change
@@ -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" />
2 changes: 1 addition & 1 deletion data/monster/monsters/icicle.xml
Original file line number Diff line number Diff line change
@@ -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" />
4 changes: 2 additions & 2 deletions data/monster/monsters/kalyassa.xml
Original file line number Diff line number Diff line change
@@ -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" />
6 changes: 4 additions & 2 deletions data/monster/monsters/lost_time.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 1 addition & 5 deletions data/monster/monsters/melting_frozen_horror.xml
Original file line number Diff line number Diff line change
@@ -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>
6 changes: 1 addition & 5 deletions data/monster/monsters/solid_frozen_horror.xml
Original file line number Diff line number Diff line change
@@ -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" />
2 changes: 1 addition & 1 deletion data/monster/monsters/thorn_minion.xml
Original file line number Diff line number Diff line change
@@ -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" />
4 changes: 3 additions & 1 deletion data/monster/monsters/time_keeper.xml
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 3 additions & 1 deletion data/monster/monsters/time_waster.xml
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions data/spells/scripts/monster/frozen_minion_beam.lua
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions data/spells/scripts/monster/frozen_minion_heal.lua
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions data/spells/scripts/monster/frozen_minion_wave.lua
Original file line number Diff line number Diff line change
@@ -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
11 changes: 0 additions & 11 deletions data/spells/scripts/monster/ghastly_dragon_paralyze.lua

This file was deleted.

16 changes: 0 additions & 16 deletions data/spells/scripts/monster/ghastly_dragon_wave.lua

This file was deleted.

5 changes: 2 additions & 3 deletions data/spells/scripts/monster/hirintror_freeze.lua
Original file line number Diff line number Diff line change
@@ -22,8 +22,7 @@ local combat = Combat()
combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_ICETORNADO)
combat:addCondition(condition)
omarcopires marked this conversation as resolved.
Show resolved Hide resolved
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
4 changes: 2 additions & 2 deletions data/spells/scripts/monster/hirintror_skill_reducer.lua
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions data/spells/scripts/monster/lloyd_wave_1.lua
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions data/spells/scripts/monster/lloyd_wave_2.lua
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions data/spells/scripts/monster/lloyd_wave_3.lua
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions data/spells/scripts/monster/root_branchy.lua
Original file line number Diff line number Diff line change
@@ -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
15 changes: 0 additions & 15 deletions data/spells/scripts/monster/souleater_wave.lua

This file was deleted.

4 changes: 2 additions & 2 deletions data/spells/scripts/monster/white_shade_paralyze.lua
Original file line number Diff line number Diff line change
@@ -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
omarcopires marked this conversation as resolved.
Show resolved Hide resolved
17 changes: 0 additions & 17 deletions data/spells/scripts/monster/wyrm_wave.lua

This file was deleted.

23 changes: 9 additions & 14 deletions data/spells/spells.xml
Original file line number Diff line number Diff line change
@@ -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>