Scale spell damage with Mind /4 plus spell tier minus one.
Attack spells add tier−1 to the mind damage roll cap; UI max-hit ranges reflect per-spell caps across known attack spells.
@@ -30,7 +30,7 @@ import
30
30
resolveSpellCast,
31
31
resolveSpellPotency
32
32
} from "../../../shared/combat/magic.js";
33
import { rollCombatDamage } from "../../../shared/combat/rolls.js";
33
import { rollSpellDamage } from "../../../shared/combat/rolls.js";
34
34
import { mobDefinition } from "../../../shared/definitions/mobs.js";
35
35
import { awardCombatHitXp, awardDamageHealthXp, awardSpellCastXp, syncPlayerHealth } from "../skills/service.js";
36
36
import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../../../shared/equipment/stats.js";
@@ -613,9 +613,9 @@ function mindRollOf (impact)
613
613
return resolveSpellPotency({ mindSkillLevel: impact.levels.mind }).mindRoll;
614
614
}
615
615
616
function mindDamageRollOf (impact)
616
function mindDamageRollOf (impact, spellTier = 1)
617
617
{
618
return rollCombatDamage(impact.levels.mind);
618
return rollSpellDamage(impact.levels.mind, spellTier);
619
619
}
620
620
621
621
function applyLightOrDarkImpact (world, impact, def, effect, now)
@@ -661,7 +661,7 @@ function applyDamageSpellImpact (world, impact, def, now)
661
661
{ return []; }
662
662
const events = [];
663
663
const affinities = targetAffinitiesForEntity(world, impact.targetEntityId);
664
const mindRoll = mindDamageRollOf(impact);
664
const mindRoll = mindDamageRollOf(impact, def.tier);
665
665
const multiplier = elementalDamageMultiplier(def, affinities);
666
666
const damage = Math.max(1, Math.floor(mindRoll * multiplier));
667
667
events.push(...applyDamageAndKill(
@@ -30,7 +30,7 @@ import30
resolveSpellCast,30
resolveSpellCast,31
resolveSpellPotency31
resolveSpellPotency32
} from "../../../shared/combat/magic.js";32
} from "../../../shared/combat/magic.js";33
import { rollCombatDamage } from "../../../shared/combat/rolls.js";33
import { rollSpellDamage } from "../../../shared/combat/rolls.js";34
import { mobDefinition } from "../../../shared/definitions/mobs.js";34
import { mobDefinition } from "../../../shared/definitions/mobs.js";35
import { awardCombatHitXp, awardDamageHealthXp, awardSpellCastXp, syncPlayerHealth } from "../skills/service.js";35
import { awardCombatHitXp, awardDamageHealthXp, awardSpellCastXp, syncPlayerHealth } from "../skills/service.js";36
import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../../../shared/equipment/stats.js";36
import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../../../shared/equipment/stats.js";@@ -613,9 +613,9 @@ function mindRollOf (impact)613
return resolveSpellPotency({ mindSkillLevel: impact.levels.mind }).mindRoll;613
return resolveSpellPotency({ mindSkillLevel: impact.levels.mind }).mindRoll;614
}614
}615
615
616
function mindDamageRollOf (impact)616
function mindDamageRollOf (impact, spellTier = 1)617
{617
{618
return rollCombatDamage(impact.levels.mind);618
return rollSpellDamage(impact.levels.mind, spellTier);619
}619
}620
620
621
function applyLightOrDarkImpact (world, impact, def, effect, now)621
function applyLightOrDarkImpact (world, impact, def, effect, now)@@ -661,7 +661,7 @@ function applyDamageSpellImpact (world, impact, def, now)661
{ return []; }661
{ return []; }662
const events = [];662
const events = [];663
const affinities = targetAffinitiesForEntity(world, impact.targetEntityId);663
const affinities = targetAffinitiesForEntity(world, impact.targetEntityId);664
const mindRoll = mindDamageRollOf(impact);664
const mindRoll = mindDamageRollOf(impact, def.tier);665
const multiplier = elementalDamageMultiplier(def, affinities);665
const multiplier = elementalDamageMultiplier(def, affinities);666
const damage = Math.max(1, Math.floor(mindRoll * multiplier));666
const damage = Math.max(1, Math.floor(mindRoll * multiplier));667
events.push(...applyDamageAndKill(667
events.push(...applyDamageAndKill(@@ -1,6 +1,6 @@
1
1
import test from "node:test";
2
2
import assert from "node:assert/strict";
3
import { resolvePhysicalAttack, rollSkill, combatDamageRollLevel, rollCombatDamage } from "../../shared/combat/rolls.js";
3
import { resolvePhysicalAttack, rollSkill, combatDamageRollLevel, rollCombatDamage, spellDamageRollLevel, rollSpellDamage } from "../../shared/combat/rolls.js";
4
4
5
5
test("rollSkill returns values within 0..skillLevel", () =>
6
6
{
@@ -100,6 +100,14 @@ test("combat damage roll level is quarter effective level rounded up", () =>
100
100
assert.equal(rollCombatDamage(5, () => 0.999999), 2);
101
101
});
102
102
103
test("spell damage roll cap adds spell tier minus one to mind cap", () =>
104
{
105
assert.equal(spellDamageRollLevel(20, 1), 5);
106
assert.equal(spellDamageRollLevel(20, 2), 6);
107
assert.equal(spellDamageRollLevel(20, 5), 9);
108
assert.equal(rollSpellDamage(20, 5, () => 0.999999), 9);
109
});
110
103
111
test("physical attack applies weakness and resistance multipliers", () =>
104
112
{
105
113
let i = 0;
@@ -1,6 +1,6 @@1
import test from "node:test";1
import test from "node:test";2
import assert from "node:assert/strict";2
import assert from "node:assert/strict";3
import { resolvePhysicalAttack, rollSkill, combatDamageRollLevel, rollCombatDamage } from "../../shared/combat/rolls.js";3
import { resolvePhysicalAttack, rollSkill, combatDamageRollLevel, rollCombatDamage, spellDamageRollLevel, rollSpellDamage } from "../../shared/combat/rolls.js";4
4
5
test("rollSkill returns values within 0..skillLevel", () =>5
test("rollSkill returns values within 0..skillLevel", () =>6
{6
{@@ -100,6 +100,14 @@ test("combat damage roll level is quarter effective level rounded up", () =>100
assert.equal(rollCombatDamage(5, () => 0.999999), 2);100
assert.equal(rollCombatDamage(5, () => 0.999999), 2);101
});101
});102
102
103
test("spell damage roll cap adds spell tier minus one to mind cap", () =>104
{105
assert.equal(spellDamageRollLevel(20, 1), 5);106
assert.equal(spellDamageRollLevel(20, 2), 6);107
assert.equal(spellDamageRollLevel(20, 5), 9);108
assert.equal(rollSpellDamage(20, 5, () => 0.999999), 9);109
});110
103
test("physical attack applies weakness and resistance multipliers", () =>111
test("physical attack applies weakness and resistance multipliers", () =>104
{112
{105
let i = 0;113
let i = 0;@@ -41,7 +41,23 @@ test("bag max hit with staff shows mind spell range from known attack spells", (
41
41
knownSpellIds: [SpellId.manaBullet, SpellId.firebolt, SpellId.hellfire]
42
42
});
43
43
assert.equal(display.statLabel, "Mind");
44
assert.equal(display.text, "1 – 5");
44
assert.equal(display.text, "5 – 11");
45
});
46
47
test("spell max hit scales with spell tier", () =>
48
{
49
assert.equal(spellMaxHitDisplay({
50
spellId: SpellId.manaBullet,
51
skillLevels: { [SkillId.mind]: 20 }
52
}), 5);
53
assert.equal(spellMaxHitDisplay({
54
spellId: SpellId.firebolt,
55
skillLevels: { [SkillId.mind]: 20 }
56
}), 7);
57
assert.equal(spellMaxHitDisplay({
58
spellId: SpellId.firebolt,
59
skillLevels: { [SkillId.mind]: 50 }
60
}), 15);
45
61
});
46
62
47
63
test("spell max hit is shown only for damage spells", () =>
@@ -52,10 +68,6 @@ test("spell max hit is shown only for damage spells", () =>
52
68
spellId: SpellId.light,
53
69
skillLevels: { [SkillId.mind]: 50 }
54
70
}), null);
55
assert.equal(spellMaxHitDisplay({
56
spellId: SpellId.firebolt,
57
skillLevels: { [SkillId.mind]: 50 }
58
}), 13);
59
71
});
60
72
61
73
test("effective physical damage level includes gear strength bonus", () =>
@@ -41,7 +41,23 @@ test("bag max hit with staff shows mind spell range from known attack spells", (41
knownSpellIds: [SpellId.manaBullet, SpellId.firebolt, SpellId.hellfire]41
knownSpellIds: [SpellId.manaBullet, SpellId.firebolt, SpellId.hellfire]42
});42
});43
assert.equal(display.statLabel, "Mind");43
assert.equal(display.statLabel, "Mind");44
assert.equal(display.text, "1 – 5");44
assert.equal(display.text, "5 – 11");45
});46
47
test("spell max hit scales with spell tier", () =>48
{49
assert.equal(spellMaxHitDisplay({50
spellId: SpellId.manaBullet,51
skillLevels: { [SkillId.mind]: 20 }52
}), 5);53
assert.equal(spellMaxHitDisplay({54
spellId: SpellId.firebolt,55
skillLevels: { [SkillId.mind]: 20 }56
}), 7);57
assert.equal(spellMaxHitDisplay({58
spellId: SpellId.firebolt,59
skillLevels: { [SkillId.mind]: 50 }60
}), 15);45
});61
});46
62
47
test("spell max hit is shown only for damage spells", () =>63
test("spell max hit is shown only for damage spells", () =>@@ -52,10 +68,6 @@ test("spell max hit is shown only for damage spells", () =>52
spellId: SpellId.light,68
spellId: SpellId.light,53
skillLevels: { [SkillId.mind]: 50 }69
skillLevels: { [SkillId.mind]: 50 }54
}), null);70
}), null);55
assert.equal(spellMaxHitDisplay({56
spellId: SpellId.firebolt,57
skillLevels: { [SkillId.mind]: 50 }58
}), 13);59
});71
});60
72
61
test("effective physical damage level includes gear strength bonus", () =>73
test("effective physical damage level includes gear strength bonus", () =>