@pkmn/engine 0.1.0-dev.84cc1a02 → 0.1.0-dev.93b7cb0d

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_OPTIONS: usize = 9; // move 1..4, switch 2..6
+pub const MAX_CHOICES: 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_OPTIONS.
+/// At least as large as MAX_CHOICES.
 pub const MAX_LOGS: usize = 180;
 
 /// The maximum number of bytes possibly logged by a single Generation I update.
-pub const OPTIONS_SIZE = if (builtin.mode == .ReleaseSmall)
-    MAX_OPTIONS
+pub const CHOICES_SIZE = if (builtin.mode == .ReleaseSmall)
+    MAX_CHOICES
 else
-    std.math.ceilPowerOfTwo(usize, MAX_OPTIONS) catch unreachable;
+    std.math.ceilPowerOfTwo(usize, MAX_CHOICES) 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)
@@ -55,8 +55,8 @@ pub fn Battle(comptime RNG: anytype) type {
         turn: u16 = 0,
         /// The last damage dealt by either side.
         last_damage: u16 = 0,
-        /// The slot index of the last selected moves for each side
-        last_selected_indexes: MoveIndexes = .{},
+        /// Details about the last move selected/used by each player required to detect desyncs.
+        last_moves: MoveDetails = .{},
         /// The pseudo random number generator.
         rng: RNG,
 
@@ -76,7 +76,7 @@ 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 logs to `log` if `options.trace` is enabled.
+        /// battle, optionally writing protocol message logs to `log` if `options.log` is enabled.
         pub fn update(self: *Self, c1: Choice, c2: Choice, log: anytype) !Result {
             return mechanics.update(self, c1, c2, log);
         }
@@ -201,17 +201,19 @@ pub const MoveSlot = extern struct {
     }
 };
 
-const uindex = if (showdown) u16 else u4;
-
-/// Representation of the move slot indexes for each side in a Generation I Pokémon battle.
-pub const MoveIndexes = packed struct {
-    /// Player 1's move index.
-    p1: uindex = 0,
-    /// Player 1's move index.
-    p2: uindex = 0,
+/// Details required to detect desyncs based on the move last selected/executed by players.
+pub const MoveDetails = packed struct {
+    /// The move slot index of the last move selected in the battle menu by Player 1
+    p1_index: if (showdown) u8 else u3 = 0,
+    /// Whether the last move executed by Player 1 was counterable.
+    p1_counterable: if (showdown) u8 else u1 = 0,
+    /// The move slot index of the last move selected in the battle menu by Player 2
+    p2_index: if (showdown) u8 else u3 = 0,
+    /// Whether the last move executed by Player 2 was counterable.
+    p2_counterable: if (showdown) u8 else u1 = 0,
 
     comptime {
-        assert(@sizeOf(MoveIndexes) == if (showdown) 4 else 1);
+        assert(@sizeOf(MoveDetails) == if (showdown) 4 else 1);
     }
 };
 

package/src/lib/gen1/helpers.zig

@@ -55,21 +55,16 @@ pub const Battle = struct {
     }
 
     pub fn random(rand: *PSRNG, opt: Options) data.Battle(data.PRNG) {
-        var p1: u4 = 0;
-        var p2: u4 = 0;
-        var battle: data.Battle(data.PRNG) = .{
+        return .{
             .rng = prng(rand),
             .turn = 0,
             .last_damage = 0,
             .sides = .{ Side.random(rand, opt), Side.random(rand, opt) },
         };
-        battle.last_selected_indexes.p1 = p1;
-        battle.last_selected_indexes.p2 = p2;
-        return battle;
     }
 };
 
-pub fn prng(rand: *PSRNG) data.PRNG {
+fn prng(rand: *PSRNG) data.PRNG {
     // GLITCH: initial bytes in seed can only range from 0-252, not 0-255
     const max: u8 = 253;
     return .{
@@ -211,16 +206,10 @@ pub const Pokemon = struct {
     }
 };
 
-// cat src/test/showdown/blocklist.json | jq '."1".moves'
 fn blocked(m: Move) bool {
-    if (Move.get(m).effect == .Binding) return true;
+    // Binding moves are borked but only via Mirror Move / Metronome which are already blocked
     return switch (m) {
-        .Counter,
-        .Mimic,
-        .Metronome,
-        .MirrorMove,
-        .Transform,
-        => true,
+        .Mimic, .Metronome, .MirrorMove, .Transform => true,
         else => false,
     };
 }