mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2024-11-27 01:06:09 +00:00
Don't apply Golden Pokeball towards enemy buffs
This commit is contained in:
parent
5567b39f20
commit
840d032aa7
@ -2811,7 +2811,8 @@ export class SelectModifierPhase extends BattlePhase {
|
|||||||
const party = this.scene.getParty();
|
const party = this.scene.getParty();
|
||||||
regenerateModifierPoolThresholds(party, this.getPoolType());
|
regenerateModifierPoolThresholds(party, this.getPoolType());
|
||||||
const modifierCount = new Utils.IntegerHolder(3);
|
const modifierCount = new Utils.IntegerHolder(3);
|
||||||
this.scene.applyModifiers(ExtraModifierModifier, true, modifierCount);
|
if (this.isPlayer())
|
||||||
|
this.scene.applyModifiers(ExtraModifierModifier, true, modifierCount);
|
||||||
const typeOptions: ModifierTypeOption[] = this.getModifierTypeOptions(modifierCount.value);
|
const typeOptions: ModifierTypeOption[] = this.getModifierTypeOptions(modifierCount.value);
|
||||||
|
|
||||||
const modifierSelectCallback = (cursor: integer) => {
|
const modifierSelectCallback = (cursor: integer) => {
|
||||||
|
@ -1248,13 +1248,6 @@ export default class BattleScene extends Phaser.Scene {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
generateEnemyBuffModifier(): void{
|
|
||||||
const enemyBuffModifierTypes = [ modifierTypes.ENEMY_DAMAGE_BOOSTER, modifierTypes.ENEMY_DAMAGE_REDUCTION ];
|
|
||||||
this.executeWithSeedOffset(() => {
|
|
||||||
(getModifierType(Phaser.Math.RND.pick(enemyBuffModifierTypes)).newModifier() as PersistentModifier).add(this.enemyModifiers, false);
|
|
||||||
}, Math.floor(this.currentBattle.waveIndex / 50));
|
|
||||||
}
|
|
||||||
|
|
||||||
clearEnemyHeldItemModifiers(): void {
|
clearEnemyHeldItemModifiers(): void {
|
||||||
const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier);
|
const modifiersToRemove = this.enemyModifiers.filter(m => m instanceof PokemonHeldItemModifier);
|
||||||
for (let m of modifiersToRemove)
|
for (let m of modifiersToRemove)
|
||||||
|
Loading…
Reference in New Issue
Block a user