pokemon-io-core 0.0.74 → 0.0.75

package/dist/api/battle.d.ts

@@ -9,6 +9,7 @@ export interface BattlePlayerView {
     nickname: string;
     hp: number;
     statuses: BattlePlayerStatusView[];
+    activeFighterId: string;
 }
 export type BattleStatus = "ongoing" | "finished";
 export interface BattleView {

package/dist/core/engine.js

@@ -488,34 +488,6 @@ const applyEffectsOnTarget = (state, actor, target, moveTypeId, isCritical, effe
     }
     return { actor: currentActor, target: currentTarget, events };
 };
-const resolveSwitchFighter = (state, playerKey, action) => {
-    if (action.kind !== "switch_fighter") {
-        return { state, events: [] };
-    }
-    const events = [];
-    const player = playerKey === "player1" ? state.player1 : state.player2;
-    const from = getActiveFighter(player);
-    const to = player.fighterTeam[action.newIndex];
-    if (!to)
-        return { state, events };
-    if (!to.isAlive || to.currentHp <= 0)
-        return { state, events };
-    if (action.newIndex === player.activeIndex)
-        return { state, events };
-    const updatedPlayer = {
-        ...player,
-        activeIndex: action.newIndex,
-    };
-    const newState = playerKey === "player1"
-        ? { ...state, player1: updatedPlayer }
-        : { ...state, player2: updatedPlayer };
-    events.push({
-        ...createBaseEvent(state.turnNumber, "fighter_switched", `${from.fighterId} cambia a ${to.fighterId}`),
-        fromFighterId: from.fighterId,
-        toFighterId: to.fighterId,
-    });
-    return { state: newState, events };
-};
 const getMovePriorityAndSpeed = (state, playerKey, action) => {
     const { self } = getOpponentAndSelf(state, playerKey);
     if (action.kind === "no_action") {
@@ -545,6 +517,53 @@ const getMovePriorityAndSpeed = (state, playerKey, action) => {
         speed: self.effectiveStats.speed,
     };
 };
+const resolveSwitchFighter = (state, playerKey, action) => {
+    if (action.kind !== "switch_fighter")
+        return { state, events: [] };
+    const events = [];
+    const selfPlayer = playerKey === "player1" ? state.player1 : state.player2;
+    const fromIndex = selfPlayer.activeIndex;
+    const toIndex = action.newIndex;
+    // validaciones
+    if (toIndex < 0 || toIndex >= selfPlayer.fighterTeam.length) {
+        return { state, events };
+    }
+    if (toIndex === fromIndex) {
+        return { state, events };
+    }
+    const target = selfPlayer.fighterTeam[toIndex];
+    if (!target || !target.isAlive || target.currentHp <= 0) {
+        return { state, events };
+    }
+    const fromFighter = selfPlayer.fighterTeam[fromIndex];
+    events.push({
+        ...createBaseEvent(state.turnNumber, "action_declared", `${fromFighter.fighterId} cambia a ${target.fighterId}`),
+        actorId: fromFighter.fighterId,
+    });
+    // actualizar activeIndex
+    if (playerKey === "player1") {
+        return {
+            state: {
+                ...state,
+                player1: {
+                    ...state.player1,
+                    activeIndex: toIndex,
+                },
+            },
+            events,
+        };
+    }
+    return {
+        state: {
+            ...state,
+            player2: {
+                ...state.player2,
+                activeIndex: toIndex,
+            },
+        },
+        events,
+    };
+};
 // ------------------------------------------------------
 // use_move
 // ------------------------------------------------------
@@ -732,10 +751,8 @@ const hasHardCc = (state, fighter) => fighter.statuses.some((st) => {
     return def?.kind === "hard_cc";
 });
 const checkWinner = (state) => {
-    const f1 = getActiveFighter(state.player1);
-    const f2 = getActiveFighter(state.player2);
-    const p1Alive = f1.isAlive && f1.currentHp > 0;
-    const p2Alive = f2.isAlive && f2.currentHp > 0;
+    const p1Alive = state.player1.fighterTeam.some((f) => f.isAlive && f.currentHp > 0);
+    const p2Alive = state.player2.fighterTeam.some((f) => f.isAlive && f.currentHp > 0);
     if (p1Alive && !p2Alive)
         return "player1";
     if (!p1Alive && p2Alive)
@@ -888,6 +905,11 @@ export const resolveTurn = (state, actions) => {
             });
             continue;
         }
+        if (action.kind === "switch_fighter") {
+            const result = resolveSwitchFighter(currentState, playerKey, action);
+            currentState = result.state;
+            events.push(...result.events);
+        }
         if (action.kind === "use_move") {
             const result = resolveDamageMove(currentState, playerKey, action);
             currentState = result.state;
@@ -898,11 +920,6 @@ export const resolveTurn = (state, actions) => {
             currentState = result.state;
             events.push(...result.events);
         }
-        if (action.kind === "switch_fighter") {
-            const result = resolveSwitchFighter(currentState, playerKey, action);
-            currentState = result.state;
-            events.push(...result.events);
-        }
         else {
             // switch_fighter u otros no implementados aún
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pokemon-io-core",
-  "version": "0.0.74",
+  "version": "0.0.75",
   "description": "",
   "main": "index.js",
   "type": "module",