@pkmn/sim 0.9.37 → 0.10.0

package/build/cjs/sim/battle.js

@@ -1881,7 +1881,7 @@ class Battle {
             const name = effect.fullname === 'tox' ? 'psn' : effect.fullname;
             switch (effect.id) {
                 case 'partiallytrapped':
-                    this.add('-damage', target, target.getHealth, '[from] ' + this.effectState.sourceEffect.fullname, '[partiallytrapped]');
+                    this.add('-damage', target, target.getHealth, '[from] ' + target.volatiles['partiallytrapped'].sourceEffect.fullname, '[partiallytrapped]');
                     break;
                 case 'powder':
                     this.add('-damage', target, target.getHealth, '[silent]');
@@ -2102,36 +2102,31 @@ class Battle {
     }
     /** Given a table of base stats and a pokemon set, return the actual stats. */
     spreadModify(baseStats, set) {
-        const modStats = { atk: 10, def: 10, spa: 10, spd: 10, spe: 10 };
-        const tr = this.trunc;
-        let statName;
-        for (statName in modStats) {
-            const stat = baseStats[statName];
-            modStats[statName] = tr(tr(2 * stat + set.ivs[statName] + tr(set.evs[statName] / 4)) * set.level / 100 + 5);
-        }
-        if ('hp' in baseStats) {
-            const stat = baseStats['hp'];
-            modStats['hp'] = tr(tr(2 * stat + set.ivs['hp'] + tr(set.evs['hp'] / 4) + 100) * set.level / 100 + 10);
+        const modStats = { hp: 0, atk: 0, def: 0, spa: 0, spd: 0, spe: 0 };
+        for (const statName in baseStats) {
+            modStats[statName] = this.statModify(baseStats, set, statName);
         }
-        return this.natureModify(modStats, set);
+        return modStats;
     }
-    natureModify(stats, set) {
-        // Natures are calculated with 16-bit truncation.
-        // This only affects Eternatus-Eternamax in Pure Hackmons.
+    statModify(baseStats, set, statName) {
         const tr = this.trunc;
+        let stat = baseStats[statName];
+        if (statName === 'hp') {
+            return tr(tr(2 * stat + set.ivs[statName] + tr(set.evs[statName] / 4) + 100) * set.level / 100 + 10);
+        }
+        stat = tr(tr(2 * stat + set.ivs[statName] + tr(set.evs[statName] / 4)) * set.level / 100 + 5);
         const nature = this.dex.natures.get(set.nature);
-        let s;
-        if (nature.plus) {
-            s = nature.plus;
-            const stat = this.ruleTable.has('overflowstatmod') ? Math.min(stats[s], 595) : stats[s];
-            stats[s] = tr(tr(stat * 110, 16) / 100);
+        // Natures are calculated with 16-bit truncation.
+        // This only affects Eternatus-Eternamax in Pure Hackmons.
+        if (nature.plus === statName) {
+            stat = this.ruleTable.has('overflowstatmod') ? Math.min(stat, 595) : stat;
+            stat = tr(tr(stat * 110, 16) / 100);
         }
-        if (nature.minus) {
-            s = nature.minus;
-            const stat = this.ruleTable.has('overflowstatmod') ? Math.min(stats[s], 728) : stats[s];
-            stats[s] = tr(tr(stat * 90, 16) / 100);
+        else if (nature.minus === statName) {
+            stat = this.ruleTable.has('overflowstatmod') ? Math.min(stat, 728) : stat;
+            stat = tr(tr(stat * 90, 16) / 100);
         }
-        return stats;
+        return stat;
     }
     finalModify(relayVar) {
         relayVar = this.modify(relayVar, this.event.modifier);
@@ -2436,7 +2431,7 @@ class Battle {
                         continue;
                     pokemon.baseSpecies = rawSpecies;
                     pokemon.details = pokemon.getUpdatedDetails();
-                    pokemon.setAbility(species.abilities['0'], null, true);
+                    pokemon.setAbility(species.abilities['0'], null, null, true);
                     pokemon.baseAbility = pokemon.ability;
                     const behemothMove = {
                         'Zacian-Crowned': 'behemothblade', 'Zamazenta-Crowned': 'behemothbash',
@@ -2842,7 +2837,7 @@ class Battle {
         return totalActions >= this.sides.length;
     }
     hint(hint, once, side) {
-        if (this.hints.has(hint))
+        if (this.hints.has(side ? `${side.id}|${hint}` : hint))
             return;
         if (side) {
             this.addSplit(side.id, ['-hint', hint]);
@@ -2851,7 +2846,7 @@ class Battle {
             this.add('-hint', hint);
         }
         if (once)
-            this.hints.add(hint);
+            this.hints.add(side ? `${side.id}|${hint}` : hint);
     }
     addSplit(side, secret, shared) {
         this.log.push(`|split|${side}`);