Scale combat damage rolls with ceil(effective level / 4).
Melee, archery, and magic damage use quarter-tier roll caps on Str, Dex, and Mind; spell potency for light, poison, and heal stays on full Mind.
@@ -30,6 +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
34
import { mobDefinition } from "../../../shared/definitions/mobs.js";
34
35
import { awardCombatHitXp, awardDamageHealthXp, awardSpellCastXp, syncPlayerHealth } from "../skills/service.js";
35
36
import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../../../shared/equipment/stats.js";
@@ -612,6 +613,11 @@ function mindRollOf (impact)
612
613
return resolveSpellPotency({ mindSkillLevel: impact.levels.mind }).mindRoll;
613
614
}
614
615
616
function mindDamageRollOf (impact)
617
{
618
return rollCombatDamage(impact.levels.mind);
619
}
620
615
621
function applyLightOrDarkImpact (world, impact, def, effect, now)
616
622
{
617
623
const events = [];
@@ -655,7 +661,7 @@ function applyDamageSpellImpact (world, impact, def, now)
655
661
{ return []; }
656
662
const events = [];
657
663
const affinities = targetAffinitiesForEntity(world, impact.targetEntityId);
658
const mindRoll = mindRollOf(impact);
664
const mindRoll = mindDamageRollOf(impact);
659
665
const multiplier = elementalDamageMultiplier(def, affinities);
660
666
const damage = Math.max(1, Math.floor(mindRoll * multiplier));
661
667
events.push(...applyDamageAndKill(
@@ -30,6 +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 { mobDefinition } from "../../../shared/definitions/mobs.js";34
import { mobDefinition } from "../../../shared/definitions/mobs.js";34
import { awardCombatHitXp, awardDamageHealthXp, awardSpellCastXp, syncPlayerHealth } from "../skills/service.js";35
import { awardCombatHitXp, awardDamageHealthXp, awardSpellCastXp, syncPlayerHealth } from "../skills/service.js";35
import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../../../shared/equipment/stats.js";36
import { equipmentBonusesFromSlots, effectiveSkillLevel } from "../../../shared/equipment/stats.js";@@ -612,6 +613,11 @@ function mindRollOf (impact)612
return resolveSpellPotency({ mindSkillLevel: impact.levels.mind }).mindRoll;613
return resolveSpellPotency({ mindSkillLevel: impact.levels.mind }).mindRoll;613
}614
}614
615
616
function mindDamageRollOf (impact)617
{618
return rollCombatDamage(impact.levels.mind);619
}620
615
function applyLightOrDarkImpact (world, impact, def, effect, now)621
function applyLightOrDarkImpact (world, impact, def, effect, now)616
{622
{617
const events = [];623
const events = [];@@ -655,7 +661,7 @@ function applyDamageSpellImpact (world, impact, def, now)655
{ return []; }661
{ return []; }656
const events = [];662
const events = [];657
const affinities = targetAffinitiesForEntity(world, impact.targetEntityId);663
const affinities = targetAffinitiesForEntity(world, impact.targetEntityId);658
const mindRoll = mindRollOf(impact);664
const mindRoll = mindDamageRollOf(impact);659
const multiplier = elementalDamageMultiplier(def, affinities);665
const multiplier = elementalDamageMultiplier(def, affinities);660
const damage = Math.max(1, Math.floor(mindRoll * multiplier));666
const damage = Math.max(1, Math.floor(mindRoll * multiplier));661
events.push(...applyDamageAndKill(667
events.push(...applyDamageAndKill(@@ -14,6 +14,7 @@ import { tileToRegion } from "../src/world/coordinates.js";
14
14
import { SkillId } from "../../shared/definitions/skills.js";
15
15
import { totalXpForLevel } from "../../shared/skills/progression.js";
16
16
import { resolveMeleeSwing, attackProfileOf, hasCombatLineOfSight, queueMeleeApproach, markSeekCover, engageTarget, applyDamageAndKill, markFleeOnHit, stepCombat, chebyshev } from "../src/combat/service.js";
17
import { combatDamageRollLevel } from "../../shared/combat/rolls.js";
17
18
import { makeCharacter, makeSimulation, pinEastSplit, stepTimes } from "./helpers/simulationHarness.js";
18
19
import { withDamagingCombatRng, installDamagingCombatRng, installMissDodgeRng, installBlockRng } from "./helpers/combatRng.js";
19
20
@@ -1251,7 +1252,7 @@ test("humanoid attackers add equipment bonuses on top of spawner level", () =>
1251
1252
const events = resolveMeleeSwing(worker.world, npcId, playerId, profile, Date.now());
1252
1253
const hit = events.find((event) => event.type === "combat-hit");
1253
1254
assert.ok(hit, "expected a hit");
1254
assert.equal(hit.damage, level + tierStatBonus(WoodTier.oak));
1255
assert.equal(hit.damage, combatDamageRollLevel(level + tierStatBonus(WoodTier.oak)));
1255
1256
}
1256
1257
finally
1257
1258
{
@@ -14,6 +14,7 @@ import { tileToRegion } from "../src/world/coordinates.js";14
import { SkillId } from "../../shared/definitions/skills.js";14
import { SkillId } from "../../shared/definitions/skills.js";15
import { totalXpForLevel } from "../../shared/skills/progression.js";15
import { totalXpForLevel } from "../../shared/skills/progression.js";16
import { resolveMeleeSwing, attackProfileOf, hasCombatLineOfSight, queueMeleeApproach, markSeekCover, engageTarget, applyDamageAndKill, markFleeOnHit, stepCombat, chebyshev } from "../src/combat/service.js";16
import { resolveMeleeSwing, attackProfileOf, hasCombatLineOfSight, queueMeleeApproach, markSeekCover, engageTarget, applyDamageAndKill, markFleeOnHit, stepCombat, chebyshev } from "../src/combat/service.js";17
import { combatDamageRollLevel } from "../../shared/combat/rolls.js";17
import { makeCharacter, makeSimulation, pinEastSplit, stepTimes } from "./helpers/simulationHarness.js";18
import { makeCharacter, makeSimulation, pinEastSplit, stepTimes } from "./helpers/simulationHarness.js";18
import { withDamagingCombatRng, installDamagingCombatRng, installMissDodgeRng, installBlockRng } from "./helpers/combatRng.js";19
import { withDamagingCombatRng, installDamagingCombatRng, installMissDodgeRng, installBlockRng } from "./helpers/combatRng.js";19
20
@@ -1251,7 +1252,7 @@ test("humanoid attackers add equipment bonuses on top of spawner level", () =>1251
const events = resolveMeleeSwing(worker.world, npcId, playerId, profile, Date.now());1252
const events = resolveMeleeSwing(worker.world, npcId, playerId, profile, Date.now());1252
const hit = events.find((event) => event.type === "combat-hit");1253
const hit = events.find((event) => event.type === "combat-hit");1253
assert.ok(hit, "expected a hit");1254
assert.ok(hit, "expected a hit");1254
assert.equal(hit.damage, level + tierStatBonus(WoodTier.oak));1255
assert.equal(hit.damage, combatDamageRollLevel(level + tierStatBonus(WoodTier.oak)));1255
}1256
}1256
finally1257
finally1257
{1258
{@@ -1,6 +1,6 @@
1
1
import test from "node:test";
2
2
import assert from "node:assert/strict";
3
import { resolvePhysicalAttack, rollSkill } from "../../shared/combat/rolls.js";
3
import { resolvePhysicalAttack, rollSkill, combatDamageRollLevel, rollCombatDamage } from "../../shared/combat/rolls.js";
4
4
5
5
test("rollSkill returns values within 0..skillLevel", () =>
6
6
{
@@ -88,7 +88,16 @@ test("physical attack hit applies rolled damage when not blocked", () =>
88
88
rng
89
89
});
90
90
assert.equal(result.outcome, "hit");
91
assert.equal(result.damage, 3);
91
assert.equal(result.damage, 1);
92
});
93
94
test("combat damage roll level is quarter effective level rounded up", () =>
95
{
96
assert.equal(combatDamageRollLevel(1), 1);
97
assert.equal(combatDamageRollLevel(4), 1);
98
assert.equal(combatDamageRollLevel(5), 2);
99
assert.equal(combatDamageRollLevel(99), 25);
100
assert.equal(rollCombatDamage(5, () => 0.999999), 2);
92
101
});
93
102
94
103
test("physical attack applies weakness and resistance multipliers", () =>
@@ -106,7 +115,7 @@ test("physical attack applies weakness and resistance multipliers", () =>
106
115
rng
107
116
});
108
117
assert.equal(weak.outcome, "hit");
109
assert.equal(weak.damage, 6);
118
assert.equal(weak.damage, 2);
110
119
assert.equal(weak.multiplier, 2);
111
120
112
121
i = 0;
@@ -120,7 +129,7 @@ test("physical attack applies weakness and resistance multipliers", () =>
120
129
rng
121
130
});
122
131
assert.equal(resist.outcome, "hit");
123
assert.equal(resist.damage, 1);
132
assert.equal(resist.damage, 0);
124
133
assert.equal(resist.multiplier, 0.5);
125
134
});
126
135
@@ -137,8 +146,8 @@ test("physical damage is the damage skill roll only", () =>
137
146
rng
138
147
});
139
148
assert.equal(result.outcome, "hit");
140
assert.equal(result.damageRoll, 2);
141
assert.equal(result.damage, 2);
149
assert.equal(result.damageRoll, 1);
150
assert.equal(result.damage, 1);
142
151
});
143
152
144
153
test("skill level 1 contest can still land a hit on equal agility", () =>
@@ -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 } from "../../shared/combat/rolls.js";3
import { resolvePhysicalAttack, rollSkill, combatDamageRollLevel, rollCombatDamage } 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
{@@ -88,7 +88,16 @@ test("physical attack hit applies rolled damage when not blocked", () =>88
rng88
rng89
});89
});90
assert.equal(result.outcome, "hit");90
assert.equal(result.outcome, "hit");91
assert.equal(result.damage, 3);91
assert.equal(result.damage, 1);92
});93
94
test("combat damage roll level is quarter effective level rounded up", () =>95
{96
assert.equal(combatDamageRollLevel(1), 1);97
assert.equal(combatDamageRollLevel(4), 1);98
assert.equal(combatDamageRollLevel(5), 2);99
assert.equal(combatDamageRollLevel(99), 25);100
assert.equal(rollCombatDamage(5, () => 0.999999), 2);92
});101
});93
102
94
test("physical attack applies weakness and resistance multipliers", () =>103
test("physical attack applies weakness and resistance multipliers", () =>@@ -106,7 +115,7 @@ test("physical attack applies weakness and resistance multipliers", () =>106
rng115
rng107
});116
});108
assert.equal(weak.outcome, "hit");117
assert.equal(weak.outcome, "hit");109
assert.equal(weak.damage, 6);118
assert.equal(weak.damage, 2);110
assert.equal(weak.multiplier, 2);119
assert.equal(weak.multiplier, 2);111
120
112
i = 0;121
i = 0;@@ -120,7 +129,7 @@ test("physical attack applies weakness and resistance multipliers", () =>120
rng129
rng121
});130
});122
assert.equal(resist.outcome, "hit");131
assert.equal(resist.outcome, "hit");123
assert.equal(resist.damage, 1);132
assert.equal(resist.damage, 0);124
assert.equal(resist.multiplier, 0.5);133
assert.equal(resist.multiplier, 0.5);125
});134
});126
135
@@ -137,8 +146,8 @@ test("physical damage is the damage skill roll only", () =>137
rng146
rng138
});147
});139
assert.equal(result.outcome, "hit");148
assert.equal(result.outcome, "hit");140
assert.equal(result.damageRoll, 2);149
assert.equal(result.damageRoll, 1);141
assert.equal(result.damage, 2);150
assert.equal(result.damage, 1);142
});151
});143
152
144
test("skill level 1 contest can still land a hit on equal agility", () =>153
test("skill level 1 contest can still land a hit on equal agility", () =>@@ -52,7 +52,7 @@ test("successful magic attack rolls mind damage and elemental multiplier", () =>
52
52
});
53
53
assert.equal(neutral.outcome, "hit");
54
54
assert.equal(neutral.multiplier, 1);
55
assert.equal(neutral.damage, 2);
55
assert.equal(neutral.damage, 1);
56
56
57
57
let j = 0;
58
58
const rngWeak = () => [0.9, 0, 0.4][j++];
@@ -52,7 +52,7 @@ test("successful magic attack rolls mind damage and elemental multiplier", () =>52
});52
});53
assert.equal(neutral.outcome, "hit");53
assert.equal(neutral.outcome, "hit");54
assert.equal(neutral.multiplier, 1);54
assert.equal(neutral.multiplier, 1);55
assert.equal(neutral.damage, 2);55
assert.equal(neutral.damage, 1);56
56
57
let j = 0;57
let j = 0;58
const rngWeak = () => [0.9, 0, 0.4][j++];58
const rngWeak = () => [0.9, 0, 0.4][j++];