pokemon-io-core 0.0.98 → 0.0.99

package/dist/api/socketTypes.d.ts

@@ -1,5 +1,6 @@
 import { BattleView } from "./battle.js";
 import { RoomView } from "./room.js";
+import { EmoteId } from "../core/emotes.js";
 export interface ClientToServerEvents {
     "room:create": (payload: {
         nickname: string;
@@ -59,6 +60,10 @@ export interface ClientToServerEvents {
     "battle:rematchChangeLoadout": (payload: {
         roomId: string;
     }) => void;
+    "battle:sendEmote": (payload: {
+        roomId: string;
+        emoteId: EmoteId;
+    }) => void;
     ping: () => void;
 }
 export interface ServerToClientEvents {
@@ -73,5 +78,10 @@ export interface ServerToClientEvents {
         message: string;
     }) => void;
     "battle:state": (payload: BattleView) => void;
+    "battle:emote": (payload: {
+        playerId: string;
+        emoteId: EmoteId;
+        timestamp: number;
+    }) => void;
     pong: (msg: string) => void;
 }

package/dist/core/emotes.d.ts

@@ -0,0 +1,13 @@
+export type EmoteCategory = "emotional" | "strategic" | "social";
+export type EmoteId = string;
+export interface EmoteDefinition {
+    id: EmoteId;
+    category: EmoteCategory;
+    emoji: string;
+    label: string;
+    description?: string;
+}
+export declare const EMOTES: EmoteDefinition[];
+export declare const getEmoteById: (id: EmoteId) => EmoteDefinition | undefined;
+export declare const getEmotesByCategory: (category: EmoteCategory) => EmoteDefinition[];
+export declare const isValidEmoteId: (id: string) => id is EmoteId;

package/dist/core/emotes.js

@@ -0,0 +1,127 @@
+// src/core/emotes.ts
+export const EMOTES = [
+    // Emotional (6)
+    {
+        id: "laugh",
+        category: "emotional",
+        emoji: "😂",
+        label: "Risa",
+        description: "¡Jaja!",
+    },
+    {
+        id: "scared",
+        category: "emotional",
+        emoji: "😱",
+        label: "Susto",
+        description: "¡Oh no!",
+    },
+    {
+        id: "cool",
+        category: "emotional",
+        emoji: "😎",
+        label: "Cool",
+        description: "Genial",
+    },
+    {
+        id: "angry",
+        category: "emotional",
+        emoji: "😡",
+        label: "Enfadado",
+        description: "¡Grr!",
+    },
+    {
+        id: "sad",
+        category: "emotional",
+        emoji: "😢",
+        label: "Triste",
+        description: "Auch...",
+    },
+    {
+        id: "thinking",
+        category: "emotional",
+        emoji: "🤔",
+        label: "Pensando",
+        description: "Hmm...",
+    },
+    // Strategic (6)
+    {
+        id: "attack",
+        category: "strategic",
+        emoji: "💥",
+        label: "Voy a atacar",
+        description: "¡Prepárate!",
+    },
+    {
+        id: "heal",
+        category: "strategic",
+        emoji: "💊",
+        label: "Voy a curarme",
+        description: "Necesito curarme",
+    },
+    {
+        id: "switch",
+        category: "strategic",
+        emoji: "🔄",
+        label: "Voy a cambiar",
+        description: "¡Cambio!",
+    },
+    {
+        id: "special",
+        category: "strategic",
+        emoji: "⚡",
+        label: "Movimiento especial",
+        description: "¡Algo grande viene!",
+    },
+    {
+        id: "defend",
+        category: "strategic",
+        emoji: "🛡️",
+        label: "Voy a defenderme",
+        description: "Me protejo",
+    },
+    {
+        id: "plan",
+        category: "strategic",
+        emoji: "🎯",
+        label: "Tengo un plan",
+        description: "Sé lo que hago",
+    },
+    // Social (4)
+    {
+        id: "well_played",
+        category: "social",
+        emoji: "👍",
+        label: "Bien jugado",
+        description: "¡Buen movimiento!",
+    },
+    {
+        id: "thanks",
+        category: "social",
+        emoji: "🙏",
+        label: "Gracias",
+        description: "Gracias por la partida",
+    },
+    {
+        id: "hello",
+        category: "social",
+        emoji: "👋",
+        label: "Hola",
+        description: "¡Hola!",
+    },
+    {
+        id: "good_luck",
+        category: "social",
+        emoji: "🤝",
+        label: "Buena suerte",
+        description: "¡Suerte!",
+    },
+];
+export const getEmoteById = (id) => {
+    return EMOTES.find((emote) => emote.id === id);
+};
+export const getEmotesByCategory = (category) => {
+    return EMOTES.filter((emote) => emote.category === category);
+};
+export const isValidEmoteId = (id) => {
+    return EMOTES.some((emote) => emote.id === id);
+};

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" | "fighter_switched" | "shield_applied" | "status_applied" | "status_refreshed" | "status_expired" | "fighter_fainted" | "turn_end" | "stats_changed" | "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" | "status_tick" | "fighter_fainted" | "turn_end" | "stats_changed" | "battle_end";
 export interface BaseBattleEvent {
     id: string;
     turnNumber: number;
@@ -79,6 +79,12 @@ export interface StatusExpiredEvent extends BaseBattleEvent {
     targetId: FighterId;
     statusId: StatusId;
 }
+export interface StatusTickEvent extends BaseBattleEvent {
+    kind: "status_tick";
+    targetId: FighterId;
+    statusId: StatusId;
+    stacks: number;
+}
 export interface FighterFaintedEvent extends BaseBattleEvent {
     kind: "fighter_fainted";
     fighterId: FighterId;
@@ -87,4 +93,4 @@ export interface BattleEndEvent extends BaseBattleEvent {
     kind: "battle_end";
     winner: "player1" | "player2" | "draw";
 }
-export type BattleEvent = ActionDeclaredEvent | MoveMissEvent | MoveHitEvent | ItemUsedEvent | DamageEvent | HealEvent | StatusAppliedEvent | StatusExpiredEvent | FighterFaintedEvent | FighterSwitchedEvent | BattleEndEvent | StatsChangedEvent | BaseBattleEvent;
+export type BattleEvent = ActionDeclaredEvent | MoveMissEvent | MoveHitEvent | ItemUsedEvent | DamageEvent | HealEvent | StatusAppliedEvent | StatusExpiredEvent | StatusTickEvent | FighterFaintedEvent | FighterSwitchedEvent | BattleEndEvent | StatsChangedEvent | BaseBattleEvent;

package/dist/core/index.d.ts

@@ -1,6 +1,7 @@
 export * from "./actions.js";
 export * from "./amulets.js";
 export * from "./battleState.js";
+export * from "./emotes.js";
 export * from "./events.js";
 export * from "./fighters.js";
 export * from "./ids.js";

package/dist/core/index.js

@@ -1,6 +1,7 @@
 export * from "./actions.js";
 export * from "./amulets.js";
 export * from "./battleState.js";
+export * from "./emotes.js";
 export * from "./events.js";
 export * from "./fighters.js";
 export * from "./ids.js";

package/dist/engine/status/apply.js

@@ -37,10 +37,13 @@ export const applyStatusToFighter = (state, target, statusId) => {
         duration,
         prevStacks: existing?.stacks ?? 0,
     });
+    const finalStacks = !existing ? 1 : existing.stacks === 1 ? 2 : existing.stacks;
     events.push({
         ...createBaseEvent(state.turnNumber, "status_applied", `Se aplica ${statusId} a ${target.fighterId}`),
         targetId: target.fighterId,
         statusId,
+        stacks: finalStacks,
+        durationTurns: duration,
     });
     return {
         updated: { ...target, statuses: newStatuses },

package/dist/engine/status/endOfTurn.js

@@ -34,6 +34,13 @@ export const applyEndOfTurnStatuses = (state) => {
                 }
             });
             if (damageFromStatus > 0) {
+                // Emit status tick event for narration
+                events.push({
+                    ...createBaseEvent(state.turnNumber, "status_tick", `${updated.fighterId} sufre por ${st.statusId}`),
+                    targetId: updated.fighterId,
+                    statusId: st.statusId,
+                    stacks: st.stacks,
+                });
                 const damageRes = applyDamageToFighter(state, updated, damageFromStatus, updated.fighterId, false);
                 updated = damageRes.updatedDefender;
                 events.push(...damageRes.events);

package/dist/engine/turn/resolveTurn.js

@@ -144,42 +144,61 @@ export const resolveTurn = (state, actions) => {
         const { self } = getOpponentAndSelf(currentState, playerKey);
         if (!self.isAlive || self.currentHp <= 0)
             continue;
-        // ✅ Paralysis check (25% chance to skip)
+        // ✅ Paralysis check (25% chance to skip ALL actions, including items)
         if (self.statuses.some((s) => s.statusId === "paralysis") &&
             Math.random() < 0.25) {
             events.push({
                 ...createBaseEvent(currentState.turnNumber, "action_skipped_hard_cc", `${self.fighterId} está paralizado y no puede moverse`),
                 actorId: self.fighterId,
+                statusId: "paralysis",
             });
             continue;
         }
-        if (hasHardCc(currentState, self)) {
-            let interruptionSuffix = "";
-            // Si estaba cargando y es interrumpido, pierde la carga (Fly/Dig fallan)
-            if (self.volatileStatus?.kind === "charging") {
-                const newFighter = { ...self, volatileStatus: null };
-                currentState = {
-                    ...currentState,
-                    [playerKey]: {
-                        ...currentState[playerKey],
-                        fighterTeam: currentState[playerKey].fighterTeam.map((f) => f.fighterId === self.fighterId ? newFighter : f),
-                    },
-                };
-                interruptionSuffix = " (Concentración perdida)";
-            }
-            events.push({
-                ...createBaseEvent(currentState.turnNumber, "action_skipped_hard_cc", `${self.fighterId} no puede actuar por control total${interruptionSuffix}`),
-                actorId: self.fighterId,
-            });
-            continue;
-        }
-        if (action.kind === "use_move") {
-            const result = resolveDamageMove(currentState, playerKey, action);
+        // ✅ Items can be used regardless of hard CC (trainer action, not Pokémon action)
+        if (action.kind === "use_item") {
+            const result = resolveItemUse(currentState, playerKey, action);
             currentState = result.state;
             events.push(...result.events);
         }
-        else if (action.kind === "use_item") {
-            const result = resolveItemUse(currentState, playerKey, action);
+        else if (action.kind === "use_move") {
+            // ✅ Moves are blocked by hard CC (sleep, freeze, flinch)
+            if (hasHardCc(currentState, self)) {
+                // Find the hard CC status
+                const ccStatus = self.statuses.find((s) => {
+                    const def = currentState.runtime.statusesById[s.statusId];
+                    return def?.kind === "hard_cc";
+                });
+                let interruptionSuffix = "";
+                // Si estaba cargando y es interrumpido, pierde la carga (Fly/Dig fallan)
+                if (self.volatileStatus?.kind === "charging") {
+                    const newFighter = { ...self, volatileStatus: null };
+                    currentState = {
+                        ...currentState,
+                        [playerKey]: {
+                            ...currentState[playerKey],
+                            fighterTeam: currentState[playerKey].fighterTeam.map((f) => f.fighterId === self.fighterId ? newFighter : f),
+                        },
+                    };
+                    interruptionSuffix = " (Concentración perdida)";
+                }
+                // Status-specific messages
+                const statusMessages = {
+                    sleep: `${self.fighterId} está dormido y no puede moverse`,
+                    freeze: `${self.fighterId} está congelado y no puede actuar`,
+                    flinch: `${self.fighterId} se acobarda y no puede atacar`,
+                };
+                const statusId = ccStatus?.statusId || "unknown";
+                const message = statusMessages[statusId] ||
+                    `${self.fighterId} no puede actuar por control total`;
+                events.push({
+                    ...createBaseEvent(currentState.turnNumber, "action_skipped_hard_cc", `${message}${interruptionSuffix}`),
+                    actorId: self.fighterId,
+                    statusId: statusId,
+                });
+                continue;
+            }
+            // Execute the move
+            const result = resolveDamageMove(currentState, playerKey, action);
             currentState = result.state;
             events.push(...result.events);
         }

package/dist/skins/pokemon/items.js

@@ -43,7 +43,6 @@ export const POKEMON_ITEMS = [
         maxUses: 2,
         effects: [
             { kind: "damage", flatAmount: 15 },
-            { kind: "apply_status", statusId: "burn" },
         ],
         image: "shotgun",
     },
@@ -55,7 +54,6 @@ export const POKEMON_ITEMS = [
         maxUses: 4,
         effects: [
             { kind: "damage", flatAmount: 8 },
-            { kind: "apply_status", statusId: "burn" },
         ],
         image: "pistol",
     },
@@ -67,7 +65,6 @@ export const POKEMON_ITEMS = [
         maxUses: 3,
         effects: [
             { kind: "damage", flatAmount: 10 },
-            { kind: "apply_status", statusId: "burn" },
         ],
         image: "riffle",
     },
@@ -79,7 +76,6 @@ export const POKEMON_ITEMS = [
         maxUses: 1,
         effects: [
             { kind: "damage", flatAmount: 30 },
-            { kind: "apply_status", statusId: "burn" },
         ],
         image: "sniper",
     },

package/package.json

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