refactor

src/lib/components/Piclets/AbilityDisplay.svelte

@@ -1,13 +1,8 @@
 <script lang="ts">
-  import type { BattleEffect, AbilityTrigger } from '$lib/types';
+  import type { SpecialAbility, BattleEffect, Trigger } from '$lib/battle-engine/types';
   
   interface Props {
-    ability: {
-      name: string;
-      description: string;
-      effects?: BattleEffect[];
-      triggers?: AbilityTrigger[];
-    };
+    ability: SpecialAbility;
     expanded?: boolean;
   }
   
@@ -71,27 +66,48 @@
   function formatEffectDescription(effect: BattleEffect): string {
     let desc = effect.type.charAt(0).toUpperCase() + effect.type.slice(1);
     
-    if (effect.target !== 'self') {
+    // Handle target (most effects have target, but not all)
+    if ('target' in effect && effect.target !== 'self') {
       desc += ` (${effect.target})`;
     }
     
-    if (effect.condition) {
+    // Handle condition (common to many effects)
+    if ('condition' in effect && effect.condition) {
       desc += ` when ${effect.condition}`;
     }
     
-    if (effect.amount) {
-      desc += ` - ${effect.amount}`;
-    }
-    
-    if (effect.stats) {
-      const statChanges = Object.entries(effect.stats).map(([stat, change]) => 
-        `${stat}: ${change}`
-      ).join(', ');
-      desc += ` (${statChanges})`;
-    }
-    
-    if (effect.status) {
-      desc += ` - ${effect.status}`;
+    // Handle type-specific properties
+    switch (effect.type) {
+      case 'damage':
+        if (effect.amount) desc += ` - ${effect.amount}`;
+        if (effect.formula) desc += ` (${effect.formula})`;
+        break;
+      case 'modifyStats':
+        const statChanges = Object.entries(effect.stats).map(([stat, change]) => 
+          `${stat}: ${change}`
+        ).join(', ');
+        desc += ` (${statChanges})`;
+        break;
+      case 'applyStatus':
+        desc += ` - ${effect.status}`;
+        if (effect.chance && effect.chance < 100) desc += ` (${effect.chance}%)`;
+        break;
+      case 'heal':
+        if (effect.amount) desc += ` - ${effect.amount}`;
+        break;
+      case 'manipulatePP':
+        desc += ` - ${effect.action}`;
+        if (effect.amount) desc += ` ${effect.amount}`;
+        break;
+      case 'counter':
+        desc += ` - ${effect.counterType} (${effect.strength})`;
+        break;
+      case 'removeStatus':
+        desc += ` - ${effect.status}`;
+        break;
+      case 'mechanicOverride':
+        desc += ` - ${effect.mechanic}`;
+        break;
     }
     
     return desc;

src/lib/components/Piclets/MoveDisplay.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">
   import type { BattleMove as DBBattleMove } from '$lib/db/schema';
-  import type { BattleMove, BattleEffect } from '$lib/types';
+  import type { Move, BattleEffect } from '$lib/battle-engine/types';
   
   interface Props {
     move: DBBattleMove;
-    enhancedMove?: { move: BattleMove; currentPp: number };
+    enhancedMove?: { move: Move; currentPp: number };
     expanded?: boolean;
     showPP?: boolean;
   }
@@ -84,27 +84,48 @@
   function formatEffectDescription(effect: BattleEffect): string {
     let desc = effect.type.charAt(0).toUpperCase() + effect.type.slice(1);
     
-    if (effect.target !== 'self') {
+    // Handle target (most effects have target, but not all)
+    if ('target' in effect && effect.target !== 'self') {
       desc += ` (${effect.target})`;
     }
     
-    if (effect.condition) {
+    // Handle condition (common to many effects)
+    if ('condition' in effect && effect.condition) {
       desc += ` when ${effect.condition}`;
     }
     
-    if (effect.amount) {
-      desc += ` - ${effect.amount}`;
-    }
-    
-    if (effect.stats) {
-      const statChanges = Object.entries(effect.stats).map(([stat, change]) => 
-        `${stat}: ${change}`
-      ).join(', ');
-      desc += ` (${statChanges})`;
-    }
-    
-    if (effect.status) {
-      desc += ` - ${effect.status}`;
+    // Handle type-specific properties
+    switch (effect.type) {
+      case 'damage':
+        if (effect.amount) desc += ` - ${effect.amount}`;
+        if (effect.formula) desc += ` (${effect.formula})`;
+        break;
+      case 'modifyStats':
+        const statChanges = Object.entries(effect.stats).map(([stat, change]) => 
+          `${stat}: ${change}`
+        ).join(', ');
+        desc += ` (${statChanges})`;
+        break;
+      case 'applyStatus':
+        desc += ` - ${effect.status}`;
+        if (effect.chance && effect.chance < 100) desc += ` (${effect.chance}%)`;
+        break;
+      case 'heal':
+        if (effect.amount) desc += ` - ${effect.amount}`;
+        break;
+      case 'manipulatePP':
+        desc += ` - ${effect.action}`;
+        if (effect.amount) desc += ` ${effect.amount}`;
+        break;
+      case 'counter':
+        desc += ` - ${effect.counterType} (${effect.strength})`;
+        break;
+      case 'removeStatus':
+        desc += ` - ${effect.status}`;
+        break;
+      case 'mechanicOverride':
+        desc += ` - ${effect.mechanic}`;
+        break;
     }
     
     return desc;

src/lib/utils/battleConversion.ts

@@ -49,8 +49,8 @@ export function picletInstanceToBattleDefinition(instance: PicletInstance): Picl
     name: instance.nickname || instance.typeId,
     description: instance.concept,
     tier,
-    primaryType: convertPicletTypeToType(instance.primaryType),
-    secondaryType: instance.secondaryType ? convertPicletTypeToType(instance.secondaryType) : undefined,
+    primaryType: instance.primaryType,
+    secondaryType: instance.secondaryType,
     baseStats,
     nature: instance.nature,
     specialAbility,
@@ -85,7 +85,7 @@ function convertBattleMoveToMove(battleMove: BattleMove, primaryType: PicletType
 
   return {
     name: battleMove.name,
-    type: convertAttackTypeToType(battleMove.type),
+    type: battleMove.type,
     power: battleMove.power,
     accuracy: battleMove.accuracy,
     pp: battleMove.pp,
@@ -95,51 +95,6 @@ function convertBattleMoveToMove(battleMove: BattleMove, primaryType: PicletType
   };
 }
 
-/**
- * Convert PicletType to battle engine type
- */
-function convertPicletTypeToType(picletType: PicletType): 'beast' | 'bug' | 'aquatic' | 'flora' | 'mineral' | 'space' | 'machina' | 'structure' | 'culture' | 'cuisine' {
-  const typeMap: Record<PicletType, any> = {
-    [PicletType.BEAST]: 'beast',
-    [PicletType.BUG]: 'bug', 
-    [PicletType.AQUATIC]: 'aquatic',
-    [PicletType.FLORA]: 'flora',
-    [PicletType.MINERAL]: 'mineral',
-    [PicletType.SPACE]: 'space',
-    [PicletType.MACHINA]: 'machina',
-    [PicletType.STRUCTURE]: 'structure',
-    [PicletType.CULTURE]: 'culture',
-    [PicletType.CUISINE]: 'cuisine'
-  };
-  
-  return typeMap[picletType] || 'beast';
-}
-
-/**
- * Convert AttackType to battle engine type
- */
-function convertAttackTypeToType(attackType: AttackType): 'beast' | 'bug' | 'aquatic' | 'flora' | 'mineral' | 'space' | 'machina' | 'structure' | 'culture' | 'cuisine' | 'normal' {
-  // AttackType and PicletType should align, but handle the NORMAL case
-  if (attackType === AttackType.NORMAL) {
-    return 'normal';
-  }
-  
-  // Map other attack types to piclet types
-  const typeMap: Record<string, any> = {
-    'beast': 'beast',
-    'bug': 'bug',
-    'aquatic': 'aquatic', 
-    'flora': 'flora',
-    'mineral': 'mineral',
-    'space': 'space',
-    'machina': 'machina',
-    'structure': 'structure',
-    'culture': 'culture',
-    'cuisine': 'cuisine'
-  };
-  
-  return typeMap[attackType.toString()] || 'normal';
-}
 
 /**
  * Convert battle engine BattlePiclet back to PicletInstance for state updates