Merge branch 'main' into update-socials

Author: tannerlinsley

src/components/game/engine/GameEngine.ts

@@ -739,16 +739,22 @@ export class GameEngine {
       this.coinSystem.update(delta, this.coins)
       this.cameraSystem.update(delta, time)
 
+      // Respawn coins that have been collected for long enough
+      useGameStore.getState().respawnCoins()
+
       if (state.stage === 'battle') {
         this.aiSystem.update(delta)
         this.cannonballSystem.update(delta, this.cannonballs)
         this.aiDebug.update()
 
         // Health regeneration
-        const { boatHealth, shipStats, setBoatHealth } = useGameStore.getState()
-        if (boatHealth < shipStats.maxHealth && shipStats.healthRegen > 0) {
+        const { boatHealth, shipStats, purchasedBoosts, setBoatHealth } =
+          useGameStore.getState()
+        const totalMaxHealth =
+          shipStats.maxHealth + purchasedBoosts.permHealth * 25
+        if (boatHealth < totalMaxHealth && shipStats.healthRegen > 0) {
           const newHealth = Math.min(
-            shipStats.maxHealth,
+            totalMaxHealth,
             boatHealth + shipStats.healthRegen * delta,
           )
           setBoatHealth(newHealth)

src/components/game/engine/systems/AISystem.ts

@@ -68,13 +68,13 @@ const AI_STATS: Record<AIDifficulty, AIStats> = {
     aggroDistance: 90,
     attackDistance: 38,
   },
-  // Corner boss - absolutely insane
+  // Corner boss - tough but beatable
   boss: {
-    health: 500,
-    fireCooldown: 200, // Extremely fast fire
-    speed: 12,
-    turnSpeed: 5.0,
-    accuracy: 0.98,
+    health: 350,
+    fireCooldown: 350, // Fast fire but not overwhelming
+    speed: 10,
+    turnSpeed: 4.0,
+    accuracy: 0.9,
     aggroDistance: 30, // Tiny aggro range - must get close
     attackDistance: 25,
   },

src/components/game/hooks/useGameStore.ts

@@ -18,6 +18,7 @@ const STORAGE_KEY = 'tanstack-island-explorer'
 interface PurchasedBoosts {
   permSpeed: number // Number of permanent speed boosts purchased
   permAccel: number // Number of permanent acceleration boosts purchased
+  permHealth: number // Number of permanent health boosts purchased (+25 each, max 8)
   rapidFire: boolean // Whether rapid fire (auto-loader) is purchased
 }
 
@@ -119,6 +120,7 @@ export interface CoinData {
   id: number
   position: [number, number, number]
   collected: boolean
+  collectedAt?: number // Timestamp when collected (for respawn timer)
 }
 
 export type BoatType = 'dinghy' | 'ship'
@@ -233,6 +235,7 @@ interface GameState {
   coinsCollected: number
   setCoins: (coins: CoinData[]) => void
   collectCoin: (id: number) => void
+  respawnCoins: () => void // Respawn coins that have been collected for long enough
 
   // Boundary collision (which edges are being hit)
   boundaryEdges: {
@@ -351,6 +354,7 @@ const initialState = {
   purchasedBoosts: {
     permSpeed: 0,
     permAccel: 0,
+    permHealth: 0,
     rapidFire: false,
   } as PurchasedBoosts,
 }
@@ -636,12 +640,31 @@ export const useGameStore = create<GameState>()((set, get) => ({
     const coin = coins.find((c) => c.id === id)
     if (coin && !coin.collected) {
       const newCoins = coins.map((c) =>
-        c.id === id ? { ...c, collected: true } : c,
+        c.id === id ? { ...c, collected: true, collectedAt: Date.now() } : c,
       )
       set({ coins: newCoins, coinsCollected: coinsCollected + 1 })
     }
   },
 
+  respawnCoins: () => {
+    const { coins } = get()
+    const now = Date.now()
+    const RESPAWN_DELAY = 60000 // 60 seconds to respawn
+
+    let hasChanges = false
+    const newCoins = coins.map((c) => {
+      if (c.collected && c.collectedAt && now - c.collectedAt > RESPAWN_DELAY) {
+        hasChanges = true
+        return { ...c, collected: false, collectedAt: undefined }
+      }
+      return c
+    })
+
+    if (hasChanges) {
+      set({ coins: newCoins })
+    }
+  },
+
   toggleMute: () => set((state) => ({ isMuted: !state.isMuted })),
 
   setShowCollisionDebug: (show) => set({ showCollisionDebug: show }),
@@ -835,8 +858,9 @@ export const useGameStore = create<GameState>()((set, get) => ({
         break
       }
       case 'healthPack': {
-        // Restore 50 health, up to max
-        const newHealth = Math.min(boatHealth + 50, shipStats.maxHealth)
+        // Restore 50 health, up to max (including purchased health boosts)
+        const maxHealth = shipStats.maxHealth + purchasedBoosts.permHealth * 25
+        const newHealth = Math.min(boatHealth + 50, maxHealth)
         set({ boatHealth: newHealth })
         break
       }
@@ -860,6 +884,20 @@ export const useGameStore = create<GameState>()((set, get) => ({
         })
         break
       }
+      case 'permHealth': {
+        // Permanent +25 max health boost
+        const newPermHealth = purchasedBoosts.permHealth + 1
+        const healthBonus = 25 // Each purchase adds 25 max health
+        set({
+          purchasedBoosts: {
+            ...purchasedBoosts,
+            permHealth: newPermHealth,
+          },
+          // Also increase current health by the bonus amount
+          boatHealth: boatHealth + healthBonus,
+        })
+        break
+      }
       case 'rapidFire': {
         // Unlock auto-loader (rapid fire side cannons)
         set({
@@ -930,19 +968,58 @@ export const useGameStore = create<GameState>()((set, get) => ({
       unlockedUpgrades,
       shipStats,
       purchasedBoosts,
+      boatPosition,
     } = get()
 
     // World boundary depends on showcase unlock status
     const worldBoundary = showcaseUnlocked ? 520 : EXPANDED_WORLD_BOUNDARY
 
+    // Find nearest discovered island to respawn at
+    const allIslands = [
+      ...islands,
+      ...expandedIslands,
+      ...showcaseIslands,
+      ...cornerIslands,
+    ]
+    const discoveredIslandsList = allIslands.filter((i) =>
+      discoveredIslands.has(i.id),
+    )
+
+    let spawnPosition: [number, number, number] = [0, 0, 0]
+    if (discoveredIslandsList.length > 0) {
+      // Find nearest discovered island to death position
+      let nearestIsland = discoveredIslandsList[0]
+      let nearestDist = Infinity
+      for (const island of discoveredIslandsList) {
+        const dx = island.position[0] - boatPosition[0]
+        const dz = island.position[2] - boatPosition[2]
+        const dist = dx * dx + dz * dz
+        if (dist < nearestDist) {
+          nearestDist = dist
+          nearestIsland = island
+        }
+      }
+      // Spawn slightly away from the island (not inside it)
+      const spawnOffset = 8
+      const angle = Math.random() * Math.PI * 2
+      spawnPosition = [
+        nearestIsland.position[0] + Math.cos(angle) * spawnOffset,
+        0,
+        nearestIsland.position[2] + Math.sin(angle) * spawnOffset,
+      ]
+    }
+
+    // Calculate total max health (upgrades + purchased boosts)
+    const totalMaxHealth = shipStats.maxHealth + purchasedBoosts.permHealth * 25
+
     set({
       phase: 'playing',
       stage: 'battle',
       boatType: 'ship',
-      boatPosition: [0, 0, 0],
+      boatPosition: spawnPosition,
       boatRotation: 0,
       boatVelocity: 0,
-      boatHealth: shipStats.maxHealth,
+      boatHealth: totalMaxHealth,
       isMovingForward: false,
       isMovingBackward: false,
       isTurningLeft: false,

src/components/game/ui/GameHUD.tsx

@@ -17,6 +17,7 @@ export function GameHUD() {
     coinsCollected,
     boatHealth,
     shipStats,
+    purchasedBoosts,
     lastFireTime,
     lastUnlockedUpgrade,
     clearLastUnlockedUpgrade,
@@ -25,6 +26,9 @@ export function GameHUD() {
     fireCannon,
   } = useGameStore()
 
+  // Calculate total max health including purchased boosts
+  const totalMaxHealth = shipStats.maxHealth + purchasedBoosts.permHealth * 25
+
   // Cooldown progress (0-1, 1 = ready)
   const [cooldownProgress, setCooldownProgress] = useState(1)
   const [showUpgradeNotification, setShowUpgradeNotification] = useState(false)
@@ -194,12 +198,12 @@ export function GameHUD() {
               <div
                 className="h-full bg-gradient-to-r from-red-600 to-red-400"
                 style={{
-                  width: `${(boatHealth / shipStats.maxHealth) * 100}%`,
+                  width: `${(boatHealth / totalMaxHealth) * 100}%`,
                 }}
               />
             </div>
             <span className="text-white text-sm font-mono w-12 max-md:text-xs max-md:w-10">
-              {Math.round(boatHealth)}/{shipStats.maxHealth}
+              {Math.round(boatHealth)}/{totalMaxHealth}
             </span>
           </div>
 

src/components/game/ui/Minimap.tsx

@@ -28,6 +28,7 @@ export function Minimap() {
     islands,
     expandedIslands,
     showcaseIslands,
+    cornerIslands,
     discoveredIslands,
   } = useGameStore()
   const [minimapSize, setMinimapSize] = useState(getMinimapSize)
@@ -77,8 +78,13 @@ export function Minimap() {
 
   const { width: W, height: H } = minimapSize
 
-  // All islands (core + expanded + showcase)
-  const allIslands = [...islands, ...expandedIslands, ...showcaseIslands]
+  // All islands (core + expanded + showcase + corners)
+  const allIslands = [
+    ...islands,
+    ...expandedIslands,
+    ...showcaseIslands,
+    ...cornerIslands,
+  ]
 
   // Convert world position to isometric minimap position
   const worldToMinimap = (worldX: number, worldZ: number) => {
@@ -197,14 +203,17 @@ export function Minimap() {
           {/* Discovered islands */}
           {discoveredIslandsList.map((island) => {
             const pos = worldToMinimap(island.position[0], island.position[2])
+            const isCorner = island.id.startsWith('corner-')
             const color =
               island.type === 'library' && island.library
                 ? getLibraryColor(island.library.id)
                 : island.type === 'partner'
                   ? '#f59e0b' // Amber for partners
-                  : island.type === 'showcase'
-                    ? '#8b5cf6' // Purple for showcases
-                    : '#8b5cf6'
+                  : isCorner
+                    ? '#ef4444' // Red for corner boss islands
+                    : island.type === 'showcase'
+                      ? '#8b5cf6' // Purple for showcases
+                      : '#8b5cf6'
             const size = (1.5 + island.scale * 1) * scale
 
             return (

src/components/game/ui/Shop.tsx

@@ -36,7 +36,9 @@ export function Shop() {
                 ? purchasedBoosts.permSpeed
                 : item.type === 'permAccel'
                   ? purchasedBoosts.permAccel
-                  : 0
+                  : item.type === 'permHealth'
+                    ? purchasedBoosts.permHealth
+                    : 0
 
             // Check if already owned (non-stackable)
             const alreadyOwned =

src/components/game/utils/shopItems.ts

@@ -6,6 +6,7 @@ export type ShopItemType =
   | 'healthPack'
   | 'permSpeed'
   | 'permAccel'
+  | 'permHealth'
   | 'rapidFire'
 
 export interface ShopItem {
@@ -67,6 +68,16 @@ export const SHOP_ITEMS: ShopItem[] = [
     stackable: true,
     maxStacks: 0, // Unlimited
   },
+  {
+    type: 'permHealth',
+    name: 'Hull Plating',
+    description: 'Permanent +25 max health',
+    cost: 30,
+    icon: '🛡️',
+    stages: ['battle'],
+    stackable: true,
+    maxStacks: 8, // Max 200 bonus health (300 total with base 100)
+  },
   {
     type: 'rapidFire',
     name: 'Auto-Loader',