@pkmn/engine 0.1.0-dev.83de29ee → 0.1.0-dev.84cc1a02

package/src/lib/gen1/helpers.zig

@@ -55,12 +55,17 @@ pub const Battle = struct {
     }
 
     pub fn random(rand: *PSRNG, opt: Options) data.Battle(data.PRNG) {
-        return .{
+        var p1: u4 = 0;
+        var p2: u4 = 0;
+        var battle: data.Battle(data.PRNG) = .{
             .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;
     }
 };
 
@@ -206,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, .Transform => 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, .Bide, .Metronome, .MirrorMove, .Transform => true,
+        .Counter,
+        .Mimic,
+        .Metronome,
+        .MirrorMove,
+        .Transform,
+        => true,
         else => false,
     };
 }