BlueGit

timfa questward

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.

timfa Tim Falken · pushed by timfa

Authored 2026-09-01 · 2 months ago

Hash
7780fb111a797280a608d05de68357c9663891be
Parent
0fcc1842
6 files changed +64 −26
server/src/spells/service.js +4 −4
@@ -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 @@ import
30 resolveSpellCast,
30 resolveSpellCast,
31 resolveSpellPotency
31 resolveSpellPotency
32} from "../../../shared/combat/magic.js";
32} from "../../../shared/combat/magic.js";
33import { rollCombatDamage } from "../../../shared/combat/rolls.js";
33import { rollSpellDamage } from "../../../shared/combat/rolls.js";
34import { mobDefinition } from "../../../shared/definitions/mobs.js";
34import { mobDefinition } from "../../../shared/definitions/mobs.js";
35import { awardCombatHitXp, awardDamageHealthXp, awardSpellCastXp, syncPlayerHealth } from "../skills/service.js";
35import { awardCombatHitXp, awardDamageHealthXp, awardSpellCastXp, syncPlayerHealth } from "../skills/service.js";
36import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../../../shared/equipment/stats.js";
36import { 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
616function mindDamageRollOf (impact)
616function mindDamageRollOf (impact, spellTier = 1)
617{
617{
618 return rollCombatDamage(impact.levels.mind);
618 return rollSpellDamage(impact.levels.mind, spellTier);
619}
619}
620
620
621function applyLightOrDarkImpact (world, impact, def, effect, now)
621function 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(
server/tests/combatRolls.test.js +9 −1
@@ -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 @@
1import test from "node:test";
1import test from "node:test";
2import assert from "node:assert/strict";
2import assert from "node:assert/strict";
3import { resolvePhysicalAttack, rollSkill, combatDamageRollLevel, rollCombatDamage } from "../../shared/combat/rolls.js";
3import { resolvePhysicalAttack, rollSkill, combatDamageRollLevel, rollCombatDamage, spellDamageRollLevel, rollSpellDamage } from "../../shared/combat/rolls.js";
4
4
5test("rollSkill returns values within 0..skillLevel", () =>
5test("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
103test("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
103test("physical attack applies weakness and resistance multipliers", () =>
111test("physical attack applies weakness and resistance multipliers", () =>
104{
112{
105 let i = 0;
113 let i = 0;
server/tests/maxHit.test.js +17 −5
@@ -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
47test("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
47test("spell max hit is shown only for damage spells", () =>
63test("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
61test("effective physical damage level includes gear strength bonus", () =>
73test("effective physical damage level includes gear strength bonus", () =>
shared/combat/magic.js +3 −2
@@ -1,4 +1,4 @@
1 import { rollCombatDamage, rollSkill } from "./rolls.js";
1 import { rollSpellDamage, rollSkill } from "./rolls.js";
2 2 import { damageTypeMultiplier, MagicElement } from "../definitions/attackTypes.js";
3 3 import { spellDifficultyFromTier } from "../spells/constants.js";
4 4
@@ -83,6 +83,7 @@ export function resolveMagicAttack ({
83 83 magicSkillLevel,
84 84 spellDifficulty,
85 85 mindSkillLevel,
86 spellTier = 1,
86 87 element = "none",
87 88 targetAffinities = {},
88 89 rng = Math.random
@@ -100,7 +101,7 @@ export function resolveMagicAttack ({
100 101 };
101 102 }
102 103
103 const mindRoll = rollCombatDamage(mindSkillLevel, rng);
104 const mindRoll = rollSpellDamage(mindSkillLevel, spellTier, rng);
104 105 const multiplier = elementalMultiplier(element, targetAffinities);
105 106 const damage = Math.max(1, Math.floor(mindRoll * multiplier));
106 107
@@ -1,4 +1,4 @@
1import { rollCombatDamage, rollSkill } from "./rolls.js";
1import { rollSpellDamage, rollSkill } from "./rolls.js";
2import { damageTypeMultiplier, MagicElement } from "../definitions/attackTypes.js";
2import { damageTypeMultiplier, MagicElement } from "../definitions/attackTypes.js";
3import { spellDifficultyFromTier } from "../spells/constants.js";
3import { spellDifficultyFromTier } from "../spells/constants.js";
4
4
@@ -83,6 +83,7 @@ export function resolveMagicAttack ({
83 magicSkillLevel,
83 magicSkillLevel,
84 spellDifficulty,
84 spellDifficulty,
85 mindSkillLevel,
85 mindSkillLevel,
86 spellTier = 1,
86 element = "none",
87 element = "none",
87 targetAffinities = {},
88 targetAffinities = {},
88 rng = Math.random
89 rng = Math.random
@@ -100,7 +101,7 @@ export function resolveMagicAttack ({
100 };
101 };
101 }
102 }
102
103
103 const mindRoll = rollCombatDamage(mindSkillLevel, rng);
104 const mindRoll = rollSpellDamage(mindSkillLevel, spellTier, rng);
104 const multiplier = elementalMultiplier(element, targetAffinities);
105 const multiplier = elementalMultiplier(element, targetAffinities);
105 const damage = Math.max(1, Math.floor(mindRoll * multiplier));
106 const damage = Math.max(1, Math.floor(mindRoll * multiplier));
106
107
shared/combat/maxHit.js +14 −14
@@ -3,7 +3,7 @@ import { EquipmentKind } from "../definitions/equipmentKinds.js";
3 3 import { SkillId, UNARMED_ATTACK } from "../definitions/skills.js";
4 4 import { spellDefinition } from "../definitions/spells.js";
5 5 import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../equipment/stats.js";
6 import { combatDamageRollLevel } from "./rolls.js";
6 import { combatDamageRollLevel, spellDamageRollLevel } from "./rolls.js";
7 7
8 8 /** Attack profile from the equipped weapon (players). */
9 9 export function attackProfileFromEquipment (equipmentSlots = {})
@@ -112,16 +112,10 @@ export function maxNeutralPhysicalHit (effectiveDamageLevel)
112 112 return combatDamageRollLevel(effectiveDamageLevel);
113 113 }
114 114
115 /** Max magic damage hit on a neutral target after a successful cast. */
116 export function maxNeutralMagicHit (effectiveMindLevel)
115 /** Max magic damage on a neutral target after a successful cast. */
116 export function maxNeutralMagicHit (effectiveMindLevel, spellTier = 1)
117 117 {
118 return Math.max(1, combatDamageRollLevel(effectiveMindLevel));
119 }
120
121 /** Min magic damage on a successful neutral hit (mind roll can be 0). */
122 export function minNeutralMagicHit ()
123 {
124 return 1;
118 return Math.max(1, spellDamageRollLevel(effectiveMindLevel, spellTier));
125 119 }
126 120
127 121 export function isPlayerAttackDamageSpell (spellId)
@@ -159,8 +153,13 @@ export function bagMaxHitDisplay ({
159 153 statLabel: "Mind"
160 154 };
161 155 }
162 const max = maxNeutralMagicHit(mindLevel);
163 const min = minNeutralMagicHit();
156 const caps = attackSpells.map((spellId) =>
157 {
158 const tier = spellDefinition(spellId)?.tier ?? 1;
159 return maxNeutralMagicHit(mindLevel, tier);
160 });
161 const min = Math.min(...caps);
162 const max = Math.max(...caps);
164 163 return {
165 164 text: min === max ? String(max) : `${min} – ${max}`,
166 165 title: `Max spell hit on neutral targets (Mind ${mindLevel})`,
@@ -186,7 +185,7 @@ export function bagMaxHitDisplay ({
186 185 };
187 186 }
188 187
189 /** Max neutral hit for one damage spell (same for all spells today). */
188 /** Max neutral hit for one damage spell. */
190 189 export function spellMaxHitDisplay ({
191 190 spellId,
192 191 skillLevels,
@@ -197,11 +196,12 @@ export function spellMaxHitDisplay ({
197 196 {
198 197 if (!isPlayerAttackDamageSpell(spellId))
199 198 { return null; }
199 const def = spellDefinition(spellId);
200 200 const mindLevel = effectiveMindDamageLevel({
201 201 skillLevels,
202 202 equipmentSlots,
203 203 settings,
204 204 statusBonuses
205 205 });
206 return maxNeutralMagicHit(mindLevel);
206 return maxNeutralMagicHit(mindLevel, def?.tier ?? 1);
207 207 }
@@ -3,7 +3,7 @@ import { EquipmentKind } from "../definitions/equipmentKinds.js";
3import { SkillId, UNARMED_ATTACK } from "../definitions/skills.js";
3import { SkillId, UNARMED_ATTACK } from "../definitions/skills.js";
4import { spellDefinition } from "../definitions/spells.js";
4import { spellDefinition } from "../definitions/spells.js";
5import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../equipment/stats.js";
5import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../equipment/stats.js";
6import { combatDamageRollLevel } from "./rolls.js";
6import { combatDamageRollLevel, spellDamageRollLevel } from "./rolls.js";
7
7
8/** Attack profile from the equipped weapon (players). */
8/** Attack profile from the equipped weapon (players). */
9export function attackProfileFromEquipment (equipmentSlots = {})
9export function attackProfileFromEquipment (equipmentSlots = {})
@@ -112,16 +112,10 @@ export function maxNeutralPhysicalHit (effectiveDamageLevel)
112 return combatDamageRollLevel(effectiveDamageLevel);
112 return combatDamageRollLevel(effectiveDamageLevel);
113}
113}
114
114
115/** Max magic damage hit on a neutral target after a successful cast. */
115/** Max magic damage on a neutral target after a successful cast. */
116export function maxNeutralMagicHit (effectiveMindLevel)
116export function maxNeutralMagicHit (effectiveMindLevel, spellTier = 1)
117{
117{
118 return Math.max(1, combatDamageRollLevel(effectiveMindLevel));
118 return Math.max(1, spellDamageRollLevel(effectiveMindLevel, spellTier));
119}
120
121/** Min magic damage on a successful neutral hit (mind roll can be 0). */
122export function minNeutralMagicHit ()
123{
124 return 1;
125}
119}
126
120
127export function isPlayerAttackDamageSpell (spellId)
121export function isPlayerAttackDamageSpell (spellId)
@@ -159,8 +153,13 @@ export function bagMaxHitDisplay ({
159 statLabel: "Mind"
153 statLabel: "Mind"
160 };
154 };
161 }
155 }
162 const max = maxNeutralMagicHit(mindLevel);
156 const caps = attackSpells.map((spellId) =>
163 const min = minNeutralMagicHit();
157 {
158 const tier = spellDefinition(spellId)?.tier ?? 1;
159 return maxNeutralMagicHit(mindLevel, tier);
160 });
161 const min = Math.min(...caps);
162 const max = Math.max(...caps);
164 return {
163 return {
165 text: min === max ? String(max) : `${min} – ${max}`,
164 text: min === max ? String(max) : `${min} – ${max}`,
166 title: `Max spell hit on neutral targets (Mind ${mindLevel})`,
165 title: `Max spell hit on neutral targets (Mind ${mindLevel})`,
@@ -186,7 +185,7 @@ export function bagMaxHitDisplay ({
186 };
185 };
187}
186}
188
187
189/** Max neutral hit for one damage spell (same for all spells today). */
188/** Max neutral hit for one damage spell. */
190export function spellMaxHitDisplay ({
189export function spellMaxHitDisplay ({
191 spellId,
190 spellId,
192 skillLevels,
191 skillLevels,
@@ -197,11 +196,12 @@ export function spellMaxHitDisplay ({
197{
196{
198 if (!isPlayerAttackDamageSpell(spellId))
197 if (!isPlayerAttackDamageSpell(spellId))
199 { return null; }
198 { return null; }
199 const def = spellDefinition(spellId);
200 const mindLevel = effectiveMindDamageLevel({
200 const mindLevel = effectiveMindDamageLevel({
201 skillLevels,
201 skillLevels,
202 equipmentSlots,
202 equipmentSlots,
203 settings,
203 settings,
204 statusBonuses
204 statusBonuses
205 });
205 });
206 return maxNeutralMagicHit(mindLevel);
206 return maxNeutralMagicHit(mindLevel, def?.tier ?? 1);
207}
207}
shared/combat/rolls.js +17 −0
@@ -20,6 +20,23 @@ export function rollCombatDamage (effectiveLevel, rng = Math.random)
20 20 return rollSkill(combatDamageRollLevel(effectiveLevel), rng);
21 21 }
22 22
23 /**
24 * Attack-spell damage roll cap: quarter-scaled Mind plus (spell tier − 1).
25 * Tier 1 adds nothing; tier 5 adds +4 to the Mind cap.
26 */
27 export function spellDamageRollLevel (mindEffectiveLevel, spellTier = 1)
28 {
29 const base = combatDamageRollLevel(mindEffectiveLevel);
30 const tier = Math.max(1, Math.floor(Number(spellTier) || 1));
31 return Math.max(0, base + tier - 1);
32 }
33
34 /** Damage roll in [0, spellDamageRollLevel(mind, tier)]. */
35 export function rollSpellDamage (mindEffectiveLevel, spellTier, rng = Math.random)
36 {
37 return rollSkill(spellDamageRollLevel(mindEffectiveLevel, spellTier), rng);
38 }
39
23 40 /**
24 41 * Melee and ranged physical attack resolution (shared rules).
25 42 * 1. Roll hit skill vs defender Agility — miss if toHitRoll < agilityRoll
@@ -20,6 +20,23 @@ export function rollCombatDamage (effectiveLevel, rng = Math.random)
20 return rollSkill(combatDamageRollLevel(effectiveLevel), rng);
20 return rollSkill(combatDamageRollLevel(effectiveLevel), rng);
21}
21}
22
22
23/**
24 * Attack-spell damage roll cap: quarter-scaled Mind plus (spell tier − 1).
25 * Tier 1 adds nothing; tier 5 adds +4 to the Mind cap.
26 */
27export function spellDamageRollLevel (mindEffectiveLevel, spellTier = 1)
28{
29 const base = combatDamageRollLevel(mindEffectiveLevel);
30 const tier = Math.max(1, Math.floor(Number(spellTier) || 1));
31 return Math.max(0, base + tier - 1);
32}
33
34/** Damage roll in [0, spellDamageRollLevel(mind, tier)]. */
35export function rollSpellDamage (mindEffectiveLevel, spellTier, rng = Math.random)
36{
37 return rollSkill(spellDamageRollLevel(mindEffectiveLevel, spellTier), rng);
38}
39
23/**
40/**
24 * Melee and ranged physical attack resolution (shared rules).
41 * Melee and ranged physical attack resolution (shared rules).
25 * 1. Roll hit skill vs defender Agility — miss if toHitRoll < agilityRoll
42 * 1. Roll hit skill vs defender Agility — miss if toHitRoll < agilityRoll