@pkmn/engine 0.1.0-dev.6195e056 → 0.1.0-dev.63cef311

package/README.md

@@ -22,7 +22,7 @@ implementation of both Pokémon battles as defined by the original game code, an
 Showdown](https://pokemonshowdown.com/)[^1] simulator which represents Pokémon battling as practically
 interpreted online.
 
-The pkmn engine is up to [**XXXX× faster**](docs/TESTING.md#results) than the
+The pkmn engine is [**more than 1000× faster**](docs/TESTING.md#results) than the
 [patched](docs/TESTING.md#patches) [Pokémon Showdown simulator
 code](https://github.com/smogon/pokemon-showdown) when playing out supported formats in
 compatibility mode and is extensively [tested](docs/TESTING.md) and [documented](docs). Note,

package/build/pkg/index.d.ts

@@ -362,7 +362,7 @@ export declare class Choice {
      * Only numeric choice data is supported.
      */
     static parse(choice: string): Choice;
-    /** Formats a `Choice` ino a Pokémon Showdown compatible choice string. */
+    /** Formats a `Choice` into a Pokémon Showdown compatible choice string. */
     static format(choice: Choice): string;
     /** Returns the "pass" `Choice`. */
     static pass(): Choice;

package/build/pkg/index.js

@@ -80,7 +80,7 @@ class Choice {
         const data = +(m[4] ?? m[7] ?? 0);
         return { type, data };
     }
-    /** Formats a `Choice` ino a Pokémon Showdown compatible choice string. */
+    /** Formats a `Choice` into a Pokémon Showdown compatible choice string. */
     static format(choice) {
         return choice.type === 'pass' ? choice.type : `${choice.type} ${choice.data}`;
     }

package/build/pkg/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pkg/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pkg/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,+CAAiC;AACjC,iCAA8B;AAC9B,6CAA+B;AA8V/B,2CAA2C;AAC9B,QAAA,MAAM,GAAG,IAAI;IACxB,2EAA2E;IAC3E,MAAM,CAAC,GAAe,EAAE,OAAsB;QAC5C,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,aAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,QAAQ,GAAG,CAAC,GAAG,EAAE;YACjB,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACxD,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;SACtD;IACH,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,GAAe,EAAE,MAAc,EAAE,OAAuB;QAC9D,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,aAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,QAAQ,GAAG,CAAC,GAAG,EAAE;YACjB,KAAK,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YACjE,OAAO,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;SACtD;IACH,CAAC;CACF,CAAC;AAEF,mDAAmD;AACnD,MAAa,MAAM;IACjB,+BAA+B;IAC/B,MAAM,CAAC,KAAK,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;IAEzC,MAAM,CAAC,IAAI,GAAG,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAU,CAAC;IAC/C,MAAM,CAAC,KAAK,GAAG,kDAAkD,CAAC;IAE5E,gBAAuB,CAAC;IAExB,sDAAsD;IACtD,MAAM,CAAC,MAAM,CAAC,IAAY;QACxB,OAAO,EAAC,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,EAAC,CAAC;IAC5D,CAAC;IAED,oDAAoD;IACpD,MAAM,CAAC,MAAM,CAAC,MAAe;QAC3B,OAAO,CAAC,MAAM;YACZ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpF,CAAC,CAAC,CAAC,CAAC,CAAC;IACT,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,MAAc;QACzB,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpC,IAAI,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,MAAM,GAAG,CAAC,CAAC;QACvD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAmB,CAAC;QACtD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAClC,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;IACtB,CAAC;IAED,2EAA2E;IAC3E,MAAM,CAAC,MAAM,CAAC,MAAc;QAC1B,OAAO,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;IAChF,CAAC;IAED,mCAAmC;IACnC,MAAM,CAAC,IAAI;QACT,OAAO,MAAM,CAAC,IAAI,CAAC;IACrB,CAAC;IAED,wDAAwD;IACxD,MAAM,CAAC,IAAI,CAAC,IAAuB;QACjC,OAAO,EAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAC,CAAC;IAC9B,CAAC;IAED,0DAA0D;IAC1D,MAAM,CAAC,MAAM,CAAC,IAAuB;QACnC,OAAO,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;IAChC,CAAC;;AAnDU,wBAAM;AAsDnB,kDAAkD;AAClD,MAAa,MAAM;IACjB,8BAA8B;IAC9B,MAAM,CAAC,KAAK,GAAG,CAAC,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAU,CAAC;IAEnE,gBAAuB,CAAC;IAExB,wDAAwD;IACxD,MAAM,CAAC,MAAM,CAAC,IAAY;QACxB,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,MAAM,CAAC;YACjC,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;YACpC,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC;SAC5B,CAAC;IACJ,CAAC;;AAbU,wBAAM;AAgBnB,uCAAwE;AAApD,gGAAA,IAAI,OAAA;AAAE,oGAAA,QAAQ,OAAA;AAAe,+FAAA,GAAG,OAAA;AACpD,+BAA8B;AAAtB,8FAAA,MAAM,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/engine",
-  "version": "0.1.0-dev.6195e056",
+  "version": "0.1.0-dev.63cef311",
   "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
   "repository": "github:pkmn/engine",
   "license": "MIT",
@@ -13,6 +13,7 @@
     "src/lib/binding/node.zig",
     "src/lib/binding/wasm.zig",
     "src/lib/common/data.zig",
+    "src/lib/common/debug.zig",
     "src/lib/common/options.zig",
     "src/lib/common/protocol.zig",
     "src/lib/common/rng.zig",
@@ -56,14 +57,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@pkmn/data": "^0.7.33",
+    "@pkmn/data": "^0.7.34",
     "@pkmn/protocol": "^0.6.11"
   },
   "devDependencies": {
     "@pkmn/eslint-config": "^3.0.0-alpha.0",
     "@pkmn/img": "^0.2.8",
     "@pkmn/sets": "^5.0.4",
-    "@pkmn/sim": "0.7.33",
+    "@pkmn/sim": "0.7.34",
     "@types/html-minifier": "^4.0.2",
     "@types/jest": "^29.5.0",
     "@types/minimist": "^1.2.2",

package/src/lib/common/debug.zig

@@ -0,0 +1,64 @@
+const std = @import("std");
+
+const debug = std.debug;
+const io = std.io;
+
+pub fn print(value: anytype) void {
+    debug.getStderrMutex().lock();
+    defer debug.getStderrMutex().unlock();
+    const stderr = io.getStdErr().writer();
+
+    nosuspend {
+        stderr.writeAll("\x1b[41m") catch return;
+        switch (@typeInfo(@TypeOf(value))) {
+            .Struct => |info| {
+                if (info.is_tuple) {
+                    inline for (info.fields, 0..) |f, i| {
+                        inspect(@field(value, f.name));
+                        if (i < info.fields.len - 1) stderr.writeAll(" ") catch return;
+                    }
+                } else {
+                    inspect(value);
+                }
+            },
+            else => inspect(value),
+        }
+        stderr.writeAll("\x1b[K\x1b[0m\n") catch return;
+    }
+}
+
+fn inspect(value: anytype) void {
+    const stderr = io.getStdErr().writer();
+
+    nosuspend {
+        const err = "Unable to format type '" ++ @typeName(@TypeOf(value)) ++ "'";
+        switch (@typeInfo(@TypeOf(value))) {
+            .Array => |info| {
+                if (info.child == u8) return stderr.print("{s}", .{value}) catch return;
+                @compileError(err);
+            },
+            .Pointer => |ptr_info| switch (ptr_info.size) {
+                .One => switch (@typeInfo(ptr_info.child)) {
+                    .Array => |info| {
+                        if (info.child == u8) return stderr.print("{s}", .{value}) catch return;
+                        @compileError(err);
+                    },
+                    .Enum, .Union, .Struct => return inspect(value.*),
+                    else => @compileError(err),
+                },
+                .Many, .C => {
+                    if (ptr_info.sentinel) |_| return inspect(std.mem.span(value));
+                    if (ptr_info.child == u8) {
+                        return stderr.print("{s}", .{std.mem.span(value)}) catch return;
+                    }
+                    @compileError(err);
+                },
+                .Slice => {
+                    if (ptr_info.child == u8) return stderr.print("{s}", .{value}) catch return;
+                    @compileError(err);
+                },
+            },
+            else => stderr.print("{}", .{value}) catch return,
+        }
+    }
+}

package/src/lib/gen1/README.md

@@ -515,7 +515,8 @@ the pkmn engine, but the following moves have their broken behavior preserved in
   glitch](https://glitchcity.wiki/Substitute_%C2%BC_HP_glitch) also fails in many cases due to
   Pokémon Showdown implementing the health check based on floating point division instead of integer
   divison like on the cartridge (meaning the Substitute 1/4 glitch will only occur if the Pokémon's
-  maximum HP is evenly divisible by 4).
+  maximum HP is evenly divisible by 4). Finally, Substitute also incorrectly blocks Dream Eater on
+  Pokémon Showdown.
 
 In addition to numerous cases where Pokémon Showdown uses the wrong type of message (e.g. `|-fail`
 vs. `|-miss|` vs. `|-immune|`, e.g. in the case of Leech Seed) which are not documented here, Pokémon

package/src/lib/gen1/data.zig

@@ -272,7 +272,7 @@ pub const Status = enum(u8) {
         return num > 0;
     }
 
-    /// Retunrns a human-readable representation of the status `num`.
+    /// Returns a human-readable representation of the status `num`.
     pub fn name(num: u8) []const u8 {
         if (Status.is(num, .EXT)) return if (num == Status.TOX) "TOX" else "SLF";
         if (Status.is(num, .SLP)) return "SLP";

package/src/lib/gen1/mechanics.zig

@@ -1278,7 +1278,9 @@ fn moveHit(battle: anytype, player: Player, move: Move.Data, immune: *bool, mist
             if (move.effect == .Swift) return true;
             if (foe.active.volatiles.Invulnerable) break :miss true;
         }
-        if (move.effect == .DreamEater and !Status.is(foe.stored().status, .SLP)) {
+        if (move.effect == .DreamEater and (!Status.is(foe.stored().status, .SLP) or
+            (showdown and foe.active.volatiles.Substitute)))
+        {
             immune.* = true;
             if (showdown) return false;
             break :miss true;
@@ -1480,16 +1482,20 @@ fn endTurn(battle: anytype, log: anytype) @TypeOf(log).Error!Result {
 
 fn checkEBC(battle: anytype) bool {
     for (battle.sides, 0..) |side, i| {
+        const foe = battle.sides[~@intCast(u1, i)];
+
         var foe_all_ghosts = true;
         var foe_all_transform = true;
+        for (foe.order, 0..) |id, j| {
+            if (id == 0) break;
+            const active = j == 0;
+            const pokemon = foe.pokemon[id - 1];
 
-        for (battle.sides[~@intCast(u1, i)].pokemon) |pokemon| {
-            if (pokemon.species == .None) continue;
-
-            const ghost = pokemon.hp == 0 or pokemon.types.includes(.Ghost);
+            const ghost = pokemon.hp == 0 or
+                (if (active) foe.active.types else pokemon.types).includes(.Ghost);
             foe_all_ghosts = foe_all_ghosts and ghost;
             foe_all_transform = foe_all_transform and pokemon.hp == 0 or transform: {
-                for (pokemon.moves) |m| {
+                for (if (active) foe.active.moves else pokemon.moves) |m| {
                     if (m.id == .None) break :transform true;
                     if (m.id != .Transform) break :transform false;
                 }
@@ -1497,10 +1503,14 @@ fn checkEBC(battle: anytype) bool {
             };
         }
 
-        for (side.pokemon) |pokemon| {
+        for (side.order, 0..) |id, j| {
+            if (id == 0) break;
+            const active = j == 0;
+            const pokemon = side.pokemon[id - 1];
+
             if (pokemon.hp == 0 or Status.is(pokemon.status, .FRZ)) continue;
             const transform = foe_all_transform and transform: {
-                for (pokemon.moves) |m| {
+                for (if (active) side.active.moves else pokemon.moves) |m| {
                     if (m.id == .None) break :transform true;
                     if (m.id != .Transform) break :transform false;
                 }
@@ -1508,7 +1518,7 @@ fn checkEBC(battle: anytype) bool {
             };
             if (transform) continue;
             const no_pp = foe_all_ghosts and no_pp: {
-                for (pokemon.moves) |m| {
+                for (if (active) side.active.moves else pokemon.moves) |m| {
                     if (m.pp != 0) break :no_pp false;
                 }
                 break :no_pp true;
@@ -1753,6 +1763,11 @@ pub const Effects = struct {
         var side = battle.side(player);
         var stored = side.stored();
 
+        if (battle.last_damage == 0) {
+            assert(showdown);
+            return;
+        }
+
         const drain = @max(battle.last_damage / 2, 1);
         battle.last_damage = drain;
 
@@ -2063,7 +2078,7 @@ pub const Effects = struct {
             return log.fail(foe_ident, if (Status.is(foe_stored.status, .PSN))
                 if (!showdown)
                     .Poison
-                else if (toxic == foe.active.volatiles.Toxic)
+                else if (toxic == (foe_stored.status == Status.TOX))
                     if (toxic) .Toxic else .Poison
                 else
                     .None
@@ -2514,13 +2529,9 @@ fn clearVolatiles(battle: anytype, who: Player, log: anytype) !void {
         volatiles.LeechSeed = false;
         try log.end(ident, .LeechSeed);
     }
-    if (volatiles.Toxic) {
+    if (!showdown and volatiles.Toxic) {
         volatiles.Toxic = false;
-        // volatiles.toxic is left unchanged, except on Pokémon Showdown which clears it
-        if (showdown) {
-            volatiles.toxic = 0;
-            try log.end(ident, .Toxic);
-        }
+        // volatiles.toxic is left unchanged, except on Pokémon Showdown which clears it (below)
     }
     if (volatiles.LightScreen) {
         volatiles.LightScreen = false;
@@ -2530,6 +2541,12 @@ fn clearVolatiles(battle: anytype, who: Player, log: anytype) !void {
         volatiles.Reflect = false;
         try log.end(ident, .Reflect);
     }
+    if (showdown and volatiles.Toxic) {
+        volatiles.Toxic = false;
+        // Pokémon Showdown erroneously clears the toxic counter
+        volatiles.toxic = 0;
+        try log.end(ident, .Toxic);
+    }
 }
 
 fn disabled(side: *Side, ident: ID, log: anytype) !bool {