pokemon-io-core 0.0.68 → 0.0.70

package/dist/api/room.d.ts

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

package/dist/api/socketTypes.d.ts

@@ -14,6 +14,10 @@ export interface ClientToServerEvents {
     "room:leave": (payload: {
         roomId: string;
     }) => void;
+    "room:reconnect": (payload: {
+        roomId: string;
+        oldPlayerId: string;
+    }) => void;
     "room:setLoadout": (payload: {
         roomId: string;
         fighterId: string;

package/dist/core/actions.d.ts

@@ -9,7 +9,8 @@ export interface UseItemAction {
 }
 export interface SwitchFighterAction {
     kind: "switch_fighter";
-    targetIndex: number;
+    newIndex: number;
+    forced?: boolean;
 }
 export interface NoAction {
     kind: "no_action";

package/dist/core/engine.d.ts

@@ -16,13 +16,16 @@ export interface BattleRuntime {
     statusesById: Record<StatusId, StatusDefinition>;
     typeEffectiveness: TypeEffectivenessMatrix;
 }
-export interface PlayerBattleConfig {
+export interface PlayerFighterConfig {
     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 fighter = createBattleFighter(cfg);
+    const fighterTeam = cfg.team.map((f) => createBattleFighter(f));
     return {
-        fighterTeam: [fighter],
-        activeIndex: 0,
+        fighterTeam,
+        activeIndex: 0, // siempre el primero al empezar
     };
 };
 export const createInitialBattleState = (config) => {
@@ -762,6 +762,35 @@ 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
 // ------------------------------------------------------
@@ -797,6 +826,7 @@ 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;
@@ -813,7 +843,29 @@ export const resolveTurn = (state, actions) => {
         priority: e.priority,
         speed: e.speed,
     })));
-    for (const entry of entries) {
+    // 🔁 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) {
         const { playerKey, action } = entry;
         if (action.kind === "no_action")
             continue;
@@ -838,7 +890,7 @@ export const resolveTurn = (state, actions) => {
             events.push(...result.events);
         }
         else {
-            // switch_fighter u otros no implementados aún
+            // Cualquier otro tipo de acción futura se ignora de momento
             continue;
         }
         const winnerAfterAction = checkWinner(currentState);
@@ -857,6 +909,7 @@ 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" | "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" | "shield_applied" | "status_applied" | "status_refreshed" | "status_expired" | "fighter_fainted" | "fighter_switched" | "turn_end" | "battle_end";
 export interface BaseBattleEvent {
     id: string;
     turnNumber: number;
@@ -60,8 +60,14 @@ 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";
 }
-export type BattleEvent = ActionDeclaredEvent | MoveMissEvent | MoveHitEvent | ItemUsedEvent | DamageEvent | HealEvent | StatusAppliedEvent | StatusExpiredEvent | FighterFaintedEvent | BattleEndEvent | BaseBattleEvent;
+export type BattleEvent = ActionDeclaredEvent | MoveMissEvent | MoveHitEvent | ItemUsedEvent | DamageEvent | HealEvent | StatusAppliedEvent | StatusExpiredEvent | FighterFaintedEvent | FighterSwitchedEvent | BattleEndEvent | BaseBattleEvent;

package/dist/index.d.ts

@@ -3,4 +3,3 @@ export * from "./api/battle.js";
 export * from "./api/room.js";
 export * from "./api/socketTypes.js";
 export * from "./skins/CombatSkin.js";
-export * from "./engine/pokemonBattleService.js";

package/dist/index.js

@@ -3,4 +3,3 @@ export * from "./api/battle.js";
 export * from "./api/room.js";
 export * from "./api/socketTypes.js";
 export * from "./skins/CombatSkin.js";
-export * from "./engine/pokemonBattleService.js";

package/dist/skins/cliches/clicheSkin.js

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

package/dist/skins/pokemon/pokemonSkin.js

@@ -70,7 +70,6 @@ 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}`);
@@ -78,11 +77,15 @@ export class PokemonSkin {
         const moves = buildMovesFromLoadout(fighter, loadout);
         const items = buildItemsFromLoadout(loadout);
         return {
-            fighter,
-            maxHp: fighter.baseStats.defense + fighter.baseStats.offense,
-            moves,
-            items,
-            amulet: null,
+            team: [
+                {
+                    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.68",
+  "version": "0.0.70",
   "description": "",
   "main": "index.js",
   "type": "module",