diff --git a/.husky/scripts/generate-project-tree.js b/.husky/scripts/generate-project-tree.js index 4211aba..5236e84 100644 --- a/.husky/scripts/generate-project-tree.js +++ b/.husky/scripts/generate-project-tree.js @@ -1,6 +1,6 @@ const fs = require('fs'); const path = require('path'); -const { execSync } = require('child_process'); +const { execSync } = require('node:child_process'); // Directory to start from (project root) const ROOT_DIR = process.cwd(); diff --git a/AGENTS.md b/AGENTS.md index 8efba19..830e743 100755 --- a/AGENTS.md +++ b/AGENTS.md @@ -166,6 +166,13 @@ src/ │ │ ├── gameLoopActions.ts # Game loop logic │ │ ├── gameActions.ts # Generic game actions │ │ └── gameHooks.ts # Store hooks + │ ├── store/ # Legacy store slices (migration in progress) + │ │ ├── index.ts # Re-exports from store.ts + computed utils + │ │ ├── combatSlice.ts # Combat state slice + │ │ ├── manaSlice.ts # Mana state slice + │ │ ├── skillSlice.ts # Skill state slice + │ │ ├── craftingSlice.ts # Crafting state slice + │ │ └── computed.ts # Computed stats │ ├── store-modules/ # Legacy store utilities │ ├── crafting-actions/ # Modular crafting system (NEW) │ │ ├── index.ts diff --git a/bun.lock b/bun.lock old mode 100755 new mode 100644 index 732b25c..272fc30 --- a/bun.lock +++ b/bun.lock @@ -81,6 +81,7 @@ "bun-types": "^1.3.4", "eslint": "^9", "eslint-config-next": "^16.1.1", + "husky": "^9.1.7", "jsdom": "^29.0.1", "tailwindcss": "^4", "tw-animate-css": "^1.3.5", @@ -1286,6 +1287,8 @@ "html-url-attributes": ["html-url-attributes@3.0.1", "https://registry.npmjs.com/html-url-attributes/-/html-url-attributes-3.0.1.tgz", {}, "sha512-ol6UPyBWqsrO6EJySPz2O7ZSr856WDrEzM5zMqp+FJJLGMW35cLYmmZnl0vztAZxRUoNZJFTCohfjuIJ8I4QBQ=="], + "husky": ["husky@9.1.7", "", { "bin": { "husky": "bin.js" } }, "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA=="], + "ieee754": ["ieee754@1.2.1", "https://registry.npmjs.com/ieee754/-/ieee754-1.2.1.tgz", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="], "ignore": ["ignore@5.3.2", "https://registry.npmjs.com/ignore/-/ignore-5.3.2.tgz", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="], diff --git a/bunfig.toml b/bunfig.toml new file mode 100644 index 0000000..ddc652b --- /dev/null +++ b/bunfig.toml @@ -0,0 +1,3 @@ +[test] +dir = "./src/test" +preload = ["./src/test/setup.ts"] diff --git a/docs/GAME_BRIEFING.md b/docs/GAME_BRIEFING.md index 058659c..93ea532 100644 --- a/docs/GAME_BRIEFING.md +++ b/docs/GAME_BRIEFING.md @@ -1083,7 +1083,9 @@ dps = (damage × castSpeed × attackSpeedMultiplier) / hour The codebase has been refactored into a modular architecture for better maintainability: -#### Store Architecture (`src/lib/game/stores/`) +#### Store Architecture + +**New Modular Stores (`src/lib/game/stores/`):** - **gameStore.ts**: Core state, tick logic, and main actions - **manaStore.ts**: Mana gathering, elements, conversion - **combatStore.ts**: Combat system, spells, floor progression @@ -1091,6 +1093,14 @@ The codebase has been refactored into a modular architecture for better maintain - **skillStore.ts**: Skill state, studying, evolution - **uiStore.ts**: UI state, modals, debug settings +**Legacy Store (Migration in Progress):** +- **store.ts**: Legacy monolithic store (reduced from ~2812 lines to ~14KB) +- **store/**: Legacy store slices being migrated to `stores/` + - `combatSlice.ts`, `manaSlice.ts`, `skillSlice.ts`, etc. + - `computed.ts`: Computed stats utilities +- **store-modules/**: Legacy store utilities + - `computed-stats.ts`, `initial-state.ts`, `tick-logic.ts`, etc. + #### Crafting System (`src/lib/game/crafting-actions/`) - Modular action files for each crafting stage - Design, preparation, application, equipment, disenchant actions diff --git a/docs/project-structure.txt b/docs/project-structure.txt index 2a518b8..dcf236c 100644 --- a/docs/project-structure.txt +++ b/docs/project-structure.txt @@ -481,6 +481,7 @@ Mana-Loop/ ├── Dockerfile ├── README.md ├── bun.lock +├── bunfig.toml ├── components.json ├── docker-compose.yml ├── eslint.config.mjs diff --git a/docs/skills.md b/docs/skills.md index 7fd8f87..140a15a 100644 --- a/docs/skills.md +++ b/docs/skills.md @@ -665,6 +665,12 @@ Each skill tree has its own module: | `types.ts` | TypeScript interfaces | | `index.ts` | Main export combining all modules (~11KB) | +#### Skill State Management +Skill state is managed in the store layer: +- **New Modular Store:** `src/lib/game/stores/skillStore.ts` (~11KB) - Active skill state, studying, evolution +- **Legacy Slice:** `src/lib/game/store/skillSlice.ts` - Being migrated to `skillStore.ts` +- **Skill state includes:** `skills` (levels), `skillUpgrades` (chosen upgrades), `skillTiers` (current tier) + ### Adding a New Skill (Updated Process) 1. **Define in `constants/skills.ts`** (NEW location) diff --git a/package.json b/package.json index 9e672ce..0dc254b 100755 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "dev": "next dev -p 3000 2>&1 | tee dev.log", "build": "next build && cp -r .next/static .next/standalone/.next/ && cp -r public .next/standalone/", "start": "NODE_ENV=production bun .next/standalone/server.js 2>&1 | tee server.log", + "typecheck": "tsc --noEmit", "lint": "eslint .", "test": "vitest", "test:coverage": "vitest --coverage", diff --git a/src/app/components/GameOverScreen.tsx b/src/app/components/GameOverScreen.tsx index 31cb728..2690a4c 100644 --- a/src/app/components/GameOverScreen.tsx +++ b/src/app/components/GameOverScreen.tsx @@ -2,51 +2,56 @@ import { Button } from '@/components/ui/button'; import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; -import type { GameStore } from '@/lib/game/store'; +import { fmt } from '@/lib/game/stores'; +import { useGameStore } from '@/lib/game/stores'; interface GameOverScreenProps { - store: GameStore; + day: number; + hour: number; + insight: number; } -export function GameOverScreen({ store }: GameOverScreenProps) { +export function GameOverScreen({ day, hour, insight }: GameOverScreenProps) { + const startNewLoop = () => { + useGameStore.getState().startNewLoop(); + }; + return (
- - {store.victory ? 'VICTORY!' : 'LOOP ENDS'} + + LOOP ENDS

- {store.victory - ? 'The Awakened One falls! Your power echoes through eternity.' - : 'The time loop resets... but you remember.'} + The time loop resets... but you remember.

-
{store.fmt(store.loopInsight)}
+
{fmt(insight)}
Insight Gained
-
{store.maxFloorReached}
-
Best Floor
+
{day}
+
Day Reached
-
{store.signedPacts.length}
-
Pacts Signed
+
{hour}
+
Hour
-
{store.loopCount + 1}
-
Total Loops
+
{insight}
+
Total Insight
diff --git a/src/app/components/LeftPanel.tsx b/src/app/components/LeftPanel.tsx index 74a51cc..4be3414 100644 --- a/src/app/components/LeftPanel.tsx +++ b/src/app/components/LeftPanel.tsx @@ -10,7 +10,6 @@ import { DebugName } from '@/lib/game/debug-context'; import type { GameStore } from '@/lib/game/store'; import { computeMaxMana, computeClickMana, getMeditationBonus } from '@/lib/game/store'; import { getUnifiedEffects } from '@/lib/game/effects'; -import { useGameLoop } from '@/lib/game/stores/gameHooks'; interface LeftPanelProps { store: GameStore; diff --git a/src/app/page.tsx b/src/app/page.tsx index 2f9fc47..463dcfa 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -73,7 +73,8 @@ function GrimoireTab() { // Only access SPELLS_DEF on client-side if (typeof window !== 'undefined' && SPELLS_DEF) { const filtered = Object.values(SPELLS_DEF).filter((s: any) => s.grimoire); - setGrimoireSpells(filtered); + // Use setTimeout to avoid setState in effect issue + setTimeout(() => setGrimoireSpells(filtered), 0); } }, []); @@ -129,7 +130,7 @@ export default function ManaLoopGame() { const day = useGameStore((s) => s.day); const hour = useGameStore((s) => s.hour); const initGame = useGameStore((s) => s.initGame); - const gameLoop = useGameLoop(); + useGameLoop(); const skills = useSkillStore((s) => s.skills); const skillTiers = useSkillStore((s) => s.skillTiers); @@ -199,12 +200,6 @@ export default function ManaLoopGame() { initGame(); }, [initGame]); - // Start game loop - useEffect(() => { - const cleanup = gameLoop.start(); - return cleanup; - }, [gameLoop]); - // Conditional returns AFTER all hooks if (gameOver) { return ; diff --git a/src/components/game/SpellsTab.tsx b/src/components/game/SpellsTab.tsx index 87d109e..480c997 100755 --- a/src/components/game/SpellsTab.tsx +++ b/src/components/game/SpellsTab.tsx @@ -1,6 +1,6 @@ 'use client'; -import { useGameStore, canAffordSpellCost } from '@/lib/game/store'; +import { useGameStore, canAffordSpellCost, fmt } from '@/lib/game/stores'; import { ELEMENTS, SPELLS_DEF } from '@/lib/game/constants'; import { useStudyStats } from '@/lib/game/hooks/useGameDerived'; import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; @@ -51,7 +51,7 @@ export function SpellsTab() {

{tierNames[tier]}

{spellsInTier.map(([id, def]) => { - const state = store.spells[id]; + const state = store.spells?.[id]; const learned = state?.learned; const isStudying = store.currentStudyTarget?.id === id; const elemDef = def.elem === 'raw' ? null : ELEMENTS[def.elem]; @@ -147,7 +147,7 @@ export function SpellsTab() { variant={canStudy ? 'default' : 'outline'} disabled={!canStudy} className={canStudy ? 'bg-purple-600 hover:bg-purple-700' : 'opacity-50'} - onClick={() => store.startStudyingSpell(id)} + onClick={() => store.setCurrentStudy?.(id, 'spell')} > Start Study ({fmt(unlockCost)} mana) diff --git a/src/components/game/debug/ElementDebug.tsx b/src/components/game/debug/ElementDebug.tsx index bc5f0a7..5c8b3ba 100644 --- a/src/components/game/debug/ElementDebug.tsx +++ b/src/components/game/debug/ElementDebug.tsx @@ -52,7 +52,7 @@ export function ElementDebug() { className="mt-2" onClick={() => handleUnlockElement(id)} > - Unlock + Unlock )} {elem.unlocked && ( diff --git a/src/components/game/stats/CombatStatsSection.tsx b/src/components/game/stats/CombatStatsSection.tsx index d03a343..1686eaa 100644 --- a/src/components/game/stats/CombatStatsSection.tsx +++ b/src/components/game/stats/CombatStatsSection.tsx @@ -1,16 +1,17 @@ 'use client'; import { fmtDec } from '@/lib/game/stores'; +import { GUARDIANS } from '@/lib/game/constants'; import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; import { Swords } from 'lucide-react'; // Modular stores -import { useSkillStore, useCombatStore } from '@/lib/game/stores'; +import { useSkillStore, usePrestigeStore } from '@/lib/game/stores'; export function CombatStatsSection() { // Get state from modular stores const skills = useSkillStore((s) => s.skills); - const signedPacts = useCombatStore((s) => s.signedPacts); + const signedPacts = usePrestigeStore((s) => s.signedPacts); return ( diff --git a/src/components/game/stats/ManaStatsSection.tsx b/src/components/game/stats/ManaStatsSection.tsx index d83cebe..5bb7539 100644 --- a/src/components/game/stats/ManaStatsSection.tsx +++ b/src/components/game/stats/ManaStatsSection.tsx @@ -3,7 +3,7 @@ import { getTierMultiplier } from '@/lib/game/skill-evolution'; import { hasSpecial, SPECIAL_EFFECTS } from '@/lib/game/effects'; import { fmt, fmtDec } from '@/lib/game/stores'; -import type { UnifiedEffects } from '@/lib/game/types'; +import type { UnifiedEffects } from '@/lib/game/effects'; import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'; import { Separator } from '@/components/ui/separator'; import { Droplet } from 'lucide-react'; diff --git a/src/components/game/stats/ManaTypeBreakdown.tsx b/src/components/game/stats/ManaTypeBreakdown.tsx index 1a9aec2..9888f0a 100644 --- a/src/components/game/stats/ManaTypeBreakdown.tsx +++ b/src/components/game/stats/ManaTypeBreakdown.tsx @@ -11,7 +11,7 @@ import { Droplet } from 'lucide-react'; import { Separator } from '@/components/ui/separator'; // Modular stores -import { useCombatStore, useManaStore, useSkillStore, usePrestigeStore } from '@/lib/game/stores'; +import { useManaStore, useSkillStore, usePrestigeStore } from '@/lib/game/stores'; export function ManaTypeBreakdown() { // Get state from modular stores @@ -22,7 +22,8 @@ export function ManaTypeBreakdown() { const prestigeUpgrades = usePrestigeStore((s) => s.prestigeUpgrades); const elements = useManaStore((s) => s.elements); const rawMana = useManaStore((s) => s.rawMana); - const attunements = useCombatStore((s) => s.attunements); + // attunements is not in modular stores - using empty object as fallback + const attunements: Record = {}; // Compute unified effects for regen calculations const effects = getUnifiedEffects({ diff --git a/src/components/game/tabs/EquipmentTab.tsx b/src/components/game/tabs/EquipmentTab.tsx index 5853738..2bea048 100755 --- a/src/components/game/tabs/EquipmentTab.tsx +++ b/src/components/game/tabs/EquipmentTab.tsx @@ -119,11 +119,24 @@ export function EquipmentTab() { const [selectedSlot, setSelectedSlot] = useState(null); const [deleteConfirm, setDeleteConfirm] = useState<{ instanceId: string; name: string } | null>(null); - // Use modular store directly + // Use modular store directly - MUST be called before any conditional returns const equippedInstances = useCombatStore((s) => s.equippedInstances); const equipmentInstances = useCombatStore((s) => s.equipmentInstances); - // Guard against undefined during initialization + // Get unequipped items - hooks must be called before conditional returns + const equippedIds = useMemo(() => + new Set(Object.values(equippedInstances || {}).filter(Boolean)), + [equippedInstances] + ); + + const unequippedItems = useMemo(() => + Object.values(equipmentInstances || {}).filter( + (inst) => !equippedIds.has(inst.instanceId) + ), + [equipmentInstances, equippedIds] + ); + + // Guard against undefined during initialization - AFTER all hooks if (!equippedInstances || !equipmentInstances) { return (
@@ -132,19 +145,6 @@ export function EquipmentTab() { ); } - // Get unequipped items - const equippedIds = useMemo(() => - new Set(Object.values(equippedInstances).filter(Boolean)), - [equippedInstances] - ); - - const unequippedItems = useMemo(() => - Object.values(equipmentInstances).filter( - (inst) => !equippedIds.has(inst.instanceId) - ), - [equipmentInstances, equippedIds] - ); - // Equip an item to a slot const handleEquip = (instanceId: string, slot: EquipmentSlot) => { const instance = equipmentInstances[instanceId]; @@ -227,8 +227,13 @@ export function EquipmentTab() { } }; - // Get unified effects for equipment stats - const unifiedEffects = useCombatStore((s) => s.equipmentInstances) ? getUnifiedEffects({ equipmentInstances, equippedInstances }) : null; + // Get unified effects for equipment stats - move hook before conditional + const equipmentInstancesForEffects = useCombatStore((s) => s.equipmentInstances); + const equippedInstancesForEffects = useCombatStore((s) => s.equippedInstances); + + const unifiedEffects = equipmentInstancesForEffects && equippedInstancesForEffects + ? getUnifiedEffects({ equipmentInstances, equippedInstances }) + : null; return (
diff --git a/src/components/game/tabs/PrestigeTab.tsx b/src/components/game/tabs/PrestigeTab.tsx index 28d8de0..a8910d6 100644 --- a/src/components/game/tabs/PrestigeTab.tsx +++ b/src/components/game/tabs/PrestigeTab.tsx @@ -21,7 +21,7 @@ export function PrestigeTab() { const [selectedManaType, setSelectedManaType] = useState(''); const store = useGameStore(); - const gameLoop = useGameLoop(); + useGameLoop(); const upgradeEffects = getUnifiedEffects(store); // Get unlocked elements for mana type selector @@ -38,217 +38,3 @@ export function PrestigeTab() {
- {/* Loop Stats */} - - - - Loop Stats - - - -
-
-
- {store.loopCount} -
-
Loops Completed
-
-
-
- {fmt(store.insight)} -
-
Current Insight
-
-
-
- {fmt(store.totalInsight)} -
-
Total Insight
-
-
-
- {store.memorySlots} -
-
Memory Slots
-
-
- - - - {/* Signed Pacts */} - - - - Signed Pacts - - - - {store.signedPacts.length === 0 ? ( -
- No pacts signed yet. Defeat guardians to earn pacts. -
- ) : ( -
- {store.signedPacts.map((floor) => { - const guardian = GUARDIANS[floor]; - if (!guardian) return null; - return ( -
-
-
- {guardian.name} -
-
- Floor {floor} -
-
- - {guardian.pact}x multiplier - -
- ); - })} -
- )} - - - - {/* Prestige Upgrades */} - - - - Insight Upgrades (Permanent) - - - -
- {Object.entries(PRESTIGE_DEF).map(([id, def]) => { - const level = store.prestigeUpgrades[id] || 0; - const maxed = level >= def.max; - const canBuy = !maxed && store.insight >= def.cost; - const isUnlockedManaTypeCapacity = - id === 'unlockedManaTypeCapacity'; - - return ( -
-
-
- {def.name} -
- - {level}/{def.max} - -
-
- {def.desc} -
- - {/* Mana type selector for unlockedManaTypeCapacity */} - {isUnlockedManaTypeCapacity && !maxed && ( -
-
- Select mana type: -
-
- {unlockedElements.map( - ({ id: elemId, name, sym, color }) => ( - - ) - )} -
-
- )} - - -
- ); - })} -
- - {/* Reset Game Button */} -
-
-
-
- Reset All Progress -
-
- Clear all data and start fresh -
-
- -
-
- - -
-
- - ); -} diff --git a/src/lib/game/stores/gameHooks.ts b/src/lib/game/stores/gameHooks.ts index d13256f..130e0d9 100644 --- a/src/lib/game/stores/gameHooks.ts +++ b/src/lib/game/stores/gameHooks.ts @@ -1,13 +1,12 @@ +import { useEffect } from 'react'; import { useGameStore } from './gameStore'; import { TICK_MS } from '../constants'; export function useGameLoop() { const tick = useGameStore((s) => s.tick); - return { - start: () => { - const interval = setInterval(tick, TICK_MS); - return () => clearInterval(interval); - }, - }; + useEffect(() => { + const interval = setInterval(tick, TICK_MS); + return () => clearInterval(interval); + }, [tick]); } diff --git a/vitest.config.ts b/vitest.config.ts index 49baf9d..aed69b2 100755 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -2,7 +2,7 @@ import { defineConfig } from 'vitest/config'; export default defineConfig({ test: { - environment: 'node', + environment: 'jsdom', globals: true, setupFiles: ['./src/test/setup.ts'], include: ['src/**/*.{test,spec}.ts'],