From e9eb7d8b1483c8af0f084ed6efbe246ae346b05a Mon Sep 17 00:00:00 2001 From: n8n-gitea Date: Mon, 25 May 2026 12:43:08 +0200 Subject: [PATCH] fix: discipline bonuses persist when paused/deactivated --- docs/circular-deps.txt | 4 ++-- docs/dependency-graph.json | 12 +++++++++++- src/lib/game/effects/discipline-effects.ts | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/circular-deps.txt b/docs/circular-deps.txt index 5042cb3..7fd1049 100644 --- a/docs/circular-deps.txt +++ b/docs/circular-deps.txt @@ -1,8 +1,8 @@ # Circular Dependencies -Generated: 2026-05-25T09:55:36.893Z +Generated: 2026-05-25T10:24:06.549Z Found: 6 circular chain(s) — these MUST be fixed before modifying involved files. -1. Processed 132 files (1.5s) (2 warnings) +1. Processed 134 files (1.6s) (2 warnings) 2. 1) utils/floor-utils.ts > utils/room-utils.ts > utils/enemy-utils.ts 3. 2) utils/floor-utils.ts > utils/room-utils.ts 4. 3) stores/gameStore.ts > stores/gameActions.ts diff --git a/docs/dependency-graph.json b/docs/dependency-graph.json index 1c0329b..879aa51 100644 --- a/docs/dependency-graph.json +++ b/docs/dependency-graph.json @@ -1,6 +1,6 @@ { "_meta": { - "generated": "2026-05-25T09:55:35.204Z", + "generated": "2026-05-25T10:24:04.726Z", "description": "Import dependency graph for src/lib/game. Keys are files, values are arrays of files they import.", "usage": "To find what a file affects, search for its path in the VALUES. To find what a file depends on, look at its KEY entry." }, @@ -174,6 +174,12 @@ "data/disciplines/base.ts": [ "types/disciplines.ts" ], + "data/disciplines/elemental-regen-advanced.ts": [ + "types/disciplines.ts" + ], + "data/disciplines/elemental-regen.ts": [ + "types/disciplines.ts" + ], "data/disciplines/enchanter-special.ts": [ "types/disciplines.ts" ], @@ -191,6 +197,8 @@ ], "data/disciplines/index.ts": [ "data/disciplines/base.ts", + "data/disciplines/elemental-regen-advanced.ts", + "data/disciplines/elemental-regen.ts", "data/disciplines/enchanter-special.ts", "data/disciplines/enchanter-spells.ts", "data/disciplines/enchanter-utility.ts", @@ -470,6 +478,8 @@ ], "stores/discipline-slice.ts": [ "data/disciplines/base.ts", + "data/disciplines/elemental-regen-advanced.ts", + "data/disciplines/elemental-regen.ts", "data/disciplines/enchanter-special.ts", "data/disciplines/enchanter-spells.ts", "data/disciplines/enchanter-utility.ts", diff --git a/src/lib/game/effects/discipline-effects.ts b/src/lib/game/effects/discipline-effects.ts index 3cbc5c5..fc19dd7 100644 --- a/src/lib/game/effects/discipline-effects.ts +++ b/src/lib/game/effects/discipline-effects.ts @@ -14,7 +14,7 @@ export function computeDisciplineEffects(_state?: DisciplineStoreState): { } { const { disciplines } = useDisciplineStore.getState(); const activeDiscs = Object.entries(disciplines) - .filter(([, disc]) => disc && !disc.paused) + .filter(([, disc]) => disc && disc.xp > 0) .map(([id, disc]) => ({ id, disc, def: ALL_DISCIPLINES.find(d => d.id === id) })) .filter((entry): entry is { id: string; disc: DisciplineState; def: NonNullable } => !!entry.def);