@pkmn/engine 0.1.0-dev.a0447192 → 0.1.0-dev.a23f64f3

package/src/lib/gen2/mechanics.zig

@@ -1,44 +1,37 @@
-const std = @import("std");
-
-const pkmn = @import("../pkmn.zig");
-
-const common = @import("../common/data.zig");
 const DEBUG = @import("../common/debug.zig").print;
-const protocol = @import("../common/protocol.zig");
-const rng = @import("../common/rng.zig");
 
+const builtin = @import("builtin");
+const common = @import("../common/data.zig");
 const data = @import("data.zig");
 const generated = @import("generated.zig");
-
-const assert = std.debug.assert;
-
-const expectEqual = std.testing.expectEqual;
-const expectEqualSlices = std.testing.expectEqualSlices;
-const expectEqualStrings = std.testing.expectEqualStrings;
-
-const showdown = pkmn.options.showdown;
-
-const Choice = common.Choice;
-const ID = common.ID;
-const Player = common.Player;
-const Result = common.Result;
+const pkmn = @import("../pkmn.zig");
+const protocol = @import("../common/protocol.zig");
+const rng = @import("../common/rng.zig");
+const std = @import("std");
 
 const Activate = protocol.Activate;
+const ActivePokemon = data.ActivePokemon;
+const assert = std.debug.assert;
 const Boost = protocol.Boost;
+const Boosts = data.Boosts;
+const Choice = common.Choice;
 const Damage = protocol.Damage;
+const Effectiveness = data.Effectiveness;
 const End = protocol.End;
+const expectEqual = std.testing.expectEqual;
+const expectEqualSlices = std.testing.expectEqualSlices;
+const expectEqualStrings = std.testing.expectEqualStrings;
 const Fail = protocol.Fail;
-const Heal = protocol.Heal;
-const Start = protocol.Start;
-
 const Gen12 = rng.Gen12;
-
-const ActivePokemon = data.ActivePokemon;
-const Boosts = data.Boosts;
-const Effectiveness = data.Effectiveness;
+const Heal = protocol.Heal;
+const ID = common.ID;
 const Item = data.Item;
 const Move = data.Move;
+const Player = common.Player;
+const Result = common.Result;
+const showdown = pkmn.options.showdown;
 const Side = data.Side;
+const Start = protocol.Start;
 const Stats = data.Stats;
 const Status = data.Status;
 const TriAttack = data.TriAttack;
@@ -1200,7 +1193,7 @@ fn updateSideCondition(
 fn endTurn(battle: anytype, options: anytype) @TypeOf(options.log).Error!Result {
     battle.turn += 1;
 
-    if (showdown and battle.turn >= 1000) {
+    if (pkmn.options.mod and battle.turn >= 1000) {
         try options.log.tie(.{});
         return Result.Tie;
     } else if (battle.turn >= 65535) {
@@ -1434,7 +1427,8 @@ pub const Effects = struct {
         if (move.type.special() != (last == .MirrorCoat)) return;
         if (state.damage == 0) return;
 
-        state.damage *|= 2;
+        // NOTE: llvm/llvm-project#58557
+        state.damage = smul(state.damage, 2);
         state.miss = false;
     }
 
@@ -1529,15 +1523,18 @@ pub const Effects = struct {
 
     pub const double = struct {
         pub fn flying(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            if (battle.foe(player).active.volatiles.Flying) state.damage *|= 2;
+            if (!battle.foe(player).active.volatiles.Flying) return;
+            state.damage = smul(state.damage, 2);
         }
 
         pub fn underground(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            if (battle.foe(player).active.volatiles.Underground) state.damage *|= 2;
+            if (!battle.foe(player).active.volatiles.Underground) return;
+            state.damage = smul(state.damage, 2);
         }
 
         pub fn minimize(battle: anytype, player: Player, state: *State, _: anytype) !void {
-            if (battle.foe(player).active.volatiles.minimized) state.damage *|= 2;
+            if (!battle.foe(player).active.volatiles.minimized) return;
+            state.damage = smul(state.damage, 2);
         }
     };
 
@@ -1706,7 +1703,7 @@ pub const Effects = struct {
         if (!state.proc) return;
         if (foe.conditions.Safeguard) return;
         // Freeze Clause Mod
-        if (showdown) for (foe.pokemon) |p| if (Status.is(p.status, .FRZ)) return;
+        if (pkmn.options.mod) for (foe.pokemon) |p| if (Status.is(p.status, .FRZ)) return;
 
         foe_stored.status = Status.init(.FRZ);
         try options.log.status(.{ foe_ident, foe_stored.status, .None });
@@ -1735,7 +1732,7 @@ pub const Effects = struct {
             state.bp *= 2;
             assert(state.bp <= 160);
         } else {
-            state.damage *|= 2;
+            state.damage = smul(state.damage, 2);
         }
     }
 
@@ -2206,7 +2203,7 @@ pub const Effects = struct {
 
     pub fn pursuit(battle: anytype, player: Player, state: *State, _: anytype) !void {
         // TODO: remove switching variable and just look at Choice saved in Battle struct?
-        if (battle.foe(player).active.volatiles.switching) state.damage *|= 2;
+        if (battle.foe(player).active.volatiles.switching) state.damage = smul(state.damage, 2);
     }
 
     pub const rage = struct {
@@ -2219,7 +2216,7 @@ pub const Effects = struct {
             const side = battle.side(player);
 
             assert(side.active.volatiles.Rage);
-            state.damage *|= (side.active.volatiles.rage +| 1);
+            state.damage = smul(state.damage, (side.active.volatiles.rage +| 1)); // TODO: |+
         }
     };
 
@@ -2314,7 +2311,7 @@ pub const Effects = struct {
             side.active.volatiles.attacks += 1;
             side.active.volatiles.Rollout = side.active.volatiles.attacks != 5;
 
-            if (side.active.volatiles.DefenseCurl) state.damage *|= 2;
+            if (side.active.volatiles.DefenseCurl) state.damage = smul(state.damage, 2);
         }
     };
 
@@ -2384,7 +2381,7 @@ pub const Effects = struct {
         }
 
         // Sleep Clause Mod
-        if (showdown) {
+        if (pkmn.options.mod) {
             for (foe.pokemon) |p| {
                 if (Status.is(p.status, .SLP) and !Status.is(p.status, .EXT)) return;
             }
@@ -2842,6 +2839,12 @@ fn convertible(active: ActivePokemon, m: Move) bool {
     return t != .@"???" and !active.types.includes(t);
 }
 
+// NOTE: llvm/llvm-project#58557
+fn smul(a: anytype, b: @TypeOf(a)) @TypeOf(a) {
+    if (!comptime builtin.target.isWasm()) return a *| b;
+    return @max(a *% b, std.math.maxInt(@TypeOf(a)));
+}
+
 pub const Rolls = struct {
     fn speedTie(battle: anytype, options: anytype) !bool {
         const p1 = if (options.calc.overridden(.P1, 0, .speed_tie)) |player|

package/src/lib/node.zig

@@ -1,8 +1,6 @@
-const std = @import("std");
-
-const pkmn = @import("pkmn.zig");
-
 const js = @import("common/js.zig");
+const pkmn = @import("pkmn.zig");
+const std = @import("std");
 
 const assert = std.debug.assert;
 

package/src/lib/pkmn.zig

@@ -96,6 +96,10 @@ pub const gen1 = struct {
         /// though damage calculator support should additionally be turned off
         /// entirely via `options.calc`.
         pub const NULL = @import("gen1/calc.zig").NULL;
+        /// TODO
+        pub const MAX_FRONTIER = @import("gen1/calc.zig").MAX_FRONTIER;
+        /// TODO
+        pub const Rolls = @import("gen1/calc.zig").Rolls;
     };
     /// Provides helpers for initializing Generation I Pokémon battles.
     pub const helpers = @import("gen1/helpers.zig");

package/src/lib/wasm.zig

@@ -1,6 +1,9 @@
+const pkmn = @import("pkmn.zig");
 const std = @import("std");
 
-const pkmn = @import("pkmn.zig");
+const assert = std.debug.assert;
+
+const Enum = if (@hasField(std.builtin.Type, "enum")) .@"enum" else .Enum;
 
 export const SHOWDOWN = pkmn.options.showdown;
 export const LOG = pkmn.options.log;
@@ -11,3 +14,35 @@ export const GEN1_CHOICES_SIZE =
     std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(pkmn.gen1.CHOICES_SIZE))) catch unreachable;
 export const GEN1_LOGS_SIZE =
     std.math.ceilPowerOfTwo(u32, @as(u32, @intCast(pkmn.gen1.LOGS_SIZE))) catch unreachable;
+
+export fn GEN1_update(
+    battle: *pkmn.gen1.Battle(pkmn.gen1.PRNG),
+    c1: pkmn.Choice,
+    c2: pkmn.Choice,
+    options: ?[*]u8,
+) pkmn.Result {
+    return (if (options) |o| result: {
+        const buf = @as([*]u8, @ptrCast(o))[0..pkmn.gen1.LOGS_SIZE];
+        var stream: pkmn.protocol.ByteStream = .{ .buffer = buf };
+        // TODO: extract out
+        var opts = pkmn.battle.options(
+            pkmn.protocol.FixedLog{ .writer = stream.writer() },
+            pkmn.gen1.chance.NULL,
+            pkmn.gen1.calc.NULL,
+        );
+        break :result battle.update(c1, c2, &opts);
+    } else battle.update(c1, c2, &pkmn.gen1.NULL)) catch unreachable;
+}
+
+export fn GEN1_choices(
+    battle: *pkmn.gen1.Battle(pkmn.gen1.PRNG),
+    player: u8,
+    request: u8,
+    buf: [*]u8,
+) u8 {
+    assert(player <= @field(@typeInfo(pkmn.Player), @tagName(Enum)).fields.len);
+    assert(request <= @field(@typeInfo(pkmn.Choice.Type), @tagName(Enum)).fields.len);
+
+    const len = GEN1_CHOICES_SIZE;
+    return battle.choices(@enumFromInt(player), @enumFromInt(request), @ptrCast(buf[0..len]));
+}

package/src/tools/display/ui.css

@@ -250,11 +250,6 @@ th, td {
 .disabled {
   color: #AAAAAA;
 }
-.log {
-  display: flex;
-  justify-content: center;
-  padding-bottom: 2em;
-}
 .position {
   position: absolute;
   right: 10px;