@pkmn/sim 0.9.27 → 0.9.28

package/build/cjs/data/items.js

@@ -201,7 +201,7 @@ exports.Items = {
         onDamagingHit(damage, target, source, move) {
             this.add('-enditem', target, 'Air Balloon');
             target.item = '';
-            target.itemState = { id: '', target };
+            this.clearEffectState(target.itemState);
             this.runEvent('AfterUseItem', target, null, null, this.dex.items.get('airballoon'));
         },
         onAfterSubDamage(damage, target, source, effect) {
@@ -209,7 +209,7 @@ exports.Items = {
             if (effect.effectType === 'Move') {
                 this.add('-enditem', target, 'Air Balloon');
                 target.item = '';
-                target.itemState = { id: '', target };
+                this.clearEffectState(target.itemState);
                 this.runEvent('AfterUseItem', target, null, null, this.dex.items.get('airballoon'));
             }
         },
@@ -585,20 +585,19 @@ exports.Items = {
     blueorb: {
         name: "Blue Orb",
         spritenum: 41,
+        onSwitchInPriority: -1,
         onSwitchIn(pokemon) {
-            if (pokemon.isActive && pokemon.baseSpecies.name === 'Kyogre') {
-                this.queue.insertChoice({ choice: 'runPrimal', pokemon: pokemon });
+            if (pokemon.isActive && pokemon.baseSpecies.name === 'Kyogre' && !pokemon.transformed) {
+                pokemon.formeChange('Kyogre-Primal', this.effect, true);
             }
         },
-        onPrimal(pokemon) {
-            pokemon.formeChange('Kyogre-Primal', this.effect, true);
-        },
         onTakeItem(item, source) {
             if (source.baseSpecies.baseSpecies === 'Kyogre')
                 return false;
             return true;
         },
         itemUser: ["Kyogre"],
+        isPrimalOrb: true,
         num: 535,
         gen: 6,
         isNonstandard: "Past",
@@ -632,14 +631,14 @@ exports.Items = {
         fling: {
             basePower: 30,
         },
-        onStart() {
+        onSwitchInPriority: -2,
+        onStart(pokemon) {
             this.effectState.started = true;
+            this.effect.onUpdate.call(this, pokemon);
         },
         onUpdate(pokemon) {
             if (!this.effectState.started || pokemon.transformed)
                 return;
-            if (this.queue.peek(true)?.choice === 'runSwitch')
-                return;
             if (pokemon.hasAbility('protosynthesis') && !this.field.isWeather('sunnyday') && pokemon.useItem()) {
                 pokemon.addVolatile('protosynthesis');
             }
@@ -1680,6 +1679,7 @@ exports.Items = {
         fling: {
             basePower: 10,
         },
+        onSwitchInPriority: -1,
         onStart(pokemon) {
             if (!pokemon.ignoringItem() && this.field.isTerrain('electricterrain')) {
                 pokemon.useItem();
@@ -2377,6 +2377,7 @@ exports.Items = {
         fling: {
             basePower: 10,
         },
+        onSwitchInPriority: -1,
         onStart(pokemon) {
             if (!pokemon.ignoringItem() && this.field.isTerrain('grassyterrain')) {
                 pokemon.useItem();
@@ -3893,20 +3894,40 @@ exports.Items = {
         onFoeAfterBoost(boost, target, source, effect) {
             if (effect?.name === 'Opportunist' || effect?.name === 'Mirror Herb')
                 return;
-            const boostPlus = {};
-            let statsRaised = false;
+            if (!this.effectState.boosts)
+                this.effectState.boosts = {};
+            const boostPlus = this.effectState.boosts;
             let i;
             for (i in boost) {
                 if (boost[i] > 0) {
-                    boostPlus[i] = boost[i];
-                    statsRaised = true;
+                    boostPlus[i] = (boostPlus[i] || 0) + boost[i];
+                    this.effectState.ready = true;
                 }
             }
-            if (!statsRaised)
+        },
+        onAnySwitchInPriority: -3,
+        onAnySwitchIn() {
+            if (!this.effectState.ready || !this.effectState.boosts)
                 return;
-            const pokemon = this.effectState.target;
-            pokemon.useItem();
-            this.boost(boostPlus, pokemon);
+            this.effectState.target.useItem();
+        },
+        onAnyAfterMove() {
+            if (!this.effectState.ready || !this.effectState.boosts)
+                return;
+            this.effectState.target.useItem();
+        },
+        onResidualOrder: 29,
+        onResidual(pokemon) {
+            if (!this.effectState.ready || !this.effectState.boosts)
+                return;
+            this.effectState.target.useItem();
+        },
+        onUse(pokemon) {
+            this.boost(this.effectState.boosts, pokemon);
+        },
+        onEnd() {
+            delete this.effectState.boosts;
+            delete this.effectState.ready;
         },
         num: 1883,
         gen: 9,
@@ -3917,6 +3938,7 @@ exports.Items = {
         fling: {
             basePower: 10,
         },
+        onSwitchInPriority: -1,
         onStart(pokemon) {
             if (!pokemon.ignoringItem() && this.field.isTerrain('mistyterrain')) {
                 pokemon.useItem();
@@ -4620,6 +4642,7 @@ exports.Items = {
         fling: {
             basePower: 10,
         },
+        onSwitchInPriority: -1,
         onStart(pokemon) {
             if (!pokemon.ignoringItem() && this.field.isTerrain('psychicterrain')) {
                 pokemon.useItem();
@@ -4849,20 +4872,19 @@ exports.Items = {
     redorb: {
         name: "Red Orb",
         spritenum: 390,
+        onSwitchInPriority: -1,
         onSwitchIn(pokemon) {
-            if (pokemon.isActive && pokemon.baseSpecies.name === 'Groudon') {
-                this.queue.insertChoice({ choice: 'runPrimal', pokemon: pokemon });
+            if (pokemon.isActive && pokemon.baseSpecies.name === 'Groudon' && !pokemon.transformed) {
+                pokemon.formeChange('Groudon-Primal', this.effect, true);
             }
         },
-        onPrimal(pokemon) {
-            pokemon.formeChange('Groudon-Primal', this.effect, true);
-        },
         onTakeItem(item, source) {
             if (source.baseSpecies.baseSpecies === 'Groudon')
                 return false;
             return true;
         },
         itemUser: ["Groudon"],
+        isPrimalOrb: true,
         num: 534,
         gen: 6,
         isNonstandard: "Past",
@@ -4997,6 +5019,7 @@ exports.Items = {
         fling: {
             basePower: 100,
         },
+        onSwitchInPriority: -1,
         onStart(pokemon) {
             if (!pokemon.ignoringItem() && this.field.getPseudoWeather('trickroom')) {
                 pokemon.useItem();
@@ -7291,6 +7314,13 @@ exports.Items = {
                 }
             },
         },
+        onAnySwitchInPriority: -2,
+        onAnySwitchIn() {
+            this.effect.onUpdate.call(this, this.effectState.target);
+        },
+        onStart(pokemon) {
+            this.effect.onUpdate.call(this, pokemon);
+        },
         onUpdate(pokemon) {
             let activate = false;
             const boosts = {};
@@ -7450,7 +7480,7 @@ exports.Items = {
             basePower: 80,
             type: "Poison",
         },
-        onResidualOrder: 5,
+        onResidualOrder: 10,
         onResidual(pokemon) {
             if (pokemon.hp <= pokemon.maxhp / 2) {
                 pokemon.eatItem();
@@ -7517,7 +7547,7 @@ exports.Items = {
             basePower: 80,
             type: "Psychic",
         },
-        onResidualOrder: 5,
+        onResidualOrder: 10,
         onResidual(pokemon) {
             if (pokemon.hp <= pokemon.maxhp / 2) {
                 pokemon.eatItem();