@pkmn/engine 0.1.0-dev.550c3889 → 0.1.0-dev.5ea92492

package/src/lib/gen1/data.zig

@@ -17,16 +17,16 @@ const expectEqual = std.testing.expectEqual;
 const expect = std.testing.expect;
 
 /// The minimum size in bytes required to hold all Generation I choice options.
-pub const MAX_CHOICES: usize = 9; // move 1..4, switch 2..6
+pub const MAX_OPTIONS: usize = 9; // move 1..4, switch 2..6
 /// The optimal size in bytes required to hold all Generation I choice options.
-/// At least as large as MAX_CHOICES.
+/// At least as large as MAX_OPTIONS.
 pub const MAX_LOGS: usize = 180;
 
 /// The maximum number of bytes possibly logged by a single Generation I update.
-pub const CHOICES_SIZE = if (builtin.mode == .ReleaseSmall)
-    MAX_CHOICES
+pub const OPTIONS_SIZE = if (builtin.mode == .ReleaseSmall)
+    MAX_OPTIONS
 else
-    std.math.ceilPowerOfTwo(usize, MAX_CHOICES) catch unreachable;
+    std.math.ceilPowerOfTwo(usize, MAX_OPTIONS) catch unreachable;
 /// The optimal size in bytes required to hold the largest amount of log data possible from a
 /// single Generation I update. At least as large as MAX_LOGS.
 pub const LOGS_SIZE = if (builtin.mode == .ReleaseSmall)
@@ -76,9 +76,10 @@ pub fn Battle(comptime RNG: anytype) type {
         }
 
         /// Returns the result of applying Player 1's choice `c1` and Player 2's choice `c2` to the
-        /// battle, optionally writing protocol message logs to `log` if `options.log` is enabled.
+        /// battle, optionally writing protocol logs to `log` if `options.trace` is enabled.
         pub fn update(self: *Self, c1: Choice, c2: Choice, log: anytype) !Result {
-            return mechanics.update(self, c1, c2, log);
+            const m = mechanics.Mechanics(*Self, @TypeOf(log)){ .battle = self, .log = log };
+            return m.update(c1, c2);
         }
 
         /// Fills in at most `out.len` possible choices for the `player` given the previous `result`

package/src/lib/gen1/helpers.zig

@@ -211,19 +211,16 @@ pub const Pokemon = struct {
     }
 };
 
-// TODO: uncomment once integration tests pass
-// fn blocked(m: Move) bool {
-//     // Binding moves are borked but only via Mirror Move / Metronome which are already blocked
-//     return switch (m) {
-//         .Mimic, .Metronome, .MirrorMove => true,
-//         else => false,
-//     };
-// }
-
+// cat src/test/showdown/blocklist.json | jq '."1".moves'
 fn blocked(m: Move) bool {
     if (Move.get(m).effect == .Binding) return true;
     return switch (m) {
-        .Counter, .Mimic, .Metronome, .MirrorMove, .Transform => true,
+        .Counter,
+        .Mimic,
+        .Metronome,
+        .MirrorMove,
+        .Transform,
+        => true,
         else => false,
     };
 }