pokemon-io-core 0.0.6 → 0.0.7

package/dist/core/battleState.d.ts

@@ -1,3 +1,4 @@
+import { BattleRuntime } from "./engine";
 import type { FighterId, TypeId, MoveId, ItemId, AmuletId, StatusId } from "./ids";
 import type { FighterStats } from "./types";
 export interface EquippedMove {
@@ -34,4 +35,5 @@ export interface BattleState {
     turnNumber: number;
     player1: PlayerBattleState;
     player2: PlayerBattleState;
+    runtime: BattleRuntime;
 }

package/dist/core/engine.d.ts

@@ -7,7 +7,7 @@ interface BattleRules {
     randomMinDamageFactor: number;
     randomMaxDamageFactor: number;
 }
-interface BattleRuntime {
+export interface BattleRuntime {
     rules: BattleRules;
     typesById: Record<TypeId, TypeDefinition>;
     movesById: Record<MoveId, MoveDefinition>;
@@ -37,7 +37,7 @@ export interface BattleConfig {
 export interface RuntimeBattleState extends BattleState {
     runtime: BattleRuntime;
 }
-export declare const createInitialBattleState: (config: BattleConfig) => RuntimeBattleState;
+export declare const createInitialBattleState: (config: BattleConfig) => BattleState;
 export declare const resolveTurn: (state: BattleState, actions: BattleActions) => {
     newState: BattleState;
     events: BattleEvent[];

package/dist/skins/pokemon/pokemonSkin.d.ts

@@ -1,13 +1,14 @@
 import type { CombatSkin, FighterLoadout } from "../CombatSkin";
-import type { MoveDefinition } from "../../core";
-import { PlayerBattleConfig } from "../../core/engine";
+import type { MoveDefinition, ItemDefinition, AmuletDefinition, StatusDefinition } from "../../core";
+import type { PlayerBattleConfig } from "../../core/engine";
 export declare class PokemonSkin implements CombatSkin {
     readonly id = "pokemon";
     getTypes(): import("../..").TypeDefinition[];
     getTypeEffectiveness(): import("../..").TypeEffectivenessMatrix;
     getMoves(): MoveDefinition[];
-    getItems(): never[];
-    getAmulets(): never[];
-    getStatuses(): never[];
+    getItems(): ItemDefinition[];
+    getAmulets(): AmuletDefinition[];
+    getStatuses(): StatusDefinition[];
     buildPlayerConfig(loadout: FighterLoadout): PlayerBattleConfig;
 }
+export declare const createPokemonSkin: () => CombatSkin;

package/dist/skins/pokemon/pokemonSkin.js

@@ -1,22 +1,52 @@
+// src/skins/pokemon/pokemonSkin.ts
 import { POKEMON_TYPES, POKEMON_TYPE_MATRIX, POKEMON_MOVES, POKEMON_FIGHTERS } from "./index";
 const MAX_HP_DEFAULT = 100;
+// Helpers locales
 const findPokemonById = (id) => {
     const lower = id.toLowerCase();
     return (POKEMON_FIGHTERS.find((f) => f.id.toLowerCase() === lower || f.name.toLowerCase() === lower) ?? null);
 };
-const findMovesForFighter = (fighter) => {
-    const moveIds = fighter.recommendedMoves ?? [];
-    const moves = POKEMON_MOVES.filter((m) => moveIds.includes(m.id));
-    if (moves.length >= 4) {
-        return moves.slice(0, 4);
-    }
-    const result = [...moves];
-    const filler = POKEMON_MOVES.find((m) => m.id === "tackle");
+const findMoveById = (id) => {
+    return POKEMON_MOVES.find((m) => m.id === id) ?? null;
+};
+const FILLER_MOVE_ID = "tackle";
+const buildMovesFromLoadout = (fighter, loadout) => {
+    // 1) si el jugador ha elegido moveIds, intentamos respetarlos
+    const selectedMoveIds = loadout.moveIds ?? [];
+    const selectedMoves = selectedMoveIds
+        .map((id) => findMoveById(id))
+        .filter((m) => m !== null);
+    // 2) si ya hay 4 válidos → nos quedamos con los primeros 4
+    if (selectedMoves.length >= 4) {
+        return selectedMoves.slice(0, 4);
+    }
+    const result = [...selectedMoves];
+    // 3) completamos con recommendedMoves del fighter
+    const recommendedIds = fighter.recommendedMoves ?? [];
+    for (const recId of recommendedIds) {
+        if (result.length >= 4)
+            break;
+        const move = findMoveById(recId);
+        if (move && !result.some((m) => m.id === move.id)) {
+            result.push(move);
+        }
+    }
+    // 4) si sigue faltando, rellenamos con "tackle"
+    const filler = findMoveById(FILLER_MOVE_ID);
     while (result.length < 4 && filler) {
         result.push(filler);
     }
-    return result;
+    // Garantizamos que haya al menos 1 movimiento
+    if (result.length === 0 && filler) {
+        result.push(filler);
+    }
+    // Cortamos por si acaso
+    return result.slice(0, 4);
 };
+// De momento no tenemos objetos / amuletos / estados modelados para Pokémon
+const POKEMON_ITEMS = [];
+const POKEMON_AMULETS = [];
+const POKEMON_STATUSES = [];
 export class PokemonSkin {
     id = "pokemon";
     getTypes() {
@@ -29,28 +59,34 @@ export class PokemonSkin {
         return POKEMON_MOVES;
     }
     getItems() {
-        return []; // más adelante
+        return POKEMON_ITEMS;
     }
     getAmulets() {
-        return []; // más adelante
+        return POKEMON_AMULETS;
     }
     getStatuses() {
-        return []; // más adelante
+        return POKEMON_STATUSES;
     }
     buildPlayerConfig(loadout) {
         if (!loadout.fighterId) {
-            throw new Error("FighterId is required in FighterLoadout");
+            throw new Error("fighterId is required in FighterLoadout");
         }
         const fighter = findPokemonById(loadout.fighterId);
         if (!fighter) {
             throw new Error(`Unknown fighterId for Pokemon skin: ${loadout.fighterId}`);
         }
+        const moves = buildMovesFromLoadout(fighter, loadout);
+        // Importante: aquí aún no aplicamos items/amuletos, pero dejamos el contrato listo
         return {
             fighter,
             maxHp: MAX_HP_DEFAULT,
-            moves: findMovesForFighter(fighter),
-            items: [], // luego mapearemos loadout.itemIds
-            amulet: null // loadout.amuletId
+            moves,
+            items: [], // Más adelante: mapear loadout.itemIds -> ItemDefinition[]
+            amulet: null // Más adelante: loadout.amuletId -> AmuletDefinition
         };
     }
 }
+// Helper para crear la skin (así importas siempre una factoría)
+export const createPokemonSkin = () => {
+    return new PokemonSkin();
+};

package/package.json

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