@pkmn/sim 0.9.27 → 0.9.28

package/build/cjs/sim/field.js

@@ -17,9 +17,9 @@ class Field {
             Object.assign(this, fieldScripts);
         this.id = '';
         this.weather = '';
-        this.weatherState = { id: '' };
+        this.weatherState = this.battle.initEffectState({ id: '' });
         this.terrain = '';
-        this.terrainState = { id: '' };
+        this.terrainState = this.battle.initEffectState({ id: '' });
         this.pseudoWeather = {};
     }
     toJSON() {
@@ -60,7 +60,7 @@ class Field {
         const prevWeather = this.weather;
         const prevWeatherState = this.weatherState;
         this.weather = status.id;
-        this.weatherState = { id: status.id };
+        this.weatherState = this.battle.initEffectState({ id: status.id });
         if (source) {
             this.weatherState.source = source;
             this.weatherState.sourceSlot = source.getSlot();
@@ -87,7 +87,7 @@ class Field {
         const prevWeather = this.getWeather();
         this.battle.singleEvent('FieldEnd', prevWeather, this.weatherState, this);
         this.weather = '';
-        this.weatherState = { id: '' };
+        this.battle.clearEffectState(this.weatherState);
         this.battle.eachEvent('WeatherChange');
         return true;
     }
@@ -132,12 +132,12 @@ class Field {
         const prevTerrain = this.terrain;
         const prevTerrainState = this.terrainState;
         this.terrain = status.id;
-        this.terrainState = {
+        this.terrainState = this.battle.initEffectState({
             id: status.id,
             source,
             sourceSlot: source.getSlot(),
             duration: status.duration,
-        };
+        });
         if (status.durationCallback) {
             this.terrainState.duration = status.durationCallback.call(this.battle, source, source, sourceEffect);
         }
@@ -155,7 +155,7 @@ class Field {
         const prevTerrain = this.getTerrain();
         this.battle.singleEvent('FieldEnd', prevTerrain, this.terrainState, this);
         this.terrain = '';
-        this.terrainState = { id: '' };
+        this.battle.clearEffectState(this.terrainState);
         this.battle.eachEvent('TerrainChange');
         return true;
     }
@@ -186,12 +186,12 @@ class Field {
                 return false;
             return this.battle.singleEvent('FieldRestart', status, state, this, source, sourceEffect);
         }
-        state = this.pseudoWeather[status.id] = {
+        state = this.pseudoWeather[status.id] = this.battle.initEffectState({
             id: status.id,
             source,
             sourceSlot: source?.getSlot(),
             duration: status.duration,
-        };
+        });
         if (status.durationCallback) {
             if (!source)
                 throw new Error(`setting fieldcond without a source`);

package/build/cjs/sim/field.js.map

@@ -1 +1 @@
-{"version":3,"file":"field.js","sourceRoot":"","sources":["../../../sim/field.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"field.js","sourceRoot":"","sources":["../../../sim/field.ts"],"names":[],"mappings":"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"}

package/build/cjs/sim/global-types.d.ts

@@ -203,6 +203,8 @@ interface ModdedBattleActions {
     getMixedSpecies?: (this: BattleActions, originalName: string, megaName: string, pokemon?: Pokemon) => Species;
 }
 interface ModdedBattleSide {
+    inherit?: true;
+    allies?: (this: Side, all?: boolean) => Pokemon[];
     canDynamaxNow?: (this: Side) => boolean;
     chooseSwitch?: (this: Side, slotText?: string) => any;
     getChoice?: (this: Side) => string;
@@ -277,9 +279,11 @@ interface ModdedBattlePokemon {
     hasLinkedMove?: (this: Pokemon, moveid: string) => boolean;
 }
 interface ModdedBattleQueue extends Partial<BattleQueue> {
+    inherit?: true;
     resolveAction?: (this: BattleQueue, action: ActionChoice, midTurn?: boolean) => Action[];
 }
 interface ModdedField extends Partial<Field> {
+    inherit?: true;
     suppressingWeather?: (this: Field) => boolean;
 }
 interface ModdedBattleScriptsData extends Partial<BattleScriptsData> {
@@ -306,6 +310,8 @@ interface ModdedBattleScriptsData extends Partial<BattleScriptsData> {
     tiebreak?: (this: Battle) => boolean;
     checkMoveMakesContact?: (this: Battle, move: ActiveMove, attacker: Pokemon, defender: Pokemon, announcePads?: boolean) => boolean;
     checkWin?: (this: Battle, faintQueue?: Battle['faintQueue'][0]) => true | undefined;
+    fieldEvent?: (this: Battle, eventid: string, targets?: Pokemon[]) => void;
+    getAllActive?: (this: Battle, includeFainted?: boolean, includeCommanding?: boolean) => Pokemon[];
 }
 type TypeInfo = import('./dex-data').TypeInfo;
 interface PlayerOptions {

package/build/cjs/sim/pokemon.d.ts

@@ -20,7 +20,9 @@ interface Attacker {
     damageValue?: (number | boolean | undefined);
 }
 export interface EffectState {
-    duration?: number | any;
+    id: string;
+    effectOrder: number;
+    duration?: number;
     [k: string]: any;
 }
 export declare const RESTORATIVE_BERRIES: Set<ID>;
@@ -101,6 +103,8 @@ export declare class Pokemon {
     fainted: boolean;
     faintQueued: boolean;
     subFainted: boolean | null;
+    /** If this Pokemon should revert to its set species when it faints */
+    regressionForme: boolean;
     types: string[];
     addedType: string;
     knownType: boolean;
@@ -213,7 +217,6 @@ export declare class Pokemon {
     duringMove: boolean;
     weighthg: number;
     speed: number;
-    abilityOrder: number;
     canMegaEvo: string | null | undefined;
     canMegaEvoX: string | null | undefined;
     canMegaEvoY: string | null | undefined;
@@ -250,7 +253,8 @@ export declare class Pokemon {
     get baseMoves(): readonly string[];
     getSlot(): PokemonSlot;
     toString(): string;
-    getDetails: () => {
+    getUpdatedDetails(level?: number): string;
+    getFullDetails: () => {
         side: SideID;
         secret: string;
         shared: string;
@@ -348,7 +352,7 @@ export declare class Pokemon {
     /**
      * Changes this Pokemon's species to the given speciesId (or species).
      * This function only handles changes to stats and type.
-     * Use formChange to handle changes to ability and sending client messages.
+     * Use formeChange to handle changes to ability and sending client messages.
      */
     setSpecies(rawSpecies: Species, source?: Effect | null, isTransform?: boolean): any;
     /**

package/build/cjs/sim/pokemon.js

@@ -16,17 +16,11 @@ exports.RESTORATIVE_BERRIES = new Set([
 ]);
 class Pokemon {
     constructor(set, side) {
-        this.getDetails = () => {
+        this.getFullDetails = () => {
             const health = this.getHealth();
             let details = this.details;
             if (this.illusion) {
-                const level = this.battle.ruleTable.has('illusionlevelmod') ? this.illusion.level : this.level;
-                let displayedSpeciesName = this.illusion.species.name;
-                if (displayedSpeciesName === 'Greninja-Bond')
-                    displayedSpeciesName = 'Greninja';
-                const illusionDetails = displayedSpeciesName + (level === 100 ? '' : ', L' + level) +
-                    (this.illusion.gender === '' ? '' : ', ' + this.illusion.gender) + (this.illusion.set.shiny ? ', shiny' : '');
-                details = illusionDetails;
+                details = this.illusion.getUpdatedDetails(this.battle.ruleTable.has('illusionlevelmod') ? this.illusion.level : this.level);
             }
             if (this.terastallized)
                 details += `, tera:${this.terastallized}`;
@@ -83,7 +77,7 @@ class Pokemon {
         if (set.name === set.species || !set.name) {
             set.name = this.baseSpecies.baseSpecies;
         }
-        this.speciesState = { id: this.species.id };
+        this.speciesState = this.battle.initEffectState({ id: this.species.id });
         this.name = set.name.substr(0, 20);
         this.fullname = this.side.id + ': ' + this.name;
         set.level = this.battle.clampIntRange(set.adjustLevel || set.level || 100, 1, 9999);
@@ -125,13 +119,9 @@ class Pokemon {
             });
         }
         this.position = 0;
-        let displayedSpeciesName = this.species.name;
-        if (displayedSpeciesName === 'Greninja-Bond')
-            displayedSpeciesName = 'Greninja';
-        this.details = displayedSpeciesName + (this.level === 100 ? '' : ', L' + this.level) +
-            (this.gender === '' ? '' : ', ' + this.gender) + (this.set.shiny ? ', shiny' : '');
+        this.details = this.getUpdatedDetails();
         this.status = '';
-        this.statusState = {};
+        this.statusState = this.battle.initEffectState({});
         this.volatiles = {};
         this.showCure = undefined;
         if (!this.set.evs) {
@@ -171,9 +161,9 @@ class Pokemon {
         this.boosts = { atk: 0, def: 0, spa: 0, spd: 0, spe: 0, accuracy: 0, evasion: 0 };
         this.baseAbility = (0, dex_1.toID)(set.ability);
         this.ability = this.baseAbility;
-        this.abilityState = { id: this.ability };
+        this.abilityState = this.battle.initEffectState({ id: this.ability, target: this });
         this.item = (0, dex_1.toID)(set.item);
-        this.itemState = { id: this.item };
+        this.itemState = this.battle.initEffectState({ id: this.item, target: this });
         this.lastItem = '';
         this.usedItemThisTurn = false;
         this.ateBerry = false;
@@ -185,6 +175,7 @@ class Pokemon {
         this.fainted = false;
         this.faintQueued = false;
         this.subFainted = null;
+        this.regressionForme = false;
         this.types = this.baseSpecies.types;
         this.baseTypes = this.types;
         this.addedType = '';
@@ -224,12 +215,6 @@ class Pokemon {
         this.duringMove = false;
         this.weighthg = 1;
         this.speed = 0;
-        /**
-         * Determines the order in which redirect abilities like Lightning Rod
-         * activate if speed tied. Surprisingly not random like every other speed
-         * tie, but based on who first switched in or acquired the ability!
-         */
-        this.abilityOrder = 0;
         this.canMegaEvo = this.battle.actions.canMegaEvo(this);
         this.canMegaEvoX = this.battle.actions.canMegaEvoX?.(this);
         this.canMegaEvoY = this.battle.actions.canMegaEvoY?.(this);
@@ -264,6 +249,13 @@ class Pokemon {
         const fullname = (this.illusion) ? this.illusion.fullname : this.fullname;
         return this.isActive ? this.getSlot() + fullname.slice(2) : fullname;
     }
+    getUpdatedDetails(level = this.level) {
+        let name = this.species.name;
+        if (name === 'Greninja-Bond')
+            name = 'Greninja';
+        return name + (level === 100 ? '' : ', L' + level) +
+            (this.gender === '' ? '' : ', ' + this.gender) + (this.set.shiny ? ', shiny' : '');
+    }
     updateSpeed() {
         this.speed = this.getActionSpeed();
     }
@@ -570,7 +562,7 @@ class Pokemon {
         return false;
     }
     ignoringItem() {
-        return !!(this.itemState.knockedOff || // Gen 3-4
+        return !this.getItem().isPrimalOrb && !!(this.itemState.knockedOff || // Gen 3-4
             (this.battle.gen >= 5 && !this.isActive) ||
             (!this.getItem().ignoreKlutz && this.hasAbility('klutz')) ||
             this.volatiles['embargo'] || this.battle.field.pseudoWeather['magicroom']);
@@ -910,7 +902,7 @@ class Pokemon {
             if (this.battle.dex.conditions.getByID(i).noCopy)
                 continue;
             // shallow clones
-            this.volatiles[i] = { ...pokemon.volatiles[i] };
+            this.volatiles[i] = this.battle.initEffectState({ ...pokemon.volatiles[i] });
             if (this.volatiles[i].linkedPokemon) {
                 delete pokemon.volatiles[i].linkedPokemon;
                 delete pokemon.volatiles[i].linkedStatus;
@@ -1027,16 +1019,14 @@ class Pokemon {
         }
         // Pokemon transformed into Ogerpon cannot Terastallize
         // restoring their ability to tera after they untransform is handled ELSEWHERE
-        if (this.species.baseSpecies === 'Ogerpon' && this.canTerastallize)
-            this.canTerastallize = false;
-        if (this.species.baseSpecies === 'Terapagos' && this.canTerastallize)
+        if (['Ogerpon', 'Terapagos'].includes(this.species.baseSpecies) && this.canTerastallize)
             this.canTerastallize = false;
         return true;
     }
     /**
      * Changes this Pokemon's species to the given speciesId (or species).
      * This function only handles changes to stats and type.
-     * Use formChange to handle changes to ability and sending client messages.
+     * Use formeChange to handle changes to ability and sending client messages.
      */
     setSpecies(rawSpecies, source = this.battle.effect, isTransform = false) {
         const species = this.battle.runEvent('ModifySpecies', this, null, source, rawSpecies);
@@ -1089,9 +1079,10 @@ class Pokemon {
         // The species the opponent sees
         const apparentSpecies = this.illusion ? this.illusion.species.name : species.baseSpecies;
         if (isPermanent) {
+            if (!this.transformed)
+                this.regressionForme = true;
             this.baseSpecies = rawSpecies;
-            this.details = species.name + (this.level === 100 ? '' : ', L' + this.level) +
-                (this.gender === '' ? '' : ', ' + this.gender) + (this.set.shiny ? ', shiny' : '');
+            this.details = this.getUpdatedDetails();
             let details = (this.illusion || this).details;
             if (this.terastallized)
                 details += `, tera:${this.terastallized}`;
@@ -1106,7 +1097,7 @@ class Pokemon {
                     this.battle.add('-burst', this, apparentSpecies, species.requiredItem);
                     this.moveThisTurnResult = true; // Ultra Burst counts as an action for Truant
                 }
-                else if (source.onPrimal) {
+                else if (source.isPrimalOrb) {
                     if (this.illusion) {
                         this.ability = '';
                         this.battle.add('-primal', this.illusion, species.requiredItem);
@@ -1203,6 +1194,8 @@ class Pokemon {
         this.newlySwitched = true;
         this.beingCalledBack = false;
         this.volatileStaleness = undefined;
+        delete this.abilityState.started;
+        delete this.itemState.started;
         this.setSpecies(this.baseSpecies);
     }
     hasType(type) {
@@ -1373,7 +1366,7 @@ class Pokemon {
             }
         }
         this.status = status.id;
-        this.statusState = { id: status.id, target: this };
+        this.statusState = this.battle.initEffectState({ id: status.id, target: this });
         if (source)
             this.statusState.source = source;
         if (status.duration)
@@ -1418,6 +1411,10 @@ class Pokemon {
         if (!source && this.battle.event && this.battle.event.target)
             source = this.battle.event.target;
         const item = this.getItem();
+        if (sourceEffect?.effectType === 'Item' && this.item !== sourceEffect.id && source === this) {
+            // if an item is telling us to eat it but we aren't holding it, we probably shouldn't eat what we are holding
+            return false;
+        }
         if (this.battle.runEvent('UseItem', this, null, null, item) &&
             (force || this.battle.runEvent('TryEatItem', this, null, null, item))) {
             this.battle.add('-enditem', this, item, '[eat]');
@@ -1437,7 +1434,7 @@ class Pokemon {
             }
             this.lastItem = this.item;
             this.item = '';
-            this.itemState = { id: '', target: this };
+            this.battle.clearEffectState(this.itemState);
             this.usedItemThisTurn = true;
             this.ateBerry = true;
             this.battle.runEvent('AfterUseItem', this, null, null, item);
@@ -1455,6 +1452,10 @@ class Pokemon {
         if (!source && this.battle.event && this.battle.event.target)
             source = this.battle.event.target;
         const item = this.getItem();
+        if (sourceEffect?.effectType === 'Item' && this.item !== sourceEffect.id && source === this) {
+            // if an item is telling us to eat it but we aren't holding it, we probably shouldn't eat what we are holding
+            return false;
+        }
         if (this.battle.runEvent('UseItem', this, null, null, item)) {
             switch (item.id) {
                 case 'redcard':
@@ -1475,7 +1476,7 @@ class Pokemon {
             this.battle.singleEvent('Use', item, this.itemState, this, source, sourceEffect);
             this.lastItem = this.item;
             this.item = '';
-            this.itemState = { id: '', target: this };
+            this.battle.clearEffectState(this.itemState);
             this.usedItemThisTurn = true;
             this.battle.runEvent('AfterUseItem', this, null, null, item);
             return true;
@@ -1499,7 +1500,7 @@ class Pokemon {
         if (this.battle.runEvent('TakeItem', this, source, null, item)) {
             this.item = '';
             const oldItemState = this.itemState;
-            this.itemState = { id: '', target: this };
+            this.battle.clearEffectState(this.itemState);
             this.pendingStaleness = undefined;
             this.battle.singleEvent('End', item, oldItemState, this);
             this.battle.runEvent('AfterTakeItem', this, null, null, item);
@@ -1526,7 +1527,7 @@ class Pokemon {
         const oldItem = this.getItem();
         const oldItemState = this.itemState;
         this.item = item.id;
-        this.itemState = { id: item.id, target: this };
+        this.itemState = this.battle.initEffectState({ id: item.id, target: this });
         if (oldItem.exists)
             this.battle.singleEvent('End', oldItem, oldItemState, this);
         if (item.id) {
@@ -1572,12 +1573,11 @@ class Pokemon {
                 this.battle.dex.moves.get(this.battle.effect.id));
         }
         this.ability = ability.id;
-        this.abilityState = { id: ability.id, target: this };
+        this.abilityState = this.battle.initEffectState({ id: ability.id, target: this });
         if (ability.id && this.battle.gen > 3 &&
             (!isTransform || oldAbility !== ability.id || this.battle.gen <= 4)) {
             this.battle.singleEvent('Start', ability, this.abilityState, this, source);
         }
-        this.abilityOrder = this.battle.abilityOrder++;
         return oldAbility;
     }
     getAbility() {
@@ -1632,7 +1632,7 @@ class Pokemon {
             this.battle.debug('add volatile [' + status.id + '] interrupted');
             return result;
         }
-        this.volatiles[status.id] = { id: status.id, name: status.name, target: this };
+        this.volatiles[status.id] = this.battle.initEffectState({ id: status.id, name: status.name, target: this });
         if (source) {
             this.volatiles[status.id].source = source;
             this.volatiles[status.id].sourceSlot = source.getSlot();
@@ -1798,13 +1798,28 @@ class Pokemon {
         return weather;
     }
     runEffectiveness(move) {
-        if (this.terastallized && move.type === 'Stellar')
-            return 1;
         let totalTypeMod = 0;
-        for (const type of this.getTypes()) {
-            let typeMod = this.battle.dex.getEffectiveness(move, type);
-            typeMod = this.battle.singleEvent('Effectiveness', move, null, this, type, move, typeMod);
-            totalTypeMod += this.battle.runEvent('Effectiveness', this, type, move, typeMod);
+        if (this.terastallized && move.type === 'Stellar') {
+            totalTypeMod = 1;
+        }
+        else {
+            for (const type of this.getTypes()) {
+                let typeMod = this.battle.dex.getEffectiveness(move, type);
+                typeMod = this.battle.singleEvent('Effectiveness', move, null, this, type, move, typeMod);
+                totalTypeMod += this.battle.runEvent('Effectiveness', this, type, move, typeMod);
+            }
+        }
+        if (this.species.name === 'Terapagos-Terastal' && this.hasAbility('Tera Shell') &&
+            !this.battle.suppressingAbility(this)) {
+            if (this.abilityState.resisted)
+                return -1; // all hits of multi-hit move should be not very effective
+            if (move.category === 'Status' || move.id === 'struggle' || !this.runImmunity(move.type) ||
+                totalTypeMod < 0 || this.hp < this.maxhp) {
+                return totalTypeMod;
+            }
+            this.battle.add('-activate', this, 'ability: Tera Shell');
+            this.abilityState.resisted = true;
+            return -1;
         }
         return totalTypeMod;
     }