@pkmn/engine 0.1.0-dev.93b7cb0d → 0.1.0-dev.942dbfa4

package/src/lib/gen1/data.zig

@@ -62,12 +62,12 @@ pub fn Battle(comptime RNG: anytype) type {
 
         /// Returns the `Side` for the given `player`.
         pub inline fn side(self: *Self, player: Player) *Side {
-            return &self.sides[@enumToInt(player)];
+            return &self.sides[@intFromEnum(player)];
         }
 
         /// Returns the `Side` of the opponent for the given `player`
         pub inline fn foe(self: *Self, player: Player) *Side {
-            return &self.sides[@enumToInt(player.foe())];
+            return &self.sides[@intFromEnum(player.foe())];
         }
 
         /// Returns an identifier for the active Pokémon of `player`.
@@ -243,13 +243,13 @@ pub const Status = enum(u8) {
     /// Whether or not the status `num` is the same as `status`.
     pub inline fn is(num: u8, status: Status) bool {
         if (status == .SLP) return Status.duration(num) > 0;
-        return ((num >> @intCast(u3, @enumToInt(status))) & 1) != 0;
+        return ((num >> @intCast(u3, @intFromEnum(status))) & 1) != 0;
     }
 
     /// Initializes a non-sleep `status`. Use `slp` or `slf` to initialize a sleep status.
     pub inline fn init(status: Status) u8 {
         assert(status != .SLP and status != .EXT);
-        return @as(u8, 1) << @intCast(u3, @enumToInt(status));
+        return @as(u8, 1) << @intCast(u3, @intFromEnum(status));
     }
 
     /// Initializes a non self-inflicted sleep status with duration `dur`.
@@ -413,7 +413,7 @@ pub fn Stats(comptime T: type) type {
         /// Computes the value of `stat` given a `base`, `dv`, stat `exp` and `level`.
         pub fn calc(comptime stat: []const u8, base: T, dv: u4, exp: u16, level: u8) T {
             assert(level > 0 and level <= 100);
-            const evs = @min(255, @floatToInt(u16, @ceil(@sqrt(@intToFloat(f32, exp)))));
+            const evs = @min(255, @intFromFloat(u16, @ceil(@sqrt(@floatFromInt(f32, exp)))));
             const core: u32 = (2 *% (@as(u32, base) +% dv)) +% (evs / 4);
             const factor: u32 = if (std.mem.eql(u8, stat, "hp")) level + 10 else 5;
             return @intCast(T, core *% @as(u32, level) / 100 +% factor);
@@ -465,7 +465,7 @@ test Boosts {
 pub const Move = moves.Move;
 
 test Move {
-    try expectEqual(2, @enumToInt(Move.KarateChop));
+    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);
@@ -526,7 +526,7 @@ test Move {
 pub const Species = species.Species;
 
 test Species {
-    try expectEqual(2, @enumToInt(Species.Ivysaur));
+    try expectEqual(2, @intFromEnum(Species.Ivysaur));
     try expectEqual(@as(u8, 100), Species.get(.Mew).stats.def);
 }
 
@@ -543,9 +543,11 @@ pub const Effectiveness = enum(u8) {
     Super = 20,
 
     /// Used to determine the effectiness of a neutral damage hit.
-    pub const neutral: u16 = @enumToInt(Effectiveness.Neutral) * @enumToInt(Effectiveness.Neutral);
+    pub const neutral: u16 =
+        @intFromEnum(Effectiveness.Neutral) * @intFromEnum(Effectiveness.Neutral);
     /// Used to detect whether there is a mismatch in type effectivness (relevant for precedence).
-    pub const mismatch: u16 = @enumToInt(Effectiveness.Resisted) + @enumToInt(Effectiveness.Super);
+    pub const mismatch: u16 =
+        @intFromEnum(Effectiveness.Resisted) + @intFromEnum(Effectiveness.Super);
 
     comptime {
         assert(@sizeOf(Effectiveness) == 1);
@@ -553,8 +555,8 @@ pub const Effectiveness = enum(u8) {
 };
 
 test Types {
-    try expectEqual(14, @enumToInt(Type.Dragon));
-    try expectEqual(20, @enumToInt(Effectiveness.Super));
+    try expectEqual(14, @intFromEnum(Type.Dragon));
+    try expectEqual(20, @intFromEnum(Effectiveness.Super));
 
     try expect(!Type.Ghost.special());
     try expect(Type.Dragon.special());

package/src/lib/gen1/helpers.zig

@@ -153,7 +153,7 @@ pub const Pokemon = struct {
     }
 
     pub fn random(rand: *PSRNG, opt: Options) data.Pokemon {
-        const s = @intToEnum(Species, rand.range(u8, 1, Species.size + 1));
+        const s = @enumFromInt(Species, rand.range(u8, 1, Species.size + 1));
         const species = Species.get(s);
         const lvl = if (rand.chance(u8, 1, 20)) rand.range(u8, 1, 99 + 1) else 100;
         var stats: Stats(u16) = .{};
@@ -176,7 +176,7 @@ pub const Pokemon = struct {
         for (0..n) |i| {
             var m: Move = .None;
             sample: while (true) {
-                m = @intToEnum(Move, rand.range(u8, 1, Move.size - 1 + 1));
+                m = @enumFromInt(Move, rand.range(u8, 1, Move.size - 1 + 1));
                 if (opt.block and blocked(m)) continue :sample;
                 for (0..i) |j| if (ms[j].id == m) continue :sample;
                 break;

package/src/lib/gen1/mechanics.zig

@@ -126,7 +126,7 @@ fn selectMove(
     const stored = side.stored();
 
     assert(!isForced(side.active) or
-        (choice.type == .Move and choice.data == @boolToInt(showdown)));
+        (choice.type == .Move and choice.data == @intFromBool(showdown)));
 
     // pre-battle menu
     if (volatiles.Recharging) {
@@ -780,9 +780,9 @@ fn setCounterable(battle: anytype, player: Player, side: *Side, move: Move.Data)
     const counterable = side.last_selected_move != .Counter and move.bp > 0 and
         (move.type == .Normal or move.type == .Fighting);
     if (player == .P1) {
-        battle.last_moves.p1_counterable = @boolToInt(counterable);
+        battle.last_moves.p1_counterable = @intFromBool(counterable);
     } else {
-        battle.last_moves.p2_counterable = @boolToInt(counterable);
+        battle.last_moves.p2_counterable = @intFromBool(counterable);
     }
 }
 
@@ -849,8 +849,8 @@ fn doMove(
     // calling moveHit early covers most of that but we also need to check type immunity first
     var miss = showdown and miss: {
         immune = move.target != .Self and !status and !counter and
-            (@enumToInt(move.type.effectiveness(foe.active.types.type1)) == 0 or
-            @enumToInt(move.type.effectiveness(foe.active.types.type2)) == 0);
+            (@intFromEnum(move.type.effectiveness(foe.active.types.type1)) == 0 or
+            @intFromEnum(move.type.effectiveness(foe.active.types.type2)) == 0);
         if (immune and move.effect != .Binding) break :miss true;
         if (move.effect == .OHKO and side.active.stats.spe < foe.active.stats.spe) {
             battle.last_damage = 0;
@@ -941,7 +941,7 @@ fn doMove(
         }
         if (move.effect == .JumpKick) {
             // Recoil is supposed to be damage/8 but damage will always be 0 here
-            assert(battle.last_damage == 0);
+            assert(showdown or battle.last_damage == 0);
             battle.last_damage = 1;
             _ = try applyDamage(battle, player, player.foe(), .None, log);
             if (showdown and side.stored().hp == 0) residual.* = false;
@@ -1137,9 +1137,9 @@ fn adjustDamage(battle: anytype, player: Player) u16 {
     var d = battle.last_damage;
     if (side.active.types.includes(move.type)) d +%= d / 2;
 
-    const neutral = @enumToInt(Effectiveness.Neutral);
-    const eff1: u16 = @enumToInt(move.type.effectiveness(types.type1));
-    const eff2: u16 = @enumToInt(move.type.effectiveness(types.type2));
+    const neutral = @intFromEnum(Effectiveness.Neutral);
+    const eff1: u16 = @intFromEnum(move.type.effectiveness(types.type1));
+    const eff2: u16 = @intFromEnum(move.type.effectiveness(types.type2));
 
     // Type effectiveness matchup precedence only matters with (NVE, SE)
     if (!showdown and (eff1 + eff2) == Effectiveness.mismatch and
@@ -1400,7 +1400,7 @@ fn moveHit(battle: anytype, player: Player, move: Move.Data, immune: *bool, mist
     }
 
     if (!miss) return true;
-    battle.last_damage = 0;
+    if (!showdown or !foe.active.volatiles.Invulnerable) battle.last_damage = 0;
     side.active.volatiles.Binding = false;
     return false;
 }
@@ -1954,7 +1954,7 @@ pub const Effects = struct {
         // Pokémon Showdown clears P1 then P2 instead of status -> side -> foe
         if (showdown) {
             for (&battle.sides, 0..) |*s, i| {
-                const p = @intToEnum(Player, i);
+                const p = @enumFromInt(Player, i);
                 // Pokémon Showdown incorrectly does not prevent sleep/freeze from moving
                 if (p != player and Status.any(s.stored().status)) {
                     try log.curestatus(foe_ident, foe_stored.status, .Silent);
@@ -2449,12 +2449,11 @@ pub const Effects = struct {
     fn unboost(battle: anytype, player: Player, move: Move.Data, log: anytype) !void {
         var foe = battle.foe(player);
         const foe_ident = battle.active(player.foe());
+        const secondary = move.effect.isStatDownChance();
 
-        if (foe.active.volatiles.Substitute) {
-            return if (!move.effect.isStatDownChance()) log.fail(foe_ident, .None);
-        }
+        if (foe.active.volatiles.Substitute) return if (!secondary) log.fail(foe_ident, .None);
 
-        if (move.effect.isStatDownChance()) {
+        if (secondary) {
             if (!Rolls.unboost(battle) or foe.active.volatiles.Invulnerable) return;
         } else if (!showdown and !try checkHit(battle, player, move, log)) {
             return; // checkHit already checks for Invulnerable
@@ -2462,11 +2461,12 @@ pub const Effects = struct {
 
         var stats = &foe.active.stats;
         var boosts = &foe.active.boosts;
+        const fail = showdown or !secondary;
 
         switch (move.effect) {
             .AttackDown1, .AttackDownChance => {
                 assert(boosts.atk >= -6 and boosts.atk <= 6);
-                if (boosts.atk == -6) return try log.fail(foe_ident, .None);
+                if (boosts.atk == -6) return if (fail) try log.fail(foe_ident, .None);
                 boosts.atk = @intCast(i4, @max(-6, @as(i8, boosts.atk) - 1));
                 if (stats.atk == 1) {
                     boosts.atk += 1;
@@ -2483,7 +2483,7 @@ pub const Effects = struct {
             },
             .DefenseDown1, .DefenseDown2, .DefenseDownChance => {
                 assert(boosts.def >= -6 and boosts.def <= 6);
-                if (boosts.def == -6) return try log.fail(foe_ident, .None);
+                if (boosts.def == -6) return if (fail) try log.fail(foe_ident, .None);
                 const n: u2 = if (move.effect == .DefenseDown2) 2 else 1;
                 boosts.def = @intCast(i4, @max(-6, @as(i8, boosts.def) - n));
                 if (stats.def == 1) {
@@ -2501,7 +2501,7 @@ pub const Effects = struct {
             },
             .SpeedDown1, .SpeedDownChance => {
                 assert(boosts.spe >= -6 and boosts.spe <= 6);
-                if (boosts.spe == -6) return try log.fail(foe_ident, .None);
+                if (boosts.spe == -6) return if (fail) try log.fail(foe_ident, .None);
                 boosts.spe = @intCast(i4, @max(-6, @as(i8, boosts.spe) - 1));
                 if (stats.spe == 1) {
                     boosts.spe += 1;
@@ -2519,7 +2519,7 @@ pub const Effects = struct {
             },
             .SpecialDownChance => {
                 assert(boosts.spc >= -6 and boosts.spc <= 6);
-                if (boosts.spc == -6) return try log.fail(foe_ident, .None);
+                if (boosts.spc == -6) return if (fail) try log.fail(foe_ident, .None);
                 boosts.spc = @intCast(i4, @max(-6, @as(i8, boosts.spc) - 1));
                 if (stats.spc == 1) {
                     boosts.spc += 1;
@@ -2539,7 +2539,7 @@ pub const Effects = struct {
             },
             .AccuracyDown1 => {
                 assert(boosts.accuracy >= -6 and boosts.accuracy <= 6);
-                if (boosts.accuracy == -6) return try log.fail(foe_ident, .None);
+                if (boosts.accuracy == -6) return if (fail) try log.fail(foe_ident, .None);
                 boosts.accuracy = @intCast(i4, @max(-6, @as(i8, boosts.accuracy) - 1));
                 try log.boost(foe_ident, .Accuracy, -1);
             },
@@ -2720,15 +2720,15 @@ pub const Rolls = struct {
 
     inline fn metronome(battle: anytype) Move {
         if (showdown) {
-            const r = battle.rng.range(u8, 0, @enumToInt(Move.Struggle) - 2);
-            const mod = @as(u2, (if (r < @enumToInt(Move.Metronome) - 1) 1 else 2));
-            return @intToEnum(Move, r + mod);
+            const r = battle.rng.range(u8, 0, @intFromEnum(Move.Struggle) - 2);
+            const mod = @as(u2, (if (r < @intFromEnum(Move.Metronome) - 1) 1 else 2));
+            return @enumFromInt(Move, r + mod);
         }
         while (true) {
             const r = battle.rng.next();
-            if (r == 0 or r == @enumToInt(Move.Metronome)) continue;
-            if (r >= @enumToInt(Move.Struggle)) continue;
-            return @intToEnum(Move, r);
+            if (r == 0 or r == @intFromEnum(Move.Metronome)) continue;
+            if (r >= @intFromEnum(Move.Struggle)) continue;
+            return @enumFromInt(Move, r);
         }
     }
 
@@ -2813,7 +2813,7 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
             // strictly correct as the player would not have been presented the option to move or
             // switch at all.
             if (isForced(active)) {
-                out[n] = .{ .type = .Move, .data = @boolToInt(showdown) };
+                out[n] = .{ .type = .Move, .data = @intFromBool(showdown) };
                 n += 1;
                 return n;
             }

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

@@ -219,18 +219,18 @@ pub const Item = enum(u8) {
     pub inline fn boost(item: Item) ?Type {
         assert(item != .None);
         if (item == .PolkadotBow) return .Normal;
-        return if (@enumToInt(item) <= 18) @intToEnum(Type, @enumToInt(item) - 1) else null;
+        return if (@intFromEnum(item) <= 18) @enumFromInt(Type, @intFromEnum(item) - 1) else null;
     }
 
     /// Whether or not this item is a Berry.
     pub inline fn berry(item: Item) bool {
         assert(item != .None);
-        return @enumToInt(item) > 30 and @enumToInt(item) <= 40;
+        return @intFromEnum(item) > 30 and @intFromEnum(item) <= 40;
     }
 
     /// Whether or not this item is Mail.
     pub inline fn mail(item: Item) bool {
         assert(item != .None);
-        return @enumToInt(item) > 60 and @enumToInt(item) <= 70;
+        return @intFromEnum(item) > 60 and @intFromEnum(item) <= 70;
     }
 };

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

@@ -2779,6 +2779,6 @@ pub const Move = enum(u8) {
     /// Returns the `Data` corresponding to the move.
     pub inline fn get(id: Move) Data {
         assert(id != .None);
-        return DATA[@enumToInt(id) - 1];
+        return DATA[@intFromEnum(id) - 1];
     }
 };

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

@@ -1793,6 +1793,6 @@ pub const Species = enum(u8) {
     /// Returns the `Data` corresponding to the species.
     pub fn get(id: Species) Data {
         assert(id != .None);
-        return DATA[@enumToInt(id) - 1];
+        return DATA[@intFromEnum(id) - 1];
     }
 };

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

@@ -86,17 +86,17 @@ pub const Type = enum(u8) {
 
     /// Whether or not this type is considered to be special as opposed to physical.
     pub inline fn special(self: Type) bool {
-        return @enumToInt(self) >= @enumToInt(Type.Fire);
+        return @intFromEnum(self) >= @intFromEnum(Type.Fire);
     }
 
     /// The `Effectiveness` of type `t2` vs. type `t1`.
     pub inline fn effectiveness(t1: Type, t2: Type) Effectiveness {
-        return CHART[@enumToInt(t1)][@enumToInt(t2)];
+        return CHART[@intFromEnum(t1)][@intFromEnum(t2)];
     }
 
     /// The precedence order of type type.
     pub inline fn precedence(self: Type) u8 {
-        return PRECEDENCE[@enumToInt(self)];
+        return PRECEDENCE[@intFromEnum(self)];
     }
 };
 

package/src/lib/gen2/data.zig

@@ -50,11 +50,11 @@ pub fn Battle(comptime RNG: anytype) type {
         field: Field = .{},
 
         pub inline fn side(self: *Self, player: Player) *Side {
-            return &self.sides[@enumToInt(player)];
+            return &self.sides[@intFromEnum(player)];
         }
 
         pub inline fn foe(self: *Self, player: Player) *Side {
-            return &self.sides[@enumToInt(player.foe())];
+            return &self.sides[@intFromEnum(player.foe())];
         }
 
         pub inline fn active(self: *Self, player: Player) ID {
@@ -208,8 +208,8 @@ const DVs = packed struct {
         const p = @intCast(u6, 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) + 1;
-        if (t >= @enumToInt(Type.@"???")) t = t + 1;
-        return DVs{ .gender = g, .pow = p, .type = @intToEnum(Type, t) };
+        if (t >= @intFromEnum(Type.@"???")) t = t + 1;
+        return DVs{ .gender = g, .pow = p, .type = @enumFromInt(Type, t) };
     }
 
     comptime {
@@ -327,7 +327,7 @@ pub fn Stats(comptime T: type) type {
 
         pub fn calc(comptime stat: []const u8, base: T, dv: u4, exp: u16, level: u8) T {
             assert(level > 0 and level <= 100);
-            const evs = @min(255, @floatToInt(u16, @ceil(@sqrt(@intToFloat(f32, exp)))));
+            const evs = @min(255, @intFromFloat(u16, @ceil(@sqrt(@floatFromInt(f32, exp)))));
             const core: u32 = (2 *% (@as(u32, base) +% dv)) +% (evs / 4);
             const factor: u32 = if (std.mem.eql(u8, stat, "hp")) level + 10 else 5;
             return @intCast(T, core *% @as(u32, level) / 100 +% factor);
@@ -390,7 +390,7 @@ test Item {
 pub const Move = moves.Move;
 
 test Move {
-    try expectEqual(251, @enumToInt(Move.BeatUp));
+    try expectEqual(251, @intFromEnum(Move.BeatUp));
     const move = Move.get(.DynamicPunch);
     try expectEqual(Move.Effect.ConfusionChance, move.effect);
     try expectEqual(@as(u8, 50), move.accuracy);
@@ -400,7 +400,7 @@ test Move {
 pub const Species = species.Species;
 
 test Species {
-    try expectEqual(152, @enumToInt(Species.Chikorita));
+    try expectEqual(152, @intFromEnum(Species.Chikorita));
     try expectEqual(@as(u8, 100), Species.get(.Celebi).stats.spd);
 }
 
@@ -409,7 +409,7 @@ pub const Types = types.Types;
 pub const Effectiveness = gen1.Effectiveness;
 
 test Types {
-    try expectEqual(13, @enumToInt(Type.Electric));
+    try expectEqual(13, @intFromEnum(Type.Electric));
 
     try expect(!Type.Steel.special());
     try expect(Type.Dark.special());

package/src/lib/gen2/helpers.zig

@@ -158,11 +158,11 @@ pub const Pokemon = struct {
     }
 
     pub fn random(rand: *PSRNG, opt: Options) data.Pokemon {
-        const s = @intToEnum(Species, rand.range(u8, 1, Species.size + 1));
+        const s = @enumFromInt(Species, rand.range(u8, 1, Species.size + 1));
         const species = Species.get(s);
         const lvl = if (rand.chance(u8, 1, 20)) rand.range(u8, 1, 99 + 1) else 100;
         // Pokémon Showdown does not support most items without in-battle held item effects
-        const max_item = @enumToInt(if (showdown) Item.FlowerMail else Item.TM50);
+        const max_item = @intFromEnum(if (showdown) Item.FlowerMail else Item.TM50);
         const item = if (rand.chance(u8, 1, 10)) 0 else rand.range(u8, 1, max_item + 1);
 
         var stats: Stats(u16) = .{};
@@ -184,7 +184,7 @@ pub const Pokemon = struct {
         for (0..n) |i| {
             var m: Move = .None;
             sample: while (true) {
-                m = @intToEnum(Move, rand.range(u8, 1, 164 + 1));
+                m = @enumFromInt(Move, rand.range(u8, 1, 164 + 1));
                 for (0..i) |j| if (ms[j].id == m) continue :sample;
                 break;
             }