@pkmn/engine 0.1.0-dev.c4f94762 → 0.1.0-dev.c4ffaf39

package/build.zig

@@ -1,26 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
 
-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() }},
-    });
-}
-
 pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
@@ -32,8 +12,8 @@ pub fn build(b: *std.Build) !void {
     const wasm_stack_size =
         b.option(u64, "wasm-stack-size", "The size of WASM stack") orelse std.wasm.page_size;
     const dynamic = b.option(bool, "dynamic", "Build a dynamic library") orelse false;
-    const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse false;
-    const pic = b.option(bool, "pic", "Force position independent code") orelse false;
+    const strip = b.option(bool, "strip", "Strip debugging symbols from binary");
+    const pic = b.option(bool, "pic", "Force position independent code");
     const emit_asm = b.option(bool, "emit-asm", "Output .s (assembly code)") orelse false;
     const emit_ll = b.option(bool, "emit-ll", "Output .ll (LLVM IR)") orelse false;
 
@@ -44,7 +24,7 @@ pub fn build(b: *std.Build) !void {
     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, ":");
+    var repository = std.mem.splitSequence(u8, parsed.value.object.get("repository").?.string, ":");
     std.debug.assert(std.mem.eql(u8, repository.first(), "github"));
 
     const showdown =
@@ -61,30 +41,37 @@ pub fn build(b: *std.Build) !void {
 
     const name = if (showdown) "pkmn-showdown" else "pkmn";
 
+    const module = b.addModule("pkmn", .{
+        .root_source_file = b.path("src/lib/pkmn.zig"),
+        .optimize = optimize,
+        .target = target,
+        .imports = &.{.{ .name = "build_options", .module = options.createModule() }},
+    });
+
     var c = false;
     if (node_headers) |headers| {
         const addon = b.fmt("{s}.node", .{name});
         const lib = b.addSharedLibrary(.{
             .name = addon,
-            .main_pkg_path = .{ .path = "." },
-            .root_source_file = .{ .path = "src/lib/binding/node.zig" },
+            .root_source_file = b.path("src/lib/node.zig"),
             .optimize = optimize,
             .target = target,
+            .strip = strip,
+            .pic = pic,
         });
-        lib.addOptions("build_options", options);
-        lib.addSystemIncludePath(.{ .path = headers });
+        lib.root_module.addOptions("build_options", options);
+        lib.addSystemIncludePath(b.path(headers));
         lib.linkLibC();
         if (node_import_lib) |il| {
-            lib.addObjectFile(.{ .path = il });
-        } else if ((try std.zig.system.NativeTargetInfo.detect(target)).target.os.tag == .windows) {
+            lib.addObjectFile(b.path(il));
+        } else if (target.result.os.tag == .windows) {
             try std.io.getStdErr().writeAll("Must provide --node-import-library path on Windows\n");
             std.process.exit(1);
         }
         lib.linker_allow_shlib_undefined = true;
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
-        if (pic) lib.force_pic = pic;
         // Always emit to build/lib because this is where the driver code expects to find it
-        // TODO(ziglang/zig#2231): using the following used to work (though was hacky):
+        // TODO: ziglang/zig#2231 - using the following used to work (though was hacky):
         //
         //    lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
         //    b.getInstallStep().dependOn(&lib.step);
@@ -95,16 +82,17 @@ pub fn build(b: *std.Build) !void {
     } else if (wasm) {
         const exe = b.addExecutable(.{
             .name = name,
-            .main_pkg_path = .{ .path = "." },
-            .root_source_file = .{ .path = "src/lib/binding/wasm.zig" },
+            .root_source_file = b.path("src/lib/wasm.zig"),
             .optimize = switch (optimize) {
                 .ReleaseFast, .ReleaseSafe => .ReleaseSmall,
                 else => optimize,
             },
-            .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding },
+            .target = b.resolveTargetQuery(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }),
+            .strip = strip,
+            .pic = pic,
         });
-        exe.addOptions("build_options", options);
-        exe.export_symbol_names = &[_][]const u8{
+        exe.root_module.addOptions("build_options", options);
+        exe.root_module.export_symbol_names = &[_][]const u8{
             "SHOWDOWN",
             "LOG",
             "CHANCE",
@@ -114,15 +102,13 @@ pub fn build(b: *std.Build) !void {
         };
         exe.entry = .disabled;
         exe.stack_size = wasm_stack_size;
-        exe.strip = strip;
-        if (pic) exe.force_pic = pic;
         const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
         if (optimize != .Debug and opt != null) {
             const out = b.fmt("build/lib/{s}.wasm", .{name});
             const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
             sh.addArtifactArg(exe);
             sh.addArg("-o");
-            sh.addFileSourceArg(.{ .path = out });
+            sh.addFileArg(b.path(out));
             b.getInstallStep().dependOn(&sh.step);
         } else {
             b.getInstallStep().dependOn(&b.addInstallArtifact(exe, .{
@@ -132,31 +118,31 @@ pub fn build(b: *std.Build) !void {
     } else if (dynamic) {
         const lib = b.addSharedLibrary(.{
             .name = name,
-            .main_pkg_path = .{ .path = "." },
-            .root_source_file = .{ .path = "src/lib/binding/c.zig" },
+            .root_source_file = b.path("src/lib/c.zig"),
             .version = try std.SemanticVersion.parse(version),
             .optimize = optimize,
             .target = target,
+            .strip = strip,
+            .pic = pic,
         });
-        lib.addOptions("build_options", options);
-        lib.addIncludePath(.{ .path = "src/include" });
+        lib.root_module.addOptions("build_options", options);
+        lib.addIncludePath(b.path("src/include"));
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
-        if (pic) lib.force_pic = pic;
         b.installArtifact(lib);
         c = true;
     } else {
         const lib = b.addStaticLibrary(.{
             .name = name,
-            .main_pkg_path = .{ .path = "." },
-            .root_source_file = .{ .path = "src/lib/binding/c.zig" },
+            .root_source_file = b.path("src/lib/c.zig"),
             .optimize = optimize,
             .target = target,
+            .strip = strip,
+            .pic = pic,
         });
-        lib.addOptions("build_options", options);
-        lib.addIncludePath(.{ .path = "src/include" });
+        lib.root_module.addOptions("build_options", options);
+        lib.addIncludePath(b.path("src/include"));
         lib.bundle_compiler_rt = true;
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
-        if (pic) lib.force_pic = pic;
         if (emit_asm) {
             b.getInstallStep().dependOn(&b.addInstallFileWithDir(
                 lib.getEmittedAsm(),
@@ -177,14 +163,18 @@ pub fn build(b: *std.Build) !void {
 
     if (c) {
         const header = b.addInstallFileWithDir(
-            .{ .path = "src/include/pkmn.h" },
+            b.path("src/include/pkmn.h"),
             .header,
             "pkmn.h",
         );
         b.getInstallStep().dependOn(&header.step);
 
         const pc = b.fmt("lib{s}.pc", .{name});
-        const file = try b.cache_root.join(b.allocator, &.{pc});
+        const file = try std.fs.path.relative(
+            b.allocator,
+            try std.process.getCwdAlloc(b.allocator),
+            try b.cache_root.join(b.allocator, &.{pc}),
+        );
         const pkgconfig_file = try std.fs.cwd().createFile(file, .{});
 
         const dirname = comptime std.fs.path.dirname(@src().file) orelse ".";
@@ -217,14 +207,10 @@ pub fn build(b: *std.Build) !void {
     // 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);
+    var exes = std.ArrayList(*std.Build.Step.Compile).init(b.allocator);
     const tools: ToolConfig = .{
-        .options = .{
-            .showdown = showdown,
-            .log = log,
-            .chance = chance,
-            .calc = calc,
-        },
+        .showdown = showdown,
+        .module = module,
         .general = config,
         .tool = .{
             .tests = if (tests.build) tests else null,
@@ -265,13 +251,12 @@ pub fn build(b: *std.Build) !void {
 
 fn maybeStrip(
     b: *std.Build,
-    artifact: *std.Build.CompileStep,
+    artifact: *std.Build.Step.Compile,
     step: *std.Build.Step,
-    strip: bool,
+    strip: ?bool,
     cmd: ?[]const u8,
 ) void {
-    artifact.strip = strip;
-    if (!strip or cmd == null) return;
+    if (!(strip orelse false) or cmd == null) return;
     // Using `strip -r -u` for dynamic libraries is supposed to work on macOS but doesn't...
     const mac = builtin.os.tag == .macos;
     if (mac and artifact.isDynamicLibrary()) return;
@@ -283,10 +268,10 @@ fn maybeStrip(
 }
 
 const Config = struct {
-    target: std.zig.CrossTarget,
+    target: std.Build.ResolvedTarget,
     optimize: std.builtin.OptimizeMode,
-    pic: bool,
-    strip: bool,
+    pic: ?bool,
+    strip: ?bool,
     cmd: ?[]const u8,
 };
 
@@ -294,9 +279,8 @@ const TestStep = struct {
     step: std.Build.Step,
     build: bool,
 
-    pub fn create(b: *std.Build, options: *std.Build.OptionsStep, config: Config) *TestStep {
+    pub fn create(b: *std.Build, options: *std.Build.Step.Options, config: Config) *TestStep {
         const coverage = b.option([]const u8, "test-coverage", "Generate test coverage");
-        const test_file = b.option([]const u8, "test-file", "Input file for test");
         const test_filter =
             b.option([]const u8, "test-filter", "Skip tests that do not match filter");
 
@@ -304,22 +288,17 @@ const TestStep = struct {
         const step = std.Build.Step.init(.{ .id = .custom, .name = "Run all tests", .owner = b });
         self.* = .{ .step = step, .build = test_filter == null };
 
-        const path = test_file orelse "src/lib/test.zig";
         const tests = b.addTest(.{
-            .name = b.fmt("{s}-{s}", .{
-                std.fs.path.basename(std.fs.path.dirname(path).?),
-                std.fs.path.stem(std.fs.path.basename(path)),
-            }),
-            .main_pkg_path = .{ .path = "." },
-            .root_source_file = .{ .path = path },
+            .root_source_file = b.path("src/lib/test.zig"),
             .optimize = config.optimize,
             .target = config.target,
             .filter = test_filter,
+            .single_threaded = true,
+            .strip = config.strip,
+            .pic = config.pic,
         });
-        tests.addOptions("build_options", options);
-        tests.single_threaded = true;
+        tests.root_module.addOptions("build_options", options);
         maybeStrip(b, tests, &tests.step, config.strip, config.cmd);
-        if (config.pic) tests.force_pic = config.pic;
         if (coverage) |c| {
             tests.setExecCmd(&.{ "kcov", "--include-pattern=src/lib", c, null });
         }
@@ -330,16 +309,17 @@ const TestStep = struct {
 };
 
 const ToolConfig = struct {
-    options: Options,
+    showdown: ?bool,
+    module: *std.Build.Module,
     general: Config,
     tool: struct {
         tests: ?*TestStep,
         name: ?[]const u8 = null,
-        exes: *std.ArrayList(*std.Build.CompileStep),
+        exes: *std.ArrayList(*std.Build.Step.Compile),
     },
 };
 
-fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.RunStep {
+fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.Step.Run {
     std.fs.cwd().access(path, .{}) catch |err| switch (err) {
         error.FileNotFound => return null,
         else => |e| return e,
@@ -347,18 +327,19 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.RunSte
     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.options.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
+    if (config.showdown orelse false) name = b.fmt("{s}-showdown", .{name});
 
     const exe = b.addExecutable(.{
         .name = name,
-        .root_source_file = .{ .path = path },
+        .root_source_file = b.path(path),
         .target = config.general.target,
         .optimize = config.general.optimize,
+        .single_threaded = true,
+        .strip = config.general.strip,
+        .pic = config.general.pic,
     });
-    exe.addModule("pkmn", module(b, config.options));
+    exe.root_module.addImport("pkmn", config.module);
 
-    exe.single_threaded = true;
-    if (config.general.pic) exe.force_pic = config.general.pic;
     if (config.tool.tests) |ts| ts.step.dependOn(&exe.step);
     config.tool.exes.append(exe) catch @panic("OOM");
 
@@ -372,7 +353,7 @@ fn tool(b: *std.Build, path: []const u8, config: ToolConfig) !?*std.Build.RunSte
 const ToolsStep = struct {
     step: std.Build.Step,
 
-    pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.CompileStep)) *ToolsStep {
+    pub fn create(b: *std.Build, exes: *std.ArrayList(*std.Build.Step.Compile)) *ToolsStep {
         const self = b.allocator.create(ToolsStep) catch @panic("OOM");
         const step = std.Build.Step.init(.{ .id = .custom, .name = "Install tools", .owner = b });
         self.* = .{ .step = step };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/engine",
-  "version": "0.1.0-dev.c4f94762",
+  "version": "0.1.0-dev.c4ffaf39",
   "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
   "repository": "github:pkmn/engine",
   "license": "MIT",
@@ -31,9 +31,6 @@
     "build/test/display.js",
     "build/tools/debug.js.map",
     "build/tools/debug.js",
-    "src/bin/install-pkmn-engine",
-    "src/lib/binding/node.zig",
-    "src/lib/binding/wasm.zig",
     "src/lib/common/battle.zig",
     "src/lib/common/data.zig",
     "src/lib/common/debug.zig",
@@ -62,7 +59,9 @@
     "src/lib/gen2/generated.zig",
     "src/lib/gen2/helpers.zig",
     "src/lib/gen2/mechanics.zig",
+    "src/lib/node.zig",
     "src/lib/pkmn.zig",
+    "src/lib/wasm.zig",
     "src/test/display/pkmn.html.tmpl"
   ],
   "engines": {
@@ -76,31 +75,31 @@
     "access": "public"
   },
   "dependencies": {
-    "@pkmn/data": "^0.8.1",
-    "@pkmn/protocol": "^0.6.17"
+    "@pkmn/data": "^0.9.9",
+    "@pkmn/protocol": "^0.6.25"
   },
   "devDependencies": {
-    "@pkmn/eslint-config": "^6.4.0",
-    "@pkmn/img": "^0.2.20",
-    "@pkmn/sets": "^5.1.0",
-    "@pkmn/sim": "0.8.1",
+    "@pkmn/eslint-config": "^7.5.0",
+    "@pkmn/img": "^0.2.30",
+    "@pkmn/sets": "^5.1.2",
+    "@pkmn/sim": "0.9.9",
     "@types/html-minifier": "^4.0.5",
-    "@types/jest": "^29.5.11",
+    "@types/jest": "^29.5.12",
     "@types/minimist": "^1.2.5",
     "@types/mustache": "^4.2.5",
-    "@types/node": "^20.10.5",
-    "@vitest/coverage-v8": "^1.0.4",
-    "binaryen": "^116.0.0",
-    "eslint": "^8.56.0",
+    "@types/node": "^20.14.10",
+    "@vitest/coverage-v8": "^2.0.2",
+    "binaryen": "^118.0.0",
+    "eslint": "<=8",
     "html-minifier": "^4.0.0",
-    "json-stringify-pretty-compact": "3.0.0",
+    "json-stringify-pretty-compact": "4.0.0",
     "minimist": "^1.2.8",
     "mustache": "^4.2.0",
     "source-map-support": "^0.5.21",
-    "table": "^6.8.1",
+    "table": "^6.8.2",
     "trakr": "^0.2.0",
-    "typescript": "^5.3.3",
-    "vitest": "^1.0.4"
+    "typescript": "^5.5.3",
+    "vitest": "^2.0.2"
   },
   "scripts": {
     "lint": "eslint --cache src --ext ts,js && eslint src/bin/*",
@@ -142,6 +141,14 @@
           ]
         }
       },
+      {
+        "files": [
+          "src/test/display.ts"
+        ],
+        "rules": {
+          "@typescript-eslint/no-unnecessary-type-assertion": "off"
+        }
+      },
       {
         "files": [
           "src/pkg/index.ts",

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: 12, patch: 0, dev: 1396};
+const ZIG_VERSION = {major: 0, minor: 13, patch: 0};
 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';
@@ -370,8 +370,10 @@ const downloadImportLib = async () => {
     const args = ['build', '-p', 'build', ...opts];
     if (!process.env.DEBUG_PKMN_ENGINE) args.push('-Doptimize=ReleaseFast', '-Dstrip');
     if (config.type === 'node') {
-      args.push(`-Dnode-headers=${headers}`);
-      if (process.platform === 'win32') args.push(`-Dnode-import-library=${lib}`);
+      args.push(`-Dnode-headers=${path.relative(ROOT, headers)}`);
+      if (process.platform === 'win32') {
+        args.push(`-Dnode-import-library=${path.relative(ROOT, lib)}`);
+      }
     } else {
       args.push('-Dwasm');
     }
@@ -386,8 +388,14 @@ const downloadImportLib = async () => {
       const prefix = process.platform === 'win32' ? '' : 'lib';
       const ext = process.platform === 'darwin'
         ? 'dylib' : process.platform === 'win32' ? 'dll' : 'so';
-      const actual = path.join('build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
-      fs.renameSync(path.join(ROOT, actual), path.join(ROOT, artifact));
+      try {
+        const actual = path.join('build', 'lib', `${prefix}pkmn${suffix}.node.${ext}`);
+        fs.renameSync(actual, artifact);
+      } catch (err) {
+        // ziglang/zig#19743 changed this path
+        const actual = path.join('build', 'bin', `${prefix}pkmn${suffix}.node.${ext}`);
+        fs.renameSync(actual, artifact);
+      }
     }
   }
 })().catch(e => {

package/src/lib/common/data.zig

@@ -22,8 +22,8 @@ pub const Player = enum(u1) {
 
 test Player {
     try expectEqual(Player.P2, Player.P1.foe());
-    try expectEqual(@as(u8, 0b0001), @as(u8, @bitCast(Player.P1.ident(1))));
-    try expectEqual(@as(u8, 0b1101), @as(u8, @bitCast(Player.P2.ident(5))));
+    try expectEqual(0b0001, @as(u8, @bitCast(Player.P1.ident(1))));
+    try expectEqual(0b1101, @as(u8, @bitCast(Player.P2.ident(5))));
 }
 
 /// An identifier for a specific Pokémon in battle.
@@ -46,8 +46,8 @@ pub const ID = packed struct(u8) {
 };
 
 test ID {
-    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 })));
+    try expectEqual(0b0001, @as(u8, @bitCast(ID{ .player = .P1, .id = 1 })));
+    try expectEqual(0b1101, @as(u8, @bitCast(ID{ .player = .P2, .id = 5 })));
     const id: ID = .{ .player = .P2, .id = 4 };
     try expectEqual(id, ID.from(id.int()));
 }

package/src/lib/common/debug.zig

@@ -4,8 +4,8 @@ const debug = std.debug;
 const io = std.io;
 
 pub fn print(value: anytype) void {
-    debug.getStderrMutex().lock();
-    defer debug.getStderrMutex().unlock();
+    debug.lockStdErr();
+    defer debug.unlockStdErr();
     const stderr = io.getStdErr().writer();
 
     nosuspend {

package/src/lib/common/optional.zig

@@ -46,7 +46,7 @@ test Optional {
     try expect(b != .true);
     try expect(b != .false);
 
-    const Player = @import("./data.zig").Player;
+    const Player = @import("data.zig").Player;
     try expect(@bitSizeOf(Optional(Player)) == 2);
 
     const p: Optional(Player) = .P2;

package/src/lib/common/options.zig

@@ -10,6 +10,7 @@ pub const Options = struct {
     advance: ?bool = null,
     ebc: ?bool = null,
     key: ?bool = null,
+    miss: ?bool = null,
     internal: ?bool = null,
 };
 
@@ -25,6 +26,7 @@ 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 miss = get("miss", true);
 pub const internal = get("internal", false);
 
 fn get(comptime name: []const u8, default: bool) bool {

package/src/lib/common/protocol.zig

@@ -3,8 +3,8 @@ const builtin = @import("builtin");
 
 const pkmn = @import("../pkmn.zig");
 
-const data = @import("./data.zig");
-const options = @import("./options.zig");
+const data = @import("data.zig");
+const options = @import("options.zig");
 
 const assert = std.debug.assert;
 const print = std.debug.print;
@@ -220,6 +220,7 @@ pub const Activate = enum(u8) {
     BeatUp, // FIXME of
 
     Magnitude,
+    Spite,
 };
 
 pub const Start = enum(u8) {
@@ -544,6 +545,7 @@ pub fn Log(comptime Writer: type) type {
         // ident: ID, reason: Activate
         // ident: ID, reason: .SubstituteBlock, m: <Move>
         // ident: ID, reason: .Magnitude, num: u8
+        // ident: ID, reason: .Spite, m: <Move>, num: u8
         pub fn activate(self: Self, args: anytype) Error!void {
             if (!enabled) return;
 
@@ -561,6 +563,9 @@ pub fn Log(comptime Writer: type) type {
                     assert(reason == .Magnitude);
                     try self.writer.writeByte(args[2]);
                 }
+            } else if (args.len == 4) {
+                assert(reason == .Spite);
+                try self.writer.writeAll(&.{ @intFromEnum(args[2]), args[3] });
             }
         }
 
@@ -1202,14 +1207,11 @@ pub fn expectLog(
 ) !void {
     if (!enabled) return;
 
-    const color = color: {
-        if (std.process.hasEnvVarConstant("ZIG_DEBUG_COLOR")) {
-            break :color true;
-        } else if (std.process.hasEnvVarConstant("NO_COLOR")) {
-            break :color false;
-        } else {
-            break :color std.io.getStdErr().supportsAnsiEscapeCodes();
-        }
+    const color = if (std.process.hasEnvVarConstant("ZIG_DEBUG_COLOR"))
+        true
+    else switch (std.io.tty.detectConfig(std.io.getStdErr())) {
+        .escape_codes => true,
+        else => false,
     };
 
     expectEqualBytes(expected, actual, offset) catch |err| switch (err) {
@@ -1248,20 +1250,13 @@ fn N(e: anytype) u8 {
 const p1 = Player.P1;
 const p2 = Player.P2;
 
-const gen1 = struct {
-    pub usingnamespace @import("../gen1/data.zig");
-    pub const helpers = @import("../gen1/helpers.zig");
-};
-
-const gen2 = struct {
-    pub usingnamespace @import("../gen2/data.zig");
-    pub const helpers = @import("../gen2/helpers.zig");
-};
-
 var buf: [pkmn.LOGS_SIZE]u8 = undefined;
 var stream: ByteStream = .{ .buffer = &buf };
 var log: FixedLog = .{ .writer = stream.writer() };
 
+const gen1 = pkmn.gen1;
+const gen2 = pkmn.gen2;
+
 const M1 = gen1.Move;
 const S1 = gen1.Species;
 

package/src/lib/common/rng.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 
-const options = @import("./options.zig");
+const options = @import("options.zig");
 
 const assert = std.debug.assert;
 const expectEqual = std.testing.expectEqual;
@@ -66,11 +66,15 @@ pub const PSRNG = extern struct {
             (@as(u64, self.range(u16, 0, 0x10000)) << 16) |
             (@as(u64, self.range(u16, 0, 0x10000)));
     }
+
+    pub fn Bound(comptime T: type) type {
+        return std.math.IntFittingRange(0, std.math.maxInt(T) + 1);
+    }
 };
 
 test PSRNG {
     var psrng: PSRNG = .{ .src = .{ .seed = 0x0001000200030004 } };
-    try expectEqual(@as(u8, 121), psrng.range(u8, 0, 256));
+    try expectEqual(121, psrng.range(u8, 0, 256));
     try expectEqual(false, psrng.chance(u8, 128, 256)); // 226 < 128
 }
 
@@ -107,9 +111,9 @@ test Gen12 {
         try expectEqual(e, rng.next());
     }
 
-    try expectEqual(@as(u8, 16), Gen12.percent(6) + 1);
-    try expectEqual(@as(u8, 16), Gen12.percent(7) - 1);
-    try expectEqual(@as(u8, 128), Gen12.percent(50) + 1);
+    try expectEqual(16, Gen12.percent(6) + 1);
+    try expectEqual(16, Gen12.percent(7) - 1);
+    try expectEqual(128, Gen12.percent(50) + 1);
 }
 
 // https://pkmn.cc/pokeemerald/src/random.c
@@ -197,7 +201,7 @@ pub fn FixedRNG(comptime gen: comptime_int, comptime len: usize) type {
             for (0..n) |_| _ = self.next();
         }
 
-        pub fn range(self: *Self, comptime T: type, from: T, to: Bound(T)) T {
+        pub fn range(self: *Self, comptime T: type, from: T, to: PSRNG.Bound(T)) T {
             assert(showdown);
             return @intCast(@as(u64, self.next()) * (to - from) / divisor + from);
         }
@@ -206,7 +210,7 @@ pub fn FixedRNG(comptime gen: comptime_int, comptime len: usize) type {
             self: *Self,
             comptime T: type,
             numerator: T,
-            denominator: Bound(T),
+            denominator: PSRNG.Bound(T),
         ) bool {
             assert(showdown);
             assert(denominator > 0);
@@ -237,7 +241,3 @@ fn Output(comptime gen: comptime_int) type {
         else => unreachable,
     };
 }
-
-fn Bound(comptime T: type) type {
-    return std.math.IntFittingRange(0, std.math.maxInt(T) + 1);
-}