btr

src/lib/battle-engine/BattleEngine.ts

@@ -34,9 +34,11 @@ export class BattleEngine {
     playerLevel = 50, 
     opponentLevel = 50
   ) {
-    // Handle roster setup
-    this.playerRoster = Array.isArray(playerPiclet) ? playerPiclet : [playerPiclet];
-    this.opponentRoster = Array.isArray(opponentPiclet) ? opponentPiclet : [opponentPiclet];
+    // Handle roster setup with internal prefixes for reliable animation targeting
+    this.playerRoster = (Array.isArray(playerPiclet) ? playerPiclet : [playerPiclet])
+      .map(piclet => ({ ...piclet, name: `player-${piclet.name}` }));
+    this.opponentRoster = (Array.isArray(opponentPiclet) ? opponentPiclet : [opponentPiclet])
+      .map(piclet => ({ ...piclet, name: `enemy-${piclet.name}` }));
     
     // Initialize roster states
     this.playerRosterStates = this.initializeRosterStates(this.playerRoster, playerLevel);

src/lib/components/Pages/Battle.svelte

@@ -6,7 +6,7 @@
   import BattleControls from '../Battle/BattleControls.svelte';
   import { BattleEngine } from '$lib/battle-engine/BattleEngine';
   import type { BattleState, MoveAction } from '$lib/battle-engine/types';
-  import { picletInstanceToBattleDefinition, battlePicletToInstance } from '$lib/utils/battleConversion';
+  import { picletInstanceToBattleDefinition, battlePicletToInstance, stripBattlePrefix } from '$lib/utils/battleConversion';
   import { getEffectivenessText, getEffectivenessColor } from '$lib/types/picletTypes';
   
   export let playerPiclet: PicletInstance;
@@ -41,6 +41,7 @@
   let playerFaint = false;
   let enemyFaint = false;
   
+  
   onMount(() => {
     // Initialize battle engine with converted piclet definitions
     const playerDefinition = picletInstanceToBattleDefinition(playerPiclet);
@@ -181,18 +182,17 @@
   
   
   function triggerVisualEffectsFromMessage(message: string) {
-    const playerName = currentPlayerPiclet.nickname;
-    const enemyName = currentEnemyPiclet.nickname;
+    // Use internal battle prefixes for reliable animation targeting
+    const playerInternalName = battleState?.playerPiclet?.definition?.name || '';
+    const enemyInternalName = battleState?.opponentPiclet?.definition?.name || '';
     
     // Damage effects
     if (message.includes('took') && message.includes('damage')) {
-      if (message.includes(playerName)) {
+      if (message.includes(playerInternalName)) {
         triggerDamageFlash('player');
-        // Update HP bar immediately for damage animation sync
         updateUIFromBattleState();
-      } else if (message.includes(enemyName)) {
+      } else if (message.includes(enemyInternalName)) {
         triggerDamageFlash('enemy');
-        // Update HP bar immediately for damage animation sync
         updateUIFromBattleState();
       }
     }
@@ -211,25 +211,25 @@
     
     // Status effects
     if (message.includes('was burned')) {
-      const target = message.includes(playerName) ? 'player' : 'enemy';
+      const target = message.includes(playerInternalName) ? 'player' : 'enemy';
       triggerEffect(target, 'burn', '🔥', 1200);
     } else if (message.includes('was poisoned')) {
-      const target = message.includes(playerName) ? 'player' : 'enemy';
+      const target = message.includes(playerInternalName) ? 'player' : 'enemy';
       triggerEffect(target, 'poison', '☠️', 1200);
     } else if (message.includes('was paralyzed')) {
-      const target = message.includes(playerName) ? 'player' : 'enemy';
+      const target = message.includes(playerInternalName) ? 'player' : 'enemy';
       triggerEffect(target, 'paralyze', '⚡', 1200);
     } else if (message.includes('fell asleep')) {
-      const target = message.includes(playerName) ? 'player' : 'enemy';
+      const target = message.includes(playerInternalName) ? 'player' : 'enemy';
       triggerEffect(target, 'sleep', '😴', 1200);
     } else if (message.includes('was frozen')) {
-      const target = message.includes(playerName) ? 'player' : 'enemy';
+      const target = message.includes(playerInternalName) ? 'player' : 'enemy';
       triggerEffect(target, 'freeze', '❄️', 1200);
     }
     
     // Stat changes
     if (message.includes("'s") && (message.includes('rose') || message.includes('fell'))) {
-      const target = message.includes(playerName) ? 'player' : 'enemy';
+      const target = message.includes(playerInternalName) ? 'player' : 'enemy';
       const isIncrease = message.includes('rose');
       
       if (message.includes('attack')) {
@@ -245,7 +245,7 @@
     
     // Healing effects
     if (message.includes('recovered') && message.includes('HP')) {
-      const target = message.includes(playerName) ? 'player' : 'enemy';
+      const target = message.includes(playerInternalName) ? 'player' : 'enemy';
       triggerEffect(target, 'heal', '💚', 1000);
       // Update HP bar immediately for healing animation sync
       updateUIFromBattleState();
@@ -258,9 +258,9 @@
     
     // Faint effects
     if (message.includes('fainted')) {
-      if (message.includes(playerName)) {
+      if (message.includes(playerInternalName)) {
         triggerFaintAnimation('player');
-      } else if (message.includes(enemyName)) {
+      } else if (message.includes(enemyInternalName)) {
         triggerFaintAnimation('enemy');
       }
     }

src/lib/utils/battleConversion.ts

@@ -37,7 +37,7 @@ export function picletInstanceToBattleDefinition(instance: PicletInstance): Picl
   else tier = 'legendary';
 
   return {
-    name: instance.nickname || instance.typeId,
+    name: instance.nickname || instance.typeId, // Keep original name - we'll add prefixes in battle engine
     description: instance.concept,
     tier,
     primaryType: instance.primaryType,
@@ -121,4 +121,18 @@ export function picletStatsToBattleDefinition(stats: PicletStats, name: string,
     specialAbility: stats.specialAbility,
     movepool: stats.movepool
   };
+}
+
+/**
+ * Strip internal battle prefixes from piclet names for display purposes
+ * Removes "player-" and "enemy-" prefixes that are used internally for animation targeting
+ */
+export function stripBattlePrefix(name: string): string {
+  if (name.startsWith('player-')) {
+    return name.substring('player-'.length);
+  }
+  if (name.startsWith('enemy-')) {
+    return name.substring('enemy-'.length);
+  }
+  return name;
 }