axiomancer-mechanics 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Character/equipment.reducer.d.ts +16 -0
- package/dist/Character/equipment.reducer.d.ts.map +1 -0
- package/dist/Character/equipment.reducer.js +133 -0
- package/dist/Character/equipment.reducer.js.map +1 -0
- package/dist/Character/index.d.ts +4 -1
- package/dist/Character/index.d.ts.map +1 -1
- package/dist/Character/index.js +17 -2
- package/dist/Character/index.js.map +1 -1
- package/dist/Combat/combat-effects.d.ts +3 -1
- package/dist/Combat/combat-effects.d.ts.map +1 -1
- package/dist/Combat/combat-effects.js +24 -7
- package/dist/Combat/combat-effects.js.map +1 -1
- package/dist/Combat/combat.reducer.d.ts.map +1 -1
- package/dist/Combat/combat.reducer.js +3 -4
- package/dist/Combat/combat.reducer.js.map +1 -1
- package/dist/Combat/combat.resolver.d.ts +17 -1
- package/dist/Combat/combat.resolver.d.ts.map +1 -1
- package/dist/Combat/combat.resolver.js +53 -2
- package/dist/Combat/combat.resolver.js.map +1 -1
- package/dist/Combat/index.d.ts +1 -1
- package/dist/Combat/index.d.ts.map +1 -1
- package/dist/Game/store.d.ts +3 -1
- package/dist/Game/store.d.ts.map +1 -1
- package/dist/Game/store.js +17 -1
- package/dist/Game/store.js.map +1 -1
- package/dist/Items/consumable.library.d.ts +4 -0
- package/dist/Items/consumable.library.d.ts.map +1 -0
- package/dist/Items/consumable.library.js +112 -0
- package/dist/Items/consumable.library.js.map +1 -0
- package/dist/Items/equipment.engine.d.ts +16 -0
- package/dist/Items/equipment.engine.d.ts.map +1 -0
- package/dist/Items/equipment.engine.js +95 -0
- package/dist/Items/equipment.engine.js.map +1 -0
- package/dist/Items/equipment.templates.d.ts +5 -0
- package/dist/Items/equipment.templates.d.ts.map +1 -0
- package/dist/Items/equipment.templates.js +250 -0
- package/dist/Items/equipment.templates.js.map +1 -0
- package/dist/Items/index.d.ts +9 -1
- package/dist/Items/index.d.ts.map +1 -1
- package/dist/Items/index.js +36 -1
- package/dist/Items/index.js.map +1 -1
- package/dist/Items/item.factory.d.ts +8 -0
- package/dist/Items/item.factory.d.ts.map +1 -0
- package/dist/Items/item.factory.js +211 -0
- package/dist/Items/item.factory.js.map +1 -0
- package/dist/Items/modifier.catalogue.d.ts +15 -0
- package/dist/Items/modifier.catalogue.d.ts.map +1 -0
- package/dist/Items/modifier.catalogue.js +446 -0
- package/dist/Items/modifier.catalogue.js.map +1 -0
- package/dist/Items/modifier.types.d.ts +17 -0
- package/dist/Items/modifier.types.d.ts.map +1 -0
- package/dist/Items/modifier.types.js +9 -0
- package/dist/Items/modifier.types.js.map +1 -0
- package/dist/Items/types.d.ts +54 -1
- package/dist/Items/types.d.ts.map +1 -1
- package/dist/Items/types.js.map +1 -1
- package/dist/Items/unique.templates.d.ts +4 -0
- package/dist/Items/unique.templates.d.ts.map +1 -0
- package/dist/Items/unique.templates.js +42 -0
- package/dist/Items/unique.templates.js.map +1 -0
- package/dist/Skills/skill.engine.d.ts +2 -1
- package/dist/Skills/skill.engine.d.ts.map +1 -1
- package/dist/Skills/skill.engine.js +6 -2
- package/dist/Skills/skill.engine.js.map +1 -1
- package/dist/index.d.ts +5 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +21 -3
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Character } from './types';
|
|
2
|
+
import { Equipment, EquipmentSlot } from '../Items/types';
|
|
3
|
+
import { StatModifier } from '../Effects/types';
|
|
4
|
+
import { Stance } from '../Combat/types';
|
|
5
|
+
export interface AggregatedEquipmentModifiers {
|
|
6
|
+
statFlat: Map<string, number>;
|
|
7
|
+
statMultBonus: Map<string, number>;
|
|
8
|
+
}
|
|
9
|
+
declare const isStanceKey: (s: string) => s is Stance;
|
|
10
|
+
export declare function getEquipmentModifiers(equipment: Partial<Record<EquipmentSlot, Equipment>>): AggregatedEquipmentModifiers;
|
|
11
|
+
export declare function equipItem(character: Character, item: Equipment): Character;
|
|
12
|
+
export declare function unequipItem(character: Character, slot: EquipmentSlot): Character;
|
|
13
|
+
export declare function getEquippedItems(equipment: Partial<Record<EquipmentSlot, Equipment>>): Equipment[];
|
|
14
|
+
export { isStanceKey as _isStanceKey };
|
|
15
|
+
export type { StatModifier };
|
|
16
|
+
//# sourceMappingURL=equipment.reducer.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"equipment.reducer.d.ts","sourceRoot":"","sources":["../../src/Character/equipment.reducer.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,SAAS,EAA2B,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAgB,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AASzC,MAAM,WAAW,4BAA4B;IACzC,QAAQ,EAAO,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAYD,QAAA,MAAM,WAAW,GAAI,GAAG,MAAM,KAAG,CAAC,IAAI,MACY,CAAC;AAQnD,wBAAgB,qBAAqB,CACjC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,GACrD,4BAA4B,CAc9B;AA+FD,wBAAgB,SAAS,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,CAwB1E;AAMD,wBAAgB,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,GAAG,SAAS,CAiBhF;AAOD,wBAAgB,gBAAgB,CAC5B,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,GACrD,SAAS,EAAE,CAUb;AAGD,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,CAAC;AAGvC,YAAY,EAAE,YAAY,EAAE,CAAC"}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports._isStanceKey = void 0;
|
|
4
|
+
exports.getEquipmentModifiers = getEquipmentModifiers;
|
|
5
|
+
exports.equipItem = equipItem;
|
|
6
|
+
exports.unequipItem = unequipItem;
|
|
7
|
+
exports.getEquippedItems = getEquippedItems;
|
|
8
|
+
const effects_library_1 = require("../Effects/effects.library");
|
|
9
|
+
const Utils_1 = require("../Utils");
|
|
10
|
+
const emptyAgg = () => ({
|
|
11
|
+
statFlat: new Map(),
|
|
12
|
+
statMultBonus: new Map(),
|
|
13
|
+
});
|
|
14
|
+
const addToMap = (m, key, value) => {
|
|
15
|
+
m.set(key, (m.get(key) ?? 0) + value);
|
|
16
|
+
};
|
|
17
|
+
const STANCE_KEYS = ['body', 'mind', 'heart'];
|
|
18
|
+
const isStanceKey = (s) => STANCE_KEYS.includes(s);
|
|
19
|
+
exports._isStanceKey = isStanceKey;
|
|
20
|
+
function getEquipmentModifiers(equipment) {
|
|
21
|
+
const agg = emptyAgg();
|
|
22
|
+
for (const slot of Object.keys(equipment)) {
|
|
23
|
+
const piece = equipment[slot];
|
|
24
|
+
if (!piece?.statModifiers)
|
|
25
|
+
continue;
|
|
26
|
+
for (const mod of piece.statModifiers) {
|
|
27
|
+
if (mod.isMultiplier) {
|
|
28
|
+
addToMap(agg.statMultBonus, mod.stat, mod.value - 1);
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
addToMap(agg.statFlat, mod.stat, mod.value);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
return agg;
|
|
36
|
+
}
|
|
37
|
+
function applyFlatAndMult(base, flat, multBonus) {
|
|
38
|
+
return (base + flat) * (1 + multBonus);
|
|
39
|
+
}
|
|
40
|
+
function recomputeDerivedStats(baseStats, mods) {
|
|
41
|
+
const stanceFlat = (s) => mods.statFlat.get(s) ?? 0;
|
|
42
|
+
const stanceMult = (s) => mods.statMultBonus.get(s) ?? 0;
|
|
43
|
+
const effBase = {
|
|
44
|
+
body: applyFlatAndMult(baseStats.body, stanceFlat('body'), stanceMult('body')),
|
|
45
|
+
mind: applyFlatAndMult(baseStats.mind, stanceFlat('mind'), stanceMult('mind')),
|
|
46
|
+
heart: applyFlatAndMult(baseStats.heart, stanceFlat('heart'), stanceMult('heart')),
|
|
47
|
+
};
|
|
48
|
+
const derived = (0, Utils_1.deriveStats)(effBase);
|
|
49
|
+
const derivedKeys = [
|
|
50
|
+
'physicalAttack', 'physicalSkill', 'physicalDefense',
|
|
51
|
+
'mentalAttack', 'mentalSkill', 'mentalDefense',
|
|
52
|
+
'emotionalAttack', 'emotionalSkill', 'emotionalDefense',
|
|
53
|
+
'luck',
|
|
54
|
+
];
|
|
55
|
+
const patched = { ...derived };
|
|
56
|
+
for (const key of derivedKeys) {
|
|
57
|
+
const flat = mods.statFlat.get(key) ?? 0;
|
|
58
|
+
const mult = mods.statMultBonus.get(key) ?? 0;
|
|
59
|
+
patched[key] = applyFlatAndMult(derived[key], flat, mult);
|
|
60
|
+
}
|
|
61
|
+
return patched;
|
|
62
|
+
}
|
|
63
|
+
function applyPassiveEffects(effects, item) {
|
|
64
|
+
if (!item.passiveEffects || item.passiveEffects.length === 0)
|
|
65
|
+
return effects;
|
|
66
|
+
const additions = [];
|
|
67
|
+
for (const effectId of item.passiveEffects) {
|
|
68
|
+
const def = (0, effects_library_1.lookupEffect)(effectId);
|
|
69
|
+
if (!def)
|
|
70
|
+
continue;
|
|
71
|
+
additions.push({
|
|
72
|
+
effectId,
|
|
73
|
+
remainingDuration: -1,
|
|
74
|
+
intensity: 1,
|
|
75
|
+
appliedAt: 0,
|
|
76
|
+
tier: def.tier,
|
|
77
|
+
resistedBy: def.resistedBy,
|
|
78
|
+
resistDR: def.resistDR,
|
|
79
|
+
sourceId: item.id,
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
return [...effects, ...additions];
|
|
83
|
+
}
|
|
84
|
+
function removePassiveEffects(effects, itemId) {
|
|
85
|
+
return effects.filter(ae => ae.sourceId !== itemId);
|
|
86
|
+
}
|
|
87
|
+
function equipItem(character, item) {
|
|
88
|
+
const slot = item.slot;
|
|
89
|
+
const previous = character.equipment[slot];
|
|
90
|
+
let nextEffects = character.effects;
|
|
91
|
+
if (previous) {
|
|
92
|
+
nextEffects = removePassiveEffects(nextEffects, previous.id);
|
|
93
|
+
}
|
|
94
|
+
nextEffects = applyPassiveEffects(nextEffects, item);
|
|
95
|
+
const nextEquipment = { ...character.equipment, [slot]: item };
|
|
96
|
+
const mods = getEquipmentModifiers(nextEquipment);
|
|
97
|
+
const nextDerived = recomputeDerivedStats(character.baseStats, mods);
|
|
98
|
+
return {
|
|
99
|
+
...character,
|
|
100
|
+
equipment: nextEquipment,
|
|
101
|
+
derivedStats: nextDerived,
|
|
102
|
+
effects: nextEffects,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
function unequipItem(character, slot) {
|
|
106
|
+
const previous = character.equipment[slot];
|
|
107
|
+
if (!previous)
|
|
108
|
+
return character;
|
|
109
|
+
const nextEquipment = { ...character.equipment };
|
|
110
|
+
delete nextEquipment[slot];
|
|
111
|
+
const mods = getEquipmentModifiers(nextEquipment);
|
|
112
|
+
const nextDerived = recomputeDerivedStats(character.baseStats, mods);
|
|
113
|
+
const nextEffects = removePassiveEffects(character.effects, previous.id);
|
|
114
|
+
return {
|
|
115
|
+
...character,
|
|
116
|
+
equipment: nextEquipment,
|
|
117
|
+
derivedStats: nextDerived,
|
|
118
|
+
effects: nextEffects,
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
function getEquippedItems(equipment) {
|
|
122
|
+
const SLOT_ORDER = [
|
|
123
|
+
'weapon', 'armor', 'accessory', 'head', 'body', 'hands', 'feet',
|
|
124
|
+
];
|
|
125
|
+
const out = [];
|
|
126
|
+
for (const slot of SLOT_ORDER) {
|
|
127
|
+
const piece = equipment[slot];
|
|
128
|
+
if (piece)
|
|
129
|
+
out.push(piece);
|
|
130
|
+
}
|
|
131
|
+
return out;
|
|
132
|
+
}
|
|
133
|
+
//# sourceMappingURL=equipment.reducer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"equipment.reducer.js","sourceRoot":"","sources":["../../src/Character/equipment.reducer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { Character, BaseStats } from './types';
|
|
2
2
|
import { ActiveEffect } from '../Effects/types';
|
|
3
3
|
import { ProcUnlocks } from '../Combat/combat-effects';
|
|
4
|
-
import { Item } from '../Items/types';
|
|
4
|
+
import { Equipment, EquipmentSlot, Item } from '../Items/types';
|
|
5
5
|
export interface CreateCharacterOptions {
|
|
6
6
|
name: string;
|
|
7
7
|
level: number;
|
|
8
8
|
baseStats: BaseStats;
|
|
9
9
|
inventory?: Item[];
|
|
10
|
+
equipment?: Partial<Record<EquipmentSlot, Equipment>>;
|
|
10
11
|
effects?: ActiveEffect[];
|
|
11
12
|
knownSkills?: string[];
|
|
12
13
|
equippedSkills?: string[];
|
|
@@ -14,4 +15,6 @@ export interface CreateCharacterOptions {
|
|
|
14
15
|
}
|
|
15
16
|
export declare function createCharacter(options: CreateCharacterOptions): Character;
|
|
16
17
|
export type { Character, BaseStats, DerivedStats, NonCombatStats } from './types';
|
|
18
|
+
export { equipItem, unequipItem, getEquipmentModifiers } from './equipment.reducer';
|
|
19
|
+
export type { AggregatedEquipmentModifiers } from './equipment.reducer';
|
|
17
20
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Character/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Character/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAQhE,MAAM,WAAW,sBAAsB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC;IAOnB,SAAS,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,CAAC;IACtD,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC7B;AAMD,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,SAAS,CAmC1E;AAED,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACpF,YAAY,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC"}
|
package/dist/Character/index.js
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getEquipmentModifiers = exports.unequipItem = exports.equipItem = void 0;
|
|
3
4
|
exports.createCharacter = createCharacter;
|
|
4
5
|
const Utils_1 = require("../Utils");
|
|
5
6
|
const game_mechanics_constants_1 = require("../Game/game-mechanics.constants");
|
|
7
|
+
const equipment_reducer_1 = require("./equipment.reducer");
|
|
6
8
|
function createCharacter(options) {
|
|
7
|
-
const { name, level, baseStats, inventory = [], effects = [], knownSkills = [], equippedSkills = [], procUnlocks, } = options;
|
|
9
|
+
const { name, level, baseStats, inventory = [], equipment = {}, effects = [], knownSkills = [], equippedSkills = [], procUnlocks, } = options;
|
|
8
10
|
const maxHealth = (0, Utils_1.calculateMaxHealth)(level, baseStats);
|
|
9
|
-
|
|
11
|
+
const baseChar = {
|
|
10
12
|
name,
|
|
11
13
|
level,
|
|
12
14
|
experience: (level - 1) * game_mechanics_constants_1.EXPERIENCE_PER_LEVEL,
|
|
@@ -17,10 +19,23 @@ function createCharacter(options) {
|
|
|
17
19
|
derivedStats: (0, Utils_1.deriveStats)(baseStats),
|
|
18
20
|
nonCombatStats: (0, Utils_1.deriveNonCombatStats)(baseStats),
|
|
19
21
|
inventory,
|
|
22
|
+
equipment: {},
|
|
20
23
|
effects,
|
|
21
24
|
knownSkills,
|
|
22
25
|
equippedSkills,
|
|
23
26
|
procUnlocks,
|
|
24
27
|
};
|
|
28
|
+
let initialised = baseChar;
|
|
29
|
+
for (const slot of Object.keys(equipment)) {
|
|
30
|
+
const piece = equipment[slot];
|
|
31
|
+
if (!piece)
|
|
32
|
+
continue;
|
|
33
|
+
initialised = (0, equipment_reducer_1.equipItem)(initialised, piece);
|
|
34
|
+
}
|
|
35
|
+
return initialised;
|
|
25
36
|
}
|
|
37
|
+
var equipment_reducer_2 = require("./equipment.reducer");
|
|
38
|
+
Object.defineProperty(exports, "equipItem", { enumerable: true, get: function () { return equipment_reducer_2.equipItem; } });
|
|
39
|
+
Object.defineProperty(exports, "unequipItem", { enumerable: true, get: function () { return equipment_reducer_2.unequipItem; } });
|
|
40
|
+
Object.defineProperty(exports, "getEquipmentModifiers", { enumerable: true, get: function () { return equipment_reducer_2.getEquipmentModifiers; } });
|
|
26
41
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Character/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Character/index.ts"],"names":[],"mappings":";;;AAiCA,0CAmCC;AAhED,oCAAiF;AACjF,+EAAwE;AACxE,2DAAgD;AA2BhD,SAAgB,eAAe,CAAC,OAA+B;IAC3D,MAAM,EACF,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EACpE,WAAW,GAAG,EAAE,EAAE,cAAc,GAAG,EAAE,EAAE,WAAW,GACrD,GAAG,OAAO,CAAC;IAEZ,MAAM,SAAS,GAAG,IAAA,0BAAkB,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAEvD,MAAM,QAAQ,GAAc;QACxB,IAAI;QACJ,KAAK;QACL,UAAU,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,+CAAoB;QAC9C,qBAAqB,EAAE,KAAK,GAAG,+CAAoB;QACnD,MAAM,EAAE,SAAS;QACjB,SAAS;QACT,SAAS;QACT,YAAY,EAAE,IAAA,mBAAW,EAAC,SAAS,CAAC;QACpC,cAAc,EAAE,IAAA,4BAAoB,EAAC,SAAS,CAAC;QAC/C,SAAS;QACT,SAAS,EAAE,EAAE;QACb,OAAO;QACP,WAAW;QACX,cAAc;QACd,WAAW;KACd,CAAC;IAIF,IAAI,WAAW,GAAG,QAAQ,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAoB,EAAE,CAAC;QAC3D,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;QAC9B,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,WAAW,GAAG,IAAA,6BAAS,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,WAAW,CAAC;AACvB,CAAC;AAGD,yDAAoF;AAA3E,8GAAA,SAAS,OAAA;AAAE,gHAAA,WAAW,OAAA;AAAE,0HAAA,qBAAqB,OAAA"}
|
|
@@ -2,6 +2,7 @@ import { Stance, Combatant } from './types';
|
|
|
2
2
|
import { Character } from '../Character/types';
|
|
3
3
|
import { Enemy } from '../Enemy/types';
|
|
4
4
|
import { ActiveEffect, Effect, EffectApplicationResult, EffectTier } from '../Effects/types';
|
|
5
|
+
import { EquipmentProcTrigger } from '../Items/types';
|
|
5
6
|
export interface CombatEffectTrigger {
|
|
6
7
|
stance: Stance;
|
|
7
8
|
action: 'attack' | 'defend';
|
|
@@ -15,7 +16,7 @@ export interface CombatEffectTrigger {
|
|
|
15
16
|
}
|
|
16
17
|
export type ProcUnlocks = Partial<Record<Stance, Partial<Record<'attack' | 'defend', EffectTier>>>>;
|
|
17
18
|
export type ProcOverrides = Partial<Record<Stance, Partial<Record<'attack' | 'defend', CombatEffectTrigger[]>>>>;
|
|
18
|
-
export declare function getEligibleTriggers(stance: Stance, action: 'attack' | 'defend', unlocks?: ProcUnlocks, overrides?: ProcOverrides): CombatEffectTrigger[];
|
|
19
|
+
export declare function getEligibleTriggers(stance: Stance, action: 'attack' | 'defend', unlocks?: ProcUnlocks, overrides?: ProcOverrides, equipmentTriggers?: EquipmentProcTrigger[]): CombatEffectTrigger[];
|
|
19
20
|
export declare function calculateProcChance(trigger: CombatEffectTrigger, actor: Combatant): number;
|
|
20
21
|
export interface ProcRollOutcome {
|
|
21
22
|
trigger: CombatEffectTrigger;
|
|
@@ -36,6 +37,7 @@ export interface RollForCombatEffectsParams {
|
|
|
36
37
|
rawAttackRoll: number;
|
|
37
38
|
unlocks?: ProcUnlocks;
|
|
38
39
|
overrides?: ProcOverrides;
|
|
40
|
+
equipmentTriggers?: EquipmentProcTrigger[];
|
|
39
41
|
rng?: () => number;
|
|
40
42
|
}
|
|
41
43
|
export declare function rollForCombatEffects(p: RollForCombatEffectsParams): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combat-effects.d.ts","sourceRoot":"","sources":["../../src/Combat/combat-effects.ts"],"names":[],"mappings":"AA6BA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"combat-effects.d.ts","sourceRoot":"","sources":["../../src/Combat/combat-effects.ts"],"names":[],"mappings":"AA6BA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAK7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAGtD,MAAM,WAAW,mBAAmB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC5B,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IAKjB,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAE5B,UAAU,EAAE,MAAM,CAAC;IAEnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B;AAOD,MAAM,MAAM,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAQ9E,MAAM,MAAM,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,QAAQ,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAuEzF,wBAAgB,mBAAmB,CAC/B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,QAAQ,GAAG,QAAQ,EAC3B,OAAO,CAAC,EAAE,WAAW,EACrB,SAAS,CAAC,EAAE,aAAa,EACzB,iBAAiB,CAAC,EAAE,oBAAoB,EAAE,GAC3C,mBAAmB,EAAE,CAavB;AAMD,wBAAgB,mBAAmB,CAC/B,OAAO,EAAE,mBAAmB,EAC5B,KAAK,EAAE,SAAS,GACjB,MAAM,CAKR;AAOD,MAAM,WAAW,eAAe;IAC5B,OAAO,EAAE,mBAAmB,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;IAExC,cAAc,EAAE,MAAM,CAAC;IAEvB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC;CAClC;AAMD,MAAM,WAAW,aAAa;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,0BAA0B;IACvC,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAE5B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,SAAS,CAAC,EAAE,aAAa,CAAC;IAM1B,iBAAiB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAM3C,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;CACtB;AAWD,wBAAgB,oBAAoB,CAChC,CAAC,EAAE,0BAA0B,GAC9B;IAAE,KAAK,EAAE,eAAe,EAAE,CAAC;IAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAA;CAAE,CA8C5D;AAWD,wBAAgB,gBAAgB,CAC5B,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,SAAS,GAAG,KAAK,EACxB,YAAY,EAAE,YAAY,EAAE,EAC5B,QAAQ,EAAE,SAAS,GAAG,KAAK,EAC3B,eAAe,EAAE,YAAY,EAAE,EAC/B,KAAK,EAAE,MAAM,EACb,kBAAkB,SAAI,GACvB;IACC,YAAY,EAAE,YAAY,EAAE,CAAC;IAC7B,eAAe,EAAE,YAAY,EAAE,CAAC;IAChC,SAAS,EAAE,MAAM,GAAG,UAAU,CAAC;IAC/B,MAAM,EAAE,uBAAuB,CAAC;CACnC,CAuFA;AAOD,wBAAgB,kBAAkB,CAC9B,MAAM,EAAE,aAAa,EACrB,YAAY,EAAE,YAAY,EAAE,EAC5B,KAAK,EAAE,MAAM,GACd;IAAE,YAAY,EAAE,YAAY,EAAE,CAAC;IAAC,MAAM,EAAE,uBAAuB,CAAA;CAAE,CAGnE;AAGD,eAAO,MAAM,oBAAoB,gCAAgB,CAAC"}
|
|
@@ -30,13 +30,30 @@ function getStatusChanceIntensity(actor) {
|
|
|
30
30
|
function unlockedTier(unlocks, stance, action) {
|
|
31
31
|
return unlocks?.[stance]?.[action] ?? 1;
|
|
32
32
|
}
|
|
33
|
-
function
|
|
33
|
+
function adaptEquipmentTrigger(eq, stance, action) {
|
|
34
|
+
return {
|
|
35
|
+
stance,
|
|
36
|
+
action,
|
|
37
|
+
tier: eq.tier,
|
|
38
|
+
effectId: eq.effectId,
|
|
39
|
+
target: eq.target,
|
|
40
|
+
baseChance: eq.baseChance,
|
|
41
|
+
intensityOverride: eq.intensityOverride,
|
|
42
|
+
durationOverride: eq.durationOverride,
|
|
43
|
+
fumbleEffectId: eq.fumbleEffectId,
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
function getEligibleTriggers(stance, action, unlocks, overrides, equipmentTriggers) {
|
|
34
47
|
const cap = unlockedTier(unlocks, stance, action);
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
48
|
+
const base = overrides?.[stance]?.[action]
|
|
49
|
+
? overrides[stance][action].filter(t => t.tier <= cap)
|
|
50
|
+
: TRIGGER_TABLE.filter(t => t.stance === stance && t.action === action && t.tier <= cap);
|
|
51
|
+
if (!equipmentTriggers || equipmentTriggers.length === 0)
|
|
52
|
+
return base;
|
|
53
|
+
const adapted = equipmentTriggers
|
|
54
|
+
.filter(eq => eq.tier <= cap)
|
|
55
|
+
.map(eq => adaptEquipmentTrigger(eq, stance, action));
|
|
56
|
+
return [...base, ...adapted];
|
|
40
57
|
}
|
|
41
58
|
function calculateProcChance(trigger, actor) {
|
|
42
59
|
const statBonus = (0, stats_1.getBaseStat)(actor, trigger.stance) * STAT_PROC_BONUS_PER_POINT;
|
|
@@ -46,7 +63,7 @@ function calculateProcChance(trigger, actor) {
|
|
|
46
63
|
}
|
|
47
64
|
function rollForCombatEffects(p) {
|
|
48
65
|
const rng = p.rng ?? Math.random;
|
|
49
|
-
const eligible = getEligibleTriggers(p.stance, p.action, p.unlocks, p.overrides);
|
|
66
|
+
const eligible = getEligibleTriggers(p.stance, p.action, p.unlocks, p.overrides, p.equipmentTriggers);
|
|
50
67
|
if (isFumble(p.rawAttackRoll)) {
|
|
51
68
|
const fumbleId = eligible.find(t => t.fumbleEffectId)?.fumbleEffectId;
|
|
52
69
|
const effect = fumbleId ? (0, effects_library_1.lookupEffect)(fumbleId) : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combat-effects.js","sourceRoot":"","sources":["../../src/Combat/combat-effects.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"combat-effects.js","sourceRoot":"","sources":["../../src/Combat/combat-effects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combat.reducer.d.ts","sourceRoot":"","sources":["../../src/Combat/combat.reducer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"combat.reducer.d.ts","sourceRoot":"","sources":["../../src/Combat/combat.reducer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAGvC,OAAO,EACH,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,EAC3D,MAAM,SAAS,CAAC;AAajB,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,WAAW,CAc7E;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,GAAG,WAAW,CAE5E;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAE/E;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAE/E;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,GAAG,WAAW,CAEhF;AAGD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,WAAW,GAAG,WAAW,CAEnE;AAGD,wBAAgB,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,WAAW,CAEzD;AAGD,eAAO,MAAM,iBAAiB,iBAAW,CAAC;AAC1C,eAAO,MAAM,iBAAiB,kBAAY,CAAC;AAC3C,eAAO,MAAM,sBAAsB,kBAAY,CAAC;AAChD,eAAO,MAAM,qBAAqB,kBAAY,CAAC;AAC/C,eAAO,MAAM,uBAAuB,kBAAY,CAAC"}
|
|
@@ -9,7 +9,9 @@ exports.appendLog = appendLog;
|
|
|
9
9
|
exports.incrementFriendship = incrementFriendship;
|
|
10
10
|
exports.endCombat = endCombat;
|
|
11
11
|
const Utils_1 = require("../Utils");
|
|
12
|
+
const equipment_engine_1 = require("../Items/equipment.engine");
|
|
12
13
|
function initializeCombat(player, enemy) {
|
|
14
|
+
const seeded = (0, equipment_engine_1.aggregateCombatStartTokens)(player.equipment ?? {});
|
|
13
15
|
return {
|
|
14
16
|
active: true,
|
|
15
17
|
phase: 'choosing_stance',
|
|
@@ -20,10 +22,7 @@ function initializeCombat(player, enemy) {
|
|
|
20
22
|
playerChoice: {},
|
|
21
23
|
enemyChoice: {},
|
|
22
24
|
log: [],
|
|
23
|
-
combatResources:
|
|
24
|
-
heart: 0, body: 0, mind: 0,
|
|
25
|
-
fallacy: 0, paradox: 0,
|
|
26
|
-
},
|
|
25
|
+
combatResources: seeded,
|
|
27
26
|
};
|
|
28
27
|
}
|
|
29
28
|
function setPhase(state, phase) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combat.reducer.js","sourceRoot":"","sources":["../../src/Combat/combat.reducer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"combat.reducer.js","sourceRoot":"","sources":["../../src/Combat/combat.reducer.ts"],"names":[],"mappings":";;;AAuBA,4CAcC;AAED,4BAEC;AAED,0CAEC;AAED,0CAEC;AAED,8BAEC;AAGD,kDAEC;AAGD,8BAEC;AAzDD,oCAAqC;AACrC,gEAAuE;AAgBvE,SAAgB,gBAAgB,CAAC,MAAiB,EAAE,KAAY;IAC5D,MAAM,MAAM,GAAG,IAAA,6CAA0B,EAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAClE,OAAO;QACH,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,CAAC;QACR,iBAAiB,EAAE,CAAC;QACpB,MAAM,EAAE,IAAA,iBAAS,EAAC,MAAM,CAAC;QACzB,KAAK,EAAE,IAAA,iBAAS,EAAC,KAAK,CAAC;QACvB,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,EAAE;QACf,GAAG,EAAE,EAAE;QACP,eAAe,EAAE,MAAM;KAC1B,CAAC;AACN,CAAC;AAED,SAAgB,QAAQ,CAAC,KAAkB,EAAE,KAAkB;IAC3D,OAAO,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,CAAC;AAC/B,CAAC;AAED,SAAgB,eAAe,CAAC,KAAkB,EAAE,MAAc;IAC9D,OAAO,EAAE,GAAG,KAAK,EAAE,YAAY,EAAE,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;AACzE,CAAC;AAED,SAAgB,eAAe,CAAC,KAAkB,EAAE,MAAc;IAC9D,OAAO,EAAE,GAAG,KAAK,EAAE,YAAY,EAAE,EAAE,GAAG,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,CAAC;AACzE,CAAC;AAED,SAAgB,SAAS,CAAC,KAAkB,EAAE,KAAqB;IAC/D,OAAO,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,CAAC,GAAG,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;AACpD,CAAC;AAGD,SAAgB,mBAAmB,CAAC,KAAkB;IAClD,OAAO,EAAE,GAAG,KAAK,EAAE,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,GAAG,CAAC,EAAE,CAAC;AACxE,CAAC;AAGD,SAAgB,SAAS,CAAC,KAAkB;IACxC,OAAO,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AACvD,CAAC;AAGY,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,sBAAsB,GAAG,SAAS,CAAC;AACnC,QAAA,qBAAqB,GAAG,SAAS,CAAC;AAClC,QAAA,uBAAuB,GAAG,SAAS,CAAC"}
|
|
@@ -227,7 +227,23 @@ export type ResourceEvent = {
|
|
|
227
227
|
outcome: BasicActionOutcome;
|
|
228
228
|
resources: CombatResources;
|
|
229
229
|
};
|
|
230
|
-
export type
|
|
230
|
+
export type ItemPhaseEvent = {
|
|
231
|
+
phase: 'item';
|
|
232
|
+
kind: 'used';
|
|
233
|
+
itemId: string;
|
|
234
|
+
itemName: string;
|
|
235
|
+
healed: number;
|
|
236
|
+
hpBefore: number;
|
|
237
|
+
hpAfter: number;
|
|
238
|
+
appliedEffectId: string | null;
|
|
239
|
+
resourceGrant: CombatResources;
|
|
240
|
+
} | {
|
|
241
|
+
phase: 'item';
|
|
242
|
+
kind: 'blocked';
|
|
243
|
+
itemId: string;
|
|
244
|
+
reason: 'unknown-item' | 'not-consumable' | 'missing-item-id';
|
|
245
|
+
};
|
|
246
|
+
export type RoundEvent = RoundStartEvent | ActionRestrictionEvent | AdvantageEvent | StanceEffectEvent | ScenarioEvent | SkillPhaseEvent | ResourceEvent | ItemPhaseEvent | RoundEndEvent;
|
|
231
247
|
export interface RoundResolution {
|
|
232
248
|
state: CombatState;
|
|
233
249
|
combatEvents: RoundEvent[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"combat.resolver.d.ts","sourceRoot":"","sources":["../../src/Combat/combat.resolver.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,uBAAuB,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAa7F,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC/E,OAAO,EACH,kBAAkB,EAAc,WAAW,EAE9C,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"combat.resolver.d.ts","sourceRoot":"","sources":["../../src/Combat/combat.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,10 @@ const Utils_1 = require("../Utils");
|
|
|
10
10
|
const combat_effects_1 = require("./combat-effects");
|
|
11
11
|
const game_mechanics_constants_1 = require("../Game/game-mechanics.constants");
|
|
12
12
|
const skill_engine_1 = require("../Skills/skill.engine");
|
|
13
|
+
const types_1 = require("../Items/types");
|
|
14
|
+
const equipment_engine_1 = require("../Items/equipment.engine");
|
|
15
|
+
const item_reducer_1 = require("../Items/item.reducer");
|
|
16
|
+
const effects_library_2 = require("../Effects/effects.library");
|
|
13
17
|
const advantage_1 = require("./advantage");
|
|
14
18
|
const stats_1 = require("./stats");
|
|
15
19
|
const effect_modifiers_1 = require("./effect-modifiers");
|
|
@@ -170,6 +174,12 @@ function resolveAttackHit(attacker, defender, rng, statValue, rollPlusStatMod, r
|
|
|
170
174
|
? { player: updatedAttacker, enemy: updatedDefender }
|
|
171
175
|
: { player: updatedDefender, enemy: updatedAttacker };
|
|
172
176
|
}
|
|
177
|
+
function equipmentTriggersFor(actor, action) {
|
|
178
|
+
const equipment = actor.equipment;
|
|
179
|
+
if (!equipment)
|
|
180
|
+
return [];
|
|
181
|
+
return (0, equipment_engine_1.getEquipmentProcTriggers)(equipment, action);
|
|
182
|
+
}
|
|
173
183
|
function runActionProcs(p) {
|
|
174
184
|
const unlocks = p.actor.procUnlocks
|
|
175
185
|
?? p.actor.procUnlocks;
|
|
@@ -181,6 +191,7 @@ function runActionProcs(p) {
|
|
|
181
191
|
rawAttackRoll: p.rawAttackRoll,
|
|
182
192
|
unlocks,
|
|
183
193
|
overrides,
|
|
194
|
+
equipmentTriggers: equipmentTriggersFor(p.actor, p.action),
|
|
184
195
|
});
|
|
185
196
|
let actor = p.actor;
|
|
186
197
|
let opponent = p.opponent;
|
|
@@ -357,6 +368,43 @@ function resolveCombatRound(state, playerAction, enemyAction, skillLookup) {
|
|
|
357
368
|
events.push(toRoundEvent(ev));
|
|
358
369
|
}
|
|
359
370
|
}
|
|
371
|
+
if (playerActionFinal === 'item') {
|
|
372
|
+
const itemId = playerAction.itemId;
|
|
373
|
+
if (!itemId) {
|
|
374
|
+
events.push({ phase: 'item', kind: 'blocked', itemId: '', reason: 'missing-item-id' });
|
|
375
|
+
}
|
|
376
|
+
else {
|
|
377
|
+
const item = player.inventory.find(i => i.id === itemId);
|
|
378
|
+
if (!item) {
|
|
379
|
+
events.push({ phase: 'item', kind: 'blocked', itemId, reason: 'unknown-item' });
|
|
380
|
+
}
|
|
381
|
+
else if (!(0, types_1.isConsumable)(item)) {
|
|
382
|
+
events.push({ phase: 'item', kind: 'blocked', itemId, reason: 'not-consumable' });
|
|
383
|
+
}
|
|
384
|
+
else {
|
|
385
|
+
const consumable = item;
|
|
386
|
+
const hpBefore = player.health;
|
|
387
|
+
const useResult = (0, equipment_engine_1.useConsumableEffect)(player, consumable, state.round, effects_library_2.lookupEffect);
|
|
388
|
+
const nextInventory = (0, item_reducer_1.useConsumable)(useResult.player.inventory, itemId);
|
|
389
|
+
player = { ...useResult.player, inventory: nextInventory };
|
|
390
|
+
combatResources = {
|
|
391
|
+
heart: combatResources.heart + useResult.resourceGrant.heart,
|
|
392
|
+
body: combatResources.body + useResult.resourceGrant.body,
|
|
393
|
+
mind: combatResources.mind + useResult.resourceGrant.mind,
|
|
394
|
+
fallacy: combatResources.fallacy + useResult.resourceGrant.fallacy,
|
|
395
|
+
paradox: combatResources.paradox + useResult.resourceGrant.paradox,
|
|
396
|
+
};
|
|
397
|
+
events.push({
|
|
398
|
+
phase: 'item', kind: 'used',
|
|
399
|
+
itemId, itemName: consumable.name,
|
|
400
|
+
healed: useResult.healed,
|
|
401
|
+
hpBefore, hpAfter: player.health,
|
|
402
|
+
appliedEffectId: useResult.applied?.id ?? null,
|
|
403
|
+
resourceGrant: useResult.resourceGrant,
|
|
404
|
+
});
|
|
405
|
+
}
|
|
406
|
+
}
|
|
407
|
+
}
|
|
360
408
|
const playerBasicAttacked = !skillBlocked && playerActionFinal === 'attack';
|
|
361
409
|
const playerBasicDefended = !skillBlocked && playerActionFinal === 'defend';
|
|
362
410
|
if (playerBasicAttacked && enemyActionFinal === 'attack') {
|
|
@@ -374,6 +422,9 @@ function resolveCombatRound(state, playerAction, enemyAction, skillLookup) {
|
|
|
374
422
|
else if (enemyActionFinal === 'attack' && playerActionFinal === 'skip') {
|
|
375
423
|
({ player, enemy } = resolveAttackVsAttack(player, enemy, playerStance, enemyStance, playerAdvantage, enemyAdvantage, events, state.round));
|
|
376
424
|
}
|
|
425
|
+
else if (enemyActionFinal === 'attack' && playerActionFinal === 'item') {
|
|
426
|
+
({ player, enemy } = resolveAttackVsAttack(player, enemy, playerStance, enemyStance, playerAdvantage, enemyAdvantage, events, state.round));
|
|
427
|
+
}
|
|
377
428
|
else if (playerActionFinal === 'defend' && enemyActionFinal === 'defend') {
|
|
378
429
|
const before = friendshipCounter;
|
|
379
430
|
friendshipCounter = before + 1;
|
|
@@ -384,14 +435,14 @@ function resolveCombatRound(state, playerAction, enemyAction, skillLookup) {
|
|
|
384
435
|
}
|
|
385
436
|
if (playerBasicAttacked) {
|
|
386
437
|
const outcome = playerWonAttackContest(events) ? 'hit' : 'miss';
|
|
387
|
-
combatResources = (0, skill_engine_1.generateBasicActionResources)(combatResources, playerStance, outcome);
|
|
438
|
+
combatResources = (0, skill_engine_1.generateBasicActionResources)(combatResources, playerStance, outcome, player.equipment);
|
|
388
439
|
events.push({
|
|
389
440
|
phase: 'resources', kind: 'generated',
|
|
390
441
|
stance: playerStance, outcome, resources: combatResources,
|
|
391
442
|
});
|
|
392
443
|
}
|
|
393
444
|
else if (playerBasicDefended) {
|
|
394
|
-
combatResources = (0, skill_engine_1.generateBasicActionResources)(combatResources, playerStance, 'defend');
|
|
445
|
+
combatResources = (0, skill_engine_1.generateBasicActionResources)(combatResources, playerStance, 'defend', player.equipment);
|
|
395
446
|
events.push({
|
|
396
447
|
phase: 'resources', kind: 'generated',
|
|
397
448
|
stance: playerStance, outcome: 'defend', resources: combatResources,
|