@pkmn/sim 0.5.16 → 0.5.17

package/build/data/mods/gen7/rulesets.js

@@ -38,7 +38,8 @@ exports.Rulesets = {
             this.add('clearpoke');
             for (const pokemon of this.getAllPokemon()) {
                 const details = pokemon.details.replace(', shiny', '')
-                    .replace(/(Arceus|Gourgeist|Genesect|Pumpkaboo|Silvally|Zacian|Zamazenta|Urshifu)(-[a-zA-Z?-]+)?/g, '$1-*');
+                    .replace(/(Arceus|Gourgeist|Pumpkaboo|Xerneas|Silvally|Urshifu)(-[a-zA-Z?-]+)?/g, '$1-*')
+                    .replace(/(Zacian|Zamazenta)(?!-Crowned)/g, '$1-*'); // Hacked-in Crowned formes will be revealed
                 this.add('poke', pokemon.side.id, details, pokemon.item ? 'item' : '');
             }
             this.makeRequest('teampreview');

package/build/data/mods/gen7/rulesets.js.map

@@ -1 +1 @@
-{"version":3,"file":"rulesets.js","sourceRoot":"","sources":["../../../../data/mods/gen7/rulesets.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAoC;IACxD,QAAQ,EAAE;QACT,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,CAAC,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,cAAc,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,YAAY,CAAC;KACnN;IACD,eAAe,EAAE;QAChB,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,CAAC,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,cAAc,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,YAAY,CAAC;KACnP;IACD,eAAe,EAAE;QAChB,OAAO,EAAE,IAAI;QACb,OAAO,EAAE;YACR,sCAAsC;YACtC,oCAAoC;YACpC,qCAAqC;YAErC,4DAA4D;YAC5D,kDAAkD;YAClD,uCAAuC;YACvC,yCAAyC;YACzC,qCAAqC;SACrC;KACD;IACD,kBAAkB,EAAE;QACnB,UAAU,EAAE,eAAe;QAC3B,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,gDAAgD;QACtD,OAAO,EAAE,CAAC,0BAA0B,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,yBAAyB,CAAC;QACpI,OAAO;YACN,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,8GAA8G,CAAC,CAAC;QAClI,CAAC;KACD;IACD,WAAW,EAAE;QACZ,OAAO,EAAE,IAAI;QACb,aAAa;YACZ,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;gBAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;qBACpD,OAAO,CAAC,yFAAyF,EAAE,MAAM,CAAC,CAAC;gBAC7G,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACvE;YACD,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;KACD;CACD,CAAC"}
+{"version":3,"file":"rulesets.js","sourceRoot":"","sources":["../../../../data/mods/gen7/rulesets.ts"],"names":[],"mappings":";;;AAAa,QAAA,QAAQ,GAAoC;IACxD,QAAQ,EAAE;QACT,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,CAAC,YAAY,EAAE,cAAc,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,cAAc,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,YAAY,CAAC;KACnN;IACD,eAAe,EAAE;QAChB,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,CAAC,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,aAAa,EAAE,cAAc,EAAE,0BAA0B,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,YAAY,CAAC;KACnP;IACD,eAAe,EAAE;QAChB,OAAO,EAAE,IAAI;QACb,OAAO,EAAE;YACR,sCAAsC;YACtC,oCAAoC;YACpC,qCAAqC;YAErC,4DAA4D;YAC5D,kDAAkD;YAClD,uCAAuC;YACvC,yCAAyC;YACzC,qCAAqC;SACrC;KACD;IACD,kBAAkB,EAAE;QACnB,UAAU,EAAE,eAAe;QAC3B,IAAI,EAAE,sBAAsB;QAC5B,IAAI,EAAE,gDAAgD;QACtD,OAAO,EAAE,CAAC,0BAA0B,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,yBAAyB,CAAC;QACpI,OAAO;YACN,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,8GAA8G,CAAC,CAAC;QAClI,CAAC;KACD;IACD,WAAW,EAAE;QACZ,OAAO,EAAE,IAAI;QACb,aAAa;YACZ,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACtB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE;gBAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;qBACpD,OAAO,CAAC,uEAAuE,EAAE,MAAM,CAAC;qBACxF,OAAO,CAAC,iCAAiC,EAAE,MAAM,CAAC,CAAC,CAAC,4CAA4C;gBAClG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;aACvE;YACD,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;KACD;CACD,CAAC"}

package/build/data/moves.js

@@ -2731,60 +2731,55 @@ exports.Moves = {
                 const offset = this.random(3) + 1;
                 // the list of all sides in counterclockwise order
                 const sides = [this.sides[0], this.sides[2], this.sides[1], this.sides[3]];
-                for (const id of sideConditions) {
-                    const effectName = this.dex.conditions.get(id).name;
-                    const rotatedSides = [];
-                    let someCondition = false;
-                    for (let i = 0; i < 4; i++) {
-                        const sourceSide = sides[i];
-                        const targetSide = sides[(i + offset) % 4]; // the next side in rotation
-                        rotatedSides.push(targetSide.sideConditions[id]);
-                        if (sourceSide.sideConditions[id]) {
-                            this.add('-sideend', sourceSide, effectName, '[silent]');
-                            someCondition = true;
-                        }
+                const temp = { 0: {}, 1: {}, 2: {}, 3: {} };
+                for (const side of sides) {
+                    for (const id in side.sideConditions) {
+                        if (!sideConditions.includes(id))
+                            continue;
+                        temp[side.n][id] = side.sideConditions[id];
+                        delete side.sideConditions[id];
+                        const effectName = this.dex.conditions.get(id).name;
+                        this.add('-sideend', side, effectName, '[silent]');
+                        success = true;
                     }
-                    if (!someCondition)
-                        continue;
-                    [
-                        sides[0].sideConditions[id], sides[1].sideConditions[id],
-                        sides[2].sideConditions[id], sides[3].sideConditions[id],
-                    ] = [...rotatedSides];
-                    for (const side of sides) {
-                        if (side.sideConditions[id]) {
-                            let layers = side.sideConditions[id].layers || 1;
-                            for (; layers > 0; layers--)
-                                this.add('-sidestart', side, effectName, '[silent]');
-                        }
-                        else {
-                            delete side.sideConditions[id];
-                        }
+                }
+                for (let i = 0; i < 4; i++) {
+                    const sourceSideConditions = temp[sides[i].n];
+                    const targetSide = sides[(i + offset) % 4]; // the next side in rotation
+                    for (const id in sourceSideConditions) {
+                        targetSide.sideConditions[id] = sourceSideConditions[id];
+                        const effectName = this.dex.conditions.get(id).name;
+                        let layers = sourceSideConditions[id].layers || 1;
+                        for (; layers > 0; layers--)
+                            this.add('-sidestart', targetSide, effectName, '[silent]');
                     }
-                    success = true;
                 }
             }
             else {
-                const sourceSide = source.side;
-                const targetSide = source.side.foe;
-                for (const id of sideConditions) {
-                    if (sourceSide.sideConditions[id] && targetSide.sideConditions[id]) {
-                        [sourceSide.sideConditions[id], targetSide.sideConditions[id]] = [
-                            targetSide.sideConditions[id], sourceSide.sideConditions[id],
-                        ];
-                    }
-                    else if (sourceSide.sideConditions[id] && !targetSide.sideConditions[id]) {
-                        targetSide.sideConditions[id] = sourceSide.sideConditions[id];
-                        delete sourceSide.sideConditions[id];
-                    }
-                    else if (targetSide.sideConditions[id] && !sourceSide.sideConditions[id]) {
-                        sourceSide.sideConditions[id] = targetSide.sideConditions[id];
-                        delete targetSide.sideConditions[id];
-                    }
-                    else {
+                const sourceSideConditions = source.side.sideConditions;
+                const targetSideConditions = source.side.foe.sideConditions;
+                const sourceTemp = {};
+                const targetTemp = {};
+                for (const id in sourceSideConditions) {
+                    if (!sideConditions.includes(id))
                         continue;
-                    }
+                    sourceTemp[id] = sourceSideConditions[id];
+                    delete sourceSideConditions[id];
+                    success = true;
+                }
+                for (const id in targetSideConditions) {
+                    if (!sideConditions.includes(id))
+                        continue;
+                    targetTemp[id] = targetSideConditions[id];
+                    delete targetSideConditions[id];
                     success = true;
                 }
+                for (const id in sourceTemp) {
+                    targetSideConditions[id] = sourceTemp[id];
+                }
+                for (const id in targetTemp) {
+                    sourceSideConditions[id] = targetTemp[id];
+                }
                 this.add('-swapsideconditions');
             }
             if (!success)
@@ -6813,7 +6808,7 @@ exports.Moves = {
             onSideStart(side) {
                 this.add('-sidestart', side, 'move: G-Max Steelsurge');
             },
-            onSwitchIn(pokemon) {
+            onEntryHazard(pokemon) {
                 if (pokemon.hasItem('heavydutyboots'))
                     return;
                 // Ice Face and Disguise correctly get typed damage from Stealth Rock
@@ -11208,30 +11203,20 @@ exports.Moves = {
         priority: 0,
         flags: {},
         noMetronome: [
-            "After You", "Apple Acid", "Assist", "Astral Barrage", "Aura Wheel", "Baneful Bunker", "Beak Blast", "Behemoth Bash", "Behemoth Blade", "Belch", "Bestow", "Body Press", "Branch Poke", "Breaking Swipe", "Celebrate", "Chatter", "Clangorous Soul", "Copycat", "Counter", "Covet", "Crafty Shield", "Decorate", "Destiny Bond", "Detect", "Diamond Storm", "Double Iron Bash", "Dragon Ascent", "Dragon Energy", "Drum Beating", "Dynamax Cannon", "Endure", "Eternabeam", "False Surrender", "Feint", "Fiery Wrath", "Fleur Cannon", "Focus Punch", "Follow Me", "Freeze Shock", "Freezing Glare", "Glacial Lance", "Grav Apple", "Helping Hand", "Hold Hands", "Hyperspace Fury", "Hyperspace Hole", "Ice Burn", "Instruct", "Jungle Healing", "King's Shield", "Life Dew", "Light of Ruin", "Mat Block", "Me First", "Meteor Assault", "Metronome", "Mimic", "Mind Blown", "Mirror Coat", "Mirror Move", "Moongeist Beam", "Nature Power", "Nature's Madness", "Obstruct", "Origin Pulse", "Overdrive", "Photon Geyser", "Plasma Fists", "Precipice Blades", "Protect", "Pyro Ball", "Quash", "Quick Guard", "Rage Powder", "Relic Song", "Secret Sword", "Shell Trap", "Sketch", "Sleep Talk", "Snap Trap", "Snarl", "Snatch", "Snore", "Spectral Thief", "Spiky Shield", "Spirit Break", "Spotlight", "Steam Eruption", "Steel Beam", "Strange Steam", "Struggle", "Sunsteel Strike", "Surging Strikes", "Switcheroo", "Techno Blast", "Thief", "Thousand Arrows", "Thousand Waves", "Thunder Cage", "Thunderous Kick", "Transform", "Trick", "V-create", "Wicked Blow", "Wide Guard",
+            "After You", "Apple Acid", "Assist", "Astral Barrage", "Aura Wheel", "Baneful Bunker", "Beak Blast", "Behemoth Bash", "Behemoth Blade", "Belch", "Bestow", "Body Press", "Branch Poke", "Breaking Swipe", "Celebrate", "Chatter", "Clangorous Soul", "Copycat", "Counter", "Covet", "Crafty Shield", "Decorate", "Destiny Bond", "Detect", "Diamond Storm", "Double Iron Bash", "Dragon Ascent", "Dragon Energy", "Dragon Hammer", "Drum Beating", "Dynamax Cannon", "Endure", "Eternabeam", "False Surrender", "Feint", "Fiery Wrath", "Fleur Cannon", "Focus Punch", "Follow Me", "Freeze Shock", "Freezing Glare", "Glacial Lance", "Grav Apple", "Helping Hand", "Hold Hands", "Hyperspace Fury", "Hyperspace Hole", "Ice Burn", "Instruct", "Jungle Healing", "King's Shield", "Life Dew", "Light of Ruin", "Mat Block", "Me First", "Meteor Assault", "Metronome", "Mimic", "Mind Blown", "Mirror Coat", "Mirror Move", "Moongeist Beam", "Nature Power", "Nature's Madness", "Obstruct", "Origin Pulse", "Overdrive", "Photon Geyser", "Plasma Fists", "Precipice Blades", "Protect", "Pyro Ball", "Quash", "Quick Guard", "Rage Powder", "Relic Song", "Secret Sword", "Shell Trap", "Sketch", "Sleep Talk", "Snap Trap", "Snarl", "Snatch", "Snore", "Spectral Thief", "Spiky Shield", "Spirit Break", "Spotlight", "Steam Eruption", "Steel Beam", "Strange Steam", "Struggle", "Sunsteel Strike", "Surging Strikes", "Switcheroo", "Techno Blast", "Thief", "Thousand Arrows", "Thousand Waves", "Thunder Cage", "Thunderous Kick", "Transform", "Trick", "V-create", "Wicked Blow", "Wide Guard",
         ],
         onHit(target, source, effect) {
-            const moves = [];
-            for (const id in exports.Moves) {
-                const move = exports.Moves[id];
-                if (move.realMove)
-                    continue;
-                if (move.isZ || move.isMax || move.isNonstandard)
-                    continue;
-                if (effect.noMetronome.includes(move.name))
-                    continue;
-                if (this.dex.moves.get(id).gen > this.gen)
-                    continue;
-                moves.push(move);
-            }
+            const moves = this.dex.moves.all().filter(move => ((![2, 4].includes(this.gen) || !source.moves.includes(move.id)) &&
+                !move.realMove && !move.isZ && !move.isMax &&
+                (!move.isNonstandard || move.isNonstandard === 'Unobtainable') &&
+                !effect.noMetronome.includes(move.name)));
             let randomMove = '';
             if (moves.length) {
                 moves.sort((a, b) => a.num - b.num);
-                randomMove = this.sample(moves).name;
+                randomMove = this.sample(moves).id;
             }
-            if (!randomMove) {
+            if (!randomMove)
                 return false;
-            }
             this.actions.useMove(randomMove, target);
         },
         secondary: null,
@@ -16653,10 +16638,8 @@ exports.Moves = {
                 this.add('-sidestart', side, 'Spikes');
                 this.effectState.layers++;
             },
-            onSwitchIn(pokemon) {
-                if (!pokemon.isGrounded())
-                    return;
-                if (pokemon.hasItem('heavydutyboots'))
+            onEntryHazard(pokemon) {
+                if (!pokemon.isGrounded() || pokemon.hasItem('heavydutyboots'))
                     return;
                 const damageAmounts = [0, 3, 4, 6]; // 1/8, 1/6, 1/4
                 this.damage(damageAmounts[this.effectState.layers] * pokemon.maxhp / 24);
@@ -16948,7 +16931,7 @@ exports.Moves = {
             onSideStart(side) {
                 this.add('-sidestart', side, 'move: Stealth Rock');
             },
-            onSwitchIn(pokemon) {
+            onEntryHazard(pokemon) {
                 if (pokemon.hasItem('heavydutyboots'))
                     return;
                 const typeMod = this.clampIntRange(pokemon.runEffectiveness(this.dex.getActiveMove('stealthrock')), -6, 6);
@@ -17073,10 +17056,8 @@ exports.Moves = {
             onSideStart(side) {
                 this.add('-sidestart', side, 'move: Sticky Web');
             },
-            onSwitchIn(pokemon) {
-                if (!pokemon.isGrounded())
-                    return;
-                if (pokemon.hasItem('heavydutyboots'))
+            onEntryHazard(pokemon) {
+                if (!pokemon.isGrounded() || pokemon.hasItem('heavydutyboots'))
                     return;
                 this.add('-activate', pokemon, 'move: Sticky Web');
                 this.boost({ spe: -1 }, pokemon, this.effectState.source, this.dex.getActiveMove('stickyweb'));
@@ -18716,7 +18697,7 @@ exports.Moves = {
                 this.add('-sidestart', side, 'move: Toxic Spikes');
                 this.effectState.layers++;
             },
-            onSwitchIn(pokemon) {
+            onEntryHazard(pokemon) {
                 if (!pokemon.isGrounded())
                     return;
                 if (pokemon.hasType('Poison')) {