@pkmn/engine 0.1.0-dev.f3aaee39 → 0.1.0-dev.f4ba6ebd

package/src/lib/{binding/node.zig → node.zig}

@@ -1,7 +1,8 @@
 const std = @import("std");
-const pkmn = @import("../pkmn.zig");
 
-const js = @import("../common/js.zig");
+const pkmn = @import("pkmn.zig");
+
+const js = @import("common/js.zig");
 
 const assert = std.debug.assert;
 
@@ -19,7 +20,7 @@ export fn napi_register_module_v1(env: c.napi_env, exports: c.napi_value) c.napi
 }
 
 pub fn register(env: c.napi_env) c.napi_value {
-    var object = js.Object.init(env);
+    const 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) }),
@@ -29,7 +30,7 @@ pub fn register(env: c.napi_env) c.napi_value {
 }
 
 fn options(env: c.napi_env) c.napi_value {
-    var object = js.Object.init(env);
+    const object = js.Object.init(env);
     const properties = [_]c.napi_property_descriptor{
         js.Property.init("showdown", .{ .value = js.Boolean.init(env, pkmn.options.showdown) }),
         js.Property.init("log", .{ .value = js.Boolean.init(env, pkmn.options.log) }),
@@ -41,7 +42,7 @@ fn options(env: c.napi_env) c.napi_value {
 }
 
 fn bindings(env: c.napi_env) c.napi_value {
-    var array = js.Array.init(env, .{ .length = 1 });
+    const array = js.Array.init(env, .{ .length = 1 });
     js.Array.set(env, array, 0, bind(env, pkmn.gen1));
     return array;
 }
@@ -49,7 +50,7 @@ fn bindings(env: c.napi_env) c.napi_value {
 fn bind(env: c.napi_env, gen: anytype) c.napi_value {
     const choices_size: u32 = @intCast(gen.CHOICES_SIZE);
     const logs_size: u32 = @intCast(gen.LOGS_SIZE);
-    var object = js.Object.init(env);
+    const object = js.Object.init(env);
     const properties = [_]c.napi_property_descriptor{
         js.Property.init("CHOICES_SIZE", .{ .value = js.Number.init(env, choices_size) }),
         js.Property.init("LOGS_SIZE", .{ .value = js.Number.init(env, logs_size) }),
@@ -72,7 +73,6 @@ fn update(gen: anytype) c.napi_callback {
             var len: usize = 0;
             assert(c.napi_get_arraybuffer_info(env, argv[0], &data, &len) == c.napi_ok);
             assert(len == @sizeOf(gen.Battle(gen.PRNG)));
-            assert(data != null);
 
             var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
             const c1: pkmn.Choice = @bitCast(js.Number.get(env, argv[1], u8));
@@ -85,10 +85,9 @@ fn update(gen: anytype) c.napi_callback {
                 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 = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
-                    var stream = pkmn.protocol.ByteStream{ .buffer = buf };
+                    const buf = @as([*]u8, @ptrCast(data.?))[0..gen.LOGS_SIZE];
+                    var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
                     // TODO: extract out
                     var opts = pkmn.battle.options(
                         pkmn.protocol.FixedLog{ .writer = stream.writer() },
@@ -116,7 +115,6 @@ fn choices(gen: anytype) c.napi_callback {
             var len: usize = 0;
             assert(c.napi_get_arraybuffer_info(env, argv[0], &data, &len) == c.napi_ok);
             assert(len == @sizeOf(gen.Battle(gen.PRNG)));
-            assert(data != null);
 
             var battle: *gen.Battle(gen.PRNG) = @alignCast(@ptrCast(data.?));
             const player: pkmn.Player = @enumFromInt(js.Number.get(env, argv[1], u8));
@@ -124,9 +122,8 @@ fn choices(gen: anytype) c.napi_callback {
 
             assert(c.napi_get_arraybuffer_info(env, argv[3], &data, &len) == c.napi_ok);
             assert(len == gen.CHOICES_SIZE);
-            assert(data != null);
 
-            var out = @as([*]pkmn.Choice, @ptrCast(data.?))[0..gen.CHOICES_SIZE];
+            const out = @as([*]pkmn.Choice, @ptrCast(data.?))[0..gen.CHOICES_SIZE];
             const n = battle.choices(player, request, out);
             return js.Number.init(env, @as(u8, @bitCast(n)));
         }

package/src/lib/pkmn.zig

@@ -22,13 +22,16 @@ pub const Choice = @import("common/data.zig").Choice;
 /// considered terminal.
 pub const Result = @import("common/data.zig").Result;
 
+// TODO
+pub const Array = @import("common/array.zig").Array;
+// TODO
+pub const Optional = @import("common/optional.zig").Optional;
+
 /// Pokémon Showdown's RNG (backed by a Generation V & VI RNG).
 pub const PSRNG = @import("common/rng.zig").PSRNG;
 
 /// Namespace for helpers related to protocol message logging.
-pub const protocol = if (options.internal) struct {
-    pub usingnamespace @import("common/protocol.zig");
-} else struct {
+pub const protocol = if (options.internal) @import("common/protocol.zig") else struct {
     /// Logs protocol information to its `Writer` during a battle update when
     /// `options.log` is enabled.
     pub const Log = @import("common/protocol.zig").Log;
@@ -82,16 +85,12 @@ pub const gen1 = struct {
     /// via `overrides` and tracks `summaries` of information relevant to damage calculation.
     pub const Calc = @import("gen1/calc.zig").Calc;
     /// Namespace for types associated with supported Generation I Pokémon damage calc features.
-    pub const calc = if (options.internal) struct {
-        pub usingnamespace @import("gen1/calc.zig");
-    } else struct {
-        /// TODO
-        pub const Overrides = @import("gen1/calc.zig").Overrides;
+    pub const calc = if (options.internal) @import("gen1/calc.zig") else struct {
         /// Information relevant to damage calculation that occured during a Generation I
         /// battle `update`.
         pub const Summaries = @import("gen1/calc.zig").Summaries;
         /// Information relevant to damage calculation that occured during a Generation I
-        ///  battle `update` for a single player.
+        /// battle `update` for a single player.
         pub const Summary = @import("gen1/calc.zig").Summary;
         /// Null object pattern implementation of Generation I `Calc` which does nothing,
         /// though damage calculator support should additionally be turned off
@@ -102,12 +101,30 @@ pub const gen1 = struct {
     pub const helpers = @import("gen1/helpers.zig");
 };
 
+/// TODO
+pub const gen2 = struct {
+    pub usingnamespace @import("gen2/data.zig");
+    pub const Chance = @import("gen2/chance.zig").Chance;
+    pub const chance = struct {
+        pub const Actions = @import("gen2/chance.zig").Actions;
+        pub const Action = @import("gen2/chance.zig").Action;
+        pub const Durations = @import("gen2/chance.zig").Durations;
+        pub const Duration = @import("gen2/chance.zig").Duration;
+        pub const NULL = @import("gen2/chance.zig").NULL;
+    };
+    pub const Calc = @import("gen2/calc.zig").Calc;
+    pub const calc = if (options.internal) @import("gen2/calc.zig") else struct {
+        pub const Summaries = @import("gen2/calc.zig").Summaries;
+        pub const Summary = @import("gen2/calc.zig").Summary;
+        pub const NULL = @import("gen2/calc.zig").NULL;
+    };
+    pub const helpers = @import("gen2/helpers.zig");
+};
+
 // Internal APIs used by other pkmn libraries, not actually part of the public API.
 // NOTE: `pub usingnamespace struct { ... }` here results in a (false?) dependency loop
-pub const js = if (options.internal) struct {
-    pub usingnamespace @import("common/js.zig");
-} else struct {};
+pub const js = if (options.internal) @import("common/js.zig") else {};
 pub const bindings = if (options.internal) struct {
-    pub const node = @import("binding/node.zig");
-    pub const wasm = @import("binding/wasm.zig");
-} else struct {};
+    pub const node = @import("node.zig");
+    pub const wasm = @import("wasm.zig");
+} else {};

package/src/lib/{binding/wasm.zig → wasm.zig}

@@ -1,5 +1,6 @@
 const std = @import("std");
-const pkmn = @import("../pkmn.zig");
+
+const pkmn = @import("pkmn.zig");
 
 export const SHOWDOWN = pkmn.options.showdown;
 export const LOG = pkmn.options.log;

package/src/test/display/pkmn.html.tmpl

@@ -218,8 +218,9 @@
         border-radius: 0 4px 4px 0;
       }
       .moves ul {
-        column-count: 2;
-        column-gap: 2em;
+        display: grid;
+        grid-template-columns: repeat(2, auto);
+        gap: 0 2em;
       }
       .left {
         padding-right: 32px;
@@ -268,7 +269,7 @@
       }
       @media(max-width: 1200px) {
         .moves ul {
-          column-count: 1;
+          grid-template-columns: repeat(1, auto);
         }
       }
       @media(max-width: 1100px) {
@@ -283,7 +284,7 @@
           margin-left: 5px;
         }
         .moves ul {
-          column-count: 2;
+          grid-template-columns: repeat(2, auto);
         }
         .left {
           padding-right: 0;
@@ -309,7 +310,6 @@
           justify-content: center;
         }
         .moves ul {
-          column-count: 1;
           display: inline-block;
           padding: 0;
         }