fix: resolve circular dependency in discipline-slice → discipline-effects
Build and Publish Mana Loop Docker Image / build-and-publish (push) Successful in 1m30s
Build and Publish Mana Loop Docker Image / build-and-publish (push) Successful in 1m30s
Replaced computeDisciplineEffects() import in discipline-slice.ts with inline XP bonus calculation using calculateStatBonus from discipline-math. This avoids the circular chain: discipline-effects → discipline-slice → discipline-effects.
This commit is contained in:
@@ -6,11 +6,11 @@ import type { DisciplineState } from '../types/disciplines';
|
||||
import type { ElementState } from '../types';
|
||||
import {
|
||||
calculateManaDrain,
|
||||
calculateStatBonus,
|
||||
canProceedDiscipline,
|
||||
checkDisciplinePrerequisites,
|
||||
getUnlockedPerks
|
||||
} from '../utils/discipline-math';
|
||||
import { computeDisciplineEffects } from '../effects/discipline-effects';
|
||||
import { baseDisciplines } from '../data/disciplines/base';
|
||||
import { elementalAttunementDisciplines } from '../data/disciplines/elemental';
|
||||
import { elementalRegenDisciplines } from '../data/disciplines/elemental-regen';
|
||||
@@ -184,7 +184,28 @@ export const useDisciplineStore = create<DisciplineStore>()(
|
||||
}
|
||||
|
||||
const oldXP = disc.xp;
|
||||
const xpBonus = computeDisciplineEffects().bonuses.disciplineXpBonus || 0;
|
||||
// Compute discipline XP bonus directly to avoid circular import
|
||||
let xpBonus = 0;
|
||||
for (const [did, dState] of Object.entries(newDisciplines)) {
|
||||
if (!dState || dState.xp <= 0) continue;
|
||||
const dDef = DISCIPLINE_MAP[did];
|
||||
if (!dDef) continue;
|
||||
// Only disciplines with disciplineXpBonus stat contribute
|
||||
if (dDef.statBonus.stat === 'disciplineXpBonus') {
|
||||
xpBonus += calculateStatBonus(
|
||||
dDef.statBonus.baseValue,
|
||||
dState.xp,
|
||||
dDef.scalingFactor
|
||||
);
|
||||
}
|
||||
// Perk bonuses for disciplineXpBonus
|
||||
const perks = getUnlockedPerks(dDef, dState.xp);
|
||||
for (const perk of perks) {
|
||||
if (perk.bonus && perk.bonus.stat === 'disciplineXpBonus') {
|
||||
xpBonus += perk.bonus.amount;
|
||||
}
|
||||
}
|
||||
}
|
||||
const xpGain = 1 + xpBonus;
|
||||
newDisciplines[id] = { ...disc, xp: disc.xp + xpGain };
|
||||
newXP += xpGain;
|
||||
|
||||
Reference in New Issue
Block a user