Phase 3: Split utils.ts by responsibility

src/lib/game/utils/mana-utils.ts

@@ -1,48 +1,12 @@
-// ─── Mana Calculation Functions ───────────────────────────────────────────────
+// ─── Mana & Regen Utilities ──────────────────────────────────────────────────
 
 import type { GameState } from '../types';
-import { HOURS_PER_TICK, TICK_MS } from '../constants';
 import type { ComputedEffects } from '../upgrade-effects';
-import { getUnifiedEffects, type UnifiedEffects } from '../effects';
-
-// ─── Default Effects Constant ───────────────────────────────────────────────────
-
-// Default empty effects for when effects aren't provided
-export const DEFAULT_EFFECTS: ComputedEffects = {
-  maxManaMultiplier: 1,
-  maxManaBonus: 0,
-  regenMultiplier: 1,
-  regenBonus: 0,
-  clickManaMultiplier: 1,
-  clickManaBonus: 0,
-  meditationEfficiency: 1,
-  spellCostMultiplier: 1,
-  conversionEfficiency: 1,
-  baseDamageMultiplier: 1,
-  baseDamageBonus: 0,
-  attackSpeedMultiplier: 1,
-  critChanceBonus: 0,
-  critDamageMultiplier: 1.5,
-  elementalDamageMultiplier: 1,
-  studySpeedMultiplier: 1,
-  studyCostMultiplier: 1,
-  progressRetention: 0,
-  instantStudyChance: 0,
-  freeStudyChance: 0,
-  elementCapMultiplier: 1,
-  elementCapBonus: 0,
-  conversionCostMultiplier: 1,
-  doubleCraftChance: 0,
-  permanentRegenBonus: 0,
-  specials: new Set(),
-  activeUpgrades: [],
-};
-
-// ─── Mana Computation Functions ────────────────────────────────────────────────
+import { HOURS_PER_TICK } from '../constants';
 
 export function computeMaxMana(
-  state: Pick<GameState, 'skills' | 'prestigeUpgrades' | 'skillUpgrades' | 'skillTiers' | 'equipmentInstances' | 'equippedInstances'>,
-  effects?: ComputedEffects | UnifiedEffects
+  state: Pick<GameState, 'skills' | 'prestigeUpgrades' | 'skillUpgrades' | 'skillTiers'>,
+  effects?: ComputedEffects
 ): number {
   const pu = state.prestigeUpgrades;
   const base = 
@@ -50,12 +14,7 @@ export function computeMaxMana(
     (state.skills.manaWell || 0) * 100 +
     (pu.manaWell || 0) * 500;
   
-  // If effects not provided, compute unified effects (includes equipment)
-  if (!effects && state.equipmentInstances && state.equippedInstances) {
-    effects = getUnifiedEffects(state as any);
-  }
-  
-  // Apply effects if available (now includes equipment bonuses)
+  // Apply upgrade effects if provided
   if (effects) {
     return Math.floor((base + effects.maxManaBonus) * effects.maxManaMultiplier);
   }
@@ -77,8 +36,8 @@ export function computeElementMax(
 }
 
 export function computeRegen(
-  state: Pick<GameState, 'skills' | 'prestigeUpgrades' | 'skillUpgrades' | 'skillTiers' | 'equipmentInstances' | 'equippedInstances'>,
-  effects?: ComputedEffects | UnifiedEffects
+  state: Pick<GameState, 'skills' | 'prestigeUpgrades' | 'skillUpgrades' | 'skillTiers'>,
+  effects?: ComputedEffects
 ): number {
   const pu = state.prestigeUpgrades;
   const temporalBonus = 1 + (pu.temporalEcho || 0) * 0.1;
@@ -90,12 +49,7 @@ export function computeRegen(
   
   let regen = base * temporalBonus;
   
-  // If effects not provided, compute unified effects (includes equipment)
-  if (!effects && state.equipmentInstances && state.equippedInstances) {
-    effects = getUnifiedEffects(state as any);
-  }
-  
-  // Apply effects if available (now includes equipment bonuses)
+  // Apply upgrade effects if provided
   if (effects) {
     regen = (regen + effects.regenBonus + effects.permanentRegenBonus) * effects.regenMultiplier;
   }
@@ -107,14 +61,12 @@ export function computeRegen(
  * Compute regen with dynamic special effects (needs current mana, max mana, incursion)
  */
 export function computeEffectiveRegen(
-  state: Pick<GameState, 'skills' | 'prestigeUpgrades' | 'rawMana' | 'incursionStrength' | 'skillUpgrades' | 'skillTiers' | 'equipmentInstances' | 'equippedInstances'>,
-  effects?: ComputedEffects | UnifiedEffects
+  state: Pick<GameState, 'skills' | 'prestigeUpgrades' | 'rawMana' | 'incursionStrength' | 'skillUpgrades' | 'skillTiers'>,
+  effects?: ComputedEffects
 ): number {
   // Base regen from existing function
   let regen = computeRegen(state, effects);
   
-  const maxMana = computeMaxMana(state, effects);
-  const currentMana = state.rawMana;
   const incursionStrength = state.incursionStrength || 0;
   
   // Apply incursion penalty
@@ -123,23 +75,42 @@ export function computeEffectiveRegen(
   return regen;
 }
 
-export function computeClickMana(
-  state: Pick<GameState, 'skills' | 'skillUpgrades' | 'skillTiers' | 'equipmentInstances' | 'equippedInstances'>,
-  effects?: ComputedEffects | UnifiedEffects
-): number {
-  const base = 
+export function computeClickMana(state: Pick<GameState, 'skills'>): number {
+  return (
     1 +
     (state.skills.manaTap || 0) * 1 +
-    (state.skills.manaSurge || 0) * 3;
-  
-  // If effects not provided, compute unified effects (includes equipment)
-  if (!effects && state.equipmentInstances && state.equippedInstances) {
-    effects = getUnifiedEffects(state as any);
-  }
-  
-  // Apply effects if available (now includes equipment bonuses)
-  if (effects) {
-    return Math.floor((base + effects.clickManaBonus) * effects.clickManaMultiplier);
-  }
-  return base;
+    (state.skills.manaSurge || 0) * 3
+  );
+}
+
+// Meditation bonus now affects regen rate directly
+export function getMeditationBonus(meditateTicks: number, skills: Record<string, number>, meditationEfficiency: number = 1): number {
+  const hasMeditation = skills.meditation === 1;
+  const hasDeepTrance = skills.deepTrance === 1;
+  const hasVoidMeditation = skills.voidMeditation === 1;
+  
+  const hours = meditateTicks * HOURS_PER_TICK;
+  
+  // Base meditation: ramps up over 4 hours to 1.5x
+  let bonus = 1 + Math.min(hours / 4, 0.5);
+  
+  // With Meditation Focus: up to 2.5x after 4 hours
+  if (hasMeditation && hours >= 4) {
+    bonus = 2.5;
+  }
+  
+  // With Deep Trance: up to 3.0x after 6 hours
+  if (hasDeepTrance && hours >= 6) {
+    bonus = 3.0;
+  }
+  
+  // With Void Meditation: up to 5.0x after 8 hours
+  if (hasVoidMeditation && hours >= 8) {
+    bonus = 5.0;
+  }
+  
+  // Apply meditation efficiency from upgrades (Deep Wellspring, etc.)
+  bonus *= meditationEfficiency;
+  
+  return bonus;
 }