@pkmn/engine 0.1.0-dev.84cc1a02 → 0.1.0-dev.976cf3c3

package/build.zig

@@ -28,7 +28,7 @@ pub fn build(b: *std.Build) !void {
     const strip = b.option(bool, "strip", "Strip debugging symbols from binary") orelse false;
     const pic = b.option(bool, "pic", "Force position independent code") orelse false;
 
-    const cmd = b.findProgram(&[_][]const u8{"strip"}, &[_][]const u8{}) catch null;
+    const cmd = b.findProgram(&.{"strip"}, &.{}) catch null;
 
     var parser = std.json.Parser.init(b.allocator, false);
     defer parser.deinit();
@@ -72,7 +72,7 @@ pub fn build(b: *std.Build) !void {
         maybeStrip(b, lib, b.getInstallStep(), strip, cmd);
         if (pic) lib.force_pic = pic;
         // Always emit to build/lib because this is where the driver code expects to find it
-        // TODO(ziglang/zig#2231): using the following used to work (though be hacky):
+        // TODO(ziglang/zig#2231): using the following used to work (though was hacky):
         //
         //    lib.emit_bin = .{ .emit_to = b.fmt("build/lib/{s}", .{addon}) };
         //    b.getInstallStep().dependOn(&lib.step);
@@ -96,13 +96,10 @@ pub fn build(b: *std.Build) !void {
         lib.rdynamic = true;
         lib.strip = strip;
         if (pic) lib.force_pic = pic;
-        const opt = b.findProgram(
-            &[_][]const u8{"wasm-opt"},
-            &[_][]const u8{"./node_modules/.bin"},
-        ) catch null;
+        const opt = b.findProgram(&.{"wasm-opt"}, &.{"./node_modules/.bin"}) catch null;
         if (optimize != .Debug and opt != null) {
             const out = b.fmt("build/lib/{s}.wasm", .{name});
-            const sh = b.addSystemCommand(&[_][]const u8{ opt.?, "-O4" });
+            const sh = b.addSystemCommand(&.{ opt.?, "-O4" });
             sh.addArtifactArg(lib);
             sh.addArg("-o");
             sh.addFileSourceArg(.{ .path = out });
@@ -233,7 +230,7 @@ fn maybeStrip(
     if (mac and artifact.isDynamicLibrary()) return;
     // Assuming GNU strip, which complains "illegal pathname found in archive member"...
     if (!mac and artifact.isStaticLibrary()) return;
-    const sh = b.addSystemCommand(&[_][]const u8{ cmd.?, if (mac) "-x" else "-s" });
+    const sh = b.addSystemCommand(&.{ cmd.?, if (mac) "-x" else "-s" });
     sh.addArtifactArg(artifact);
     step.dependOn(&sh.step);
 }
@@ -246,7 +243,7 @@ const Config = struct {
     cmd: ?[]const u8,
 };
 
-const TESTS = [_][]const u8{
+const TESTS = .{
     "src/lib/common/test.zig",
     "src/lib/gen1/test.zig",
     "src/lib/gen2/test.zig",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/engine",
-  "version": "0.1.0-dev.84cc1a02",
+  "version": "0.1.0-dev.976cf3c3",
   "description": "A minimal, complete, Pokémon battle simulation engine optimized for performance",
   "repository": "github:pkmn/engine",
   "license": "MIT",
@@ -57,14 +57,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@pkmn/data": "^0.7.35",
+    "@pkmn/data": "^0.7.36",
     "@pkmn/protocol": "^0.6.11"
   },
   "devDependencies": {
     "@pkmn/eslint-config": "^3.0.0",
     "@pkmn/img": "^0.2.8",
     "@pkmn/sets": "^5.0.4",
-    "@pkmn/sim": "0.7.35",
+    "@pkmn/sim": "0.7.36",
     "@types/html-minifier": "^4.0.2",
     "@types/jest": "^29.5.0",
     "@types/minimist": "^1.2.2",

package/src/bin/install-pkmn-engine

@@ -15,8 +15,10 @@ const DEV = ZIG_VERSION.dev ? `-dev.${ZIG_VERSION.dev}` : '';
 const VERSION = `${ZIG_VERSION.major}.${ZIG_VERSION.minor}.${ZIG_VERSION.patch}${DEV}`;
 const INDEX = 'https://ziglang.org/download/index.json';
 const ROOT = path.resolve(__dirname, '..', '..');
+let SILENT = false;
 
 const sh = (cmd, args) => execFileSync(cmd, args, {encoding: 'utf8', cwd: ROOT});
+const log = (...args) => { if (!SILENT) console.log(...args); };
 
 // This is hardly the browser fetch API, but it works for our primitive needs
 const fetch = url => new Promise((resolve, reject) => {
@@ -61,7 +63,7 @@ const unpack7 = (input, output) => new Promise((resolve, reject) => {
     require.resolve('7zip-min');
   } catch (err) {
     if (err.code !== 'MODULE_NOT_FOUND') throw err;
-    console.log('Installing 7zip-min package locally to unpack the archive...');
+    log('Installing 7zip-min package locally to unpack the archive...');
     sh('npm', ['install', '7zip-min', '--no-audit', '--no-save']);
   }
 
@@ -83,7 +85,7 @@ const unpack = async (input, output) => {
       sh('tar', ['xf', input, '-C', output]);
       return;
     } catch {
-      console.log('tar command not found, falling back to 7z');
+      log('tar command not found, falling back to 7z');
     }
   }
   // Try to use a 7z binary if we can, and only install 7zip-min as a last resort
@@ -120,10 +122,10 @@ const find = zig => {
         (!ZIG_VERSION.dev || (dev && dev >= ZIG_VERSION.dev)));
 
     if (compatible) {
-      console.log('Found existing compatible Zig executable:', zig_exe);
+      log('Found existing compatible Zig executable:', zig_exe);
       return zig_exe;
     } else {
-      console.log(`Existing Zig executable is not compatible (${version} < ${VERSION}):`, zig_exe);
+      log(`Existing Zig executable is not compatible (${version} < ${VERSION}):`, zig_exe);
     }
   } catch (err) {
     if (err.code !== 'ENOENT') throw err;
@@ -168,11 +170,11 @@ const install = async () => {
   let base = path.basename(url);
   const archive = path.join(dir, path.basename(url));
 
-  console.log(`Downloading Zig tarball from ${url} to ${archive}`);
+  log(`Downloading Zig tarball from ${url} to ${archive}`);
   try {
     await download(url, archive, release.shasum);
 
-    console.log(`Extracting tarball and installing to ${dir}`);
+    log(`Extracting tarball and installing to ${dir}`);
     await unpack(archive, dir);
     if (archive.endsWith('.zip')) {
       base = base.slice(0, -4);
@@ -187,17 +189,17 @@ const install = async () => {
     } catch (err) {
       if (err.code !== 'ENOENT') throw err;
     }
-    console.log(`Zig${version === 'master' ? '' : ` v${version}`} executable:`, zig,
+    log(`Zig${version === 'master' ? '' : ` v${version}`} executable:`, zig,
       '(this version of Zig will be retained to speed up future updates)');
     const [pre, post] = tty.isatty(1) ? ['\x1b[1m\x1b[35m', '\x1b[0m'] : ['', ''];
-    console.log(
+    log(
       `${pre}Consider moving the ${path.dirname(zig)} directory and adding it to your PATH`,
       `to use Zig on other projects, or delete this if you wish to save space.${post}`
     );
 
     return zig;
   } finally {
-    console.log(`Cleaning up ${archive}`);
+    log(`Cleaning up ${archive}`);
     try { fs.rmSync(archive); } catch {}
   }
 };
@@ -206,17 +208,17 @@ const install = async () => {
 const downloadHeaders = async () => {
   const include = path.resolve(process.execPath, '..', '..', 'include', 'node');
   if (fs.existsSync(path.join(include, 'node.h'))) {
-    console.log('Node headers:', include);
+    log('Node headers:', include);
     return include;
   }
 
   const dir = path.join(ROOT, 'build', 'include');
   const dest = path.join(dir, 'node');
   if (fs.existsSync(path.join(dest, 'node.h'))) {
-    console.log('Node headers:', dest);
+    log('Node headers:', dest);
     return dest;
   } else {
-    console.log(`Could not find Node headers at ${include}, downloading...`);
+    log(`Could not find Node headers at ${include}, downloading...`);
   }
 
   try {
@@ -229,14 +231,14 @@ const downloadHeaders = async () => {
   const targz = path.join(dir, path.basename(url));
   const unpacked = path.join(dir, `node-${process.version}`, 'include');
 
-  console.log(`Downloading Node headers from ${url} to ${targz}`);
+  log(`Downloading Node headers from ${url} to ${targz}`);
 
   try {
     await download(url, targz);
     await unpack(targz, dir);
     fs.renameSync(path.join(unpacked, 'node'), dest);
 
-    console.log('Node headers:', dest);
+    log('Node headers:', dest);
 
     return dest;
   } finally {
@@ -248,7 +250,7 @@ const downloadHeaders = async () => {
 const downloadImportLib = async () => {
   const library = path.resolve(process.execPath, '..', 'node.lib');
   if (fs.existsSync(path.join(library, 'node.h'))) {
-    console.log('Node import library:', library);
+    log('Node import library:', library);
     return library;
   }
 
@@ -256,10 +258,10 @@ const downloadImportLib = async () => {
   const url = new URL('./win-x64/node.lib', process.release.headersUrl).href;
   const dest = path.join(dir, path.basename(url));
   if (fs.existsSync(path.join(dest))) {
-    console.log('Node import library:', dest);
+    log('Node import library:', dest);
     return dest;
   } else {
-    console.log(`Could not find Node import library at ${library}, downloading...`);
+    log(`Could not find Node import library at ${library}, downloading...`);
   }
 
   try {
@@ -268,24 +270,41 @@ const downloadImportLib = async () => {
     if (err.code !== 'EEXIST') throw err;
   }
 
-  console.log(`Downloading Node import library from ${url} to ${dest}`);
+  log(`Downloading Node import library from ${url} to ${dest}`);
   await download(url, dest);
-  console.log('Node import library:', dest);
+  log('Node import library:', dest);
 
   return dest;
 };
 
 (async () => {
-  const options = (process.argv[2] || '').startsWith('--options=')
-    ? process.argv[2].slice(10).split(' ') : undefined;
-  if (process.argv.length > 3 ||
-    process.argv.length === 3 && !(process.argv[2] === '--zig' || options)) {
+  let only = false;
+  let options = undefined;
+  let error = false;
+  for (let i = 2; i < process.argv.length; i++) {
+    switch (process.argv[i]) {
+    case "--silent": {
+      SILENT = true;
+      break;
+    }
+    case "--zig": {
+      if (options || only) error = true;
+      only = true;
+      break;
+    }
+    default: {
+      if (options || only || !process.argv[i].startsWith('--options=')) error = true;
+      options = process.argv[i].slice(10).split(' ');
+    }
+    }
+  }
+  if (error) {
     console.error('Invalid arguments');
     process.exit(1);
   }
 
   const zig = await install();
-  if (process.argv[2] === '--zig') process.exit(0);
+  if (only) process.exit(0);
 
   let tmp;
   try {
@@ -355,7 +374,7 @@ const downloadImportLib = async () => {
       opts.includes('-Dshowdown') || opts.includes('-Dshowdown=true') ? '-showdown' : '';
     const flags = opts.length ? ` (${opts.join(' ')})` : '';
     const artifact = path.join('build', 'lib', `pkmn${suffix}.${config.type}`);
-    console.log(`Building ${artifact}${flags}`);
+    log(`Building ${artifact}${flags}`);
     sh(zig, args);
     // TODO: ziglang/zig#14647 broke emit_to so we get to rename the file ourselves...
     if (config.type === 'node') {

package/src/lib/gen1/README.md

@@ -493,6 +493,10 @@ the pkmn engine, but the following moves have their broken behavior preserved in
   instead cleared in Pokémon Showdown's "residual" phase, meaning the flinch status gets erroneously
   preserved across fainting (as fainting triggers Pokémon Showdown's "instaswitch" behavior which
   skips end-of-turn residuals).
+- **Rage**: Rage boosts should still result in burn/paralysis [stat modification
+  errors](https://pkmn.cc/bulba-glitch-1#Stat_modification_errors) but don't on Pokémon Showdown.
+  Furthermore, Pokémon Showdown only builds Rage for Disable/Explosion (hit/miss) when attacking
+  into a Substitute instead of all moves.
 - **Thrash** / **Petal Dance**: once a Pokémon is locked into a thrashing move they will lose all
   speed ties on Pokémon Showdown (due to the fact that if they win the speed tie their action will
   then get "changed" and inserted back into the queue after their opponent's action).

package/src/lib/gen1/mechanics.zig

@@ -620,8 +620,9 @@ fn beforeMove(
             return .done;
         }
 
+        const sub = showdown and foe.active.volatiles.Substitute;
         _ = try applyDamage(battle, player.foe(), player.foe(), .None, log);
-        if (foe.stored().hp > 0) try buildRage(battle, player.foe(), log);
+        if (foe.stored().hp > 0 and !sub) try buildRage(battle, player.foe(), log);
 
         // For reasons passing understanding, Pokémon Showdown still inflicts residual damage to
         // Bide's user even if the above damage has caused the foe to faint. It's simpler to always
@@ -894,6 +895,9 @@ fn doMove(
         hits = side.active.volatiles.attacks;
     }
 
+    // Pokémon Showdown only builds Rage for Disable/Explosion (hit/miss) when attacking into a sub
+    const sub = showdown and foe.active.volatiles.Substitute;
+
     var nullified = false;
     var hit: u4 = 0;
     while (hit < hits) {
@@ -909,7 +913,7 @@ fn doMove(
         if (hit == 0 and ohko) try log.ohko();
         hit += 1;
         if (foe.stored().hp == 0) break;
-        if (!late) try buildRage(battle, player.foe(), log);
+        if (!late and !sub) try buildRage(battle, player.foe(), log);
         // If the substitute breaks during a multi-hit attack, the attack ends
         if (nullified) break;
     }
@@ -946,8 +950,8 @@ fn doMove(
 
     if (foe.stored().hp == 0) return null;
 
-    // Pokémon Showdown builds Rage at the wrong time for non-MultiHit moves
-    if (late and move.effect != .Disable) try buildRage(battle, player.foe(), log);
+    // Pokémon Showdown builds Rage at the wrong time for non-MultiHit move
+    if (late and !sub and move.effect != .Disable) try buildRage(battle, player.foe(), log);
 
     if (!move.effect.isSpecial()) {
         // On the cartridge Rage is not considered to be "special" and thus gets executed for a
@@ -1100,11 +1104,12 @@ fn randomizeDamage(battle: anytype) void {
 
 fn specialDamage(battle: anytype, player: Player, move: Move.Data, log: anytype) !?Result {
     const side = battle.side(player);
+    const foe = battle.foe(player);
 
     if (!try checkHit(battle, player, move, log)) return null;
 
     battle.last_damage = switch (side.last_selected_move) {
-        .SuperFang => @max(battle.foe(player).stored().hp / 2, 1),
+        .SuperFang => @max(foe.stored().hp / 2, 1),
         .SeismicToss, .NightShade => side.stored().level,
         .SonicBoom => 20,
         .DragonRage => 40,
@@ -1127,8 +1132,9 @@ fn specialDamage(battle: anytype, player: Player, move: Move.Data, log: anytype)
 
     if (battle.last_damage == 0) return if (showdown) null else Result.Error;
 
+    const sub = showdown and foe.active.volatiles.Substitute;
     _ = try applyDamage(battle, player.foe(), player.foe(), .None, log);
-    if (battle.foe(player).stored().hp > 0) try buildRage(battle, player.foe(), log);
+    if (battle.foe(player).stored().hp > 0 and !sub) try buildRage(battle, player.foe(), log);
 
     return null;
 }
@@ -2343,6 +2349,8 @@ pub const Effects = struct {
                 const stat = unmodifiedStats(battle, player).atk;
                 stats.atk = @min(MAX_STAT_VALUE, stat * mod[0] / mod[1]);
                 try log.boost(ident, reason, n);
+                // Pokémon Showdown doesn't re-apply status modifiers after Rage boosts
+                if (showdown and move.effect == .Rage) return;
             },
             .DefenseUp1, .DefenseUp2 => {
                 assert(boosts.def >= -6 and boosts.def <= 6);
@@ -2593,9 +2601,14 @@ fn disabled(side: *Side, ident: ID, log: anytype) !bool {
     if (side.active.volatiles.disabled_move != 0) {
         // A Pokémon that transforms after being disabled may end up with less move slots
         const m = side.active.moves[side.active.volatiles.disabled_move - 1].id;
-        if (m != .None and m == side.last_selected_move) {
+        // side.last_selected_move can be Struggle here on Pokemon Showdown we need an extra check
+        const last = if (showdown and m == .Bide and side.active.volatiles.Bide)
+            m
+        else
+            side.last_selected_move;
+        if (m != .None and m == last) {
             side.active.volatiles.Charging = false;
-            try log.disabled(ident, side.last_selected_move);
+            try log.disabled(ident, last);
             return true;
         }
     }
@@ -2757,7 +2770,7 @@ pub fn choices(battle: anytype, player: Player, request: Choice.Type, out: []Cho
                 while (slot <= 4) : (slot += 1) {
                     const m = active.moves[slot - 1];
                     if (m.id == .None) break;
-                    if (m.id == side.last_selected_move) {
+                    if (m.id == if (active.volatiles.Bide) .Bide else side.last_selected_move) {
                         // Pokémon Showdown displays Struggle if limited to Bide but unable to pick
                         const struggle =
                             m.id == .Bide and (m.pp == 0 or active.volatiles.disabled_move == slot);