Fix misc. shaman bugs (#210)
fluid healing affecting aura heal crash bug with invigorate puppets Co-authored-by: hppeng <hppeng>
This commit is contained in:
parent
23499b59de
commit
50b981620d
4 changed files with 10 additions and 4 deletions
|
@ -576,7 +576,9 @@ const atree_scaling = new (class extends ComputeNode {
|
|||
merge_stat(ret_effects, name, value);
|
||||
} else if (type === 'prop') {
|
||||
const merge_abil = atree_edit.get(abil);
|
||||
merge_abil.properties[name] += value;
|
||||
if (merge_abil) {
|
||||
merge_abil.properties[name] += value;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (const [abil_id, abil] of atree_merged.entries()) {
|
||||
|
|
|
@ -10816,7 +10816,7 @@ const atrees = {
|
|||
],
|
||||
"output": {
|
||||
"type": "stat",
|
||||
"name": "healPct.Fluid:3.Heal Amount"
|
||||
"name": "healPct:3.Heal Amount"
|
||||
},
|
||||
"scaling": [ 0.3 ]
|
||||
}
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -603,8 +603,9 @@ class SpellDamageCalcNode extends ComputeNode {
|
|||
// TODO: move preprocessing to separate node/node chain
|
||||
for (const part of spell_parts) {
|
||||
let spell_result;
|
||||
const part_id = spell.base_spell + '.' + part.name
|
||||
if ('multipliers' in part) { // damage type spell
|
||||
let results = calculateSpellDamage(stats, weapon, part.multipliers, use_spell, !use_speed, spell.base_spell + '.' + part.name);
|
||||
let results = calculateSpellDamage(stats, weapon, part.multipliers, use_spell, !use_speed, part_id);
|
||||
spell_result = {
|
||||
type: "damage",
|
||||
normal_min: results[2].map(x => x[0]),
|
||||
|
@ -617,6 +618,9 @@ class SpellDamageCalcNode extends ComputeNode {
|
|||
} else if ('power' in part) {
|
||||
// TODO: wynn2 formula
|
||||
let _heal_amount = (part.power * getDefenseStats(stats)[0] * (stats.get('healPct')/100));
|
||||
if (stats.has('healPct:'+part_id)) {
|
||||
_heal_amount *= 1+(stats.get('healPct:'+part_id)/100);
|
||||
}
|
||||
spell_result = {
|
||||
type: "heal",
|
||||
heal_amount: _heal_amount
|
||||
|
|
Loading…
Reference in a new issue