@pkmn/engine 0.1.0-dev.46307385 → 0.1.0-dev.4c173f03

package/src/lib/gen1/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/gen1/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");
 
@@ -30,7 +30,7 @@ pub const Type = enum(u4) {
     Ice,
     Dragon,
 
-    const CHART = [15][15]Effectiveness{
+    const CHART: [15][15]Effectiveness = .{
         [_]Effectiveness{ N, N, N, N, N, R, N, I, N, N, N, N, N, N, N }, // Normal
         [_]Effectiveness{ S, N, R, R, N, S, R, I, N, N, N, N, R, S, N }, // Fighting
         [_]Effectiveness{ N, S, N, N, N, R, S, N, N, N, S, R, N, N, N }, // Flying
@@ -99,7 +99,7 @@ pub const Type = enum(u4) {
         return CHART[@intFromEnum(t1)][@intFromEnum(t2)];
     }
 
-    /// The precedence order of type `t2` vs. type  `t1`.
+    /// The precedence order of Type `t2` vs. Type `t1`.
     pub fn precedence(t1: Type, t2: Type) u8 {
         for (PRECEDENCE, 0..) |matchup, i| {
             if (matchup.type1 == t1 and matchup.type2 == t2) return @intCast(i);

package/src/lib/gen1/data.zig

@@ -214,7 +214,7 @@ pub const Pokemon = extern struct {
     }
 };
 
-/// Representation of a Generation I & II Pokémon's move slot in a battle.
+/// Representation of a Generation I Pokémon's move slot in a battle.
 pub const MoveSlot = extern struct {
     /// The identifier for the move.
     id: Move = .None,
@@ -222,20 +222,16 @@ pub const MoveSlot = extern struct {
     pp: u8 = 0,
 
     comptime {
-        assert(@sizeOf(MoveSlot) == @sizeOf(u16));
+        assert(@sizeOf(MoveSlot) == 2);
     }
 };
 
 /// Details required to detect desyncs based on the move last selected/executed by players.
-pub const MoveDetails = packed struct {
+pub const MoveDetails = packed struct(if (showdown) u16 else u8) {
     /// The move slot index of the last move selected in the battle menu.
     index: if (showdown) u8 else u4 = 0,
     /// Whether the last move executed was counterable.
     counterable: if (showdown) u8 else u4 = 0,
-
-    comptime {
-        assert(@sizeOf(MoveDetails) == if (showdown) 2 else 1);
-    }
 };
 
 /// Bitfield representation of a Generation I & II Pokémon's major status condition.
@@ -329,7 +325,7 @@ test Status {
 }
 
 /// Bitfield representation of volatile statuses and associated data in Generation I.
-pub const Volatiles = packed struct {
+pub const Volatiles = packed struct(u64) {
     /// Whether the "Bide" volatile status is present.
     Bide: bool = false,
     /// Whether the "Thrashing" volatile status is present.
@@ -382,19 +378,15 @@ pub const Volatiles = packed struct {
     /// The identity of whom the active Pokémon is transformed into.
     transform: u4 = 0,
     /// The remaining turns the move is disabled.
-    disabled_duration: u4 = 0,
+    disable_duration: u4 = 0,
     /// The move slot (1-4) that is disabled.
-    disabled_move: u3 = 0,
+    disable_move: u3 = 0,
     /// The number of turns toxic damage has been accumulating.
     toxic: u5 = 0,
-
-    comptime {
-        assert(@sizeOf(Volatiles) == 8);
-    }
 };
 
 test Volatiles {
-    var volatiles = Volatiles{};
+    var volatiles: Volatiles = .{};
     volatiles.Confusion = true;
     volatiles.confusion = 2;
     volatiles.Thrashing = true;
@@ -403,8 +395,8 @@ test Volatiles {
     volatiles.Substitute = true;
     volatiles.substitute = 42;
     volatiles.toxic = 4;
-    volatiles.disabled_move = 2;
-    volatiles.disabled_duration = 4;
+    volatiles.disable_move = 2;
+    volatiles.disable_duration = 4;
 
     try expect(volatiles.Confusion);
     try expect(volatiles.Thrashing);
@@ -415,8 +407,8 @@ test Volatiles {
 
     try expectEqual(@as(u16, 235), volatiles.state);
     try expectEqual(@as(u8, 42), volatiles.substitute);
-    try expectEqual(@as(u4, 2), volatiles.disabled_move);
-    try expectEqual(@as(u4, 4), volatiles.disabled_duration);
+    try expectEqual(@as(u4, 2), volatiles.disable_move);
+    try expectEqual(@as(u4, 4), volatiles.disable_duration);
     try expectEqual(@as(u4, 2), volatiles.confusion);
     try expectEqual(@as(u5, 4), volatiles.toxic);
     try expectEqual(@as(u4, 3), volatiles.attacks);
@@ -456,7 +448,7 @@ test Stats {
 }
 
 /// Representation of a Pokémon's boosts in Generation I.
-pub const Boosts = packed struct {
+pub const Boosts = packed struct(u32) {
     /// A Pokémon's Attack boosts.
     atk: i4 = 0,
     /// A Pokémon's Defense boosts.
@@ -471,14 +463,10 @@ pub const Boosts = packed struct {
     evasion: i4 = 0,
 
     _: u8 = 0,
-
-    comptime {
-        assert(@sizeOf(Boosts) == 4);
-    }
 };
 
 test Boosts {
-    const boosts = Boosts{ .spc = -6 };
+    const boosts: Boosts = .{ .spc = -6 };
     try expectEqual(0, boosts.atk);
     try expectEqual(-6, boosts.spc);
 }
@@ -490,7 +478,7 @@ test Move {
     try expectEqual(2, @intFromEnum(Move.KarateChop));
     const move = Move.get(.Fissure);
     try expectEqual(Move.Effect.OHKO, move.effect);
-    try expectEqual(@as(u8, 30), move.accuracy);
+    try expectEqual(rng.Gen12.percent(30), move.accuracy);
     try expectEqual(Type.Ground, move.type);
 
     try expect(!Move.Effect.onBegin(.None));
@@ -628,16 +616,16 @@ pub const DVs = struct {
 };
 
 test DVs {
-    var dvs = DVs{ .spc = 15, .spe = 15 };
+    var dvs: DVs = .{ .spc = 15, .spe = 15 };
     try expectEqual(@as(u4, 15), dvs.hp());
-    dvs = DVs{
+    dvs = .{
         .atk = 5,
         .def = 15,
         .spe = 13,
         .spc = 13,
     };
     try expectEqual(@as(u4, 15), dvs.hp());
-    dvs = DVs{
+    dvs = .{
         .def = 3,
         .spe = 10,
         .spc = 11,

package/src/lib/gen1/helpers.zig

@@ -455,36 +455,21 @@ pub const Rolls = struct {
     }
 
     const MOVE_NONE = [_]Move{.None};
-    const MOVES = init: {
-        var moves: [Move.size - 2]Move = undefined;
-        var i: usize = 0;
-        for (@typeInfo(Move).Enum.fields) |f| {
-            if (!(std.mem.eql(u8, f.name, "None") or
-                std.mem.eql(u8, f.name, "Metronome") or
-                std.mem.eql(u8, f.name, "Struggle") or
-                std.mem.eql(u8, f.name, "SKIP_TURN")))
-            {
-                moves[i] = @field(Move, f.name);
-                i += 1;
-            }
-        }
-        break :init moves;
-    };
 
     /// Returns a slice with the correct range of values for metronome given the `action` state.
     pub inline fn metronome(action: Action) []const Move {
-        return if (@field(action, "metronome") == .None) &MOVE_NONE else &MOVES;
+        return if (@field(action, "metronome") == .None) &MOVE_NONE else &Move.METRONOME;
     }
 };
 
 test "Rolls.speedTie" {
-    const actions = Actions{ .p1 = .{ .speed_tie = .P2 } };
+    const actions: Actions = .{ .p1 = .{ .speed_tie = .P2 } };
     try expectEqualSlices(Optional(Player), &.{ .P1, .P2 }, Rolls.speedTie(actions.p1));
     try expectEqualSlices(Optional(Player), &.{.None}, Rolls.speedTie(actions.p2));
 }
 
 test "Rolls.damage" {
-    const actions = Actions{ .p2 = .{ .damage = 221 } };
+    const actions: Actions = .{ .p2 = .{ .damage = 221 } };
     try expectEqual(Rolls.Range{ .min = 0, .max = 1 }, Rolls.damage(actions.p1, .None));
     try expectEqual(Rolls.Range{ .min = 217, .max = 256 }, Rolls.damage(actions.p2, .None));
     try expectEqual(Rolls.Range{ .min = 0, .max = 1 }, Rolls.damage(actions.p2, .false));
@@ -502,7 +487,7 @@ test "Rolls.coalesce" {
 }
 
 test "Rolls.hit" {
-    const actions = Actions{ .p2 = .{ .hit = .true } };
+    const actions: Actions = .{ .p2 = .{ .hit = .true } };
     try expectEqualSlices(Optional(bool), &.{.None}, Rolls.hit(actions.p1, .None));
     try expectEqualSlices(Optional(bool), &.{ .false, .true }, Rolls.hit(actions.p2, .None));
     try expectEqualSlices(Optional(bool), &.{.None}, Rolls.hit(actions.p2, .true));
@@ -510,7 +495,7 @@ test "Rolls.hit" {
 }
 
 test "Rolls.secondaryChance" {
-    const actions = Actions{ .p1 = .{ .secondary_chance = .true } };
+    const actions: Actions = .{ .p1 = .{ .secondary_chance = .true } };
     try expectEqualSlices(
         Optional(bool),
         &.{ .false, .true },
@@ -521,7 +506,7 @@ test "Rolls.secondaryChance" {
 }
 
 test "Rolls.criticalHit" {
-    const actions = Actions{ .p1 = .{ .critical_hit = .true } };
+    const actions: Actions = .{ .p1 = .{ .critical_hit = .true } };
     try expectEqualSlices(
         Optional(bool),
         &.{ .false, .true },
@@ -532,14 +517,14 @@ test "Rolls.criticalHit" {
 }
 
 test "Rolls.confused" {
-    const actions = Actions{ .p2 = .{ .confused = .true } };
+    const actions: Actions = .{ .p2 = .{ .confused = .true } };
     try expectEqualSlices(Optional(bool), &.{.None}, Rolls.confused(actions.p1, 1));
     try expectEqualSlices(Optional(bool), &.{ .false, .true }, Rolls.confused(actions.p2, 1));
     try expectEqualSlices(Optional(bool), &.{.None}, Rolls.confused(actions.p2, 0));
 }
 
 test "Rolls.paralyzed" {
-    const actions = Actions{ .p2 = .{ .paralyzed = .true } };
+    const actions: Actions = .{ .p2 = .{ .paralyzed = .true } };
     try expectEqualSlices(Optional(bool), &.{.None}, Rolls.paralyzed(actions.p1, .None));
     try expectEqualSlices(Optional(bool), &.{ .false, .true }, Rolls.paralyzed(actions.p2, .None));
     try expectEqualSlices(Optional(bool), &.{ .false, .true }, Rolls.paralyzed(actions.p2, .false));
@@ -547,7 +532,7 @@ test "Rolls.paralyzed" {
 }
 
 test "Rolls.duration" {
-    const actions = Actions{ .p2 = .{ .duration = 3 } };
+    const actions: Actions = .{ .p2 = .{ .duration = 3 } };
     try expectEqualSlices(u1, &.{0}, Rolls.duration(actions.p1, .None));
     try expectEqualSlices(u1, &.{1}, Rolls.duration(actions.p2, .None));
     try expectEqualSlices(u1, &.{0}, Rolls.duration(actions.p2, .false));
@@ -757,27 +742,27 @@ test "Rolls.binding" {
 }
 
 test "Rolls.moveSlot" {
-    const actions = Actions{ .p2 = .{ .move_slot = 3 } };
+    const actions: Actions = .{ .p2 = .{ .move_slot = 3 } };
     try expectEqualSlices(u4, &.{0}, Rolls.moveSlot(actions.p1, .None));
     try expectEqualSlices(u4, &.{ 1, 2, 3, 4 }, Rolls.moveSlot(actions.p2, .None));
     try expectEqualSlices(u4, &.{0}, Rolls.moveSlot(actions.p2, .false));
 }
 
 test "Rolls.multiHit" {
-    const actions = Actions{ .p2 = .{ .multi_hit = 3 } };
+    const actions: Actions = .{ .p2 = .{ .multi_hit = 3 } };
     try expectEqualSlices(u4, &.{0}, Rolls.multiHit(actions.p1, .None));
     try expectEqualSlices(u4, &.{ 2, 3, 4, 5 }, Rolls.multiHit(actions.p2, .None));
     try expectEqualSlices(u4, &.{0}, Rolls.multiHit(actions.p2, .false));
 }
 
 test "Rolls.metronome" {
-    const actions = Actions{ .p2 = .{ .metronome = .Surf } };
+    const actions: Actions = .{ .p2 = .{ .metronome = .Surf } };
     try expectEqualSlices(Move, &.{.None}, Rolls.metronome(actions.p1));
     try expectEqual(@as(Move, @enumFromInt(24)), Rolls.metronome(actions.p2)[23]);
 }
 
 test "Rolls.psywave" {
-    const actions = Actions{ .p2 = .{ .psywave = 79 } };
+    const actions: Actions = .{ .p2 = .{ .psywave = 79 } };
     var side = Side.init(&[_]Pokemon{.{
         .species = .Bulbasaur,
         .level = 100,