more more

src/lib/components/Battle/BattleControls.svelte

@@ -34,7 +34,7 @@
   <div class="action-area">
     {#if waitingForContinue}
       <!-- Tap to continue overlay -->
-      <div class="tap-continue-overlay" role="button" tabindex="0" onclick={onContinueTap}>
+      <div class="tap-continue-overlay" role="button" tabindex="0" onclick={onContinueTap} onkeydown={(e) => e.key === 'Enter' || e.key === ' ' ? onContinueTap() : null}>
         <div class="tap-indicator">
           <span>Tap to continue</span>
         </div>

src/lib/components/PicletGenerator/PicletGenerator.svelte

@@ -7,7 +7,7 @@
   import PicletResult from './PicletResult.svelte';
   import { removeBackground } from '$lib/utils/professionalImageProcessing';
   import { extractPicletMetadata } from '$lib/services/picletMetadata';
-  import { savePicletInstance, monsterToPicletInstance } from '$lib/db/piclets';
+  import { savePicletInstance, generatedDataToPicletInstance } from '$lib/db/piclets';
   import { PicletType, TYPE_DATA } from '$lib/types/picletTypes';
   import { EncounterService } from '$lib/db/encounterService';
   
@@ -892,7 +892,7 @@ Write your response within \`\`\`json\`\`\``;
       console.log('- stats:', cleanStats);
       
       // Convert to PicletInstance format and save
-      const picletInstance = await monsterToPicletInstance(picletData);
+      const picletInstance = await generatedDataToPicletInstance(picletData);
       const picletId = await savePicletInstance(picletInstance);
       console.log('Piclet auto-saved as uncaught with ID:', picletId);
       

src/lib/components/PicletGenerator/PicletResult.svelte

@@ -2,7 +2,7 @@
   import type { PicletWorkflowState } from '$lib/types';
   import type { PicletInstance } from '$lib/db/schema';
   import { TYPE_DATA, PicletType } from '$lib/types/picletTypes';
-  import { monsterToPicletInstance } from '$lib/db/piclets';
+  import { generatedDataToPicletInstance } from '$lib/db/piclets';
   import PicletCard from '../Piclets/PicletCard.svelte';
   import PicletDetail from '../Piclets/PicletDetail.svelte';
   
@@ -34,7 +34,7 @@
         };
         
         // Create piclet instance asynchronously
-        monsterToPicletInstance(picletData).then(instance => {
+        generatedDataToPicletInstance(picletData).then(instance => {
           picletInstance = { ...instance, id: 0 }; // Add temporary id for display
         }).catch(error => {
           console.error('Failed to create piclet instance:', error);
@@ -76,7 +76,7 @@
     {#if picletInstance}
       <div class="piclet-preview">
         <PicletCard 
-          instance={picletInstance}
+          piclet={picletInstance}
           size={140}
           onClick={handleCardClick}
         />

src/lib/components/Piclets/NewlyCaughtPicletDetail.svelte

@@ -62,12 +62,12 @@
   }
 </script>
 
-<div class="detail-overlay" role="dialog" aria-modal="true" tabindex="-1" onclick={onClose}>
+<div class="detail-overlay" role="dialog" aria-modal="true" tabindex="-1" onclick={onClose} onkeydown={(e) => e.key === 'Escape' ? onClose() : null}>
   <div class="detail-container newly-caught" role="document" onclick={handleContainerClick}>
     
     <!-- Celebration overlay -->
     {#if showCelebration}
-      <div class="celebration-overlay" role="button" tabindex="0" onclick={dismissCelebration}>
+      <div class="celebration-overlay" role="button" tabindex="0" onclick={dismissCelebration} onkeydown={(e) => e.key === 'Enter' || e.key === ' ' ? dismissCelebration() : null}>
         <div class="celebration-content">
           <div class="celebration-sparkles">✨</div>
           <h1 class="celebration-title">Welcome to your team!</h1>

src/lib/db/piclets.ts

@@ -4,6 +4,139 @@ import { PicletType, AttackType, getTypeFromConcept } from '../types/picletTypes
 import type { PicletStats } from '../types';
 import { generateUnlockLevels } from '../services/unlockLevels';
 
+// Interface for generated piclet data (from PicletResult component)
+interface GeneratedPicletData {
+  name: string;
+  imageUrl: string;
+  imageData?: string;
+  imageCaption: string;
+  concept: string;
+  imagePrompt: string;
+  stats: PicletStats;
+  createdAt: Date;
+}
+
+// Convert generated piclet data to a PicletInstance
+export async function generatedDataToPicletInstance(data: GeneratedPicletData, level: number = 5): Promise<Omit<PicletInstance, 'id'>> {
+  if (!data.stats) {
+    throw new Error('Generated data must have stats to create PicletInstance');
+  }
+
+  // All generated data must now have the battle-ready format
+  const stats = data.stats as PicletStats;
+  
+  if (!stats.baseStats || !stats.specialAbility || !stats.movepool) {
+    throw new Error('Generated stats must be in battle-ready format with baseStats, specialAbility, and movepool');
+  }
+  
+  // Calculate base stats from battle-ready format
+  const baseHp = Math.floor(stats.baseStats.hp * 2 + 50);
+  const baseAttack = Math.floor(stats.baseStats.attack * 1.5 + 30);
+  const baseDefense = Math.floor(stats.baseStats.defense * 1.5 + 30);
+  const baseSpeed = Math.floor(stats.baseStats.speed * 1.5 + 30);
+  
+  // Determine primary type from battle stats
+  const normalizedType = stats.primaryType.toLowerCase();
+  const validType = Object.values(PicletType).find(type => type === normalizedType);
+  const primaryType = validType || getTypeFromConcept(data.concept, data.imageCaption);
+  
+  if (!validType) {
+    console.warn(`Invalid primaryType "${stats.primaryType}" from stats, falling back to concept detection`);
+  }
+
+  // Create moves from battle-ready format (without unlock levels initially)
+  const baseMoves: BattleMove[] = stats.movepool.map(move => ({
+    name: move.name,
+    type: move.type as unknown as AttackType,
+    power: move.power,
+    accuracy: move.accuracy,
+    pp: move.pp,
+    currentPp: move.pp,
+    description: move.description,
+    unlockLevel: 1 // Temporary, will be set below
+  }));
+  
+  // Generate unlock levels for moves and special ability
+  const { movesWithUnlocks, abilityUnlockLevel } = generateUnlockLevels(baseMoves, stats.specialAbility);
+  const moves = movesWithUnlocks;
+  
+  // Field stats are variations of regular stats
+  const baseFieldAttack = Math.floor(baseAttack * 0.8);
+  const baseFieldDefense = Math.floor(baseDefense * 0.8);
+  
+  // Use Pokemon-accurate stat calculations (matching levelingService)
+  const calculateStat = (base: number, level: number) => {
+    if (level === 1) {
+      return Math.max(1, Math.floor(base / 10) + 5);
+    }
+    return Math.floor((2 * base * level) / 100) + 5;
+  };
+  
+  const calculateHp = (base: number, level: number) => {
+    if (level === 1) {
+      return Math.max(1, Math.floor(base / 10) + 11);
+    }
+    return Math.floor((2 * base * level) / 100) + level + 10;
+  };
+  
+  const maxHp = calculateHp(baseHp, level);
+  
+  const bst = baseHp + baseAttack + baseDefense + baseFieldAttack + baseFieldDefense + baseSpeed;
+  
+  return {
+    // Type Info
+    typeId: data.name.toLowerCase().replace(/\s+/g, '-'),
+    nickname: data.name,
+    primaryType: primaryType,
+    secondaryType: undefined,
+    
+    // Current Stats
+    currentHp: maxHp,
+    maxHp,
+    level,
+    xp: 0,
+    attack: calculateStat(baseAttack, level),
+    defense: calculateStat(baseDefense, level),
+    fieldAttack: calculateStat(baseFieldAttack, level),
+    fieldDefense: calculateStat(baseFieldDefense, level),
+    speed: calculateStat(baseSpeed, level),
+    
+    // Base Stats
+    baseHp,
+    baseAttack,
+    baseDefense,
+    baseFieldAttack,
+    baseFieldDefense,
+    baseSpeed,
+    
+    // Battle
+    moves,
+    nature: stats.nature,
+    specialAbility: stats.specialAbility,
+    specialAbilityUnlockLevel: abilityUnlockLevel,
+    
+    // Roster
+    isInRoster: false,
+    rosterPosition: undefined,
+    
+    // Metadata
+    caught: false, // Scanned Piclets start as uncaught
+    caughtAt: undefined, // Will be set when caught
+    bst,
+    tier: stats.tier, // Use tier from stats
+    role: 'balanced', // Could be enhanced based on stat distribution
+    variance: 0,
+    
+    // Original generation data
+    imageUrl: data.imageUrl,
+    imageData: data.imageData,
+    imageCaption: data.imageCaption,
+    concept: data.concept,
+    description: stats.description,
+    imagePrompt: data.imagePrompt
+  };
+}
+
 
 // Save a new PicletInstance
 export async function savePicletInstance(piclet: Omit<PicletInstance, 'id'>): Promise<number> {