fix berserker of 7.x formula and lower knight challenge and berserker mana consumption

This commit is contained in:
ErikasKontenis 2021-05-07 22:35:24 +03:00
parent ed8ff38284
commit 02450e8840
2 changed files with 11 additions and 12 deletions

View File

@ -1,21 +1,20 @@
local combat = Combat() local combat = Combat()
combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_PHYSICALDAMAGE) combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_PHYSICALDAMAGE)
combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_HITAREA) combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_HITAREA)
combat:setParameter(COMBAT_PARAM_BLOCKARMOR, true)
combat:setParameter(COMBAT_PARAM_BLOCKSHIELD, false)
combat:setParameter(COMBAT_PARAM_USECHARGES, true)
combat:setArea(createCombatArea(AREA_SQUARE1X1)) combat:setArea(createCombatArea(AREA_SQUARE1X1))
function onGetFormulaValues(player, skill, attack, fightMode) function onGetFormulaValues(player, level, maglevel)
local base = 80 local base = 80
local variation = 20 local variation = 20
local formula = 3 * player:getMagicLevel() + (2 * player:getLevel())
local damage = formula * base / 100 local formula = 4 * level
damage = damage * attack / 25
return -damage - variation, -damage + variation local min = (formula * (base - variation)) / 100
local max = (formula * (base + variation)) / 100
return -min, -max
end end
combat:setCallback(CALLBACK_PARAM_SKILLVALUE, "onGetFormulaValues") combat:setCallback(CALLBACK_PARAM_LEVELMAGICVALUE, "onGetFormulaValues")
function onCastSpell(creature, variant) function onCastSpell(creature, variant)
return combat:execute(creature, variant) return combat:execute(creature, variant)

View File

@ -56,10 +56,10 @@
<!-- Knight Spells --> <!-- Knight Spells -->
<instant name="Challenge" words="exeta res" maglv="4" mana="90" prem="0" aggressive="0" needlearn="0" script="spells/challenge.lua"> <instant name="Challenge" words="exeta res" maglv="4" mana="30" prem="0" aggressive="0" needlearn="0" script="spells/challenge.lua">
<vocation name="Elite Knight" /> <vocation name="Elite Knight" />
</instant> </instant>
<instant name="Berserk" words="exori" maglv="5" manapercent="4" prem="0" needweapon="1" needlearn="0" script="spells/berserk.lua"> <instant name="Berserk" words="exori" maglv="5" mana="150" prem="0" needweapon="1" needlearn="0" script="spells/berserk.lua">
<vocation name="Knight" /> <vocation name="Knight" />
<vocation name="Elite Knight" /> <vocation name="Elite Knight" />
</instant> </instant>