@pkmn/engine 0.1.0-dev.d716e940 → 0.1.0-dev.d73cd76c

package/build/pkg/addon.d.ts

@@ -1,7 +1,29 @@
-import { Choice, Player, Result } from '.';
+import { Choice, Player, Result } from './common';
+export type Argument = string | URL | WebAssembly.Module | WebAssembly.Instance | Promise<Response>;
+export interface Bindings<T extends boolean> {
+    /**
+     * The compile-time options the bindings were built with. showdown is special
+     * cased because it changes the name of addon.
+     */
+    options: {
+        showdown: T;
+        log: boolean;
+        chance: boolean;
+        calc: boolean;
+    };
+    /** Bindings are per-generation, Generation I is index 0. */
+    bindings: Binding[];
+}
+export interface Binding {
+    CHOICES_SIZE: number;
+    LOGS_SIZE: number;
+    update(battle: ArrayBufferLike, c1: number, c2: number, log: ArrayBufferLike | undefined): number;
+    choices(battle: ArrayBufferLike, player: number, request: number, out: ArrayBufferLike): number;
+}
+/** TODO */
+export declare function initialize(showdown: boolean, addon?: Argument): Promise<void | undefined>;
 export declare function check(showdown: boolean): void;
 export declare function supports(showdown: boolean, log?: boolean): boolean;
-export declare function update(index: number, showdown: boolean, battle: ArrayBuffer, c1?: Choice, c2?: Choice, log?: ArrayBuffer): Result;
-export declare function choices(index: number, showdown: boolean, battle: ArrayBuffer, player: Player, choice: Choice['type'], buf: ArrayBuffer): Choice[];
-export declare function choose(index: number, showdown: boolean, battle: ArrayBuffer, player: Player, choice: Choice['type'], buf: ArrayBuffer, fn: (n: number) => number): Choice;
+export declare function update(index: number, showdown: boolean, battle: ArrayBufferLike, c1?: Choice, c2?: Choice, log?: ArrayBufferLike): Result;
+export declare function choices(index: number, showdown: boolean, battle: ArrayBufferLike, player: Player, choice: Choice['type'], out: Uint8Array): Choice[];
 export declare function size(index: number, type: 'choices' | 'log'): number;

package/build/pkg/addon.js

@@ -1,77 +1,58 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.size = exports.choose = exports.choices = exports.update = exports.supports = exports.check = void 0;
-const path = __importStar(require("path"));
-const _1 = require(".");
-const ROOT = path.join(__dirname, '..', '..');
-let ADDON = undefined;
-function load() {
-    if (ADDON)
-        return ADDON;
-    let pkmn = undefined;
-    let showdown = undefined;
-    try {
-        pkmn = require(path.join(ROOT, 'build', 'lib', 'pkmn.node'));
-    }
-    catch { }
-    try {
-        showdown = require(path.join(ROOT, 'build', 'lib', 'pkmn-showdown.node'));
-    }
-    catch { }
-    if (!pkmn && !showdown) {
-        throw new Error('Could not find native addons - did you run `npx install-pkmn-engine`?');
+exports.initialize = initialize;
+exports.check = check;
+exports.supports = supports;
+exports.update = update;
+exports.choices = choices;
+exports.size = size;
+const node_1 = require("./addon/node");
+const common_1 = require("./common");
+const ADDONS = [];
+const loading = [];
+/** TODO */
+async function initialize(showdown, addon) {
+    if (loading[+showdown]) {
+        throw new Error(`Cannot call initialize more than once with showdown=${showdown}`);
     }
-    return (ADDON = [pkmn, showdown]);
+    loading[+showdown] = (0, node_1.load)(showdown, addon);
+    loading[+showdown].then(a => {
+        ADDONS[+showdown] = a;
+    }).catch(() => {
+        loading[+showdown] = undefined;
+    });
+    return loading[+showdown]?.then(() => { });
 }
 function check(showdown) {
-    if (!load()[+showdown]) {
-        const opts = ADDON[+!showdown].options.log ? ['-log'] : [];
+    if (!addons(showdown)[+showdown]) {
+        const opts = ADDONS[+!showdown].options.log ? ['-log'] : [];
         if (showdown)
             opts.push('-Dshowdown');
         throw new Error(`@pkmn/engine has ${showdown ? 'not' : 'only'} been configured to support Pokémon Showdown.` +
             `\n(running \`npx install-pkmn-engine --options='${opts.join(' ')}'\` can fix this issue).`);
     }
 }
-exports.check = check;
 function supports(showdown, log) {
-    if (!load()[+showdown])
+    if (!addons(showdown)[+showdown])
         return false;
     if (log === undefined)
         return true;
-    return ADDON[+showdown].options.log === log;
+    return ADDONS[+showdown].options.log === log;
+}
+function addons(showdown) {
+    if (ADDONS[+showdown])
+        return ADDONS;
+    // If we havem't been initialized attempt to autoload if we're on Node
+    ADDONS[+showdown] = (0, node_1.loadSync)(showdown);
+    return ADDONS;
 }
-exports.supports = supports;
 function update(index, showdown, battle, c1, c2, log) {
-    return _1.Result.decode(ADDON[+showdown].bindings[index]
-        .update(battle, _1.Choice.encode(c1), _1.Choice.encode(c2), log));
+    return common_1.Result.decode(ADDONS[+showdown].bindings[index]
+        .update(battle, common_1.Choice.encode(c1), common_1.Choice.encode(c2), log));
 }
-exports.update = update;
-function choices(index, showdown, battle, player, choice, buf) {
+function choices(index, showdown, battle, player, choice, out) {
     const request = choice[0] === 'p' ? 0 : choice[0] === 'm' ? 1 : 2;
-    const n = ADDON[+showdown].bindings[index].choices(battle, +(player !== 'p1'), request, buf);
+    const n = ADDONS[+showdown].bindings[index].choices(battle, +(player !== 'p1'), request, out.buffer);
     // The top-level API signature means our hands our tied with respect to
     // writing really fast bindings here. The simplest approach would be to return
     // the ArrayBuffer the bindings populate as well as its size and only decode a
@@ -86,26 +67,14 @@ function choices(index, showdown, battle, player, choice, buf) {
     // choices function for each generation within node.zig. We could do something
     // really galaxy-brained and return some sort of frankenstein subclass of
     // Array backed by ArrayBuffer which would lazily decode the Choice on access,
-    // but thats ultimately not worth the effort. You can't have both a high-level
-    // idiomatic API and performance here, hence why the choose function below
-    // exists.
+    // but thats ultimately not worth the effort.
     const options = new Array(n);
-    const data = new Uint8Array(buf);
     for (let i = 0; i < n; i++)
-        options[i] = _1.Choice.decode(data[i]);
+        options[i] = common_1.Choice.decode(out[i]);
     return options;
 }
-exports.choices = choices;
-function choose(index, showdown, battle, player, choice, buf, fn) {
-    const request = choice[0] === 'p' ? 0 : choice[0] === 'm' ? 1 : 2;
-    const n = ADDON[+showdown].bindings[index].choices(battle, +(player !== 'p1'), request, buf);
-    const data = new Uint8Array(buf);
-    return _1.Choice.decode(data[fn(n)]);
-}
-exports.choose = choose;
 function size(index, type) {
-    const bindings = (ADDON[1] ?? ADDON[0]).bindings[index];
+    const bindings = (ADDONS[1] ?? ADDONS[0]).bindings[index];
     return type[0] === 'c' ? bindings.CHOICES_SIZE : bindings.LOGS_SIZE;
 }
-exports.size = size;
 //# sourceMappingURL=addon.js.map

package/build/pkg/addon.js.map

@@ -1 +1 @@
-{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../src/pkg/addon.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"addon.js","sourceRoot":"","sources":["../../src/pkg/addon.ts"],"names":[],"mappings":";;AA0BA,gCAWC;AAED,sBASC;AAED,4BAIC;AASD,wBAUC;AAED,0BA6BC;AAED,oBAGC;AA7GD,uCAA4C;AAC5C,qCAAgD;AAqBhD,MAAM,MAAM,GAAwC,EAAE,CAAC;AACvD,MAAM,OAAO,GAA0D,EAAE,CAAC;AAE1E,WAAW;AACJ,KAAK,UAAU,UAAU,CAAC,QAAiB,EAAE,KAAgB;IAClE,IAAI,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,uDAAuD,QAAQ,EAAE,CAAC,CAAC;IACrF,CAAC;IACD,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAA,WAAI,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC3C,OAAO,CAAC,CAAC,QAAQ,CAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QAC3B,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC;IACjC,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,SAAgB,KAAK,CAAC,QAAiB;IACrC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,IAAI,QAAQ;YAAE,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,MAAM,IAAI,KAAK,CACb,oBAAoB,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,+CAA+C;YAC5F,mDAAmD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAC5F,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAgB,QAAQ,CAAC,QAAiB,EAAE,GAAa;IACvD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IAC/C,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACnC,OAAO,MAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,OAAO,CAAC,GAAG,KAAK,GAAG,CAAC;AAChD,CAAC;AAED,SAAS,MAAM,CAAC,QAAiB;IAC/B,IAAI,MAAM,CAAC,CAAC,QAAQ,CAAC;QAAE,OAAO,MAAM,CAAC;IACrC,sEAAsE;IACtE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,MAAM,CACpB,KAAa,EACb,QAAiB,EACjB,MAAuB,EACvB,EAAW,EACX,EAAW,EACX,GAAqB;IAErB,OAAO,eAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC;SACpD,MAAM,CAAC,MAAM,EAAE,eAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,eAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;AAChE,CAAC;AAED,SAAgB,OAAO,CACrB,KAAa,EACb,QAAiB,EACjB,MAAuB,EACvB,MAAc,EACd,MAAsB,EACtB,GAAe;IAEf,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,GACL,MAAM,CAAC,CAAC,QAAQ,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC9F,uEAAuE;IACvE,8EAA8E;IAC9E,8EAA8E;IAC9E,oEAAoE;IACpE,0EAA0E;IAC1E,2EAA2E;IAC3E,4EAA4E;IAC5E,8EAA8E;IAC9E,4EAA4E;IAC5E,2EAA2E;IAC3E,uEAAuE;IACvE,8EAA8E;IAC9E,yEAAyE;IACzE,8EAA8E;IAC9E,6CAA6C;IAC7C,MAAM,OAAO,GAAG,IAAI,KAAK,CAAS,CAAC,CAAC,CAAC;IACrC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;QAAE,OAAO,CAAC,CAAC,CAAC,GAAG,eAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAgB,IAAI,CAAC,KAAa,EAAE,IAAuB;IACzD,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC3D,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;AACtE,CAAC"}

package/build/pkg/data/ids.json

@@ -20,15 +20,15 @@
     },
     {
         "types": [
+            "Ground",
+            "Rock",
+            "Steel",
             "Normal",
             "Fighting",
             "Flying",
             "Poison",
-            "Ground",
-            "Rock",
             "Bug",
             "Ghost",
-            "Steel",
             "???",
             "Fire",
             "Water",
@@ -40,15 +40,15 @@
             "Dark"
         ],
         "items": [
+            "softsand",
+            "hardstone",
+            "metalcoat",
             "pinkbow",
             "blackbelt",
             "sharpbeak",
             "poisonbarb",
-            "softsand",
-            "hardstone",
             "silverpowder",
             "spelltag",
-            "metalcoat",
             "polkadotbow",
             "charcoal",
             "mysticwater",
@@ -65,21 +65,21 @@
             "stick",
             "thickclub",
             "focusband",
-            "berryjuice",
             "scopelens",
             "leftovers",
             "berserkgene",
             "lightball",
+            "berry",
+            "berryjuice",
+            "goldberry",
+            "mintberry",
             "psncureberry",
             "przcureberry",
-            "burntberry",
             "iceberry",
-            "bitterberry",
-            "mintberry",
+            "burntberry",
             "miracleberry",
+            "bitterberry",
             "mysteryberry",
-            "berry",
-            "goldberry",
             "masterball",
             "ultraball",
             "greatball",

package/build/pkg/data/layout.json

@@ -4,7 +4,10 @@
             "Battle": 384,
             "Side": 184,
             "Pokemon": 24,
-            "ActivePokemon": 32
+            "ActivePokemon": 32,
+            "Actions": 16,
+            "Durations": 8,
+            "Summaries": 12
         },
         "offsets": {
             "Battle": {
@@ -12,7 +15,7 @@
                 "turn": 368,
                 "last_damage": 370,
                 "last_moves": 372,
-                "rng": 373
+                "rng": 374
             },
             "Side": {
                 "pokemon": 0,
@@ -77,9 +80,41 @@
                 "state": 24,
                 "substitute": 40,
                 "transform": 48,
-                "disabled_duration": 52,
-                "disabled_move": 56,
+                "disable_duration": 52,
+                "disable_move": 56,
                 "toxic": 59
+            },
+            "Action": {
+                "damage": 0,
+                "hit": 8,
+                "critical_hit": 10,
+                "secondary_chance": 12,
+                "speed_tie": 14,
+                "confused": 16,
+                "paralyzed": 18,
+                "duration": 20,
+                "sleep": 24,
+                "confusion": 26,
+                "disable": 29,
+                "attacking": 31,
+                "binding": 33,
+                "move_slot": 36,
+                "pp": 40,
+                "multi_hit": 44,
+                "psywave": 48,
+                "metronome": 56
+            },
+            "Duration": {
+                "sleeps": 0,
+                "confusion": 18,
+                "disable": 21,
+                "attacking": 25,
+                "binding": 28
+            },
+            "Damage": {
+                "base": 0,
+                "final": 2,
+                "capped": 4
             }
         }
     }

package/build/pkg/data/protocol.json

@@ -48,7 +48,7 @@
         "EndAbility",
         "ClearNegativeBoost",
         "FormeChange",
-        "NoTarget",
+        "LastNoTarget",
         "SwapBoost",
         "FieldStart",
         "FieldEnd",
@@ -70,7 +70,9 @@
         "Burst",
         "ClearPositiveBoost",
         "CanDynamax",
-        "SwapSideConditions"
+        "SwapSideConditions",
+        "UpdatePoke",
+        "Terastallize"
     ],
     "Move": [
         "None",
@@ -84,12 +86,17 @@
         "Flinch",
         "Disable",
         "Recharge",
-        "PP"
+        "PP",
+        "Attract"
     ],
     "Heal": [
         "None",
         "Silent",
-        "Drain"
+        "Drain",
+        "Leftovers",
+        "Berry",
+        "BerryJuice",
+        "GoldBerry"
     ],
     "Damage": [
         "None",
@@ -97,7 +104,16 @@
         "Burn",
         "Confusion",
         "LeechSeed",
-        "RecoilOf"
+        "RecoilOf",
+        "Bind",
+        "Wrap",
+        "FireSpin",
+        "Clamp",
+        "Whirlpool",
+        "Spikes",
+        "Nightmare",
+        "Curse",
+        "Sandstorm"
     ],
     "Status": [
         "None",
@@ -136,7 +152,20 @@
         "Mist",
         "Struggle",
         "Substitute",
-        "Splash"
+        "Splash",
+        "Rage",
+        "Attract",
+        "LockOn",
+        "Bind",
+        "Wrap",
+        "FireSpin",
+        "Clamp",
+        "Whirlpool",
+        "SubstituteBlock",
+        "DestinyBond",
+        "BeatUp",
+        "Magnitude",
+        "Spite"
     ],
     "Start": [
         "Bide",
@@ -150,24 +179,66 @@
         "Substitute",
         "TypeChange",
         "Disable",
-        "Mimic"
+        "Mimic",
+        "Attract",
+        "Nightmare",
+        "Curse",
+        "Foresight",
+        "Encore",
+        "FutureSight",
+        "PerishSong0",
+        "PerishSong1",
+        "PerishSong2",
+        "PerishSong3",
+        "PerishSong3Silent"
     ],
     "End": [
         "Disable",
         "Confusion",
         "Bide",
         "Substitute",
+        "Nightmare",
+        "Curse",
+        "Foresight",
+        "Encore",
+        "FutureSight",
+        "LeechSeed",
+        "Bind",
+        "Wrap",
+        "FireSpin",
+        "Clamp",
+        "Whirlpool",
         "DisableSilent",
         "ConfusionSilent",
-        "Mist",
-        "FocusEnergy",
-        "LeechSeed",
-        "Toxic",
-        "LightScreen",
-        "Reflect"
+        "MistSilent",
+        "FocusEnergySilent",
+        "LeechSeedSilent",
+        "ToxicSilent",
+        "LightScreenSilent",
+        "ReflectSilent",
+        "BideSilent",
+        "LeechSeedFrom"
     ],
     "Immune": [
         "None",
         "OHKO"
+    ],
+    "EndItem": [
+        "None",
+        "Eat"
+    ],
+    "SetHP": [
+        "None",
+        "Silent"
+    ],
+    "Side": [
+        "Safeguard",
+        "Reflect",
+        "LightScreen",
+        "Spikes"
+    ],
+    "Weather": [
+        "None",
+        "Upkeep"
     ]
 }

package/build/pkg/data.d.ts

@@ -1,12 +1,12 @@
-import { Generation, ID, TypeName } from '@pkmn/data';
+import { GenerationNum, ID, TypeName } from '@pkmn/data';
 export declare const LE: boolean;
 export type IDs = [
     {
-        types: TypeName[];
+        types: Exclude<TypeName, 'Dark' | 'Steel' | 'Fairy' | 'Stellar'>[];
     },
     {
         items: ID[];
-        types: TypeName[];
+        types: Exclude<TypeName, 'Fairy' | 'Stellar'>[];
     }
 ];
 export declare const IDS: IDs;
@@ -15,7 +15,7 @@ export declare const PROTOCOL: {
         [name: string]: number;
     };
 };
-export declare const LAYOUT: {
+export declare const LAYOUT: Array<{
     sizes: {
         [decl: string]: number;
     };
@@ -24,10 +24,31 @@ export declare const LAYOUT: {
             [field: string]: number;
         };
     };
-}[];
+}>;
 export declare const Data: {
     view(buf: number[] | Buffer): DataView;
 };
+interface Generation {
+    num: GenerationNum;
+    species: {
+        get(id: ID): {
+            num: number;
+        } | undefined;
+        [Symbol.iterator](): Generator<{
+            id: ID;
+            num: number;
+        }, void>;
+    };
+    moves: {
+        get(id: ID): {
+            num: number;
+        } | undefined;
+        [Symbol.iterator](): Generator<{
+            id: ID;
+            num: number;
+        }, void>;
+    };
+}
 /**
  * Translation table for encoding/decoding Pokémon Showdown string identifiers
  * to the identifiers used internally by the pkmn engine.
@@ -89,3 +110,4 @@ export declare class Lookup {
      */
     itemByID(id: ID | undefined): number;
 }
+export {};

package/build/pkg/data.js.map

@@ -1 +1 @@
-{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/pkg/data.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data.js","sourceRoot":"","sources":["../../src/pkg/data.ts"],"names":[],"mappings":"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"}

package/build/pkg/gen1.d.ts

@@ -1,20 +1,20 @@
 import { BoostID, BoostsTable, Generation, ID, PokemonSet, StatID, StatsTable, StatusName, TypeName } from '@pkmn/data';
+import { Choice, Player, Result } from './common';
 import { Lookup } from './data';
-import { Choice, CreateOptions, Data, Gen1, Player, RestoreOptions, Result, Slot } from '.';
+import { CreateOptions, Data, Gen1, RestoreOptions, Slot } from '.';
 export declare class Battle implements Gen1.Battle {
     readonly config: CreateOptions | RestoreOptions;
     readonly log?: DataView;
+    readonly data: DataView;
     private readonly lookup;
-    private readonly data;
-    private readonly options;
-    private readonly buf;
+    private readonly out;
     private readonly cache;
     constructor(lookup: Lookup, data: DataView, config: CreateOptions | RestoreOptions);
+    bytes(): DataView<ArrayBufferLike>;
     update(c1?: Choice, c2?: Choice): Result;
     choices(id: Player, result: Result): Choice[];
-    choose(id: Player, result: Result, fn: (n: number) => number): Choice;
     get sides(): Generator<Side, void, unknown>;
-    _sides(): Generator<Side, void, unknown>;
+    private _sides;
     side(id: Player): Side;
     foe(side: Player): Side;
     get turn(): number;
@@ -34,16 +34,16 @@ export declare class Side implements Gen1.Side {
     constructor(battle: Battle, lookup: Lookup, data: DataView, id: 'p1' | 'p2');
     get active(): Pokemon | undefined;
     get pokemon(): Generator<Pokemon, void, unknown>;
-    _pokemon(): Generator<Pokemon, void, unknown>;
+    private _pokemon;
     slot(id: number): Slot | undefined;
     get(slot: Slot): Pokemon | undefined;
     get lastUsedMove(): ID | undefined;
     get lastSelectedMove(): ID | undefined;
     get lastMoveIndex(): 1 | 2 | 3 | 4 | undefined;
     get lastMoveCounterable(): boolean;
-    toJSON(): Gen1.Side;
+    toJSON(): Data<Gen1.Side>;
     static init(gen: Generation, lookup: Lookup, team: Partial<PokemonSet>[], data: DataView, offset: number): void;
-    static encode(gen: Generation, showdown: boolean, lookup: Lookup, battle: Data<Gen1.Battle>, side: Gen1.Side, data: DataView, offset: number): void;
+    static encode(gen: Generation, showdown: boolean, lookup: Lookup, battle: Data<Gen1.Battle>, side: Data<Gen1.Side>, data: DataView, offset: number): void;
 }
 export declare class Pokemon implements Gen1.Pokemon {
     static Volatiles: {
@@ -64,7 +64,7 @@ export declare class Pokemon implements Gen1.Pokemon {
     get volatiles(): Gen1.Volatiles;
     move(slot: 1 | 2 | 3 | 4): Gen1.MoveSlot | undefined;
     get moves(): Iterable<Gen1.MoveSlot>;
-    _moves(): Generator<Gen1.MoveSlot, void, unknown>;
+    private _moves;
     boost(boost: BoostID): number;
     get boosts(): BoostsTable;
     get species(): ID;
@@ -80,10 +80,10 @@ export declare class Pokemon implements Gen1.Pokemon {
     private get sleep();
     private get ext();
     private get toxic();
-    toJSON(): Gen1.Pokemon;
+    toJSON(): Data<Gen1.Pokemon>;
     static init(gen: Generation, lookup: Lookup, set: Partial<PokemonSet>, data: DataView, offset: number, index: number): void;
-    static encodeStored(gen: Generation, showdown: boolean, lookup: Lookup, pokemon: Gen1.Pokemon, data: DataView, offset: number): void;
-    static encodeActive(gen: Generation, lookup: Lookup, battle: Data<Gen1.Battle>, pokemon: Gen1.Pokemon | undefined, data: DataView, offset: number): void;
+    static encodeStored(gen: Generation, showdown: boolean, lookup: Lookup, pokemon: Data<Gen1.Pokemon>, data: DataView, offset: number): void;
+    static encodeActive(gen: Generation, lookup: Lookup, battle: Data<Gen1.Battle>, pokemon: Data<Gen1.Pokemon> | undefined, data: DataView, offset: number): void;
 }
 export declare class StoredPokemon {
     private readonly lookup;
@@ -100,11 +100,8 @@ export declare class StoredPokemon {
         id: ID;
         pp: number;
     }, void, unknown>;
-    _moves(): Generator<{
-        id: ID;
-        pp: number;
-    }, void, unknown>;
+    private _moves;
     get species(): ID;
     get types(): readonly [TypeName, TypeName];
-    toJSON(): Gen1.Pokemon['stored'];
+    toJSON(): Data<Gen1.Pokemon['stored']>;
 }