@pkmn/engine 0.1.0-dev.fb5bf955 → 0.1.0-dev.fb6653d6

package/build/pkg/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Lookup = exports.Log = exports.SideInfo = exports.Info = exports.Result = exports.Choice = exports.Battle = void 0;
+exports.Lookup = exports.Log = exports.SideInfo = exports.Info = exports.Result = exports.Choice = exports.initialize = exports.Battle = void 0;
 const addon = __importStar(require("./addon"));
 const data_1 = require("./data");
 const gen1 = __importStar(require("./gen1"));
@@ -51,68 +51,11 @@ exports.Battle = new class {
         }
     }
 };
-/** Utilities for working with `Choice` objects. */
-class Choice {
-    /** All valid choices types. */
-    static Types = ['pass', 'move', 'switch'];
-    static PASS = { type: 'pass', data: 0 };
-    static MATCH = /^(?:(pass)|((move) ([0-4]))|((switch) ([2-6])))$/;
-    constructor() { }
-    /** Decode a choice from its binary representation. */
-    static decode(byte) {
-        return { type: Choice.Types[byte & 0b11], data: byte >> 2 };
-    }
-    /** Encode a choice to its binary representation. */
-    static encode(choice) {
-        return (choice
-            ? (choice.data << 2 | (choice.type === 'pass' ? 0 : choice.type === 'move' ? 1 : 2))
-            : 0);
-    }
-    /**
-     * Parse a Pokémon Showdown choice string into a `Choice`.
-     * Only numeric choice data is supported.
-     */
-    static parse(choice) {
-        const m = Choice.MATCH.exec(choice);
-        if (!m)
-            throw new Error(`Invalid choice: '${choice}'`);
-        const type = (m[1] ?? m[3] ?? m[6]);
-        const data = +(m[4] ?? m[7] ?? 0);
-        return { type, data };
-    }
-    /** Formats a `Choice` into a Pokémon Showdown compatible choice string. */
-    static format(choice) {
-        return choice.type === 'pass' ? choice.type : `${choice.type} ${choice.data}`;
-    }
-    /** Returns the "pass" `Choice`. */
-    static pass() {
-        return Choice.PASS;
-    }
-    /** Returns a "move" `Choice` with the provided data. */
-    static move(data) {
-        return { type: 'move', data };
-    }
-    /** Returns a "switch" `Choice` with the provided data. */
-    static switch(data) {
-        return { type: 'switch', data };
-    }
-}
-exports.Choice = Choice;
-/** Utilities for working with `Result` objects */
-class Result {
-    /** All valid result types. */
-    static Types = [undefined, 'win', 'lose', 'tie', 'error'];
-    constructor() { }
-    /** Decode a `Result` from its binary representation. */
-    static decode(byte) {
-        return {
-            type: Result.Types[byte & 0b1111],
-            p1: Choice.Types[(byte >> 4) & 0b11],
-            p2: Choice.Types[byte >> 6],
-        };
-    }
-}
-exports.Result = Result;
+var addon_1 = require("./addon");
+Object.defineProperty(exports, "initialize", { enumerable: true, get: function () { return addon_1.initialize; } });
+var common_1 = require("./common");
+Object.defineProperty(exports, "Choice", { enumerable: true, get: function () { return common_1.Choice; } });
+Object.defineProperty(exports, "Result", { enumerable: true, get: function () { return common_1.Result; } });
 var protocol_1 = require("./protocol");
 Object.defineProperty(exports, "Info", { enumerable: true, get: function () { return protocol_1.Info; } });
 Object.defineProperty(exports, "SideInfo", { enumerable: true, get: function () { return protocol_1.SideInfo; } });

package/build/pkg/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pkg/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pkg/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,+CAAiC;AAEjC,iCAA8B;AAC9B,6CAA+B;AA2U/B,2CAA2C;AAC9B,QAAA,MAAM,GAAG,IAAI;IACxB,2EAA2E;IAC3E,MAAM,CAAC,GAAe,EAAE,OAAsB;QAC5C,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,aAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,QAAQ,GAAG,CAAC,GAAG,EAAE,CAAC;YAChB,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACxD,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,GAAe,EAAE,MAAoB,EAAE,OAAuB;QACpE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,aAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,QAAQ,GAAG,CAAC,GAAG,EAAE,CAAC;YAChB,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACjE,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;CACF,CAAC;AAEF,iCAAmC;AAA3B,mGAAA,UAAU,OAAA;AAClB,mCAAwC;AAAhC,gGAAA,MAAM,OAAA;AAAE,gGAAA,MAAM,OAAA;AAGtB,uCAA+C;AAAvC,gGAAA,IAAI,OAAA;AAAE,oGAAA,QAAQ,OAAA;AAAE,+FAAA,GAAG,OAAA;AAC3B,+BAA8B;AAAtB,8FAAA,MAAM,OAAA"}

package/build/pkg/protocol.d.ts

@@ -1,7 +1,25 @@
-import { Generation, StatusName, TypeName } from '@pkmn/data';
+import { GenderName, GenerationNum, ID, MoveName, SpeciesName, StatusName, TypeName } from '@pkmn/data';
 import { Protocol } from '@pkmn/protocol';
 import { Lookup } from './data';
 import { PlayerOptions } from '.';
+interface Generation {
+    num: GenerationNum;
+    species: {
+        get(id: ID): {
+            name: SpeciesName;
+            genderRatio: {
+                M: number;
+                F: number;
+            };
+            gender?: GenderName;
+        } | undefined;
+    };
+    moves: {
+        get(id: ID): {
+            name: MoveName;
+        } | undefined;
+    };
+}
 /** A message logged by the engine parsed into Pokémon Showdown's protocol. */
 export interface ParsedLine {
     /** Positional protocol arguments. */
@@ -39,8 +57,10 @@ export declare class SideInfo {
  * protocol from the engine's binary protocol.
  */
 export interface PokemonInfo {
-    /** The Pokémon's nickname. */
-    name: string;
+    /** The Pokémon's nickname. Either this or species must be set. */
+    name?: string;
+    /** The Pokémon's species. Either this or name must be set. */
+    species?: string;
     /** The gender of the Pokémon. */
     gender?: string;
     /** Whether or not the Pokémon is shiny. */
@@ -69,3 +89,4 @@ export declare function decodeIdentRaw(byte: number): {
 };
 export declare function decodeStatus(val: number): StatusName | undefined;
 export declare function decodeTypes(lookup: Lookup, val: number): readonly [TypeName, TypeName];
+export {};

package/build/pkg/protocol.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeTypes = exports.decodeStatus = exports.decodeIdentRaw = exports.Log = exports.SideInfo = exports.Info = void 0;
-const data_1 = require("./data");
-const ArgType = data_1.PROTOCOL.ArgType;
+exports.Log = exports.SideInfo = exports.Info = void 0;
+exports.decodeIdentRaw = decodeIdentRaw;
+exports.decodeStatus = decodeStatus;
+exports.decodeTypes = decodeTypes;
+const data_1 = require("@pkmn/data");
+const data_2 = require("./data");
+const ArgType = data_2.PROTOCOL.ArgType;
 /**
  * Information related to battle required to parse the engine's binary protocol
  * into Pokémon Showdown's text protocol (e.g. Pokémon nicknames).
@@ -30,10 +34,11 @@ class SideInfo {
     constructor(gen, player) {
         this.name = player.name;
         this.team = player.team.map(p => {
-            const species = gen.species.get(p.species);
+            const species = gen.species.get((0, data_1.toID)(p.species));
             const name = p.name ?? species.name;
+            const dv = Math.floor((p.ivs?.atk ?? 31) / 2);
             const fallback = gen.num === 1 ? undefined
-                : gen.num === 2 ? gen.stats.toDV(p.ivs?.atk ?? 31) >= species.genderRatio.F * 16 ? 'M' : 'F'
+                : gen.num === 2 ? dv >= species.genderRatio.F * 16 ? 'M' : 'F'
                     : 'M';
             const gender = (p.gender ?? species.gender ?? fallback);
             return { species: species.name, name, gender, shiny: p.shiny };
@@ -99,86 +104,102 @@ class Log {
     }
 }
 exports.Log = Log;
-const CANT = new Array(data_1.PROTOCOL.Cant.length);
-CANT[data_1.PROTOCOL.Cant.Sleep] = 'slp';
-CANT[data_1.PROTOCOL.Cant.Freeze] = 'frz';
-CANT[data_1.PROTOCOL.Cant.Paralysis] = 'par';
-CANT[data_1.PROTOCOL.Cant.Bound] = 'partiallytrapped';
-CANT[data_1.PROTOCOL.Cant.Flinch] = 'flinch';
-CANT[data_1.PROTOCOL.Cant.Recharge] = 'recharge';
-CANT[data_1.PROTOCOL.Cant.PP] = 'nopp';
-const DAMAGE = new Array(data_1.PROTOCOL.Damage.length);
-DAMAGE[data_1.PROTOCOL.Damage.Poison] = 'psn';
-DAMAGE[data_1.PROTOCOL.Damage.Burn] = 'brn';
-DAMAGE[data_1.PROTOCOL.Damage.Confusion] = 'confusion';
-DAMAGE[data_1.PROTOCOL.Damage.LeechSeed] = 'Leech Seed';
-DAMAGE[data_1.PROTOCOL.Damage.RecoilOf] = 'Recoil';
-const BOOSTS = new Array(data_1.PROTOCOL.Boost.length);
-BOOSTS[data_1.PROTOCOL.Boost.Rage] = 'atk';
-BOOSTS[data_1.PROTOCOL.Boost.Attack] = 'atk';
-BOOSTS[data_1.PROTOCOL.Boost.Defense] = 'def';
-BOOSTS[data_1.PROTOCOL.Boost.Speed] = 'spe';
-BOOSTS[data_1.PROTOCOL.Boost.SpecialAttack] = 'spa';
-BOOSTS[data_1.PROTOCOL.Boost.SpecialDefense] = 'spd';
-BOOSTS[data_1.PROTOCOL.Boost.Accuracy] = 'accuracy';
-BOOSTS[data_1.PROTOCOL.Boost.Evasion] = 'evasion';
-const FAIL = new Array(data_1.PROTOCOL.Fail.length);
-FAIL[data_1.PROTOCOL.Fail.Sleep] = 'slp';
-FAIL[data_1.PROTOCOL.Fail.Poison] = 'psn';
-FAIL[data_1.PROTOCOL.Fail.Burn] = 'brn';
-FAIL[data_1.PROTOCOL.Fail.Freeze] = 'frz';
-FAIL[data_1.PROTOCOL.Fail.Paralysis] = 'par';
-FAIL[data_1.PROTOCOL.Fail.Toxic] = 'tox';
-const ACTIVATE = new Array(data_1.PROTOCOL.Activate.length);
-ACTIVATE[data_1.PROTOCOL.Activate.Bide] = 'Bide';
-ACTIVATE[data_1.PROTOCOL.Activate.Confusion] = 'confusion';
-ACTIVATE[data_1.PROTOCOL.Activate.Haze] = 'move: Haze';
-ACTIVATE[data_1.PROTOCOL.Activate.Mist] = 'move: Mist';
-ACTIVATE[data_1.PROTOCOL.Activate.Struggle] = 'move: Struggle';
-ACTIVATE[data_1.PROTOCOL.Activate.Substitute] = 'Substitute';
-ACTIVATE[data_1.PROTOCOL.Activate.Splash] = 'move: Splash';
-const START = new Array(data_1.PROTOCOL.Start.length);
-START[data_1.PROTOCOL.Start.Bide] = 'Bide';
-START[data_1.PROTOCOL.Start.Confusion] = 'confusion';
-START[data_1.PROTOCOL.Start.ConfusionSilent] = 'confusion';
-START[data_1.PROTOCOL.Start.FocusEnergy] = 'move: Focus Energy';
-START[data_1.PROTOCOL.Start.LeechSeed] = 'move: Leech Seed';
-START[data_1.PROTOCOL.Start.LightScreen] = 'Light Screen';
-START[data_1.PROTOCOL.Start.Mist] = 'Mist';
-START[data_1.PROTOCOL.Start.Reflect] = 'Reflect';
-START[data_1.PROTOCOL.Start.Substitute] = 'Substitute';
-const END = new Array(data_1.PROTOCOL.End.length);
-END[data_1.PROTOCOL.End.Disable] = 'Disable';
-END[data_1.PROTOCOL.End.Confusion] = 'confusion';
-END[data_1.PROTOCOL.End.Bide] = 'Bide';
-END[data_1.PROTOCOL.End.Substitute] = 'Substitute';
-END[data_1.PROTOCOL.End.DisableSilent] = 'Disable';
-END[data_1.PROTOCOL.End.ConfusionSilent] = 'confusion';
-END[data_1.PROTOCOL.End.Mist] = 'Mist';
-END[data_1.PROTOCOL.End.FocusEnergy] = 'move: Focus Energy';
-END[data_1.PROTOCOL.End.LeechSeed] = 'move: Leech Seed';
-END[data_1.PROTOCOL.End.Toxic] = 'Toxic counter';
-END[data_1.PROTOCOL.End.LightScreen] = 'Light Screen';
-END[data_1.PROTOCOL.End.Reflect] = 'Reflect';
+const GENDERS = ['M', 'F', 'N'];
+const CANT = new Array(data_2.PROTOCOL.Cant.length);
+CANT[data_2.PROTOCOL.Cant.Sleep] = 'slp';
+CANT[data_2.PROTOCOL.Cant.Freeze] = 'frz';
+CANT[data_2.PROTOCOL.Cant.Paralysis] = 'par';
+CANT[data_2.PROTOCOL.Cant.Bound] = 'partiallytrapped';
+CANT[data_2.PROTOCOL.Cant.Flinch] = 'flinch';
+CANT[data_2.PROTOCOL.Cant.Recharge] = 'recharge';
+CANT[data_2.PROTOCOL.Cant.PP] = 'nopp';
+const DAMAGE = new Array(data_2.PROTOCOL.Damage.length);
+DAMAGE[data_2.PROTOCOL.Damage.Poison] = 'psn';
+DAMAGE[data_2.PROTOCOL.Damage.Burn] = 'brn';
+DAMAGE[data_2.PROTOCOL.Damage.Confusion] = 'confusion';
+DAMAGE[data_2.PROTOCOL.Damage.LeechSeed] = 'Leech Seed';
+DAMAGE[data_2.PROTOCOL.Damage.RecoilOf] = 'Recoil';
+const BOOSTS = new Array(data_2.PROTOCOL.Boost.length);
+BOOSTS[data_2.PROTOCOL.Boost.Rage] = 'atk';
+BOOSTS[data_2.PROTOCOL.Boost.Attack] = 'atk';
+BOOSTS[data_2.PROTOCOL.Boost.Defense] = 'def';
+BOOSTS[data_2.PROTOCOL.Boost.Speed] = 'spe';
+BOOSTS[data_2.PROTOCOL.Boost.SpecialAttack] = 'spa';
+BOOSTS[data_2.PROTOCOL.Boost.SpecialDefense] = 'spd';
+BOOSTS[data_2.PROTOCOL.Boost.Accuracy] = 'accuracy';
+BOOSTS[data_2.PROTOCOL.Boost.Evasion] = 'evasion';
+const FAIL = new Array(data_2.PROTOCOL.Fail.length);
+FAIL[data_2.PROTOCOL.Fail.Sleep] = 'slp';
+FAIL[data_2.PROTOCOL.Fail.Poison] = 'psn';
+FAIL[data_2.PROTOCOL.Fail.Burn] = 'brn';
+FAIL[data_2.PROTOCOL.Fail.Freeze] = 'frz';
+FAIL[data_2.PROTOCOL.Fail.Paralysis] = 'par';
+FAIL[data_2.PROTOCOL.Fail.Toxic] = 'tox';
+const ACTIVATE = [new Array(data_2.PROTOCOL.Activate.length)];
+ACTIVATE[0][data_2.PROTOCOL.Activate.Bide] = 'Bide';
+ACTIVATE[0][data_2.PROTOCOL.Activate.Confusion] = 'confusion';
+ACTIVATE[0][data_2.PROTOCOL.Activate.Haze] = 'move: Haze';
+ACTIVATE[0][data_2.PROTOCOL.Activate.Mist] = 'move: Mist';
+ACTIVATE[0][data_2.PROTOCOL.Activate.Struggle] = 'move: Struggle';
+ACTIVATE[0][data_2.PROTOCOL.Activate.Substitute] = 'Substitute';
+ACTIVATE[0][data_2.PROTOCOL.Activate.Splash] = 'move: Splash';
+ACTIVATE[1] = ACTIVATE[0].slice(0);
+ACTIVATE[1][data_2.PROTOCOL.Activate.Bide] = 'move: Bide';
+const START = [new Array(data_2.PROTOCOL.Start.length)];
+START[0][data_2.PROTOCOL.Start.Bide] = 'Bide';
+START[0][data_2.PROTOCOL.Start.Confusion] = 'confusion';
+START[0][data_2.PROTOCOL.Start.ConfusionSilent] = 'confusion';
+START[0][data_2.PROTOCOL.Start.FocusEnergy] = 'move: Focus Energy';
+START[0][data_2.PROTOCOL.Start.LeechSeed] = 'move: Leech Seed';
+START[0][data_2.PROTOCOL.Start.LightScreen] = 'Light Screen';
+START[0][data_2.PROTOCOL.Start.Mist] = 'Mist';
+START[0][data_2.PROTOCOL.Start.Reflect] = 'Reflect';
+START[0][data_2.PROTOCOL.Start.Substitute] = 'Substitute';
+START[1] = START[0].slice(0);
+START[1][data_2.PROTOCOL.Start.Bide] = 'move: Bide';
+const END = [new Array(data_2.PROTOCOL.End.length)];
+END[0][data_2.PROTOCOL.End.Disable] = 'Disable';
+END[0][data_2.PROTOCOL.End.Confusion] = 'confusion';
+END[0][data_2.PROTOCOL.End.Bide] = 'Bide';
+END[0][data_2.PROTOCOL.End.Substitute] = 'Substitute';
+END[0][data_2.PROTOCOL.End.DisableSilent] = 'Disable';
+END[0][data_2.PROTOCOL.End.ConfusionSilent] = 'confusion';
+END[0][data_2.PROTOCOL.End.MistSilent] = 'Mist';
+END[0][data_2.PROTOCOL.End.FocusEnergySilent] = 'move: Focus Energy';
+END[0][data_2.PROTOCOL.End.LeechSeedSilent] = 'move: Leech Seed';
+END[0][data_2.PROTOCOL.End.ToxicSilent] = 'Toxic counter';
+END[0][data_2.PROTOCOL.End.LightScreenSilent] = 'Light Screen';
+END[0][data_2.PROTOCOL.End.ReflectSilent] = 'Reflect';
+END[0][data_2.PROTOCOL.End.BideSilent] = 'move: Bide';
+END[1] = END[0].slice(0);
+END[1][data_2.PROTOCOL.End.Disable] = 'move: Disable';
+END[1][data_2.PROTOCOL.End.Bide] = 'move: Bide';
+END[1][data_2.PROTOCOL.End.LeechSeed] = 'Leech Seed';
+const SIDE = new Array(data_2.PROTOCOL.Side.length);
+SIDE[data_2.PROTOCOL.Side.Safeguard] = 'Safeguard';
+SIDE[data_2.PROTOCOL.Side.Reflect] = 'Reflect';
+SIDE[data_2.PROTOCOL.Side.LightScreen] = 'move: Light Screen';
+SIDE[data_2.PROTOCOL.Side.Spikes] = 'Spikes';
 const DECODERS = new Array(ArgType.length);
 DECODERS[ArgType.Move] = function (offset, data) {
     const source = decodeIdent(this.info, data.getUint8(offset++));
     const m = data.getUint8(offset++);
     const { player, id } = decodeIdentRaw(data.getUint8(offset++));
+    const set = this.info[player].team[id - 1];
     const target = id === 0
-        ? '' : `${player}a: ${this.info[player].team[id - 1].name}`;
+        ? '' : `${player}a: ${(set.name || set.species)}`;
     const reason = data.getUint8(offset++);
-    const move = reason === data_1.PROTOCOL.Move.Recharge
+    const move = reason === data_2.PROTOCOL.Move.Recharge
         ? 'recharge' : this.gen.moves.get(this.lookup.moveByNum(m)).name;
     const args = ['move', source, move, target];
-    const kwArgs = reason === data_1.PROTOCOL.Move.From
+    const kwArgs = reason === data_2.PROTOCOL.Move.From
         ? { from: this.gen.moves.get(this.lookup.moveByNum(data.getUint8(offset++))).name } : {};
     return { offset, line: { args, kwArgs } };
 };
 DECODERS[ArgType.Switch] = function (offset, data) {
     const ident = decodeIdent(this.info, data.getUint8(offset++));
     const details = decodeDetails(offset, data, this.gen, this.lookup);
-    offset += 2;
+    offset += this.gen.num > 1 ? 3 : 2;
     const hpStatus = decodeHPStatus(offset, data);
     offset += 5;
     const args = ['switch', ident, details, hpStatus];
@@ -188,7 +209,7 @@ DECODERS[ArgType.Cant] = function (offset, data) {
     const ident = decodeIdent(this.info, data.getUint8(offset++));
     const reason = data.getUint8(offset++);
     let args;
-    if (reason === data_1.PROTOCOL.Cant.Disable) {
+    if (reason === data_2.PROTOCOL.Cant.Disable) {
         const move = this.gen.moves.get(this.lookup.moveByNum(data.getUint8(offset++))).name;
         args = ['cant', ident, 'Disable', move];
     }
@@ -201,7 +222,7 @@ DECODERS[ArgType.Faint] = function (offset, data) {
     return decodeProtocol('faint', offset, data, this.info);
 };
 DECODERS[ArgType.Turn] = function (offset, data) {
-    const turn = data.getUint16(offset, data_1.LE).toString();
+    const turn = data.getUint16(offset, data_2.LE).toString();
     offset += 2;
     return { offset, line: { args: ['turn', turn], kwArgs: {} } };
 };
@@ -220,9 +241,9 @@ DECODERS[ArgType.Damage] = function (offset, data) {
     offset += 5;
     const reason = data.getUint8(offset++);
     const kwArgs = {};
-    if (reason > data_1.PROTOCOL.Damage.None)
+    if (reason > data_2.PROTOCOL.Damage.None)
         kwArgs.from = DAMAGE[reason];
-    if (reason === data_1.PROTOCOL.Damage.RecoilOf) {
+    if (reason === data_2.PROTOCOL.Damage.RecoilOf) {
         kwArgs.of = decodeIdent(this.info, data.getUint8(offset++));
     }
     const args = ['-damage', ident, hpStatus];
@@ -234,11 +255,11 @@ DECODERS[ArgType.Heal] = function (offset, data) {
     offset += 5;
     const reason = data.getUint8(offset++);
     const kwArgs = {};
-    if (reason === data_1.PROTOCOL.Heal.Drain) {
+    if (reason === data_2.PROTOCOL.Heal.Drain) {
         kwArgs.from = 'drain';
         kwArgs.of = decodeIdent(this.info, data.getUint8(offset++));
     }
-    else if (reason === data_1.PROTOCOL.Heal.Silent) {
+    else if (reason === data_2.PROTOCOL.Heal.Silent) {
         kwArgs.silent = true;
     }
     const args = ['-heal', ident, hpStatus];
@@ -249,10 +270,10 @@ DECODERS[ArgType.Status] = function (offset, data) {
     const status = decodeStatus(data.getUint8(offset++));
     const reason = data.getUint8(offset++);
     const kwArgs = {};
-    if (reason === data_1.PROTOCOL.CureStatus.Silent) {
+    if (reason === data_2.PROTOCOL.Status.Silent) {
         kwArgs.silent = true;
     }
-    else if (reason === data_1.PROTOCOL.Status.From) {
+    else if (reason === data_2.PROTOCOL.Status.From) {
         const move = this.gen.moves.get(this.lookup.moveByNum(data.getUint8(offset++))).name;
         kwArgs.from = `move: ${move}`;
     }
@@ -264,10 +285,10 @@ DECODERS[ArgType.CureStatus] = function (offset, data) {
     const status = decodeStatus(data.getUint8(offset++));
     const reason = data.getUint8(offset++);
     const kwArgs = {};
-    if (reason === data_1.PROTOCOL.CureStatus.Message) {
+    if (reason === data_2.PROTOCOL.CureStatus.Message) {
         kwArgs.msg = true;
     }
-    else if (reason === data_1.PROTOCOL.CureStatus.Silent) {
+    else if (reason === data_2.PROTOCOL.CureStatus.Silent) {
         kwArgs.silent = true;
     }
     const args = ['-curestatus', ident, status];
@@ -278,7 +299,7 @@ DECODERS[ArgType.Boost] = function (offset, data) {
     const reason = data.getUint8(offset++);
     const boost = BOOSTS[reason];
     const kwArgs = {};
-    if (reason === data_1.PROTOCOL.Boost.Rage) {
+    if (reason === data_2.PROTOCOL.Boost.Rage) {
         kwArgs.from = 'Rage';
     }
     const n = data.getUint8(offset++) - 6;
@@ -297,13 +318,13 @@ DECODERS[ArgType.Fail] = function (offset, data) {
     const reason = data.getUint8(offset++);
     let args;
     const kwArgs = {};
-    const weak = reason === data_1.PROTOCOL.Fail.Weak;
-    if (weak || reason === data_1.PROTOCOL.Fail.Substitute) {
+    const weak = reason === data_2.PROTOCOL.Fail.Weak;
+    if (weak || reason === data_2.PROTOCOL.Fail.Substitute) {
         args = ['-fail', ident, 'move: Substitute'];
         if (weak)
             kwArgs.weak = true;
     }
-    else if (reason !== data_1.PROTOCOL.Fail.None) {
+    else if (reason !== data_2.PROTOCOL.Fail.None) {
         args = ['-fail', ident, FAIL[reason]];
     }
     else {
@@ -332,11 +353,12 @@ DECODERS[ArgType.MustRecharge] = function (offset, data) {
 DECODERS[ArgType.Activate] = function (offset, data) {
     const ident = decodeIdent(this.info, data.getUint8(offset++));
     const reason = data.getUint8(offset++);
-    const type = reason === data_1.PROTOCOL.Activate.Mist ? '-block' : '-activate';
-    const args = reason === data_1.PROTOCOL.Activate.Splash
-        ? [type, '', ACTIVATE[reason]]
-        : [type, ident, ACTIVATE[reason], ''];
-    const kwArgs = reason === data_1.PROTOCOL.Activate.Substitute ? { damage: true } : {};
+    const type = reason === data_2.PROTOCOL.Activate.Mist ? '-block' : '-activate';
+    const activate = ACTIVATE[this.gen.num - 1];
+    const args = reason === data_2.PROTOCOL.Activate.Splash
+        ? [type, '', activate[reason]]
+        : [type, ident, activate[reason], ''];
+    const kwArgs = reason === data_2.PROTOCOL.Activate.Substitute ? { damage: true } : {};
     return { offset, line: { args, kwArgs } };
 };
 DECODERS[ArgType.FieldActivate] = function (offset) {
@@ -349,12 +371,12 @@ DECODERS[ArgType.Start] = function (offset, data) {
     const reason = data.getUint8(offset++);
     let args;
     const kwArgs = {};
-    if (reason < data_1.PROTOCOL.Start.TypeChange) {
-        args = ['-start', ident, START[reason]];
-        if (reason === data_1.PROTOCOL.Start.ConfusionSilent)
+    if (reason < data_2.PROTOCOL.Start.TypeChange) {
+        args = ['-start', ident, START[this.gen.num - 1][reason]];
+        if (reason === data_2.PROTOCOL.Start.ConfusionSilent)
             kwArgs.silent = true;
     }
-    else if (reason === data_1.PROTOCOL.Start.TypeChange) {
+    else if (reason === data_2.PROTOCOL.Start.TypeChange) {
         const types = decodeTypes(this.lookup, data.getUint8(offset++));
         const t = types[0] === types[1] ? types[0] : types.join('/');
         args = ['-start', ident, 'typechange', t];
@@ -363,7 +385,7 @@ DECODERS[ArgType.Start] = function (offset, data) {
     }
     else {
         const move = this.gen.moves.get(this.lookup.moveByNum(data.getUint8(offset++))).name;
-        const effect = reason === data_1.PROTOCOL.Start.Disable ? 'Disable' : 'Mimic';
+        const effect = reason === data_2.PROTOCOL.Start.Disable ? 'Disable' : 'Mimic';
         args = ['-start', ident, effect, move];
     }
     return { offset, line: { args, kwArgs } };
@@ -371,8 +393,8 @@ DECODERS[ArgType.Start] = function (offset, data) {
 DECODERS[ArgType.End] = function (offset, data) {
     const ident = decodeIdent(this.info, data.getUint8(offset++));
     const reason = data.getUint8(offset++);
-    const args = ['-end', ident, END[reason]];
-    const kwArgs = reason >= data_1.PROTOCOL.End.DisableSilent ? { silent: true } : {};
+    const args = ['-end', ident, END[this.gen.num - 1][reason]];
+    const kwArgs = reason >= data_2.PROTOCOL.End.DisableSilent ? { silent: true } : {};
     return { offset, line: { args, kwArgs } };
 };
 DECODERS[ArgType.OHKO] = function (offset) {
@@ -390,7 +412,7 @@ DECODERS[ArgType.Resisted] = function (offset, data) {
 DECODERS[ArgType.Immune] = function (offset, data) {
     const ident = decodeIdent(this.info, data.getUint8(offset++));
     const reason = data.getUint8(offset++);
-    const kwArgs = reason === data_1.PROTOCOL.Immune.OHKO ? { ohko: true } : {};
+    const kwArgs = reason === data_2.PROTOCOL.Immune.OHKO ? { ohko: true } : {};
     return { offset, line: { args: ['-immune', ident], kwArgs } };
 };
 DECODERS[ArgType.Transform] = function (offset, data) {
@@ -405,17 +427,21 @@ function decodeProtocol(type, offset, data, info) {
 }
 function decodeIdent(info, byte) {
     const { player, id } = decodeIdentRaw(byte);
-    return `${player}a: ${info[player].team[id - 1].name}`;
+    const set = info[player].team[id - 1];
+    return `${player}a: ${(set.name || set.species)}`;
 }
 function decodeDetails(offset, data, gen, lookup) {
     const species = gen.species.get(lookup.speciesByNum(data.getUint8(offset++))).name;
+    const gender = gen.num > 1 ? GENDERS[data.getUint8(offset++)] : 'N';
     const level = data.getUint8(offset);
-    return (level === 100 ? species : `${species}, L${level}`);
+    const mf = gender === 'N' ? '' : `, ${gender}`;
+    const lvl = level === 100 ? '' : `, L${level}`;
+    return `${species}${mf}${lvl}`;
 }
 function decodeHPStatus(offset, data) {
-    const hp = data.getUint16(offset, data_1.LE);
+    const hp = data.getUint16(offset, data_2.LE);
     offset += 2;
-    const maxhp = data.getUint16(offset, data_1.LE);
+    const maxhp = data.getUint16(offset, data_2.LE);
     offset += 2;
     if (hp === 0)
         return '0 fnt';
@@ -428,7 +454,6 @@ function decodeIdentRaw(byte) {
         id: byte & 0b111,
     };
 }
-exports.decodeIdentRaw = decodeIdentRaw;
 function decodeStatus(val) {
     if (val & 0b111)
         return 'slp';
@@ -444,9 +469,7 @@ function decodeStatus(val) {
         return 'psn';
     return undefined;
 }
-exports.decodeStatus = decodeStatus;
 function decodeTypes(lookup, val) {
     return [lookup.typeByNum(val & 0x0F), lookup.typeByNum(val >> 4)];
 }
-exports.decodeTypes = decodeTypes;
 //# sourceMappingURL=protocol.js.map