@pkmn/engine 0.1.0-dev.bcb16a6c → 0.1.0-dev.be951af1

package/src/lib/gen2/data/moves.zig

@@ -288,6 +288,8 @@ pub const Move = enum(u8) {
         const Extra = packed struct(u8) {
             /// Whether this move can be called via Metronome.
             metronome: bool = true,
+            /// Whether this move can be called via Sleep Talk.
+            sleep_talk: bool = true,
             /// Whether this move is considered to be "continuous".
             continuous: bool = false,
             /// Whether this move can hit a flying target.
@@ -295,7 +297,7 @@ pub const Move = enum(u8) {
             /// Whether this move can hit an underground target.
             underground: bool = false,
             /// Protocol reason offset associated with this move.
-            protocol: u4 = 0,
+            protocol: u3 = 0,
         };
 
         comptime {
@@ -410,7 +412,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(75),
             .target = .Foes,
-            .extra = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // SwordsDance
         .{
@@ -457,12 +459,12 @@ pub const Move = enum(u8) {
         },
         // Fly
         .{
-            .effect = .Fly,
+            .effect = .FlyDig,
             .bp = 70,
             .type = .Flying,
             .accuracy = percent(95),
             .target = .Any,
-            .extra = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // Bind
         .{
@@ -941,7 +943,7 @@ pub const Move = enum(u8) {
             .type = .Grass,
             .accuracy = percent(100),
             .target = .Other,
-            .extra = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // PoisonPowder
         .{
@@ -1065,11 +1067,12 @@ pub const Move = enum(u8) {
         },
         // Dig
         .{
-            .effect = .Fly,
+            .effect = .FlyDig,
             .bp = 60,
             .type = .Ground,
             .accuracy = percent(100),
             .target = .Other,
+            .extra = .{ .sleep_talk = false },
         },
         // Toxic
         .{
@@ -1282,7 +1285,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .Self,
-            .extra = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // Metronome
         .{
@@ -1394,7 +1397,7 @@ pub const Move = enum(u8) {
             .type = .Normal,
             .accuracy = percent(100),
             .target = .Other,
-            .extra = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // SpikeCannon
         .{
@@ -1500,7 +1503,7 @@ pub const Move = enum(u8) {
             .type = .Flying,
             .accuracy = percent(90),
             .target = .Any,
-            .extra = .{ .continuous = true },
+            .extra = .{ .sleep_talk = false, .continuous = true },
         },
         // Transform
         .{
@@ -2463,7 +2466,7 @@ pub const Move = enum(u8) {
         FixedDamage,
         FlameWheel,
         FlinchChance,
-        Fly,
+        FlyDig,
         FocusEnergy,
         ForceSwitch,
         Foresight,
@@ -2847,6 +2850,20 @@ pub const Move = enum(u8) {
     /// The number of Pokémon moves in this generation.
     pub const size = 251;
 
+    /// Pokémon moves that can be called by Metronome in this generation.
+    pub const METRONOME = init: {
+        var num = 0;
+        var moves: [239]Move = undefined;
+        for (1..Move.size + 1) |i| {
+            if (Move.get(@enumFromInt(i)).extra.metronome) {
+                moves[num] = @enumFromInt(i);
+                num += 1;
+            }
+        }
+        assert(num == moves.len);
+        break :init moves;
+    };
+
     /// Returns the `Data` corresponding to the move.
     pub inline fn get(id: Move) Data {
         assert(id != .None);

package/src/lib/gen2/data/types.zig

@@ -219,7 +219,8 @@ pub const Types = extern struct {
     }
 
     /// Whether this typing is immune to damage from Sandstorm.
-    pub inline fn sandstormImmune(self: Types) u8 {
-        return self.type1 <= @intFromEnum(Type.Steel) or self.type2 <= @intFromEnum(Type.Steel);
+    pub inline fn sandstormImmune(self: Types) bool {
+        return @intFromEnum(self.type1) <= @intFromEnum(Type.Steel) or
+            @intFromEnum(self.type2) <= @intFromEnum(Type.Steel);
     }
 };

package/src/lib/gen2/data.zig

@@ -336,12 +336,13 @@ pub const Volatiles = packed struct(u128) {
     dirty: bool = false,
 
     frozen: bool = false,
-    _: u15 = 0,
+    _: u11 = 0,
+    // TODO?
+    transform: u4 = 0,
 
-    bind_reason: u4 = 0,
-    bind: u4 = 0,
     bide: u16 = 0,
-    disabled: Disabled = .{},
+    bind: Bind = .{},
+    disable: Disable = .{},
     rage: u8 = 0,
     substitute: u8 = 0,
     toxic: u8 = 0,
@@ -353,7 +354,12 @@ pub const Volatiles = packed struct(u128) {
     protect: u4 = 0,
     attacks: u4 = 0, // bide/thrashing/rollout turns
 
-    const Disabled = packed struct(u8) {
+    const Bind = packed struct(u8) {
+        duration: u4 = 0,
+        reason: u4 = 0,
+    };
+
+    const Disable = packed struct(u8) {
         move: u4 = 0,
         duration: u4 = 0,
     };