pokemon-io-core 0.0.11 → 0.0.13

package/dist/api/socketTypes.d.ts

@@ -0,0 +1,46 @@
+import { BattleView } from "./battle";
+import { RoomView } from "./room";
+export interface ClientToServerEvents {
+    "room:create": (payload: {
+        nickname: string;
+    }) => void;
+    "room:join": (payload: {
+        roomId: string;
+        nickname: string;
+    }) => void;
+    "room:leave": (payload: {
+        roomId: string;
+    }) => void;
+    "room:setLoadout": (payload: {
+        roomId: string;
+        fighterId: string;
+        moveIds: string[];
+        itemIds: string[];
+        amuletId?: string | null;
+    }) => void;
+    "room:startBattleRequest": (payload: {
+        roomId: string;
+    }) => void;
+    "battle:useMove": (payload: {
+        roomId: string;
+        moveIndex: number;
+    }) => void;
+    "battle:useItem": (payload: {
+        roomId: string;
+        itemIndex: number;
+    }) => void;
+    "ping": () => void;
+}
+export interface ServerToClientEvents {
+    "connection:state": (payload: {
+        isConnected: boolean;
+        socketId: string | null;
+    }) => void;
+    "room:state": (payload: RoomView) => void;
+    "room:error": (payload: {
+        code: string;
+        message: string;
+    }) => void;
+    "battle:state": (payload: BattleView) => void;
+    "pong": (msg: string) => void;
+}

package/dist/api/socketTypes.js

@@ -0,0 +1 @@
+export {};

package/dist/core/engine.js

@@ -175,6 +175,89 @@ const applyDamageToFighter = (state, defender, amount, actorId, isCritical) => {
     }
     return { updatedDefender, events };
 };
+const applyStatusToFighter = (state, target, statusId) => {
+    const def = state.runtime.statusesById[statusId];
+    if (!def)
+        return { updated: target, events: [] };
+    const events = [];
+    const existing = target.statuses.find((s) => s.statusId === statusId);
+    const duration = Math.floor(randomInRange(def.minDurationTurns, def.maxDurationTurns + 1)) ||
+        def.minDurationTurns;
+    let newStatuses = [...target.statuses];
+    if (!existing) {
+        newStatuses.push({
+            statusId,
+            stacks: 1,
+            remainingTurns: duration,
+        });
+    }
+    else if (existing.stacks === 1) {
+        newStatuses = newStatuses.map((s) => s.statusId === statusId
+            ? { ...s, stacks: 2, remainingTurns: duration }
+            : s);
+    }
+    else {
+        newStatuses = newStatuses.map((s) => s.statusId === statusId ? { ...s, remainingTurns: duration } : s);
+    }
+    events.push({
+        ...createBaseEvent(state.turnNumber, "status_applied", `Se aplica ${statusId} a ${target.fighterId}`),
+        targetId: target.fighterId,
+        statusId,
+    });
+    return {
+        updated: { ...target, statuses: newStatuses },
+        events,
+    };
+};
+const applyHealToFighter = (state, target, amount, sourceId) => {
+    const newHp = Math.min(target.maxHp, target.currentHp + amount);
+    const healed = newHp - target.currentHp;
+    const updated = {
+        ...target,
+        currentHp: newHp,
+        isAlive: newHp > 0,
+    };
+    const events = [];
+    events.push({
+        ...createBaseEvent(state.turnNumber, "heal", `${sourceId} cura ${healed} a ${target.fighterId}`),
+        actorId: sourceId,
+        targetId: target.fighterId,
+        amount: healed,
+    });
+    return { updated, events };
+};
+const applyEffectsOnTarget = (state, actor, target, effects) => {
+    let currentActor = actor;
+    let currentTarget = target;
+    const events = [];
+    for (const eff of effects) {
+        switch (eff.kind) {
+            case "heal": {
+                const res = applyHealToFighter(state, currentActor, eff.amount, actor.fighterId);
+                currentActor = res.updated;
+                events.push(...res.events);
+                break;
+            }
+            case "apply_status": {
+                const res = applyStatusToFighter(state, currentTarget, eff.statusId);
+                currentTarget = res.updated;
+                events.push(...res.events);
+                break;
+            }
+            case "damage": {
+                if (typeof eff.amount === "number") {
+                    const res = applyDamageToFighter(state, currentTarget, eff.amount, actor.fighterId, false);
+                    currentTarget = res.updatedDefender;
+                    events.push(...res.events);
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    }
+    return { actor: currentActor, target: currentTarget, events };
+};
 const getMovePriorityAndSpeed = (state, playerKey, action) => {
     const { self } = getOpponentAndSelf(state, playerKey);
     if (action.kind === "no_action") {
@@ -200,43 +283,51 @@ const getMovePriorityAndSpeed = (state, playerKey, action) => {
 };
 const resolveDamageMove = (state, playerKey, action) => {
     if (action.kind !== "use_move") {
-        // por ahora ignoramos otros tipos aquí
         return { state, events: [] };
     }
     const { self, opponent } = getOpponentAndSelf(state, playerKey);
     const events = [];
     const moveSlot = self.moves[action.moveIndex];
     if (!moveSlot) {
-        // movimiento vacío → no hace nada
         return { state, events };
     }
     const move = state.runtime.movesById[moveSlot.moveId];
     if (!move) {
         return { state, events };
     }
-    // Sin PP → no hace nada (podrías emitir evento de "sin PP" si quieres)
+    // Sin PP → no hace nada
     if (moveSlot.currentPP <= 0) {
         return { state, events };
     }
-    // Movimientos de estado/curación aún no implementados en detalle
-    if (move.kind === "status" || move.kind === "heal") {
-        // stub: no hacemos nada por ahora
-        return { state, events };
+    // Movimiento solo de curación → no calculamos daño base
+    if (move.kind === "heal") {
+        events.push({
+            ...createBaseEvent(state.turnNumber, "action_declared", `${self.fighterId} usa ${move.name}`),
+            actorId: self.fighterId,
+        });
+        const updatedMoves = self.moves.map((m, idx) => idx === action.moveIndex
+            ? { ...m, currentPP: Math.max(0, m.currentPP - 1) }
+            : m);
+        let updatedSelf = { ...self, moves: updatedMoves };
+        let updatedOpponent = { ...opponent };
+        const { actor: finalSelf, target: finalOpp, events: extraEvents, } = applyEffectsOnTarget(state, updatedSelf, updatedOpponent, move.effects);
+        events.push(...extraEvents);
+        const newState = updateFightersInState(state, playerKey, finalSelf, finalOpp);
+        return { state: newState, events };
     }
-    // Acción declarada (para narrador avanzado)
+    // Movimiento de daño/hybrid
     events.push({
         ...createBaseEvent(state.turnNumber, "action_declared", `${self.fighterId} usa ${move.name}`),
         actorId: self.fighterId,
     });
-    // Comprobar accuracy
     const accuracy = move.accuracy ?? 100;
     const hitRoll = randomInRange(0, 100);
     const hit = hitRoll < accuracy;
-    // Reducir PP
     const updatedMoves = self.moves.map((m, idx) => idx === action.moveIndex
         ? { ...m, currentPP: Math.max(0, m.currentPP - 1) }
         : m);
     let updatedSelf = { ...self, moves: updatedMoves };
+    let updatedOpponent = { ...opponent };
     if (!hit) {
         events.push({
             ...createBaseEvent(state.turnNumber, "move_miss", `${self.fighterId} falla ${move.name}`),
@@ -244,16 +335,16 @@ const resolveDamageMove = (state, playerKey, action) => {
             moveId: move.id,
             targetId: opponent.fighterId,
         });
-        const newState = updateFightersInState(state, playerKey, updatedSelf, opponent);
+        const newState = updateFightersInState(state, playerKey, updatedSelf, updatedOpponent);
         return { state: newState, events };
     }
-    // Crítico
+    // Crítico y daño base
     const critChance = computeCritChance(state.runtime.rules, updatedSelf.effectiveStats.crit);
     const isCritical = chance(critChance);
     const { damage, effectiveness } = computeDamage({
         state,
         attacker: updatedSelf,
-        defender: opponent,
+        defender: updatedOpponent,
         move,
         isCritical,
     });
@@ -265,9 +356,42 @@ const resolveDamageMove = (state, playerKey, action) => {
         isCritical,
         effectiveness,
     });
-    const damageResult = applyDamageToFighter(state, opponent, damage, updatedSelf.fighterId, isCritical);
-    events.push(...damageResult.events);
-    const newState = updateFightersInState(state, playerKey, updatedSelf, damageResult.updatedDefender);
+    const damageRes = applyDamageToFighter(state, updatedOpponent, damage, updatedSelf.fighterId, isCritical);
+    updatedOpponent = damageRes.updatedDefender;
+    events.push(...damageRes.events);
+    // Efectos secundarios del movimiento (quemado, buffs, daño extra fijo, etc.)
+    const { actor: finalSelf, target: finalOpp, events: extraEvents, } = applyEffectsOnTarget(state, updatedSelf, updatedOpponent, move.effects);
+    events.push(...extraEvents);
+    const newState = updateFightersInState(state, playerKey, finalSelf, finalOpp);
+    return { state: newState, events };
+};
+const resolveItemUse = (state, playerKey, action) => {
+    if (action.kind !== "use_item") {
+        return { state, events: [] };
+    }
+    const { self, opponent } = getOpponentAndSelf(state, playerKey);
+    const events = [];
+    const itemSlot = self.items[action.itemIndex];
+    if (!itemSlot || itemSlot.usesRemaining <= 0) {
+        return { state, events };
+    }
+    const itemDef = state.runtime.itemsById[itemSlot.itemId];
+    if (!itemDef) {
+        return { state, events };
+    }
+    // Reducir usos
+    const updatedItems = self.items.map((it, idx) => idx === action.itemIndex
+        ? { ...it, usesRemaining: Math.max(0, it.usesRemaining - 1) }
+        : it);
+    let updatedSelf = { ...self, items: updatedItems };
+    let updatedOpponent = { ...opponent };
+    events.push({
+        ...createBaseEvent(state.turnNumber, "action_declared", `${self.fighterId} usa objeto ${itemDef.name}`),
+        actorId: self.fighterId,
+    });
+    const { actor: finalSelf, target: finalOpp, events: extraEvents, } = applyEffectsOnTarget(state, updatedSelf, updatedOpponent, itemDef.effects);
+    events.push(...extraEvents);
+    const newState = updateFightersInState(state, playerKey, finalSelf, finalOpp);
     return { state: newState, events };
 };
 const updateFightersInState = (state, actingPlayerKey, updatedSelf, updatedOpponent) => {
@@ -433,8 +557,13 @@ export const resolveTurn = (state, actions) => {
             currentState = result.state;
             events.push(...result.events);
         }
+        else if (action.kind === "use_item") {
+            const result = resolveItemUse(currentState, playerKey, action);
+            currentState = result.state;
+            events.push(...result.events);
+        }
         else {
-            // MVP: ignoramos use_item y switch_fighter de momento
+            // switch_fighter y otros aún no implementados
             continue;
         }
         // Comprobar victoria inmediata tras cada acción

package/dist/core/moves.d.ts

@@ -4,6 +4,7 @@ export type TargetKind = "self" | "enemy";
 export type EffectKind = "damage" | "heal" | "shield" | "modify_stats" | "apply_status" | "modify_hit_chance" | "modify_crit_chance" | "modify_priority" | "modify_effective_speed";
 export interface DamageEffect {
     kind: "damage";
+    amount: number;
     powerMultiplier?: number;
     flatBonus?: number;
 }

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./core/index.js";
 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

@@ -1,5 +1,6 @@
 export * from "./core/index.js";
 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/pokemon/index.d.ts

@@ -3,3 +3,4 @@ export * from "./moves.js";
 export * from "./fighters.js";
 export * from "./pokemonSkin.js";
 export * from "./items.js";
+export * from "./statuses.js";

package/dist/skins/pokemon/index.js

@@ -3,3 +3,4 @@ export * from "./moves.js";
 export * from "./fighters.js";
 export * from "./pokemonSkin.js";
 export * from "./items.js";
+export * from "./statuses.js";

package/dist/skins/pokemon/items.js

@@ -1,51 +1,26 @@
-// Para MVP: 4 objetos simples
 export const POKEMON_ITEMS = [
     {
         id: "potion",
         name: "Poción",
         category: "heal_shield",
         maxUses: 2,
-        effects: [
-            {
-                kind: "heal", // tu EffectDefinition debe tener esto
-                amount: 30
-            }
-        ]
+        effects: [{ kind: "heal", amount: 30 }]
     },
     {
         id: "super_potion",
         name: "Super Poción",
         category: "heal_shield",
         maxUses: 1,
-        effects: [
-            {
-                kind: "heal",
-                amount: 60
-            }
-        ]
+        effects: [{ kind: "heal", amount: 60 }]
     },
     {
-        id: "bomb",
-        name: "Bomba",
+        id: "burn_bomb",
+        name: "Bomba de Fuego",
         category: "damage",
         maxUses: 1,
         effects: [
-            {
-                kind: "damage",
-                powerMultiplier: 1.5
-            }
-        ]
-    },
-    {
-        id: "guard_charm",
-        name: "Amuleto de Guardia",
-        category: "status_buff",
-        maxUses: 1,
-        effects: [
-            {
-                kind: "apply_status",
-                statusId: "guard"
-            }
+            { kind: "damage", amount: 20 },
+            { kind: "apply_status", statusId: "burn" }
         ]
     }
 ];

package/dist/skins/pokemon/moves.js

@@ -12,9 +12,10 @@ export const POKEMON_MOVES = [
         target: "enemy",
         effects: [
             {
-                kind: "damage"
-            }
-        ]
+                kind: "damage",
+                amount: 20,
+            },
+        ],
     },
     {
         id: "ember",
@@ -28,9 +29,10 @@ export const POKEMON_MOVES = [
         target: "enemy",
         effects: [
             {
-                kind: "damage"
-            }
-        ]
+                kind: "apply_status",
+                statusId: "burn",
+            },
+        ],
     },
     {
         id: "water_gun",
@@ -44,9 +46,10 @@ export const POKEMON_MOVES = [
         target: "enemy",
         effects: [
             {
-                kind: "damage"
-            }
-        ]
+                kind: "damage",
+                amount: 20,
+            },
+        ],
     },
     {
         id: "vine_whip",
@@ -60,9 +63,10 @@ export const POKEMON_MOVES = [
         target: "enemy",
         effects: [
             {
-                kind: "damage"
-            }
-        ]
+                kind: "damage",
+                amount: 20,
+            },
+        ],
     },
     {
         id: "thunder_shock",
@@ -76,8 +80,24 @@ export const POKEMON_MOVES = [
         target: "enemy",
         effects: [
             {
-                kind: "damage"
-            }
-        ]
-    }
+                kind: "damage",
+                amount: 20,
+            },
+        ],
+    },
+    {
+        id: "fire_fang",
+        name: "Colmillo Ígneo",
+        typeId: "fire",
+        kind: "damage",
+        basePower: 65,
+        accuracy: 95,
+        maxPP: 15,
+        priority: 0,
+        target: "enemy",
+        effects: [
+            { kind: "damage", amount: 10 },
+            { kind: "apply_status", statusId: "burn" },
+        ],
+    },
 ];

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

@@ -0,0 +1,2 @@
+import { StatusDefinition } from "../../core";
+export declare const POKEMON_STATUSES: StatusDefinition[];

package/dist/skins/pokemon/statuses.js

@@ -0,0 +1,21 @@
+export const POKEMON_STATUSES = [
+    {
+        id: "burn",
+        name: "Quemado",
+        kind: "soft",
+        minDurationTurns: 2,
+        maxDurationTurns: 4,
+        effectsPerStack: [
+            // DoT ligero
+            { kind: "damage", amount: 10 }
+        ]
+    },
+    {
+        id: "stun",
+        name: "Aturdido",
+        kind: "hard_cc",
+        minDurationTurns: 1,
+        maxDurationTurns: 1,
+        effectsPerStack: []
+    }
+];

package/package.json

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