Remove orphaned code and consolidate image generation utilities

src/components/PixiStageController.ts

@@ -11,7 +11,7 @@ import { LaneManager } from './stage/LaneManager'
 import { EffectManager } from './stage/EffectManager'
 import { NoteManager } from './stage/NoteManager'
 import { getGigTimeMs } from '../utils/audio/audioEngine'
-import { withTimeout } from './stage/utils'
+import { withTimeout } from './stage/stageRenderUtils'
 import type { StageControllerOptions } from '../types/components'
 import type { RhythmGameRefState } from '../types/rhythmGame'
 

src/components/postGig/CompletePhase.tsx

@@ -1,12 +1,7 @@
 import { motion } from 'framer-motion'
 import { useTranslation } from 'react-i18next'
 import { ActionButton } from '../../ui/shared'
-import {
-  getGenImageUrl,
-  IMG_PROMPTS,
-  isImageGenerationAvailable,
-  getGeneratedImageFallbackUrl
-} from '../../utils/imageGen'
+import { IMG_PROMPTS, resolveGenImageUrl } from '../../utils/imageGen'
 import { SideEffectsSummary } from './SideEffectsSummary'
 import type { CompletePhaseProps } from '../../types/components'
 
@@ -20,7 +15,7 @@ export const CompletePhase = ({
 }: CompletePhaseProps) => {
   const { t, i18n } = useTranslation()
   const hasPR = player?.hqUpgrades?.includes('pr_manager_contract')
-  const isHighControversy = (social?.controversyLevel || 0) > 50
+  const isHighControversy = (social?.controversyLevel ?? 0) > 50
 
   const getOutcomeImagePrompt = () => {
     if (result.success === true) {
@@ -38,7 +33,7 @@ export const CompletePhase = ({
       <div
         className='absolute inset-0 opacity-20 bg-cover bg-center mix-blend-screen pointer-events-none z-0'
         style={{
-          backgroundImage: `url("${isImageGenerationAvailable() ? getGenImageUrl(getOutcomeImagePrompt()) : getGeneratedImageFallbackUrl()}")`
+          backgroundImage: `url("${resolveGenImageUrl(getOutcomeImagePrompt())}")`
         }}
       />
       <motion.div

src/components/postGig/DealCard.tsx

@@ -13,12 +13,7 @@ import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ActionButton } from '../../ui/shared'
 import { BRAND_ALIGNMENTS } from '../../context/initialState'
-import {
-  IMG_PROMPTS,
-  getGenImageUrl,
-  isImageGenerationAvailable,
-  getGeneratedImageFallbackUrl
-} from '../../utils/imageGen'
+import { IMG_PROMPTS, resolveGenImageUrl } from '../../utils/imageGen'
 import type {
   DealImageProps,
   DealInfoProps,
@@ -141,11 +136,7 @@ const getAlignmentColor = (alignment?: string) => {
 const DealImage = memo(({ alignment, name }: DealImageProps) => (
   <div className='shrink-0 w-24 h-24 border border-current opacity-80 overflow-hidden'>
     <img
-      src={
-        isImageGenerationAvailable()
-          ? getGenImageUrl(getAlignmentImagePrompt(alignment))
-          : getGeneratedImageFallbackUrl()
-      }
+      src={resolveGenImageUrl(getAlignmentImagePrompt(alignment))}
       alt={name}
       className='w-full h-full object-cover object-center grayscale hover:grayscale-0 transition-all duration-300'
       loading='lazy'

src/components/postGig/SocialOptionButton.tsx

@@ -3,12 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { motion } from 'framer-motion'
 import { ActionButton } from '../../ui/shared'
 import { SideEffectsPreview } from './SideEffectsPreview'
-import {
-  getGenImageUrl,
-  IMG_PROMPTS,
-  isImageGenerationAvailable,
-  getGeneratedImageFallbackUrl
-} from '../../utils/imageGen'
+import { IMG_PROMPTS, resolveGenImageUrl } from '../../utils/imageGen'
 import type { SocialOptionButtonProps } from '../../types/components'
 
 const CATEGORY_PROMPTS = {
@@ -49,7 +44,7 @@ export const SocialOptionButton = memo(function SocialOptionButton({
         <div
           className='absolute inset-0 opacity-80 group-hover:opacity-20 transition-opacity bg-cover bg-center pointer-events-none'
           style={{
-            backgroundImage: `url("${isImageGenerationAvailable() ? getGenImageUrl(getImagePromptForCategory(opt.category, opt.badges)) : getGeneratedImageFallbackUrl()}")`
+            backgroundImage: `url("${resolveGenImageUrl(getImagePromptForCategory(opt.category, opt.badges))}")`
           }}
         />
 

src/components/postGig/ZealotryGauge.tsx

@@ -1,12 +1,8 @@
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ZEALOTRY_PROMO_THRESHOLD } from '../../utils/economyEngine'
-import {
-  getGenImageUrl,
-  IMG_PROMPTS,
-  isImageGenerationAvailable,
-  getGeneratedImageFallbackUrl
-} from '../../utils/imageGen'
+import { clampZealotry } from '../../utils/gameStateUtils'
+import { IMG_PROMPTS, resolveGenImageUrl } from '../../utils/imageGen'
 
 type ZealotryGaugeProps = { zealotryLevel?: number }
 
@@ -20,11 +16,7 @@ export const ZealotryGauge = memo(
       <div className='flex flex-row items-center gap-4 mb-4 p-3 bg-blood-red/10 border border-blood-red/30 rounded relative overflow-hidden'>
         <div className='w-12 h-12 shrink-0 border border-blood-red/50 rounded overflow-hidden'>
           <img
-            src={
-              isImageGenerationAvailable()
-                ? getGenImageUrl(IMG_PROMPTS.ZEALOTRY_CULT)
-                : getGeneratedImageFallbackUrl()
-            }
+            src={resolveGenImageUrl(IMG_PROMPTS.ZEALOTRY_CULT)}
             alt={t('ui:postGig.socialPhase.altZealotryCult', {
               defaultValue: 'Zealotry Cult'
             })}
@@ -46,7 +38,7 @@ export const ZealotryGauge = memo(
             <div
               className='bg-blood-red h-full transition-all duration-500'
               style={{
-                width: `${Math.min(100, Math.max(0, zealotryLevel))}%`
+                width: `${clampZealotry(zealotryLevel)}%`
               }}
             />
           </div>

src/components/stage/AmpStageController.ts

@@ -2,6 +2,7 @@ import * as PIXI from 'pixi.js'
 import { getPixiColorFromToken } from './stageRenderUtils'
 import { BaseStageController } from './BaseStageController'
 import { getSafeRandom } from '../../utils/crypto'
+import { clamp0to100 } from '../../utils/gameStateUtils'
 import type {
   StageControllerOptions,
   AmpStageOptions
@@ -88,7 +89,7 @@ export class AmpStageController extends BaseStageController<AmpStageOptions> {
       if (Object.hasOwn(state, 'interference')) {
         const sanitizedInterference = Number(state.interference)
         if (Number.isFinite(sanitizedInterference)) {
-          this.interference = Math.max(0, Math.min(100, sanitizedInterference))
+          this.interference = clamp0to100(sanitizedInterference)
         }
       }
       if (Object.hasOwn(state, 'isHijackActive')) {

src/components/stage/CrowdTextureManager.ts

@@ -1,10 +1,5 @@
 import type { Texture } from 'pixi.js'
-import {
-  getGenImageUrl,
-  IMG_PROMPTS,
-  isImageGenerationAvailable,
-  getGeneratedImageFallbackUrl
-} from '../../utils/imageGen'
+import { IMG_PROMPTS, resolveGenImageUrl } from '../../utils/imageGen'
 import { handleError } from '../../utils/errorHandler'
 import { loadTextures } from './stageRenderUtils'
 
@@ -23,12 +18,8 @@ export class CrowdTextureManager {
   async loadAssets(): Promise<void> {
     try {
       const urls = {
-        idle: isImageGenerationAvailable()
-          ? getGenImageUrl(IMG_PROMPTS.CROWD_IDLE)
-          : getGeneratedImageFallbackUrl(),
-        mosh: isImageGenerationAvailable()
-          ? getGenImageUrl(IMG_PROMPTS.CROWD_MOSH)
-          : getGeneratedImageFallbackUrl()
+        idle: resolveGenImageUrl(IMG_PROMPTS.CROWD_IDLE),
+        mosh: resolveGenImageUrl(IMG_PROMPTS.CROWD_MOSH)
       }
 
       const loadedTextures = await loadTextures(

src/components/stage/EffectTextureManager.ts

@@ -12,12 +12,7 @@
  */
 import { Graphics, Texture } from 'pixi.js'
 import type { Application } from 'pixi.js'
-import {
-  getGenImageUrl,
-  IMG_PROMPTS,
-  isImageGenerationAvailable,
-  getGeneratedImageFallbackUrl
-} from '../../utils/imageGen'
+import { IMG_PROMPTS, resolveGenImageUrl } from '../../utils/imageGen'
 import { logger } from '../../utils/logger'
 import {
   loadTextures,
@@ -106,12 +101,8 @@ export class EffectTextureManager {
   async loadAssets(): Promise<void> {
     try {
       const urls = {
-        blood: isImageGenerationAvailable()
-          ? getGenImageUrl(IMG_PROMPTS.HIT_BLOOD)
-          : getGeneratedImageFallbackUrl(),
-        toxic: isImageGenerationAvailable()
-          ? getGenImageUrl(IMG_PROMPTS.HIT_TOXIC)
-          : getGeneratedImageFallbackUrl()
+        blood: resolveGenImageUrl(IMG_PROMPTS.HIT_BLOOD),
+        toxic: resolveGenImageUrl(IMG_PROMPTS.HIT_TOXIC)
       }
 
       const loadedTextures = await loadTextures(

src/components/stage/NoteTextureManager.ts

@@ -1,11 +1,6 @@
 import { Texture } from 'pixi.js'
 import { handleError } from '../../utils/errorHandler'
-import {
-  getGenImageUrl,
-  IMG_PROMPTS,
-  isImageGenerationAvailable,
-  getGeneratedImageFallbackUrl
-} from '../../utils/imageGen'
+import { IMG_PROMPTS, resolveGenImageUrl } from '../../utils/imageGen'
 import { loadTextures } from './stageRenderUtils'
 
 export type NoteTextures = { skull: Texture | null; lightning: Texture | null }
@@ -20,12 +15,8 @@ export class NoteTextureManager {
   async loadAssets(): Promise<void> {
     try {
       const urls = {
-        skull: isImageGenerationAvailable()
-          ? getGenImageUrl(IMG_PROMPTS.NOTE_SKULL)
-          : getGeneratedImageFallbackUrl(),
-        lightning: isImageGenerationAvailable()
-          ? getGenImageUrl(IMG_PROMPTS.NOTE_LIGHTNING)
-          : getGeneratedImageFallbackUrl()
+        skull: resolveGenImageUrl(IMG_PROMPTS.NOTE_SKULL),
+        lightning: resolveGenImageUrl(IMG_PROMPTS.NOTE_LIGHTNING)
       }
 
       const loadedTextures = await loadTextures(

src/context/actionCreators.ts

@@ -12,7 +12,8 @@ import {
   clampPlayerFame,
   calculateFameLevel,
   clampBandHarmony,
-  clampNonNegative
+  clampNonNegative,
+  clamp0to100
 } from '../utils/gameStateUtils'
 import type { RhythmSetlistEntry } from '../types/rhythmGame'
 import type {
@@ -96,22 +97,6 @@ export const createUpdatePlayerAction = (
   }
 }
 
-/**
- * Creates a band update action
- * @param {Object} updates - Band state updates
- * @returns {Object} Action object
- */
-export const createUpdateVoidStressAction = (
-  delta: number
-): Extract<GameAction, { type: typeof ActionTypes.UPDATE_VOID_STRESS }> => {
-  return {
-    type: ActionTypes.UPDATE_VOID_STRESS,
-    payload: {
-      delta: Number.isFinite(delta) ? delta : 0
-    }
-  }
-}
-
 export const createUpdateBandAction = (
   updates: UpdateBandPayload
 ): Extract<GameAction, { type: typeof ActionTypes.UPDATE_BAND }> => {
@@ -448,7 +433,7 @@ export const createCompleteRoadieMinigameAction = (
 > => ({
   type: ActionTypes.COMPLETE_ROADIE_MINIGAME,
   payload: {
-    equipmentDamage: Math.max(0, Math.min(100, Number(equipmentDamage) || 0)),
+    equipmentDamage: clamp0to100(Number(equipmentDamage) || 0),
     contrabandDelivered: Math.max(0, Number(contrabandDelivered) || 0)
   }
 })

src/context/actionTypes.ts

@@ -6,7 +6,6 @@ export const ActionTypes = {
   CHANGE_SCENE: 'CHANGE_SCENE',
   UPDATE_PLAYER: 'UPDATE_PLAYER',
   UPDATE_BAND: 'UPDATE_BAND',
-  UPDATE_VOID_STRESS: 'UPDATE_VOID_STRESS',
   TOGGLE_NEURO_DECIMATOR: 'TOGGLE_NEURO_DECIMATOR',
   UPDATE_SOCIAL: 'UPDATE_SOCIAL',
   UPDATE_SETTINGS: 'UPDATE_SETTINGS',

src/context/reducers/systemReducer.ts

@@ -24,6 +24,7 @@ import {
   calculateFameLevel,
   isForbiddenKey,
   clampVanFuel,
+  clampRelationship,
   isPlainObject,
   isEmptyObject
 } from '../../utils/gameStateUtils'
@@ -564,7 +565,7 @@ const normalizeLoadedGameMap = (gameMap: unknown): GameMap | null => {
       }
     }
 
-    if (Object.keys(sanitizedCityStates).length > 0) {
+    if (!isEmptyObject(sanitizedCityStates)) {
       sanitizedMap.cityStates = sanitizedCityStates
     }
   }
@@ -905,16 +906,18 @@ const sanitizeBand = (loadedBand: unknown): BandState => {
         equipment: copySafePrimitiveObject(m.equipment) ?? {},
         relationships: isPlainObject(m.relationships)
           ? Object.fromEntries(
-              Object.entries(m.relationships).filter(([key, value]) => {
-                const normalizedKey = key.toLowerCase()
-                if (
-                  selfRelationshipKeys.has(key) ||
-                  selfRelationshipKeys.has(normalizedKey)
-                ) {
-                  return false
-                }
-                return typeof value === 'number' && Number.isFinite(value)
-              }) as Array<[string, number]>
+              (
+                Object.entries(m.relationships).filter(([key, value]) => {
+                  const normalizedKey = key.toLowerCase()
+                  if (
+                    selfRelationshipKeys.has(key) ||
+                    selfRelationshipKeys.has(normalizedKey)
+                  ) {
+                    return false
+                  }
+                  return typeof value === 'number' && Number.isFinite(value)
+                }) as Array<[string, number]>
+              ).map(([key, value]) => [key, clampRelationship(value)])
             )
           : {}
       }
@@ -1269,7 +1272,7 @@ const sanitizeNpcs = (value: unknown): GameState['npcs'] => {
         : {}),
       ...(typeof npc.relationship === 'number' &&
       Number.isFinite(npc.relationship)
-        ? { relationship: npc.relationship }
+        ? { relationship: clampRelationship(npc.relationship) }
         : {})
     }
   }

src/hooks/minigames/useRoadieLogic.ts

@@ -7,7 +7,7 @@ import { useRef, useCallback, useEffect, useState } from 'react'
 import { useGameState } from '../../context/GameState'
 import { GAME_PHASES } from '../../context/gameConstants'
 import { audioManager } from '../../utils/audio/audioEngine'
-import { isEmptyObject } from '../../utils/gameStateUtils'
+import { isEmptyObject, clamp0to100 } from '../../utils/gameStateUtils'
 import {
   ROADIE_GRID_WIDTH,
   ROADIE_GRID_HEIGHT,
@@ -79,7 +79,7 @@ export function handleCrash(
   audioManager.playSFX('crash')
 
   if (game.carrying) {
-    game.equipmentDamage = Math.max(0, Math.min(100, game.equipmentDamage + 10))
+    game.equipmentDamage = clamp0to100(game.equipmentDamage + 10)
 
     if (game.equipmentDamage >= 100) {
       game.isGameOver = true

src/hooks/minigames/useTourbusLogic.ts

@@ -12,6 +12,7 @@ import {
   TOURBUS_TARGET_DISTANCE
 } from './minigameConstants'
 import { getSafeRandom } from '../../utils/crypto'
+import { clamp0to100 } from '../../utils/gameStateUtils'
 
 type TourbusObstacleType = 'FUEL' | 'OBSTACLE' | 'VOID_HAZARD'
 
@@ -187,7 +188,7 @@ export const useTourbusLogic = () => {
             // Damage Mitigation
             const hitDamage = getHitDamage(upgradesRef.current)
 
-            game.damage = Math.max(0, Math.min(100, game.damage + hitDamage))
+            game.damage = clamp0to100(game.damage + hitDamage)
             audioManager.playSFX('crash') // Play SFX immediately on collision
           } else if (obs.type === 'FUEL') {
             game.itemsCollected.push('FUEL')