mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-06-30 21:42:20 +02:00
MBE is always untransferable
This commit is contained in:
parent
a0041eb18a
commit
928d8a8f97
@ -19,7 +19,7 @@ import { EncounterPhaseEvent } from "#app/events/battle-scene";
|
|||||||
import type Pokemon from "#app/field/pokemon";
|
import type Pokemon from "#app/field/pokemon";
|
||||||
import { FieldPosition } from "#app/field/pokemon";
|
import { FieldPosition } from "#app/field/pokemon";
|
||||||
import { getPokemonNameWithAffix } from "#app/messages";
|
import { getPokemonNameWithAffix } from "#app/messages";
|
||||||
import { BoostBugSpawnModifier, IvScannerModifier, TurnHeldItemTransferModifier } from "#app/modifier/modifier";
|
import { BoostBugSpawnModifier, IvScannerModifier } from "#app/modifier/modifier";
|
||||||
import { ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
|
import { ModifierPoolType, regenerateModifierPoolThresholds } from "#app/modifier/modifier-type";
|
||||||
import Overrides from "#app/overrides";
|
import Overrides from "#app/overrides";
|
||||||
import { BattlePhase } from "#app/phases/battle-phase";
|
import { BattlePhase } from "#app/phases/battle-phase";
|
||||||
@ -547,22 +547,6 @@ export class EncounterPhase extends BattlePhase {
|
|||||||
if (enemyPokemon.isShiny(true)) {
|
if (enemyPokemon.isShiny(true)) {
|
||||||
globalScene.phaseManager.unshiftNew("ShinySparklePhase", BattlerIndex.ENEMY + e);
|
globalScene.phaseManager.unshiftNew("ShinySparklePhase", BattlerIndex.ENEMY + e);
|
||||||
}
|
}
|
||||||
/** This sets Eternatus' held item to be untransferrable, preventing it from being stolen */
|
|
||||||
if (
|
|
||||||
enemyPokemon.species.speciesId === SpeciesId.ETERNATUS &&
|
|
||||||
(globalScene.gameMode.isBattleClassicFinalBoss(globalScene.currentBattle.waveIndex) ||
|
|
||||||
globalScene.gameMode.isEndlessMajorBoss(globalScene.currentBattle.waveIndex))
|
|
||||||
) {
|
|
||||||
const enemyMBH = globalScene.findModifier(
|
|
||||||
m => m instanceof TurnHeldItemTransferModifier,
|
|
||||||
false,
|
|
||||||
) as TurnHeldItemTransferModifier;
|
|
||||||
if (enemyMBH) {
|
|
||||||
globalScene.removeModifier(enemyMBH, true);
|
|
||||||
enemyMBH.setTransferrableFalse();
|
|
||||||
globalScene.addEnemyModifier(enemyMBH);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (![BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(globalScene.currentBattle.battleType)) {
|
if (![BattleType.TRAINER, BattleType.MYSTERY_ENCOUNTER].includes(globalScene.currentBattle.battleType)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user