@pkmn/engine 0.1.0-dev.24867658 → 0.1.0-dev.2c13d3ec

package/build.zig

@@ -1,13 +1,20 @@
 const std = @import("std");
 const builtin = @import("builtin");
 
-pub const Options = struct { showdown: ?bool = null, log: ?bool = null };
+pub const Options = struct {
+    showdown: ?bool = null,
+    log: ?bool = null,
+    chance: ?bool = null,
+    calc: ?bool = null,
+};
 
 pub fn module(b: *std.Build, options: Options) *std.Build.Module {
     const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
     const build_options = b.addOptions();
     build_options.addOption(?bool, "showdown", options.showdown);
     build_options.addOption(?bool, "log", options.log);
+    build_options.addOption(?bool, "chance", options.chance);
+    build_options.addOption(?bool, "calc", options.calc);
     return b.createModule(.{
         .source_file = .{ .path = dirname ++ "/src/lib/pkmn.zig" },
         .dependencies = &.{.{ .name = "build_options", .module = build_options.createModule() }},
@@ -31,22 +38,25 @@ pub fn build(b: *std.Build) !void {
 
     const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
 
-    var parser = std.json.Parser.init(b.allocator, false);
-    defer parser.deinit();
-    var tree = try parser.parse(@embedFile("package.json"));
-    defer tree.deinit();
-    const version = tree.root.Object.get("version").?.String;
-    const description = tree.root.Object.get("description").?.String;
-    var repository = std.mem.split(u8, tree.root.Object.get("repository").?.String, ":");
+    const json = @embedFile("package.json");
+    var parsed = try std.json.parseFromSlice(std.json.Value, b.allocator, json, .{});
+    defer parsed.deinit();
+    const version = parsed.value.object.get("version").?.string;
+    const description = parsed.value.object.get("description").?.string;
+    var repository = std.mem.split(u8, parsed.value.object.get("repository").?.string, ":");
     std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
 
     const showdown =
         b.option(bool, "showdown", "Enable Pokémon Showdown compatibility mode") orelse false;
     const log = b.option(bool, "log", "Enable protocol message logging") orelse false;
+    const chance = b.option(bool, "chance", "Enable update probability tracking") orelse false;
+    const calc = b.option(bool, "calc", "Enable damage calculator support") orelse false;
 
     const options = b.addOptions();
     options.addOption(?bool, "showdown", showdown);
     options.addOption(?bool, "log", log);
+    options.addOption(?bool, "chance", chance);
+    options.addOption(?bool, "calc", calc);
 
     const name = if (showdown) "pkmn-showdown" else "pkmn";
 
@@ -111,7 +121,7 @@ pub fn build(b: *std.Build) !void {
         const lib = b.addSharedLibrary(.{
             .name = name,
             .root_source_file = .{ .path = "src/lib/binding/c.zig" },
-            .version = try std.builtin.Version.parse(version),
+            .version = try std.SemanticVersion.parse(version),
             .optimize = optimize,
             .target = target,
         });
@@ -178,14 +188,20 @@ pub fn build(b: *std.Build) !void {
         .strip = strip,
         .cmd = cmd,
     };
+
+    // TODO: tests can be run multiple times due to @imports
     const tests = TestStep.create(b, options, config);
 
     var exes = std.ArrayList(*std.Build.CompileStep).init(b.allocator);
     const tools: ToolConfig = .{
-        .general = config,
-        .tool = .{
+        .options = .{
             .showdown = showdown,
             .log = log,
+            .chance = chance,
+            .calc = calc,
+        },
+        .general = config,
+        .tool = .{
             .tests = if (tests.build) tests else null,
             .exes = &exes,
         },
@@ -199,10 +215,11 @@ pub fn build(b: *std.Build) !void {
     var fuzz_config = tools;
     fuzz_config.general.strip = false;
     fuzz_config.tool.name = "fuzz";
-    const fuzz = tool(b, "src/test/benchmark.zig", fuzz_config);
+    const fuzz = tool(b, "src/test/fuzz.zig", fuzz_config);
 
+    const dump = tool(b, "src/tools/dump.zig", tools);
     const serde = tool(b, "src/tools/serde.zig", tools);
-    const protocol = tool(b, "src/tools/protocol.zig", tools);
+    const transitions = tool(b, "src/tools/transitions.zig", tools);
 
     const lint_exe =
         b.addExecutable(.{ .name = "lint", .root_source_file = .{ .path = "src/tools/lint.zig" } });
@@ -210,12 +227,13 @@ pub fn build(b: *std.Build) !void {
     const lint = b.addRunArtifact(lint_exe);
 
     b.step("benchmark", "Run benchmark code").dependOn(&benchmark.step);
+    b.step("dump", "Run protocol dump tool").dependOn(&dump.step);
     b.step("fuzz", "Run fuzz tester").dependOn(&fuzz.step);
     b.step("lint", "Lint source files").dependOn(&lint.step);
-    b.step("protocol", "Run protocol dump tool").dependOn(&protocol.step);
     b.step("serde", "Run serialization/deserialization tool").dependOn(&serde.step);
     b.step("test", "Run all tests").dependOn(&tests.step);
     b.step("tools", "Install tools").dependOn(&ToolsStep.create(b, &exes).step);
+    b.step("transitions", "Visualize transitions algorithm search").dependOn(&transitions.step);
 }
 
 fn maybeStrip(
@@ -290,10 +308,9 @@ const TestStep = struct {
 };
 
 const ToolConfig = struct {
+    options: Options,
     general: Config,
     tool: struct {
-        showdown: bool,
-        log: bool,
         tests: ?*TestStep,
         name: ?[]const u8 = null,
         exes: *std.ArrayList(*std.Build.CompileStep),
@@ -304,7 +321,7 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
     var name = config.tool.name orelse std.fs.path.basename(path);
     const index = std.mem.lastIndexOfScalar(u8, name, '.');
     if (index) |i| name = name[0..i];
-    if (config.tool.showdown) name = b.fmt("{s}-showdown", .{name});
+    if (config.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
 
     const exe = b.addExecutable(.{
         .name = name,
@@ -312,10 +329,8 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) *std.Build.RunStep
         .target = config.general.target,
         .optimize = config.general.optimize,
     });
-    exe.addModule("pkmn", module(b, .{
-        .showdown = config.tool.showdown,
-        .log = config.tool.log,
-    }));
+    exe.addModule("pkmn", module(b, config.options));
+
     exe.single_threaded = true;
     if (config.general.pic) exe.force_pic = config.general.pic;
     if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/engine",
-  "version": "0.1.0-dev.24867658",
+  "version": "0.1.0-dev.2c13d3ec",
   "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
   "repository": "github:pkmn/engine",
   "license": "MIT",
@@ -66,30 +66,30 @@
     "access": "public"
   },
   "dependencies": {
-    "@pkmn/data": "^0.7.38",
-    "@pkmn/protocol": "^0.6.11"
+    "@pkmn/data": "^0.7.44",
+    "@pkmn/protocol": "^0.6.12"
   },
   "devDependencies": {
-    "@pkmn/eslint-config": "^3.0.0",
-    "@pkmn/img": "^0.2.8",
+    "@pkmn/eslint-config": "^3.2.0",
+    "@pkmn/img": "^0.2.12",
     "@pkmn/sets": "^5.0.4",
-    "@pkmn/sim": "0.7.38",
+    "@pkmn/sim": "0.7.44",
     "@types/html-minifier": "^4.0.2",
-    "@types/jest": "^29.5.0",
+    "@types/jest": "^29.5.2",
     "@types/minimist": "^1.2.2",
     "@types/mustache": "^4.2.2",
-    "@types/node": "^18.15.11",
-    "@vitest/coverage-c8": "^0.30.1",
-    "binaryen": "^112.0.0",
-    "eslint": "^8.38.0",
+    "@types/node": "^20.3.1",
+    "@vitest/coverage-c8": "^0.32.2",
+    "binaryen": "^113.0.0",
+    "eslint": "^8.43.0",
     "html-minifier": "^4.0.0",
-    "json-stringify-pretty-compact": "4.0.0",
+    "json-stringify-pretty-compact": "3.0.0",
     "minimist": "^1.2.8",
     "mustache": "^4.2.0",
     "source-map-support": "^0.5.21",
     "trakr": "^0.2.0",
-    "typescript": "^5.0.4",
-    "vitest": "^0.30.1"
+    "typescript": "^5.1.3",
+    "vitest": "^0.32.2"
   },
   "scripts": {
     "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",

package/src/bin/install-pkmn-engine

@@ -10,7 +10,7 @@ const path = require('path');
 const {pipeline} = require('stream/promises');
 const tty = require('tty');
 
-const ZIG_VERSION = {major: 0, minor: 11, patch: 0, dev: 2750};
+const ZIG_VERSION = {major: 0, minor: 11, patch: 0, dev: 3859};
 const DEV = ZIG_VERSION.dev ? `-dev.${ZIG_VERSION.dev}` : '';
 const VERSION = `${ZIG_VERSION.major}.${ZIG_VERSION.minor}.${ZIG_VERSION.patch}${DEV}`;
 const INDEX = 'https://ziglang.org/download/index.json';
@@ -336,14 +336,18 @@ const downloadImportLib = async () => {
         node = true;
         if (!options) {
           const addon = require(copy);
-          if (addon.options.showdown) opts.push('-Dshowdown');
-          if (addon.options.log) opts.push('-Dlog');
+          if (addon.engine.options.showdown) opts.push('-Dshowdown');
+          if (addon.engine.options.log) opts.push('-Dlog');
+          if (addon.engine.options.chance) opts.push('-Dchance');
+          if (addon.engine.options.calc) opts.push('-Dcalc');
         }
       } else if (!options) {
         const addon = await WebAssembly.instantiate(fs.readFileSync(copy));
         const values = new Uint8Array(addon.instance.exports.memory.buffer);
         if (values[addon.instance.exports.SHOWDOWN.value]) opts.push('-Dshowdown');
         if (values[addon.instance.exports.LOG.value]) opts.push('-Dlog');
+        if (values[addon.instance.exports.CHANCE.value]) opts.push('-Dchance');
+        if (values[addon.instance.exports.CALC.value]) opts.push('-Dcalc');
       }
       const key = `${type} ${opts.sort().join(' ')}`;
       if (!configs.has(key)) configs.set(key, {type, options: opts});
@@ -354,8 +358,9 @@ const downloadImportLib = async () => {
   // either the default options or whatever was passed in
   if (!configs.size) {
     node = true;
-    configs.set('node', {type: 'node', options: options || ['-Dshowdown']});
-    configs.set('wasm', {type: 'wasm', options: options || ['-Dshowdown']});
+    const DEFAULT = ['-Dshowdown', '-Dlog', '-Dchance', '-Dcalc'];
+    configs.set('node', {type: 'node', options: options || DEFAULT});
+    configs.set('wasm', {type: 'wasm', options: options || DEFAULT});
   }
 
   const headers = node ? await downloadHeaders() : undefined;

package/src/lib/binding/node.zig

@@ -1,6 +1,8 @@
 const std = @import("std");
 const pkmn = @import("../pkmn.zig");
 
+const js = @import("../common/js.zig");
+
 const assert = std.debug.assert;
 
 const c = @cImport({
@@ -10,38 +12,49 @@ const c = @cImport({
 
 export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi_value {
     const properties = [_]c.napi_property_descriptor{
-        Property.init("options", .{ .value = options(env) }),
-        Property.init("bindings", .{ .value = bindings(env) }),
+        js.Property.init("engine", .{ .value = register(env) }),
     };
     assert(c.napi_define_properties(env, exports, properties.len, &properties) == c.napi_ok);
     return exports;
 }
 
+pub fn register(env: c.napi_env) c.napi_value {
+    var object = js.Object.init(env);
+    const properties = [_]c.napi_property_descriptor{
+        js.Property.init("options", .{ .value = options(env) }),
+        js.Property.init("bindings", .{ .value = bindings(env) }),
+    };
+    assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
+    return object;
+}
+
 fn options(env: c.napi_env) c.napi_value {
-    var object = Object.init(env);
+    var object = js.Object.init(env);
     const properties = [_]c.napi_property_descriptor{
-        Property.init("showdown", .{ .value = Boolean.init(env, pkmn.options.showdown) }),
-        Property.init("log", .{ .value = Boolean.init(env, pkmn.options.log) }),
+        js.Property.init("showdown", .{ .value = js.Boolean.init(env, pkmn.options.showdown) }),
+        js.Property.init("log", .{ .value = js.Boolean.init(env, pkmn.options.log) }),
+        js.Property.init("chance", .{ .value = js.Boolean.init(env, pkmn.options.chance) }),
+        js.Property.init("calc", .{ .value = js.Boolean.init(env, pkmn.options.calc) }),
     };
     assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
     return object;
 }
 
 fn bindings(env: c.napi_env) c.napi_value {
-    var array = Array.init(env, .{ .length = 1 });
-    Array.set(env, array, 0, bind(env, pkmn.gen1));
+    var array = js.Array.init(env, .{ .length = 1 });
+    js.Array.set(env, array, 0, bind(env, pkmn.gen1));
     return array;
 }
 
 fn bind(env: c.napi_env, gen: anytype) c.napi_value {
-    const choices_size = @intCast(u32, gen.CHOICES_SIZE);
-    const logs_size = @intCast(u32, gen.LOGS_SIZE);
-    var object = Object.init(env);
+    const choices_size: u32 = @intCast(gen.CHOICES_SIZE);
+    const logs_size: u32 = @intCast(gen.LOGS_SIZE);
+    var object = js.Object.init(env);
     const properties = [_]c.napi_property_descriptor{
-        Property.init("CHOICES_SIZE", .{ .value = Number.init(env, choices_size) }),
-        Property.init("LOGS_SIZE", .{ .value = Number.init(env, logs_size) }),
-        Property.init("update", .{ .method = update(gen) }),
-        Property.init("choices", .{ .method = choices(gen) }),
+        js.Property.init("CHOICES_SIZE", .{ .value = js.Number.init(env, choices_size) }),
+        js.Property.init("LOGS_SIZE", .{ .value = js.Number.init(env, logs_size) }),
+        js.Property.init("update", .{ .method = update(gen) }),
+        js.Property.init("choices", .{ .method = choices(gen) }),
     };
     assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
     return object;
@@ -61,28 +74,32 @@ fn update(gen: anytype) c.napi_callback {
             assert(len == @sizeOf(gen.Battle(gen.PRNG)));
             assert(data != null);
 
-            var aligned = @alignCast(@alignOf(*gen.Battle(gen.PRNG)), data.?);
-            var battle = @ptrCast(*gen.Battle(gen.PRNG), aligned);
-            const c1 = @bitCast(pkmn.Choice, Number.get(env, argv[1], u8));
-            const c2 = @bitCast(pkmn.Choice, Number.get(env, argv[2], u8));
+            var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
+            const c1: pkmn.Choice = @bitCast(js.Number.get(env, argv[1], u8));
+            const c2: pkmn.Choice = @bitCast(js.Number.get(env, argv[2], u8));
 
             var vtype: c.napi_valuetype = undefined;
             assert(c.napi_typeof(env, argv[3], &vtype) == c.napi_ok);
             const result = switch (vtype) {
-                c.napi_undefined, c.napi_null => battle.update(c1, c2, pkmn.protocol.NULL),
+                c.napi_undefined, c.napi_null => battle.update(c1, c2, &gen.NULL),
                 else => result: {
                     assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
                     assert(len == gen.LOGS_SIZE);
                     assert(data != null);
 
-                    var buf = @ptrCast([*]u8, data.?)[0..gen.LOGS_SIZE];
+                    var buf = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
                     var stream = pkmn.protocol.ByteStream{ .buffer = buf };
-                    var log = pkmn.protocol.FixedLog{ .writer = stream.writer() };
-                    break :result battle.update(c1, c2, log);
+                    // TODO: extract out
+                    var opts = pkmn.battle.options(
+                        pkmn.protocol.FixedLog{ .writer = stream.writer() },
+                        gen.chance.NULL,
+                        gen.calc.NULL,
+                    );
+                    break :result battle.update(c1, c2, &opts);
                 },
             } catch unreachable;
 
-            return Number.init(env, @bitCast(u8, result));
+            return js.Number.init(env, @as(u8, @bitCast(result)));
         }
     }.call;
 }
@@ -101,129 +118,17 @@ fn choices(gen: anytype) c.napi_callback {
             assert(len == @sizeOf(gen.Battle(gen.PRNG)));
             assert(data != null);
 
-            var aligned = @alignCast(@alignOf(*gen.Battle(gen.PRNG)), data.?);
-            var battle = @ptrCast(*gen.Battle(gen.PRNG), aligned);
-
-            const player = @intToEnum(pkmn.Player, Number.get(env, argv[1], u8));
-            const request = @intToEnum(pkmn.Choice.Type, Number.get(env, argv[2], u8));
+            var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
+            const player: pkmn.Player = @enumFromInt(js.Number.get(env, argv[1], u8));
+            const request: pkmn.Choice.Type = @enumFromInt(js.Number.get(env, argv[2], u8));
 
             assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
             assert(len == gen.CHOICES_SIZE);
             assert(data != null);
 
-            var out = @ptrCast([*]pkmn.Choice, data.?)[0..gen.CHOICES_SIZE];
+            var out = @as([*]pkmn.Choice, @ptrCast(data.?))[0..gen.CHOICES_SIZE];
             const n = battle.choices(player, request, out);
-            return Number.init(env, @bitCast(u8, n));
+            return js.Number.init(env, @as(u8, @bitCast(n)));
         }
     }.call;
 }
-
-const Array = struct {
-    fn init(env: c.napi_env, o: struct { length: ?usize }) c.napi_value {
-        var result: c.napi_value = undefined;
-        assert(c.napi_ok == if (o.length) |n|
-            c.napi_create_array_with_length(env, n, &result)
-        else
-            c.napi_create_array(env, &result));
-        return result;
-    }
-
-    fn set(env: c.napi_env, array: c.napi_value, index: u32, value: c.napi_value) void {
-        assert(c.napi_set_element(env, array, index, value) == c.napi_ok);
-    }
-};
-
-const Boolean = struct {
-    fn init(env: c.napi_env, value: bool) c.napi_value {
-        var result: c.napi_value = undefined;
-        assert(c.napi_get_boolean(env, value, &result) == c.napi_ok);
-        return result;
-    }
-};
-
-const Number = struct {
-    fn init(env: c.napi_env, value: anytype) c.napi_value {
-        const T = @TypeOf(value);
-        var result: c.napi_value = undefined;
-        assert(c.napi_ok == switch (@typeInfo(T)) {
-            .Int => |info| switch (info.bits) {
-                0...32 => switch (info.signedness) {
-                    .signed => c.napi_create_int32(env, @as(i32, value), &result),
-                    .unsigned => c.napi_create_uint32(env, @as(u32, value), &result),
-                },
-                33...52 => c.napi_create_int64(env, @as(i64, value), &result),
-                else => @compileError("int can't be represented as JS number"),
-            },
-            else => @compileError("expected number, got: " ++ @typeName(T)),
-        });
-        return result;
-    }
-
-    fn get(env: c.napi_env, value: c.napi_value, comptime T: type) T {
-        switch (@typeInfo(T)) {
-            .Int => |info| switch (info.bits) {
-                0...32 => switch (info.signedness) {
-                    .signed => {
-                        var result: i32 = undefined;
-                        assert(c.napi_get_value_int32(env, value, &result) == c.napi_ok);
-                        return if (info.bits == 32) result else @intCast(T, result);
-                    },
-                    .unsigned => {
-                        var result: u32 = undefined;
-                        assert(c.napi_get_value_uint32(env, value, &result) == c.napi_ok);
-                        return if (info.bits == 32) result else @intCast(T, result);
-                    },
-                },
-                33...63 => {
-                    var result: i64 = undefined;
-                    assert(c.napi_get_value_int64(env, value, &result) == c.napi_ok);
-                    return @intCast(T, result);
-                },
-                else => {
-                    var result: i64 = undefined;
-                    assert(c.napi_get_value_int64(env, value, &result) == c.napi_ok);
-                    return switch (info.signedness) {
-                        .signed => @as(T, value),
-                        .unsigned => if (0 <= value) @intCast(T, value) else unreachable,
-                    };
-                },
-            },
-            else => @compileError("expected number, got: " ++ @typeName(T)),
-        }
-    }
-};
-
-const Object = struct {
-    fn init(env: c.napi_env) c.napi_value {
-        var result: c.napi_value = undefined;
-        assert(c.napi_create_object(env, &result) == c.napi_ok);
-        return result;
-    }
-};
-
-const Property = union(enum) {
-    method: c.napi_callback,
-    value: c.napi_value,
-
-    fn init(comptime name: [:0]const u8, property: Property) c.napi_property_descriptor {
-        return .{
-            .utf8name = name,
-            .name = null,
-            .method = switch (property) {
-                .method => |m| m,
-                .value => null,
-            },
-            .getter = null,
-            .setter = null,
-            .value = switch (property) {
-                .method => null,
-                .value => |v| v,
-            },
-            .attributes = switch (property) {
-                .method => c.napi_default,
-                .value => c.napi_enumerable,
-            },
-            .data = null,
-        };
-    }
-};

package/src/lib/binding/wasm.zig

@@ -3,8 +3,10 @@ const pkmn = @import("../pkmn.zig");
 
 export const SHOWDOWN = pkmn.options.showdown;
 export const LOG = pkmn.options.log;
+export const CHANCE = pkmn.options.chance;
+export const CALC = pkmn.options.calc;
 
 export const GEN1_CHOICES_SIZE =
-    std.math.ceilPowerOfTwo(u32, @intCast(u32, pkmn.gen1.CHOICES_SIZE)) catch unreachable;
+    std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(pkmn.gen1.CHOICES_SIZE))) catch unreachable;
 export const GEN1_LOGS_SIZE =
-    std.math.ceilPowerOfTwo(u32, @intCast(u32, pkmn.gen1.LOGS_SIZE)) catch unreachable;
+    std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(pkmn.gen1.LOGS_SIZE))) catch unreachable;

package/src/lib/common/data.zig

@@ -10,7 +10,7 @@ pub const Player = enum(u1) {
 
     /// Returns a player's opponent.
     pub inline fn foe(self: Player) Player {
-        return @intToEnum(Player, ~@enumToInt(self));
+        return @enumFromInt(~@intFromEnum(self));
     }
 
     /// Return's an identifier for the player's Pokémon at the one-indexed `id`.
@@ -22,8 +22,8 @@ pub const Player = enum(u1) {
 
 test Player {
     try expectEqual(Player.P2, Player.P1.foe());
-    try expectEqual(@as(u8, 0b0001), @bitCast(u8, Player.P1.ident(1)));
-    try expectEqual(@as(u8, 0b1101), @bitCast(u8, Player.P2.ident(5)));
+    try expectEqual(@as(u8, 0b0001), @as(u8, @bitCast(Player.P1.ident(1))));
+    try expectEqual(@as(u8, 0b1101), @as(u8, @bitCast(Player.P2.ident(5))));
 }
 
 /// An identifier for a specific Pokémon in battle.
@@ -40,18 +40,18 @@ pub const ID = packed struct {
 
     /// Converts the identifier into a number.
     pub inline fn int(self: ID) u4 {
-        return @intCast(u4, @bitCast(u8, self));
+        return @intCast(@as(u8, @bitCast(self)));
     }
 
     /// Decodes the identifier from a number.
     pub inline fn from(id: u4) ID {
-        return @bitCast(ID, @as(u8, id));
+        return @bitCast(@as(u8, id));
     }
 };
 
 test ID {
-    try expectEqual(@as(u8, 0b0001), @bitCast(u8, ID{ .player = .P1, .id = 1 }));
-    try expectEqual(@as(u8, 0b1101), @bitCast(u8, ID{ .player = .P2, .id = 5 }));
+    try expectEqual(@as(u8, 0b0001), @as(u8, @bitCast(ID{ .player = .P1, .id = 1 })));
+    try expectEqual(@as(u8, 0b1101), @as(u8, @bitCast(ID{ .player = .P2, .id = 5 })));
     const id = ID{ .player = .P2, .id = 4 };
     try expectEqual(id, ID.from(id.int()));
 }
@@ -84,8 +84,8 @@ test Choice {
     const p2: Choice = .{ .type = .Switch, .data = 5 };
     try expectEqual(5, p2.data);
     try expectEqual(Choice.Type.Move, p1.type);
-    try expectEqual(0b0001_0001, @bitCast(u8, p1));
-    try expectEqual(0b0001_0110, @bitCast(u8, p2));
+    try expectEqual(0b0001_0001, @as(u8, @bitCast(p1)));
+    try expectEqual(0b0001_0110, @as(u8, @bitCast(p2)));
 }
 
 /// The result of the battle - all results other than 'None' should be considered terminal.
@@ -124,6 +124,6 @@ pub const Result = packed struct {
 };
 
 test Result {
-    try expectEqual(0b0101_0000, @bitCast(u8, Result.Default));
-    try expectEqual(0b1000_0000, @bitCast(u8, Result{ .p2 = .Switch }));
+    try expectEqual(0b0101_0000, @as(u8, @bitCast(Result.Default)));
+    try expectEqual(0b1000_0000, @as(u8, @bitCast(Result{ .p2 = .Switch })));
 }

package/src/lib/common/debug.zig

@@ -10,18 +10,27 @@ pub fn print(value: anytype) void {
 
     nosuspend {
         stderr.writeAll("\x1b[41m") catch return;
-        switch (@typeInfo(@TypeOf(value))) {
-            .Struct => |info| {
-                if (info.is_tuple) {
-                    inline for (info.fields, 0..) |f, i| {
-                        inspect(@field(value, f.name));
-                        if (i < info.fields.len - 1) stderr.writeAll(" ") catch return;
+        if (@TypeOf(@src()) == @TypeOf(value)) {
+            stderr.print("{s} ({s}:{d}:{d})", .{
+                value.fn_name,
+                value.file,
+                value.line,
+                value.column,
+            }) catch return;
+        } else {
+            switch (@typeInfo(@TypeOf(value))) {
+                .Struct => |info| {
+                    if (info.is_tuple) {
+                        inline for (info.fields, 0..) |f, i| {
+                            inspect(@field(value, f.name));
+                            if (i < info.fields.len - 1) stderr.writeAll(" ") catch return;
+                        }
+                    } else {
+                        inspect(value);
                     }
-                } else {
-                    inspect(value);
-                }
-            },
-            else => inspect(value),
+                },
+                else => inspect(value),
+            }
         }
         stderr.writeAll("\x1b[K\x1b[0m\n") catch return;
     }

package/src/lib/common/options.zig

@@ -1,11 +1,15 @@
 const build_options = @import("build_options");
 const root = @import("root");
 
+/// Configures the behavior of the pkmn package.
 pub const Options = struct {
     showdown: ?bool = null,
     log: ?bool = null,
+    chance: ?bool = null,
+    calc: ?bool = null,
     advance: ?bool = null,
     ebc: ?bool = null,
+    key: ?bool = null,
     internal: ?bool = null,
 };
 
@@ -13,9 +17,14 @@ pub const Options = struct {
 pub const showdown = get("showdown", false);
 /// Whether or not protocol message logging is enabled.
 pub const log = get("log", false);
+/// Whether or not update probability tracking is enabled.
+pub const chance = get("chance", false);
+/// Whether or not damage calculator support is enabled.
+pub const calc = get("calc", false);
 
 pub const advance = get("advance", true);
 pub const ebc = get("ebc", true);
+pub const key = get("key", false);
 pub const internal = get("internal", false);
 
 fn get(comptime name: []const u8, default: bool) bool {