@pkmn/engine 0.1.0-dev.62399ed5 → 0.1.0-dev.6344ceb5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2021-2024 pkmn contributors
+Copyright (c) 2021-2025 pkmn contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/README.md

@@ -57,9 +57,14 @@ $ zig build --prefix /usr/local -Doptimize=ReleaseFast
 ```
 
 The Zig website has [installation instructions](https://ziglang.org/learn/getting-started/) which
-walk through how to install Zig on each platform - the engine code should work on Zig v0.13.0,
+walk through how to install Zig on each platform - the engine code should work on Zig v0.11.0,
 though tracks Zig's master branch so this may change in the future if breaking language changes are
-introduced.
+introduced. Note that **due to a [bug in the Zig
+compiler](https://github.com/ziglang/zig/issues/17768), compiling with a version of Zig before
+`0.12.0-dev.876+aaf46187a` is recommended for performance**. Alternatively, building a version of
+[Zig from source](https://github.com/ziglang/zig/wiki/Building-Zig-From-Source) after having applied
+a [patch](zig.patch) to revert [ziglang/zig#17391](https://github.com/ziglang/zig/pull/17391) will
+restore performance while allowing modern Zig features to be used.
 
 `libpkmn` can be built with `-Dshowdown` to instead produce the Pokémon Showdown compatible
 `libpkmn-showdown` library. Furthermore, protocol message logging can be enabled through `-Dlog`.
@@ -113,6 +118,48 @@ error: dependency is missing hash field
 note: expected .hash = "122056b93b403033cb7d9bed96a02c2eb8cc1275515976167726ada6eb4207e8ef8a",
 ```
 
+You must add `build.zig.zon` to the engine package to be able to import it in your `build.zig`:
+
+<details><summary>Before v0.14.0</summary>
+
+```zig
+.{
+    .name = "pkmn",
+    .version = "0.1.0-dev",
+    .minimum_zig_version = "0.11.0",
+    .paths = .{
+        "build.zig",
+        "docs",
+        "LICENSE",
+        "README.md",
+        "src/include",
+        "src/lib",
+    },
+}
+```
+</details>
+
+
+<details><summary>After v0.14.0</summary>
+
+```zig
+.{
+    .name = .pkmn,
+    .version = "0.1.0-dev",
+    .minimum_zig_version = "0.14.0",
+    .paths = .{
+        "build.zig",
+        "docs",
+        "LICENSE",
+        "README.md",
+        "src/include",
+        "src/lib",
+    },
+    .fingerprint = 0x74a002f44f200a47,
+}
+```
+</details>
+
 Note that this hash is **not** going to be the same as the commit hash. After adding the hash to
 your `build.zig.zon` you will be able to import the `pkmn` package's build helpers into your
 `build.zig`:
@@ -210,18 +257,19 @@ protocol via `Log.parse`.
 ```ts
 import {Dex} from '@pkmn/dex';
 import {Generations} from '@pkmn/data';
-import {Battle} from '@pkmn/engine';
+import {Battle, Choice} from '@pkmn/engine';
 
 const gens = new Generations(Dex);
 const battle = Battle.create(...);
 
-const choose = (n: number) => Math.random() * n;
+const choose = (choices: Choice[]) =>
+  choices[Math.floor(Math.random() * choices.length)];
 
 let result: Result;
 let c1: Choice, c2: Choice;
 while (!(result = battle.update(c1, c2)).type) {
-  c1 = battle.choose('p1', result, choose);
-  c2 = battle.choose('p2', result, choose);
+  c1 = choose(battle.choices('p1', result));
+  c2 = choose(battle.choices('p2', result));
 }
 
 console.log(result);

package/build/pkg/addon/browser.d.ts

@@ -0,0 +1,3 @@
+import type { Argument } from '../addon';
+export declare function load(showdown: boolean, addon?: Argument): Promise<import("../addon").Bindings<boolean>>;
+export declare function loadSync(): void;

package/build/pkg/addon/browser.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.load = load;
+exports.loadSync = loadSync;
+const wasm_1 = require("./wasm");
+async function load(showdown, addon) {
+    if (typeof addon === 'string' && addon !== 'wasm') {
+        throw new Error('Unable to load native addons in the browser!');
+    }
+    let wasm;
+    if (addon instanceof WebAssembly.Instance) {
+        wasm = addon;
+    }
+    else if (addon instanceof WebAssembly.Module) {
+        try {
+            wasm = (await WebAssembly.instantiate(addon));
+        }
+        catch (err) {
+            if (!(err instanceof Error))
+                throw err;
+            throw new Error(`Could not instantiate WASM module!\n${err.message}`);
+        }
+    }
+    else {
+        const name = `pkmn${showdown ? '-showdown' : ''}.wasm`;
+        try {
+            const response = !addon || addon === 'wasm' ? fetch(name)
+                : addon instanceof URL ? fetch(addon) : addon;
+            wasm = (await WebAssembly.instantiateStreaming(response)).instance;
+        }
+        catch (err) {
+            if (!(err instanceof Error))
+                throw err;
+            const message = !addon || addon === 'wasm'
+                ? `Could not find ${name} - did you run \`npx install-pkmn-engine\`?`
+                : addon instanceof URL
+                    ? `Could not fetch WASM module from '${addon.href}'!`
+                    : 'Could not instantiate WASM module!';
+            throw new Error(`${message}\n${err.message}`);
+        }
+    }
+    return (0, wasm_1.toBindings)(wasm.exports);
+}
+function loadSync() {
+    throw new Error('You must `initialize` the WASM addon before using the engine!');
+}
+//# sourceMappingURL=browser.js.map

package/build/pkg/addon/browser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../src/pkg/addon/browser.ts"],"names":[],"mappings":";;AAKA,oBAiCC;AAED,4BAEC;AAvCD,iCAAkC;AAE3B,KAAK,UAAU,IAAI,CAAC,QAAiB,EAAE,KAAgB;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,IAA0B,CAAC;IAC/B,IAAI,KAAK,YAAY,WAAW,CAAC,QAAQ,EAAE,CAAC;QAC1C,IAAI,GAAG,KAAK,CAAC;IACf,CAAC;SAAM,IAAI,KAAK,YAAY,WAAW,CAAC,MAAM,EAAE,CAAC;QAC/C,IAAI,CAAC;YACH,IAAI,GAAG,CAAC,MAAM,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;gBAAE,MAAM,GAAG,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,uCAAuC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,GAAG,OAAO,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC;QACvD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,CAAC,KAAK,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBACvD,CAAC,CAAE,KAAiC,YAAY,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7E,IAAI,GAAG,CAAC,MAAM,WAAW,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC;QACrE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;gBAAE,MAAM,GAAG,CAAC;YACvC,MAAM,OAAO,GAAG,CAAC,KAAK,IAAI,KAAK,KAAK,MAAM;gBACxC,CAAC,CAAC,kBAAkB,IAAI,6CAA6C;gBACrE,CAAC,CAAE,KAAiC,YAAY,GAAG;oBACjD,CAAC,CAAC,qCAAsC,KAAa,CAAC,IAAI,IAAI;oBAC9D,CAAC,CAAC,oCAAoC,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,KAAK,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,CAAC;IACH,CAAC;IAED,OAAO,IAAA,iBAAU,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,SAAgB,QAAQ;IACtB,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;AACnF,CAAC"}

package/build/pkg/addon/node.d.ts

@@ -0,0 +1,3 @@
+import type { Argument } from '../addon';
+export declare function load(showdown: boolean, addon?: Argument): Promise<any>;
+export declare function loadSync(showdown: boolean): any;

package/build/pkg/addon/node.js

@@ -0,0 +1,110 @@
+"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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.load = load;
+exports.loadSync = loadSync;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const wasm_1 = require("./wasm");
+const ROOT = path.join(__dirname, '..', '..', '..');
+const LIB = path.join(ROOT, 'build', 'lib');
+const NODE = [path.join(LIB, 'pkmn.node'), path.join(LIB, 'pkmn-showdown.node')];
+const WASM = [path.join(LIB, 'pkmn.wasm'), path.join(LIB, 'pkmn-showdown.wasm')];
+async function load(showdown, addon) {
+    if (addon === undefined || typeof addon === 'string' && addon !== 'wasm') {
+        try {
+            return require(!addon || addon === 'node' ? NODE[+showdown] : addon).engine;
+        }
+        catch (err) {
+            if (!(err instanceof Error))
+                return err;
+            if (addon && addon !== 'node') {
+                throw new Error(`Unable to load native addon: '${addon}'\n${err.message}`);
+            }
+            else {
+                throw error(NODE[+showdown], err);
+            }
+        }
+    }
+    let wasm;
+    if (addon === 'wasm') {
+        try {
+            wasm = (await WebAssembly.instantiate(fs.readFileSync(WASM[+showdown]))).instance;
+        }
+        catch (err) {
+            throw error(WASM[+showdown], err);
+        }
+    }
+    else if (addon instanceof WebAssembly.Instance) {
+        wasm = addon;
+    }
+    else if (addon instanceof WebAssembly.Module) {
+        try {
+            wasm = (await WebAssembly.instantiate(addon));
+        }
+        catch (err) {
+            if (!(err instanceof Error))
+                throw err;
+            throw new Error(`Could not instantiate WASM module!\n${err.message}`);
+        }
+    }
+    else {
+        try {
+            const response = addon instanceof Promise ? addon : fetch(addon);
+            wasm = (await WebAssembly.instantiateStreaming(response)).instance;
+        }
+        catch (err) {
+            if (!(err instanceof Error))
+                throw err;
+            throw new Error(`Could not instantiate WASM module!\n${err.message}`);
+        }
+    }
+    return (0, wasm_1.toBindings)(wasm.exports);
+}
+function loadSync(showdown) {
+    try {
+        return require(NODE[+showdown]).engine;
+    }
+    catch {
+        return undefined;
+    }
+}
+function error(file, err) {
+    if (!(err instanceof Error))
+        return err;
+    const message = `Could not find ${path.basename(file)} addon`;
+    return new Error(`${message} - did you run \`npx install-pkmn-engine\`?\n${err.message}`);
+}
+//# sourceMappingURL=node.js.map

package/build/pkg/addon/node.js.map

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

package/build/pkg/addon/wasm.d.ts

@@ -0,0 +1,2 @@
+import type { Bindings } from '../addon';
+export declare function toBindings<T extends boolean>(w: WebAssembly.Exports): Bindings<T>;

package/build/pkg/addon/wasm.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toBindings = toBindings;
+const data_1 = require("../data");
+function toBindings(w) {
+    const memory = new Uint8Array(w.memory.buffer);
+    return {
+        options: {
+            showdown: !!memory[w.SHOWDOWN.valueOf()],
+            log: !!memory[w.LOG.valueOf()],
+            chance: !!memory[w.CHANCE.valueOf()],
+            calc: !!memory[w.CALC.valueOf()],
+        },
+        bindings: [toBinding(1, w)],
+    };
+}
+function toBinding(gen, w) {
+    const prefix = `GEN${gen}`;
+    const buf = w.memory.buffer;
+    const constants = new Uint32Array(buf);
+    const CHOICES_SIZE = constants[w[`${prefix}_CHOICES_SIZE`].valueOf() / 4];
+    const LOGS_SIZE = constants[w[`${prefix}_LOGS_SIZE`].valueOf() / 4];
+    const size = data_1.LAYOUT[gen - 1].sizes.Battle;
+    const update = w[`${prefix}_update`];
+    const choices = w[`${prefix}_choices`];
+    const memory = new Uint8Array(buf);
+    return {
+        CHOICES_SIZE,
+        LOGS_SIZE,
+        update(battle, c1, c2, log) {
+            const bytes = new Uint8Array(battle);
+            memory.set(bytes, 0);
+            let result;
+            if (log) {
+                result = update(0, c1, c2, size);
+                new Uint8Array(log).set(memory.subarray(size, size + LOGS_SIZE));
+            }
+            else {
+                result = update(0, c1, c2, 0);
+            }
+            bytes.set(memory.subarray(0, size));
+            return result;
+        },
+        choices(battle, player, request, options) {
+            const opts = new Uint8Array(options);
+            memory.set(new Uint8Array(battle));
+            const n = choices(0, player, request, size);
+            opts.set(memory.subarray(size, size + n));
+            return n;
+        },
+    };
+}
+//# sourceMappingURL=wasm.js.map

package/build/pkg/addon/wasm.js.map

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

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: ArrayBuffer, c1: number, c2: number, log: ArrayBuffer | undefined): number;
+    choices(battle: ArrayBuffer, player: number, request: number, out: ArrayBuffer): 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 choices(index: number, showdown: boolean, battle: ArrayBuffer, player: Player, choice: Choice['type'], out: Uint8Array): Choice[];
 export declare function size(index: number, type: 'choices' | 'log'): number;

package/build/pkg/addon.js

@@ -1,60 +1,31 @@
 "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.initialize = initialize;
 exports.check = check;
 exports.supports = supports;
 exports.update = update;
 exports.choices = choices;
-exports.choose = choose;
 exports.size = size;
-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')).engine;
-    }
-    catch { }
-    try {
-        showdown =
-            require(path.join(ROOT, 'build', 'lib', 'pkmn-showdown.node')).engine;
-    }
-    catch { }
-    if (!pkmn && !showdown) {
-        throw new Error('Could not find native addons - did you run `npx install-pkmn-engine`?');
+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.` +
@@ -62,19 +33,26 @@ function check(showdown) {
     }
 }
 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;
 }
 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));
 }
-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
@@ -89,23 +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;
 }
-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)]);
-}
 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;
 }
 //# 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,MAAmB,EACnB,EAAW,EACX,EAAW,EACX,GAAiB;IAEjB,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,MAAmB,EACnB,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/layout.json

@@ -6,6 +6,7 @@
             "Pokemon": 24,
             "ActivePokemon": 32,
             "Actions": 16,
+            "Durations": 8,
             "Summaries": 12
         },
         "offsets": {
@@ -92,12 +93,24 @@
                 "confused": 16,
                 "paralyzed": 18,
                 "duration": 20,
-                "durations": 24,
-                "move_slot": 40,
+                "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,

package/build/pkg/data/protocol.json

@@ -48,7 +48,7 @@
         "EndAbility",
         "ClearNegativeBoost",
         "FormeChange",
-        "NoTarget",
+        "LastNoTarget",
         "SwapBoost",
         "FieldStart",
         "FieldEnd",
@@ -71,6 +71,7 @@
         "ClearPositiveBoost",
         "CanDynamax",
         "SwapSideConditions",
+        "UpdatePoke",
         "Terastallize"
     ],
     "Move": [
@@ -92,7 +93,10 @@
         "None",
         "Silent",
         "Drain",
-        "Leftovers"
+        "Leftovers",
+        "Berry",
+        "BerryJuice",
+        "GoldBerry"
     ],
     "Damage": [
         "None",
@@ -106,7 +110,10 @@
         "FireSpin",
         "Clamp",
         "Whirlpool",
-        "Spikes"
+        "Spikes",
+        "Nightmare",
+        "Curse",
+        "Sandstorm"
     ],
     "Status": [
         "None",
@@ -146,6 +153,7 @@
         "Struggle",
         "Substitute",
         "Splash",
+        "Rage",
         "Attract",
         "LockOn",
         "Bind",
@@ -153,7 +161,11 @@
         "FireSpin",
         "Clamp",
         "Whirlpool",
-        "BeatUp"
+        "SubstituteBlock",
+        "DestinyBond",
+        "BeatUp",
+        "Magnitude",
+        "Spite"
     ],
     "Start": [
         "Bide",
@@ -168,16 +180,17 @@
         "TypeChange",
         "Disable",
         "Mimic",
+        "Attract",
         "Nightmare",
         "Curse",
         "Foresight",
         "Encore",
         "FutureSight",
-        "PerishSong3Silent",
-        "PerishSong3",
-        "PerishSong2",
+        "PerishSong0",
         "PerishSong1",
-        "PerishSong0"
+        "PerishSong2",
+        "PerishSong3",
+        "PerishSong3Silent"
     ],
     "End": [
         "Disable",
@@ -203,7 +216,8 @@
         "ToxicSilent",
         "LightScreenSilent",
         "ReflectSilent",
-        "BideSilent"
+        "BideSilent",
+        "LeechSeedFrom"
     ],
     "Immune": [
         "None",