@pkmn/engine 0.1.0-dev.84cc1a02 → 0.1.0-dev.942dbfa4

package/src/lib/binding/node.zig

@@ -21,7 +21,7 @@ fn options(env: c.napi_env) c.napi_value {
     var object = Object.init(env);
     const properties = [_]c.napi_property_descriptor{
         Property.init("showdown", .{ .value = Boolean.init(env, pkmn.options.showdown) }),
-        Property.init("trace", .{ .value = Boolean.init(env, pkmn.options.trace) }),
+        Property.init("log", .{ .value = Boolean.init(env, pkmn.options.log) }),
     };
     assert(c.napi_define_properties(env, object, properties.len, &properties) == c.napi_ok);
     return object;
@@ -34,11 +34,11 @@ fn bindings(env: c.napi_env) c.napi_value {
 }
 
 fn bind(env: c.napi_env, gen: anytype) c.napi_value {
-    const options_size = @intCast(u32, gen.OPTIONS_SIZE);
+    const choices_size = @intCast(u32, gen.CHOICES_SIZE);
     const logs_size = @intCast(u32, gen.LOGS_SIZE);
     var object = Object.init(env);
     const properties = [_]c.napi_property_descriptor{
-        Property.init("OPTIONS_SIZE", .{ .value = Number.init(env, options_size) }),
+        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) }),
@@ -104,14 +104,14 @@ fn choices(gen: anytype) c.napi_callback {
             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));
+            const player = @enumFromInt(pkmn.Player, Number.get(env, argv[1], u8));
+            const request = @enumFromInt(pkmn.Choice.Type, Number.get(env, argv[2], u8));
 
             assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
-            assert(len == gen.OPTIONS_SIZE);
+            assert(len == gen.CHOICES_SIZE);
             assert(data != null);
 
-            var out = @ptrCast([*]pkmn.Choice, data.?)[0..gen.OPTIONS_SIZE];
+            var out = @ptrCast([*]pkmn.Choice, data.?)[0..gen.CHOICES_SIZE];
             const n = battle.choices(player, request, out);
             return Number.init(env, @bitCast(u8, n));
         }

package/src/lib/binding/wasm.zig

@@ -2,9 +2,9 @@ const std = @import("std");
 const pkmn = @import("../pkmn.zig");
 
 export const SHOWDOWN = pkmn.options.showdown;
-export const TRACE = pkmn.options.trace;
+export const LOG = pkmn.options.log;
 
-export const GEN1_OPTIONS_SIZE =
-    std.math.ceilPowerOfTwo(u32, @intCast(u32, pkmn.gen1.OPTIONS_SIZE)) catch unreachable;
+export const GEN1_CHOICES_SIZE =
+    std.math.ceilPowerOfTwo(u32, @intCast(u32, pkmn.gen1.CHOICES_SIZE)) catch unreachable;
 export const GEN1_LOGS_SIZE =
     std.math.ceilPowerOfTwo(u32, @intCast(u32, 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(Player, ~@intFromEnum(self));
     }
 
     /// Return's an identifier for the player's Pokémon at the one-indexed `id`.

package/src/lib/common/debug.zig

@@ -58,6 +58,7 @@ fn inspect(value: anytype) void {
                     @compileError(err);
                 },
             },
+            .Optional => stderr.print("{?}", .{value}) catch return,
             else => stderr.print("{}", .{value}) catch return,
         }
     }

package/src/lib/common/options.zig

@@ -3,7 +3,7 @@ const root = @import("root");
 
 pub const Options = struct {
     showdown: ?bool = null,
-    trace: ?bool = null,
+    log: ?bool = null,
     advance: ?bool = null,
     ebc: ?bool = null,
     internal: ?bool = null,
@@ -11,8 +11,8 @@ pub const Options = struct {
 
 /// Whether or not Pokémon Showdown compatibility mode is enabled.
 pub const showdown = get("showdown", false);
-/// Whether or not protocol trace logging is enabled.
-pub const trace = get("trace", false);
+/// Whether or not protocol message logging is enabled.
+pub const log = get("log", false);
 
 pub const advance = get("advance", true);
 pub const ebc = get("ebc", true);