Merge pull request #18 from tobiasmullett-svg/claude/game-sweep-improvements-itn70m

fix: implement missing pet perks and fix sweep-found bugs

Author: tobiasmullett-svg

app/game.tsx

@@ -31,11 +31,11 @@ import ShopOverlay from '../components/game/ShopOverlay';
 import GameOverOverlay from '../components/game/GameOverOverlay';
 import Minimap from '../components/game/Minimap';
 import TutorialOverlay from '../components/game/TutorialOverlay';
-import { BOSS_WAVES } from '../engine/constants';
+import { BOSS_WAVES, WAVE_BASE_TIME } from '../engine/constants';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 
 const defaultHud: HudData = {
-  hp: 100, maxHp: 100, armor: 0, waveNum: 1, waveTimer: 25, waveMaxTime: 25,
+  hp: 100, maxHp: 100, armor: 0, waveNum: 1, waveTimer: WAVE_BASE_TIME, waveMaxTime: WAVE_BASE_TIME,
   materials: 0, level: 1, xp: 0, xpToNext: 10,
   abilityCd: 0, abilityMaxCd: 30, abilityEmoji: '\u2B50', phase: 'waveAnnounce',
   comboCount: 0, comboTimer: 0, comboMaxTime: 3.2, bestCombo: 0,

components/game/GameCanvas.tsx

@@ -2,7 +2,8 @@ import React from 'react';
 import { View, Text, StyleSheet } from 'react-native';
 import type { GameState } from '../../engine/types';
 import { ELITE_EMOJIS, ELITE_COLORS } from '../../engine/data';
-import { PICKUP_BASE_RANGE } from '../../engine/constants';
+import { CRIT_HIT_STOP } from '../../engine/constants';
+import { getPickupRange } from '../../engine/GameEngine';
 import ArenaBackground from './arena/ArenaBackground';
 import WeaponIcon, { hasWeaponIcon } from './WeaponIcon';
 
@@ -18,8 +19,9 @@ function DangerVignette({ frame }: { frame: number }) {
   );
 }
 
-function CritFlash({ frame }: { frame: number }) {
-  const opacity = Math.max(0, 1 - (frame % 20) * 0.15);
+function CritFlash({ hitStop }: { hitStop: number }) {
+  // Fade with the remaining hit-stop so the flash decays deterministically.
+  const opacity = Math.min(1, hitStop / CRIT_HIT_STOP);
   if (opacity <= 0) return null;
   return <View style={[s.critFlash, { opacity }]} />;
 }
@@ -44,8 +46,7 @@ export default function GameCanvas({ gameState, frame }: Props) {
   const visibleEffects = (effects ?? []).filter(fx => vis(fx.x, fx.y));
   const visibleDeathParticles = (deathParticles ?? []).filter(dp => vis(dp.x, dp.y));
   const visibleDmgNums = (dmgNums ?? []).filter(d => vis(d.x, d.y));
-  const relicIds = new Set((state.relics ?? []).map(relic => relic.id));
-  const effectivePickupRange = p.pickupRange * (relicIds.has('abyssalMagnet') ? 1.9 : 1) * (1 + p.luck * 0.01);
+  const effectivePickupRange = getPickupRange(state);
   const crowded = state.wave.number >= 5 || visibleEnemies.length + visibleProjectiles.length > 45 || visibleEffects.length + visibleDmgNums.length > 35;
   const displayProjectiles = crowded ? visibleProjectiles.slice(0, 48) : visibleProjectiles;
   const displayEffects = crowded ? visibleEffects.filter(fx => fx.kind !== 'muzzle' && fx.kind !== 'spark').slice(-14) : visibleEffects;
@@ -709,7 +710,7 @@ export default function GameCanvas({ gameState, frame }: Props) {
       )}
       <OffScreenMarkers state={state} />
       {(p.hp / p.maxHp) < 0.32 && <DangerVignette frame={frame} />}
-      {showCritFlash && <CritFlash frame={frame} />}
+      {showCritFlash && <CritFlash hitStop={state.hitStop} />}
       {state.waveModifier === 'denseFog' && (
         <View style={s.fogOverlay} pointerEvents="none">
           <View style={s.fogVignette} />

components/game/Minimap.tsx

@@ -37,7 +37,7 @@ export default function Minimap({ gameState, size = 120 }: Props) {
       ))}
 
       {/* Resource Nodes */}
-      {resourceNodes.map(r => (
+      {resourceNodes.filter(r => r.alive).map(r => (
         <View
           key={`res-${r.id}`}
           style={[

components/game/ShopOverlay.tsx

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { View, Text, Pressable, StyleSheet, ScrollView } from 'react-native';
 import type { GameState } from '../../engine/types';
 import { RARITY_COLORS, WEAPON_EVOLVE_KILLS, WEAPON_EVOLVE_COST, WEAPON_MAX_LEVEL } from '../../engine/constants';
-import { buyShopItem, rerollShop, healPlayer, buyEgg, trainPets, fusePets, evolveWeapon, getPetSynergies, toggleShopSlotLock } from '../../engine/GameEngine';
+import { buyShopItem, rerollShop, healPlayer, buyEgg, trainPets, fusePets, evolveWeapon, getPetSynergies, getPetAttackStats, toggleShopSlotLock } from '../../engine/GameEngine';
 import { WEAPONS, EVOLVED_WEAPONS, ITEM_DEFS } from '../../engine/data';
 import WeaponIcon, { hasWeaponIcon } from './WeaponIcon';
 
@@ -34,17 +34,6 @@ const PET_DETAILS: Record<string, { upgrade: string; breed: string }> = {
   },
 };
 
-function getPetCooldown(level: number, kind: string): string {
-  const base = kind === 'snapper' ? 0.85 : kind === 'spark' ? 1.2 : 1.5;
-  return (base * Math.max(0.62, 1 - (level - 1) * 0.035)).toFixed(2);
-}
-
-function getPetRange(kind: string): number {
-  if (kind === 'spark') return 180;
-  if (kind === 'mender') return 145;
-  return 130;
-}
-
 export default function ShopOverlay({ gameState, onNextWave }: Props) {
   const [, force] = useState(0);
   const [broodNotice, setBroodNotice] = useState('');
@@ -54,6 +43,7 @@ export default function ShopOverlay({ gameState, onNextWave }: Props) {
   if (!state) return null;
   const { shopSlots, materials, player, wave, rerollCost, healCost } = state;
   const canHeal = player.hp < player.maxHp;
+  const broodFull = state.pets.length + state.pendingHatches.length >= 5;
   const eggCost = 18 + state.pets.length * 6 + wave.number * 2;
   const trainCost = 10 + state.pets.reduce((sum, pet) => sum + pet.level * 4, 0);
   const canTrain = state.pets.length > 0 && state.pets.some(pet => pet.level < 9);
@@ -202,6 +192,7 @@ export default function ShopOverlay({ gameState, onNextWave }: Props) {
                 <Text style={s.emptyPetText}>Find eggs in the arena or buy one here.</Text>
               ) : state.pets.map(pet => {
                 const detail = PET_DETAILS[pet.kind];
+                const attackStats = getPetAttackStats(pet);
                 const nextPower = pet.level >= 9 ? 'Max trained' : `Next: Pow ${Math.round(pet.damage + 1 + Math.floor((pet.level + 1) / 4))}`;
                 const nextPerkLevel = [3, 5, 7].find(l => l > pet.level);
                 return (
@@ -219,7 +210,7 @@ export default function ShopOverlay({ gameState, onNextWave }: Props) {
                         <Text style={s.petName}>{pet.name}</Text>
                         <Text style={[s.generationTag, { backgroundColor: pet.color ?? '#2DD4BF' }]}>Gen {pet.generation ?? 1}</Text>
                       </View>
-                      <Text style={s.petLevel}>Lv.{pet.level} · Pow {Math.round(pet.damage)} · {getPetCooldown(pet.level, pet.kind)}s · R{getPetRange(pet.kind)}</Text>
+                      <Text style={s.petLevel}>Lv.{pet.level} · Pow {Math.round(pet.damage)} · {attackStats.cooldown.toFixed(2)}s · R{attackStats.range}</Text>
                       <Text style={s.petTrait}>{pet.attackName}: {PET_TRAITS[pet.kind] ?? 'Companion'}</Text>
                       {(pet.perks?.length ?? 0) > 0 && (
                         <View style={s.perkRow}>
@@ -254,15 +245,14 @@ export default function ShopOverlay({ gameState, onNextWave }: Props) {
               <Pressable
                 onPress={() => {
                   if (buyEgg(state)) {
-                    const newest = state.pets[state.pets.length - 1];
-                    setBroodNotice(newest ? `${newest.name} joined the brood` : '+12 overflow materials');
+                    setBroodNotice('A new egg is hatching…');
                     force(n => n + 1);
                   }
                 }}
-                disabled={(materials ?? 0) < eggCost}
-                style={[s.actionBtn, (materials ?? 0) < eggCost && s.disabled]}
+                disabled={broodFull || (materials ?? 0) < eggCost}
+                style={[s.actionBtn, (broodFull || (materials ?? 0) < eggCost) && s.disabled]}
               >
-                <Text style={s.actionText}>🥚 Egg (🔩{eggCost})</Text>
+                <Text style={s.actionText}>{broodFull ? '🥚 Brood Full' : `🥚 Egg (🔩${eggCost})`}</Text>
               </Pressable>
               <Pressable
                 onPress={() => {