@pkmn/engine 0.1.0-dev.900756a9 → 0.1.0-dev.9257876b

package/src/lib/gen2/chance.zig

@@ -14,7 +14,7 @@ const util = @import("../common/util.zig");
 const Player = @import("../common/data.zig").Player;
 const Optional = @import("../common/optional.zig").Optional;
 
-const data = @import("./data.zig");
+const data = @import("data.zig");
 
 const enabled = options.chance;
 const showdown = options.showdown;
@@ -97,16 +97,17 @@ pub const Actions = extern struct {
     }
 };
 
+// TODO: ziglang/zig#19730
 test Actions {
     const a: Actions = .{ .p1 = .{ .hit = .true, .critical_hit = .false, .damage = 245 } };
     const b: Actions = .{ .p1 = .{ .hit = .false, .critical_hit = .true, .damage = 246 } };
     const c: Actions = .{ .p1 = .{ .hit = .true } };
-    const d: Actions = .{ .p2 = .{ .hit = .true, .durations = .{ .sleep = 2 } } };
-    const e: Actions = .{ .p2 = .{ .hit = .false, .durations = .{ .sleep = 4 } } };
-    const f: Actions = .{ .p1 = .{ .hit = .false, .durations = .{ .sleep = 4 } } };
-    const g: Actions = .{ .p1 = .{ .hit = .false, .durations = .{ .confusion = 1 } } };
-    const h: Actions =
-        .{ .p1 = .{ .hit = .false, .durations = .{ .confusion = 1, .thrash = true } } };
+    // const d: Actions = .{ .p2 = .{ .hit = .true, .durations = .{ .sleep = 2 } } };
+    // const e: Actions = .{ .p2 = .{ .hit = .false, .durations = .{ .sleep = 4 } } };
+    // const f: Actions = .{ .p1 = .{ .hit = .false, .durations = .{ .sleep = 4 } } };
+    // const g: Actions = .{ .p1 = .{ .hit = .false, .durations = .{ .confusion = 1 } } };
+    // const h: Actions =
+    //     .{ .p1 = .{ .hit = .false, .durations = .{ .confusion = 1, .thrash = true } } };
 
     try expect(a.eql(a));
     try expect(!a.eql(b));
@@ -119,10 +120,10 @@ test Actions {
     try expect(b.matches(a));
     try expect(!a.matches(c));
     try expect(!c.matches(a));
-    try expect(d.matches(e));
-    try expect(!d.matches(f));
-    try expect(!g.matches(h));
-    try expect(h.matches(h));
+    // try expect(d.matches(e));
+    // try expect(!d.matches(f));
+    // try expect(!g.matches(h));
+    // try expect(h.matches(h));
 }
 
 /// Information about the RNG that was observed during a Generation II battle `update` for a
@@ -699,7 +700,7 @@ test "Chance.damage" {
     var chance: Chance(rational.Rational(u64)) = .{ .probability = .{} };
 
     try chance.damage(.P1, 217);
-    try expectValue(@as(u8, 217), chance.actions.p1.damage);
+    try expectValue(217, chance.actions.p1.damage);
     try expectProbability(&chance.probability, 1, 39);
 }
 
@@ -824,7 +825,7 @@ test "Chance.present" {
     } else {
         try expectProbability(&chance.probability, 25, 256);
     }
-    try expectValue(@as(u3, 4), chance.actions.p2.present);
+    try expectValue(4, chance.actions.p2.present);
 
     chance.reset();
 
@@ -834,7 +835,7 @@ test "Chance.present" {
     } else {
         try expectProbability(&chance.probability, 51, 256);
     }
-    try expectValue(@as(u3, 1), chance.actions.p1.present);
+    try expectValue(1, chance.actions.p1.present);
 }
 
 test "Chance.magnitude" {
@@ -846,7 +847,7 @@ test "Chance.magnitude" {
     } else {
         try expectProbability(&chance.probability, 13, 256);
     }
-    try expectValue(@as(u3, 7), chance.actions.p2.magnitude);
+    try expectValue(7, chance.actions.p2.magnitude);
 
     chance.reset();
 
@@ -856,7 +857,7 @@ test "Chance.magnitude" {
     } else {
         try expectProbability(&chance.probability, 51, 256);
     }
-    try expectValue(@as(u3, 5), chance.actions.p1.magnitude);
+    try expectValue(5, chance.actions.p1.magnitude);
 }
 
 test "Chance.tripleKick" {
@@ -864,7 +865,7 @@ test "Chance.tripleKick" {
 
     try chance.tripleKick(.P1, 2);
     try expectProbability(&chance.probability, 1, 3);
-    try expectValue(@as(u2, 2), chance.actions.p1.triple_kick);
+    try expectValue(2, chance.actions.p1.triple_kick);
 }
 
 test "Chance.spite" {
@@ -872,7 +873,7 @@ test "Chance.spite" {
 
     try chance.spite(.P1, 3);
     try expectProbability(&chance.probability, 1, 4);
-    try expectValue(@as(u3, 3), chance.actions.p1.spite);
+    try expectValue(3, chance.actions.p1.spite);
 }
 
 test "Chance.conversion2" {
@@ -899,7 +900,7 @@ test "Chance.psywave" {
 
     try chance.psywave(.P2, 100, 150);
     try expectProbability(&chance.probability, 1, 150);
-    try expectValue(@as(u8, 100), chance.actions.p2.psywave);
+    try expectValue(100, chance.actions.p2.psywave);
 }
 
 test "Chance.metronome" {
@@ -915,19 +916,19 @@ test "Chance.moveSlot" {
 
     try chance.moveSlot(.P2, 2, 2);
     try expectProbability(&chance.probability, 1, 2);
-    try expectValue(@as(u4, 2), chance.actions.p2.move_slot);
+    try expectValue(2, chance.actions.p2.move_slot);
 
     chance.reset();
 
     try chance.moveSlot(.P1, 1, 3);
     try expectProbability(&chance.probability, 1, 3);
-    try expectValue(@as(u4, 1), chance.actions.p1.move_slot);
+    try expectValue(1, chance.actions.p1.move_slot);
 
     chance.reset();
 
     try chance.moveSlot(.P1, 4, 1);
     try expectProbability(&chance.probability, 1, 1);
-    try expectValue(@as(u4, 4), chance.actions.p1.move_slot);
+    try expectValue(4, chance.actions.p1.move_slot);
 }
 
 test "Chance.forceSwitch" {
@@ -935,19 +936,19 @@ test "Chance.forceSwitch" {
 
     try chance.forceSwitch(.P2, 2, 2);
     try expectProbability(&chance.probability, 1, 2);
-    try expectValue(@as(u4, 2), chance.actions.p2.force_switch);
+    try expectValue(2, chance.actions.p2.force_switch);
 
     chance.reset();
 
     try chance.forceSwitch(.P1, 1, 3);
     try expectProbability(&chance.probability, 1, 3);
-    try expectValue(@as(u4, 1), chance.actions.p1.force_switch);
+    try expectValue(1, chance.actions.p1.force_switch);
 
     chance.reset();
 
     try chance.forceSwitch(.P1, 4, 1);
     try expectProbability(&chance.probability, 1, 1);
-    try expectValue(@as(u4, 4), chance.actions.p1.force_switch);
+    try expectValue(4, chance.actions.p1.force_switch);
 }
 
 test "Chance.multiHit" {
@@ -955,21 +956,21 @@ test "Chance.multiHit" {
 
     try chance.multiHit(.P1, 3);
     try expectProbability(&chance.probability, 3, 8);
-    try expectValue(@as(u4, 3), chance.actions.p1.multi_hit);
+    try expectValue(3, chance.actions.p1.multi_hit);
 
     chance.reset();
 
     try chance.multiHit(.P2, 5);
     try expectProbability(&chance.probability, 1, 8);
-    try expectValue(@as(u4, 5), chance.actions.p2.multi_hit);
+    try expectValue(5, chance.actions.p2.multi_hit);
 }
 
 test "Chance.duration" {
     var chance: Chance(rational.Rational(u64)) = .{ .probability = .{} };
 
     chance.duration(.sleep, .P1, .P2, 2);
-    try expectValue(@as(u4, 2), chance.actions.p1.duration);
-    try expectValue(@as(u3, 1), chance.actions.p2.durations.sleep);
+    try expectValue(2, chance.actions.p1.duration);
+    try expectValue(1, chance.actions.p2.durations.sleep);
 }
 
 test "Chance.sleep" {
@@ -979,7 +980,7 @@ test "Chance.sleep" {
         chance.actions.p1.durations.sleep = @intCast(i);
         try chance.sleep(.P1, 0);
         try expectProbability(&chance.probability, 1, d);
-        try expectValue(@as(u3, 0), chance.actions.p1.durations.sleep);
+        try expectValue(0, chance.actions.p1.durations.sleep);
 
         chance.reset();
 
@@ -1003,7 +1004,7 @@ test "Chance.confusion" {
             chance.actions.p2.durations.confusion = @intCast(i);
             try chance.confusion(.P2, 0);
             try expectProbability(&chance.probability, 1, d);
-            try expectValue(@as(u3, 0), chance.actions.p2.durations.confusion);
+            try expectValue(0, chance.actions.p2.durations.confusion);
             try expectValue(false, chance.actions.p2.durations.thrash);
 
             chance.reset();
@@ -1028,7 +1029,7 @@ test "Chance.confusion" {
             chance.actions.p2.durations.confusion = @intCast(i);
             try chance.confusion(.P2, 0);
             try expectProbability(&chance.probability, 1, d);
-            try expectValue(@as(u3, 0), chance.actions.p2.durations.confusion);
+            try expectValue(0, chance.actions.p2.durations.confusion);
             try expectValue(true, chance.actions.p2.durations.thrash);
 
             chance.reset();
@@ -1054,7 +1055,7 @@ test "Chance.disable" {
                 chance.actions.p2.durations.disable = @intCast(i);
                 try chance.disable(.P2, 0);
                 try expectProbability(&chance.probability, 1, d);
-                try expectValue(@as(u4, 0), chance.actions.p2.durations.disable);
+                try expectValue(0, chance.actions.p2.durations.disable);
 
                 chance.reset();
             }
@@ -1074,7 +1075,7 @@ test "Chance.disable" {
                 chance.actions.p2.durations.disable = @intCast(i);
                 try chance.disable(.P2, 0);
                 try expectProbability(&chance.probability, 1, d);
-                try expectValue(@as(u4, 0), chance.actions.p2.durations.disable);
+                try expectValue(0, chance.actions.p2.durations.disable);
 
                 chance.reset();
             }
@@ -1099,7 +1100,7 @@ test "Chance.attacking" {
             chance.actions.p2.durations.attacking = @intCast(i);
             try chance.attacking(.P2, 0);
             try expectProbability(&chance.probability, 1, d);
-            try expectValue(@as(u3, 0), chance.actions.p2.durations.attacking);
+            try expectValue(0, chance.actions.p2.durations.attacking);
 
             chance.reset();
         }
@@ -1123,7 +1124,7 @@ test "Chance.binding" {
             chance.actions.p2.durations.binding = @intCast(i);
             try chance.binding(.P2, 0);
             try expectProbability(&chance.probability, 1, d);
-            try expectValue(@as(u3, 0), chance.actions.p2.durations.binding);
+            try expectValue(0, chance.actions.p2.durations.binding);
 
             chance.reset();
         }
@@ -1147,7 +1148,7 @@ test "Chance.encore" {
             chance.actions.p2.durations.encore = @intCast(i);
             try chance.encore(.P2, 0);
             try expectProbability(&chance.probability, 1, d);
-            try expectValue(@as(u3, 0), chance.actions.p2.durations.encore);
+            try expectValue(0, chance.actions.p2.durations.encore);
 
             chance.reset();
         }

package/src/lib/gen2/data.zig

@@ -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);
@@ -380,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) {
@@ -428,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());
@@ -439,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;
@@ -452,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));

package/src/lib/gen2/generated.zig

@@ -7,8 +7,6 @@ const common = @import("../common/data.zig");
 const data = @import("data.zig");
 const mechanics = @import("mechanics.zig");
 
-const assert = std.debug.assert;
-
 const Player = common.Player;
 const Result = common.Result;
 
@@ -42,7 +40,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
     var log = options.log;
 
     var side = battle.side(player);
-    var volatiles = &side.active.volatiles;
+    const volatiles = &side.active.volatiles;
 
     const ident = battle.active(player);
     const foe_ident = battle.active(player.foe());
@@ -175,7 +173,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
             if (!skip_pp) _ = decrementPP(side, state.move, state.mslot); // TODO if no pp return
             // TODO rampage
             // usedmovetext
-            try log.move(ident, state.move, foe_ident); // FIXME self? from?
+            try log.move(.{ ident, state.move, foe_ident }); // FIXME self? from?
             try checkHit(battle, player, state, options);
             try checkCriticalHit(battle, player, state, options);
             try calcDamage(battle, player, state, options);
@@ -368,7 +366,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
                 (volatiles.BeatUp or volatiles.Thrashing or volatiles.Bide);
             if (!skip_pp) _ = decrementPP(side, state.move, state.mslot); // TODO if no pp return
             // usedmovetext
-            try log.move(ident, state.move, foe_ident); // FIXME self? from?
+            try log.move(.{ ident, state.move, foe_ident }); // FIXME self? from?
             try Effects.bide.unleash(battle, player, state, options);
 
             if (state.immune()) {
@@ -555,7 +553,7 @@ pub fn runMove(battle: anytype, player: Player, state: *State, options: anytype)
                 (volatiles.BeatUp or volatiles.Thrashing or volatiles.Bide);
             if (!skip_pp) _ = decrementPP(side, state.move, state.mslot); // TODO if no pp return
             // usedmovetext
-            try log.move(ident, state.move, foe_ident); // FIXME self? from?
+            try log.move(.{ ident, state.move, foe_ident }); // FIXME self? from?
             try checkCriticalHit(battle, player, state, options);
             try calcDamage(battle, player, state, options);
             try adjustDamage(battle, player, state, options);