pokemon-io-core 0.0.70 → 0.0.72

package/dist/api/room.d.ts

@@ -1,10 +1,8 @@
 export interface PlayerLoadoutView {
-    fighterIds: string[];
-    movesByFighterId: Record<string, string[]>;
-    itemIds: string[];
-    amuletId: string | null;
     fighterId: string | null;
     moveIds: string[];
+    itemIds: string[];
+    amuletId: string | null;
 }
 export interface PlayerView {
     id: string;

package/dist/api/socketTypes.d.ts

@@ -42,6 +42,10 @@ export interface ClientToServerEvents {
         roomId: string;
         itemIndex: number;
     }) => void;
+    "battle:switchFighter": (payload: {
+        roomId: string;
+        newIndex: number;
+    }) => void;
     "battle:rematchSameLoadout": (payload: {
         roomId: string;
     }) => void;

package/dist/api/socketTypes.js

@@ -1 +1,2 @@
+// @pokemon-io/combat-core/src/api/socketTypests
 export {};

package/dist/core/engine.d.ts

@@ -16,16 +16,13 @@ export interface BattleRuntime {
     statusesById: Record<StatusId, StatusDefinition>;
     typeEffectiveness: TypeEffectivenessMatrix;
 }
-export interface PlayerFighterConfig {
+export interface PlayerBattleConfig {
     fighter: FighterDefinition;
     maxHp: number;
     moves: MoveDefinition[];
     items: ItemDefinition[];
     amulet: AmuletDefinition | null;
 }
-export interface PlayerBattleConfig {
-    team: PlayerFighterConfig[];
-}
 export interface BattleConfig {
     types: TypeDefinition[];
     typeEffectiveness: TypeEffectivenessMatrix;

package/dist/core/engine.js

@@ -90,10 +90,10 @@ const recomputeEffectiveStatsForFighter = (state, fighter) => {
     };
 };
 const createPlayerBattleState = (cfg) => {
-    const fighterTeam = cfg.team.map((f) => createBattleFighter(f));
+    const fighter = createBattleFighter(cfg);
     return {
-        fighterTeam,
-        activeIndex: 0, // siempre el primero al empezar
+        fighterTeam: [fighter],
+        activeIndex: 0,
     };
 };
 export const createInitialBattleState = (config) => {
@@ -480,6 +480,34 @@ 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") {
@@ -497,6 +525,12 @@ const getMovePriorityAndSpeed = (state, playerKey, action) => {
             speed: self.effectiveStats.speed,
         };
     }
+    if (action.kind === "switch_fighter") {
+        return {
+            priority: 10, // prioridad especial (ajústalo si quieres)
+            speed: self.effectiveStats.speed,
+        };
+    }
     // Items y switch: prioridad base 0 por ahora
     return {
         priority: 0,
@@ -762,35 +796,6 @@ const applyEndOfTurnStatuses = (state) => {
     };
     return { state: newState, events };
 };
-const applySwitchAction = (state, playerKey, newIndex, events) => {
-    const playerState = state[playerKey];
-    const team = playerState.fighterTeam;
-    // Validaciones básicas
-    if (newIndex < 0 || newIndex >= team.length)
-        return state;
-    if (!team[newIndex]?.isAlive)
-        return state;
-    if (newIndex === playerState.activeIndex)
-        return state;
-    const oldIndex = playerState.activeIndex;
-    const oldFighter = team[oldIndex];
-    const newFighter = team[newIndex];
-    const newPlayerState = {
-        ...playerState,
-        activeIndex: newIndex,
-    };
-    const newState = {
-        ...state,
-        [playerKey]: newPlayerState,
-    };
-    events.push({
-        ...createBaseEvent(state.turnNumber, "fighter_switched", `${oldFighter.fighterId} se retira. ¡Adelante ${newFighter.fighterId}!`),
-        player: playerKey,
-        oldFighterId: oldFighter.fighterId,
-        newFighterId: newFighter.fighterId,
-    });
-    return newState;
-};
 // ------------------------------------------------------
 // Bucle principal de turno
 // ------------------------------------------------------
@@ -826,7 +831,6 @@ export const resolveTurn = (state, actions) => {
             ...getMovePriorityAndSpeed(runtimeState, "player2", actions.player2),
         },
     ];
-    // Orden clásico por prioridad + velocidad
     entries.sort((a, b) => {
         if (b.priority !== a.priority) {
             return b.priority - a.priority;
@@ -843,29 +847,7 @@ export const resolveTurn = (state, actions) => {
         priority: e.priority,
         speed: e.speed,
     })));
-    // 🔁 1) FASE DE CAMBIOS (switch_fighter) – prioridad absoluta
-    const switchEntries = entries.filter((e) => e.action.kind === "switch_fighter");
-    for (const entry of switchEntries) {
-        const { playerKey, action } = entry;
-        if (action.kind !== "switch_fighter")
-            continue;
-        const { self } = getOpponentAndSelf(currentState, playerKey);
-        // Si el activo ya está muerto, no tiene sentido cambiar (o el combate ya está decidido).
-        if (!self.isAlive || self.currentHp <= 0)
-            continue;
-        if (hasHardCc(currentState, self)) {
-            // No puede cambiar tampoco si está bajo hard CC
-            events.push({
-                ...createBaseEvent(currentState.turnNumber, "action_skipped_hard_cc", `${self.fighterId} no puede actuar por control total`),
-                actorId: self.fighterId,
-            });
-            continue;
-        }
-        currentState = applySwitchAction(currentState, playerKey, action.newIndex, events);
-    }
-    // 🔁 2) FASE DE ACCIONES (movimientos / objetos)
-    const actionEntries = entries.filter((e) => e.action.kind !== "switch_fighter");
-    for (const entry of actionEntries) {
+    for (const entry of entries) {
         const { playerKey, action } = entry;
         if (action.kind === "no_action")
             continue;
@@ -884,13 +866,18 @@ export const resolveTurn = (state, actions) => {
             currentState = result.state;
             events.push(...result.events);
         }
-        else if (action.kind === "use_item") {
+        if (action.kind === "use_item") {
             const result = resolveItemUse(currentState, playerKey, action);
             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 {
-            // Cualquier otro tipo de acción futura se ignora de momento
+            // switch_fighter u otros no implementados aún
             continue;
         }
         const winnerAfterAction = checkWinner(currentState);
@@ -909,7 +896,6 @@ export const resolveTurn = (state, actions) => {
             };
         }
     }
-    // 🔁 3) Estados de final de turno
     const statusResult = applyEndOfTurnStatuses(currentState);
     currentState = statusResult.state;
     events.push(...statusResult.events);

package/dist/core/events.d.ts

@@ -1,5 +1,5 @@
 import type { FighterId, MoveId, ItemId, StatusId } from "./ids.js";
-export type BattleEventKind = "turn_start" | "action_declared" | "action_skipped_hard_cc" | "move_miss" | "move_hit" | "item_used" | "status_cleared" | "damage" | "heal" | "shield_applied" | "status_applied" | "status_refreshed" | "status_expired" | "fighter_fainted" | "fighter_switched" | "turn_end" | "battle_end";
+export type BattleEventKind = "turn_start" | "action_declared" | "action_skipped_hard_cc" | "move_miss" | "move_hit" | "item_used" | "status_cleared" | "damage" | "heal" | "fighter_switched" | "shield_applied" | "status_applied" | "status_refreshed" | "status_expired" | "fighter_fainted" | "turn_end" | "battle_end";
 export interface BaseBattleEvent {
     id: string;
     turnNumber: number;
@@ -51,6 +51,11 @@ export interface StatusAppliedEvent extends BaseBattleEvent {
     stacks: 1 | 2;
     durationTurns: number;
 }
+export interface FighterSwitchedEvent extends BaseBattleEvent {
+    kind: "fighter_switched";
+    fromFighterId: FighterId;
+    toFighterId: FighterId;
+}
 export interface StatusExpiredEvent extends BaseBattleEvent {
     kind: "status_expired";
     targetId: FighterId;
@@ -60,12 +65,6 @@ export interface FighterFaintedEvent extends BaseBattleEvent {
     kind: "fighter_fainted";
     fighterId: FighterId;
 }
-export interface FighterSwitchedEvent extends BaseBattleEvent {
-    kind: "fighter_switched";
-    player: "player1" | "player2";
-    oldFighterId: FighterId;
-    newFighterId: FighterId;
-}
 export interface BattleEndEvent extends BaseBattleEvent {
     kind: "battle_end";
     winner: "player1" | "player2" | "draw";

package/dist/skins/cliches/clicheSkin.js

@@ -1,8 +1,8 @@
-// pokemon-io-core/src/skins/tribes/clicheSkin.ts
+// pokemon-io-core/src/skins/pokemon/pokemonSkin.ts
 import { POKEMON_ITEMS } from "../pokemon/index.js";
 import { TRIBE_FIGHTERS, TRIBE_MOVES, TRIBE_STATUSES, TRIBE_TYPES, TRIBE_TYPE_MATRIX, } from "./index.js";
 // --- helpers ---
-const findTribeFighterById = (id) => {
+const findPokemonById = (id) => {
     const lower = id.toLowerCase();
     return TRIBE_FIGHTERS.find((f) => f.id.toLowerCase() === lower) ?? null;
 };
@@ -71,22 +71,19 @@ export class TribeSkin {
         if (!loadout.fighterId) {
             throw new Error("fighterId is required in FighterLoadout");
         }
-        const fighter = findTribeFighterById(loadout.fighterId);
+        console.log("buildPlayerConfig", loadout.fighterId);
+        const fighter = findPokemonById(loadout.fighterId);
         if (!fighter) {
-            throw new Error(`Unknown fighterId for tribe skin: ${loadout.fighterId}`);
+            throw new Error(`Unknown fighterId for Pokemon skin: ${loadout.fighterId}`);
         }
         const moves = buildMovesFromLoadout(fighter, loadout);
         const items = buildItemsFromLoadout(loadout);
         return {
-            team: [
-                {
-                    fighter,
-                    maxHp: fighter.baseStats.defense + fighter.baseStats.offense,
-                    moves,
-                    items,
-                    amulet: null,
-                },
-            ],
+            fighter,
+            maxHp: fighter.baseStats.defense + fighter.baseStats.offense,
+            moves,
+            items,
+            amulet: null,
         };
     }
 }

package/dist/skins/pokemon/pokemonSkin.js

@@ -70,6 +70,7 @@ export class PokemonSkin {
         if (!loadout.fighterId) {
             throw new Error("fighterId is required in FighterLoadout");
         }
+        console.log("buildPlayerConfig", loadout.fighterId);
         const fighter = findPokemonById(loadout.fighterId);
         if (!fighter) {
             throw new Error(`Unknown fighterId for Pokemon skin: ${loadout.fighterId}`);
@@ -77,15 +78,11 @@ export class PokemonSkin {
         const moves = buildMovesFromLoadout(fighter, loadout);
         const items = buildItemsFromLoadout(loadout);
         return {
-            team: [
-                {
-                    fighter,
-                    maxHp: fighter.baseStats.defense + fighter.baseStats.offense,
-                    moves,
-                    items,
-                    amulet: null,
-                },
-            ],
+            fighter,
+            maxHp: fighter.baseStats.defense + fighter.baseStats.offense,
+            moves,
+            items,
+            amulet: null,
         };
     }
 }

package/package.json

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