@pkmn/engine 0.1.0-dev.305a932f → 0.1.0-dev.32adfe77

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

@@ -1,4 +1,4 @@
-//! Code generated by `tools/generate` - manual edits will be overwritten
+//! Code generated by `tools/generate` - manual edits will be overwritten.
 
 const std = @import("std");
 
@@ -216,14 +216,14 @@ pub const Item = enum(u8) {
     pub const size = 196;
 
     /// Returns a `Type` boosted by this item or `null` if the item is not a type-boosting item.
-    pub inline fn boost(item: Item) ?Type {
+    pub fn boost(item: Item) ?Type {
         assert(item != .None);
         if (item == .PolkadotBow) return .Normal;
         return if (@intFromEnum(item) <= 18) @enumFromInt(@intFromEnum(item) - 1) else null;
     }
 
     /// Whether or not this item is Mail.
-    pub inline fn isMail(item: Item) bool {
+    pub fn isMail(item: Item) bool {
         assert(item != .None);
         return @intFromEnum(item) > 60 and @intFromEnum(item) <= 70;
     }

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

@@ -1,4 +1,4 @@
-//! Code generated by `tools/generate` - manual edits will be overwritten
+//! Code generated by `tools/generate` - manual edits will be overwritten.
 
 const std = @import("std");
 
@@ -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
         .{
@@ -936,12 +938,12 @@ pub const Move = enum(u8) {
         },
         // SolarBeam
         .{
-            .effect = .Solarbeam,
+            .effect = .SolarBeam,
             .bp = 120,
             .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,
@@ -2526,7 +2529,7 @@ pub const Move = enum(u8) {
         Sleep,
         SleepTalk,
         Snore,
-        Solarbeam,
+        SolarBeam,
         SpAtkUp1,
         SpDefDownChance,
         SpDefUp2,
@@ -2559,7 +2562,7 @@ pub const Move = enum(u8) {
         }
 
         /// Whether this effect has a high critical rate.
-        pub inline fn isHighCritical(effect: Effect) bool {
+        pub fn isHighCritical(effect: Effect) bool {
             return effect == .HighCritical or effect == .RazorWind;
         }
     };
@@ -2847,8 +2850,22 @@ 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 {
+    pub fn get(id: Move) Data {
         assert(id != .None);
         return DATA[@intFromEnum(id) - 1];
     }

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

@@ -1,4 +1,4 @@
-//! Code generated by `tools/generate` - manual edits will be overwritten
+//! Code generated by `tools/generate` - manual edits will be overwritten.
 
 const std = @import("std");
 

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

@@ -1,4 +1,4 @@
-//! Code generated by `tools/generate` - manual edits will be overwritten
+//! Code generated by `tools/generate` - manual edits will be overwritten.
 
 const std = @import("std");
 
@@ -96,23 +96,58 @@ pub const Type = enum(u8) {
         27, // Dark
     };
 
-    const HIDDEN_POWER = [_]u8{
-        4, // Fighting
-        5, // Flying
-        6, // Poison
-        0, // Ground
-        1, // Rock
-        7, // Bug
-        8, // Ghost
-        2, // Steel
-        10, // Fire
-        11, // Water
-        12, // Grass
-        13, // Electric
-        14, // Psychic
-        15, // Ice
-        16, // Dragon
-        17, // Dark
+    const CONVERSION_2 = [_]Type{
+        .Normal,
+        .Fighting,
+        .Flying,
+        .Poison,
+        .Ground,
+        .Rock,
+        .@"???", // placeholder
+        .Bug,
+        .Ghost,
+        .Steel,
+    };
+
+    const HIDDEN_POWER = [_]Type{
+        .Fighting,
+        .Flying,
+        .Poison,
+        .Ground,
+        .Rock,
+        .Bug,
+        .Ghost,
+        .Steel,
+        .Fire,
+        .Water,
+        .Grass,
+        .Electric,
+        .Psychic,
+        .Ice,
+        .Dragon,
+        .Dark,
+    };
+
+    /// Order of Pokémon Showdown's types.
+    pub const SHOWDOWN = [_]Type{
+        .Fire,
+        .Ice,
+        .Steel,
+        .Electric,
+        .Ghost,
+        .Grass,
+        .Dark,
+        .Bug,
+        .Dragon,
+        .Fighting,
+        .Flying,
+        .Ground,
+        .Normal,
+        .Poison,
+        .Psychic,
+        .Rock,
+        .Water,
+        .@"???",
     };
 
     comptime {
@@ -120,34 +155,45 @@ pub const Type = enum(u8) {
         assert(@sizeOf(@TypeOf(CHART)) == 324);
         assert(@sizeOf(@TypeOf(PRECEDENCE)) == 18);
         assert(@sizeOf(@TypeOf(INDEXES)) == 18);
+        assert(@sizeOf(@TypeOf(CONVERSION_2)) == 10);
         assert(@sizeOf(@TypeOf(HIDDEN_POWER)) == 16);
+        assert(@sizeOf(@TypeOf(SHOWDOWN)) == 18);
     }
 
     /// The number of types in this generation.
     pub const size = 18;
 
     /// Whether or not this type is considered to be special as opposed to physical.
-    pub inline fn special(self: Type) bool {
+    pub fn special(self: Type) bool {
         return @intFromEnum(self) >= @intFromEnum(Type.Fire);
     }
 
     /// The `Effectiveness` of type `t2` vs. type `t1`.
-    pub inline fn effectiveness(t1: Type, t2: Type) Effectiveness {
+    pub fn effectiveness(t1: Type, t2: Type) Effectiveness {
         return CHART[@intFromEnum(t1)][@intFromEnum(t2)];
     }
 
     /// The precedence order of Type `type`.
-    pub inline fn precedence(self: Type) u8 {
+    pub fn precedence(self: Type) u8 {
         return PRECEDENCE[@intFromEnum(self)];
     }
+
     /// The internal index of this Type used by Present.
-    pub inline fn present(self: Type) u8 {
+    pub fn present(self: Type) u8 {
         return INDEXES[@intFromEnum(self)];
     }
 
+    /// The Type corresponding to a random roll of `num` for Conversion 2.
+    pub fn conversion2(num: u8) Type {
+        assert(num != 6);
+        assert(num < 10 or num >= 20);
+        assert(num <= 27);
+        return if (num < 10) CONVERSION_2[num] else @enumFromInt(num - 10);
+    }
+
     /// The Type corresponding to a Hidden Power `index`.
-    pub inline fn hiddenPower(index: u8) Type {
-        return @enumFromInt(HIDDEN_POWER[index]);
+    pub fn hiddenPower(index: u8) Type {
+        return HIDDEN_POWER[index];
     }
 };
 
@@ -163,17 +209,18 @@ pub const Types = extern struct {
     }
 
     /// Whether this typing is immune to type `t`.
-    pub inline fn immune(self: Types, t: Type) bool {
+    pub fn immune(self: Types, t: Type) bool {
         return t.effectiveness(self.type1) == I or t.effectiveness(self.type2) == I;
     }
 
     /// Whether this typing includes type `t`.
-    pub inline fn includes(self: Types, t: Type) bool {
+    pub fn includes(self: Types, t: Type) bool {
         return self.type1 == t or self.type2 == t;
     }
 
     /// 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 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

@@ -62,17 +62,17 @@ pub fn Battle(comptime RNG: anytype) type {
 
         _: [padding]u8 = .{0} ** padding,
 
-        pub inline fn side(self: anytype, player: Player) PointerType(@TypeOf(self), Side) {
+        pub fn side(self: anytype, player: Player) PointerType(@TypeOf(self), Side) {
             assert(@typeInfo(@TypeOf(self)).Pointer.child == Self);
             return &self.sides[@intFromEnum(player)];
         }
 
-        pub inline fn foe(self: anytype, player: Player) PointerType(@TypeOf(self), Side) {
+        pub fn foe(self: anytype, player: Player) PointerType(@TypeOf(self), Side) {
             assert(@typeInfo(@TypeOf(self)).Pointer.child == Self);
             return &self.sides[@intFromEnum(player.foe())];
         }
 
-        pub inline fn active(self: *const Self, player: Player) ID {
+        pub fn active(self: *const Self, player: Player) ID {
             return player.ident(@intCast(self.side(player).pokemon[0].position));
         }
 
@@ -133,7 +133,7 @@ pub const Side = extern struct {
         assert(@sizeOf(Side) == 248);
     }
 
-    pub inline fn get(self: anytype, slot: u8) PointerType(@TypeOf(self), Pokemon) {
+    pub fn get(self: anytype, slot: u8) PointerType(@TypeOf(self), Pokemon) {
         assert(@typeInfo(@TypeOf(self)).Pointer.child == Side);
         assert(slot > 0 and slot <= 6);
         const id = self.pokemon[slot - 1].position;
@@ -141,19 +141,19 @@ pub const Side = extern struct {
         return &self.pokemon[id - 1];
     }
 
-    pub inline fn stored(self: anytype) PointerType(@TypeOf(self), Pokemon) {
+    pub fn stored(self: anytype) PointerType(@TypeOf(self), Pokemon) {
         assert(@typeInfo(@TypeOf(self)).Pointer.child == Side);
         return self.get(1);
     }
 
-    pub inline fn lastMove(self: anytype, encore: bool) Move {
+    pub fn lastMove(self: anytype, encore: bool) Move {
         assert(self.last_used_move != .None or !self.active.volatiles.dirty);
         if (encore) return self.last_used_move;
         return if (self.active.volatiles.dirty) .None else self.last_used_move;
     }
 
     // TODO
-    // pub inline fn useMove(self: anytype) void {
+    // pub fn useMove(self: anytype) void {
     //     assert(side.last_selected_move != .None);
     //     self.last_used_move = side.last_selected_move;
     //     self.active.volatiles.dirty = false;
@@ -175,7 +175,7 @@ pub const ActivePokemon = extern struct {
         assert(@sizeOf(ActivePokemon) == 44);
     }
 
-    pub inline fn move(self: anytype, mslot: u8) PointerType(@TypeOf(self), MoveSlot) {
+    pub fn move(self: anytype, mslot: u8) PointerType(@TypeOf(self), MoveSlot) {
         assert(@typeInfo(@TypeOf(self)).Pointer.child == Pokemon);
         assert(mslot > 0 and mslot <= 4);
         assert(self.moves[mslot - 1].id != .None);
@@ -200,7 +200,7 @@ pub const Pokemon = extern struct {
         assert(@sizeOf(Pokemon) == 32);
     }
 
-    pub inline fn move(self: anytype, mslot: u8) PointerType(@TypeOf(self), MoveSlot) {
+    pub fn move(self: anytype, mslot: u8) PointerType(@TypeOf(self), MoveSlot) {
         assert(@typeInfo(@TypeOf(self)).Pointer.child == Pokemon);
         assert(mslot > 0 and mslot <= 4);
         assert(self.moves[mslot - 1].id != .None);
@@ -225,7 +225,7 @@ pub const DVs = packed struct(u16) {
         return .{ .gender = g, .pow = p, .type = t };
     }
 
-    pub inline fn power(dvs: DVs) u8 {
+    pub fn power(dvs: DVs) u8 {
         return @as(u8, dvs.pow) + 30;
     }
 
@@ -239,7 +239,7 @@ pub const DVs = packed struct(u16) {
         };
         const p: u6 = @intCast(1 + ((5 * @as(u8, (dvs.atk & 0b1000) | ((dvs.def & 0b1000)) >> 1 |
             ((dvs.spe & 0b1000)) >> 2 | ((dvs.spc & 0b1000)) >> 3) + (dvs.spc & 0b0011)) >> 1));
-        var t = @as(u8, dvs.def & 0b0011) + (@as(u8, dvs.atk & 0b0011) << 2);
+        const t = @as(u8, dvs.def & 0b0011) + (@as(u8, dvs.atk & 0b0011) << 2);
         return .{ .gender = g, .pow = p, .type = Type.hiddenPower(t) };
     }
 };
@@ -248,12 +248,12 @@ test DVs {
     var dvs = DVs.from(.Mewtwo, .{ .def = 13 });
     try expectEqual(Gender.Unknown, dvs.gender);
     try expectEqual(Type.Ice, dvs.type);
-    try expectEqual(@as(u8, 70), dvs.power());
+    try expectEqual(70, dvs.power());
 
     dvs = DVs.from(.Pikachu, .{ .spc = 14 });
     try expectEqual(Gender.Male, dvs.gender);
     try expectEqual(Type.Dark, dvs.type);
-    try expectEqual(@as(u8, 69), dvs.power());
+    try expectEqual(69, dvs.power());
 
     dvs = DVs.from(.Cyndaquil, .{ .atk = 1, .def = 3, .spe = 10, .spc = 9 });
     try expectEqual(Gender.Female, dvs.gender);
@@ -279,6 +279,9 @@ pub const MoveSlot = extern struct {
 
 pub const Status = gen1.Status;
 
+/// TODO
+pub const TriAttack = enum(u2) { PAR, FRZ, BRN };
+
 pub const Volatiles = packed struct(u128) {
     Bide: bool = false,
     Thrashing: bool = false,
@@ -311,19 +314,23 @@ pub const Volatiles = packed struct(u128) {
     Encore: bool = false,
     LockOn: bool = false,
     DestinyBond: bool = false,
+    Trapped: bool = false,
 
-    trapped: bool = false,
     switched: bool = false,
+    // TODO: replace with simply looking at Choice on Battle
     switching: bool = false,
+    // TODO: simply store both last moves on side
     dirty: bool = false,
 
     frozen: bool = false,
-    _: u15 = 0,
+    minimized: bool = false,
+    _: u10 = 0,
+    // TODO: is this needed for unmodified stats?
+    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,
@@ -335,7 +342,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,
     };
@@ -368,9 +380,9 @@ test Stats {
     try expectEqual(0, stats.def);
 
     var base = Species.get(.Gyarados).stats;
-    try expectEqual(@as(u16, 127), Stats(u16).calc("hp", base.hp, 0, 5120, 38));
+    try expectEqual(127, Stats(u16).calc("hp", base.hp, 0, 5120, 38));
     base = Species.get(.Pidgeot).stats;
-    try expectEqual(@as(u16, 279), Stats(u16).calc("spe", base.spe, 15, 63001, 100));
+    try expectEqual(279, Stats(u16).calc("spe", base.spe, 15, 63001, 100));
 }
 
 pub const Boosts = packed struct(u32) {
@@ -416,8 +428,8 @@ test Move {
     try expectEqual(Move.Effect.ConfusionChance, move.effect);
     try expectEqual(rng.Gen12.percent(50), move.accuracy);
     try expectEqual(rng.Gen12.percent(100), move.chance);
-    try expectEqual(@as(u8, 5), Move.pp(.DynamicPunch));
-    try expectEqual(@as(i8, -1), Move.get(.Counter).priority);
+    try expectEqual(5, Move.pp(.DynamicPunch));
+    try expectEqual(-1, Move.get(.Counter).priority);
     try expect(!move.effect.isHighCritical());
     try expect(Move.get(.KarateChop).effect.isHighCritical());
     try expect(Move.get(.RazorWind).effect.isHighCritical());
@@ -427,7 +439,7 @@ pub const Species = species.Species;
 
 test Species {
     try expectEqual(152, @intFromEnum(Species.Chikorita));
-    try expectEqual(@as(u8, 100), Species.get(.Celebi).stats.spd);
+    try expectEqual(100, Species.get(.Celebi).stats.spd);
 }
 
 pub const Type = types.Type;
@@ -440,7 +452,7 @@ test Types {
     try expect(!Type.Steel.special());
     try expect(Type.Dark.special());
 
-    try expectEqual(@as(u8, 3), Type.Water.precedence());
+    try expectEqual(3, Type.Water.precedence());
     try expect(Type.Bug.precedence() > Type.Poison.precedence());
 
     try expectEqual(Effectiveness.Super, Type.effectiveness(.Ghost, .Psychic));