diff --git a/src/battle-phases.ts b/src/battle-phases.ts index 0f454fa35d3..a3fcd544987 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -2255,12 +2255,15 @@ export class VictoryPhase extends PokemonPhase { if (this.scene.currentBattle.battleType === BattleType.TRAINER) this.scene.pushPhase(new TrainerVictoryPhase(this.scene)); if (this.scene.gameMode !== GameMode.CLASSIC || this.scene.currentBattle.waveIndex < this.scene.finalWave) { - if (this.scene.currentBattle.waveIndex > 30 || this.scene.currentBattle.waveIndex % 10) { + if (this.scene.currentBattle.waveIndex % 10) this.scene.pushPhase(new SelectModifierPhase(this.scene)); + else { + this.scene.pushPhase(new ModifierRewardPhase(this.scene, this.scene.currentBattle.waveIndex % 30 ? modifierTypes.EXP_CHARM : modifierTypes.GOLDEN_EXP_CHARM)); + if (this.scene.currentBattle.waveIndex <= 150 && !(this.scene.currentBattle.waveIndex % 50)) + this.scene.pushPhase(new ModifierRewardPhase(this.scene, modifierTypes.GOLDEN_POKEBALL)); if (this.scene.gameMode !== GameMode.CLASSIC && !(this.scene.currentBattle.waveIndex % 50)) this.scene.pushPhase(new AddEnemyBuffModifierPhase(this.scene)); - } else - this.scene.pushPhase(new ModifierRewardPhase(this.scene, modifierTypes.GOLDEN_EXP_CHARM)) + } this.scene.pushPhase(new NewBattlePhase(this.scene)); } else this.scene.pushPhase(new GameOverPhase(this.scene, true)); diff --git a/src/data/move.ts b/src/data/move.ts index c5c577b375b..3afdbfbdf93 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -3497,7 +3497,7 @@ export function initMoves() { .target(MoveTarget.USER), // TODO new AttackMove(Moves.SCALD, "Scald", Type.WATER, MoveCategory.SPECIAL, 80, 100, 15, -1, "May burn opponent.", 30, 0, 5) .attr(StatusEffectAttr, StatusEffect.BURN), - new SelfStatusMove(Moves.SHELL_SMASH, "Shell Smash", Type.NORMAL, -1, 15, -1, "Sharply raises user's Attack, Special Attack and Speed but lowers Defense and Special Defense.", -1, 0, 5) + new SelfStatusMove(Moves.SHELL_SMASH, "Shell Smash", Type.NORMAL, -1, 15, -1, "Sharply raises user's Attack, Special Attack, and Speed but lowers Defense and Special Defense.", -1, 0, 5) .attr(StatChangeAttr, [ BattleStat.ATK, BattleStat.SPATK, BattleStat.SPD ], 2, true) .attr(StatChangeAttr, [ BattleStat.DEF, BattleStat.SPDEF ], -1, true), new StatusMove(Moves.HEAL_PULSE, "Heal Pulse", Type.PSYCHIC, -1, 10, -1, "Restores half the target's max HP.", -1, 0, 5) diff --git a/src/data/trainer-type.ts b/src/data/trainer-type.ts index 7935edfe7da..7cb04e3d2f6 100644 --- a/src/data/trainer-type.ts +++ b/src/data/trainer-type.ts @@ -702,7 +702,7 @@ export const trainerConfigs: TrainerConfigs = { $Just kidding! I lost fair and square, and now I know you'll do fine out there. $By the way, the professor wanted me to give you some items. Hopefully they're helpful! $Do your best like always! I believe in you!` - ]).setModifierRewardFuncs(() => modifierTypes.EXP_CHARM, () => modifierTypes.EXP_SHARE).setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT ])) + ]).setModifierRewardFuncs(() => modifierTypes.GOLDEN_EXP_CHARM, () => modifierTypes.EXP_SHARE).setPartyMemberFunc(0, getRandomPartyMemberFunc([ Species.BULBASAUR, Species.CHARMANDER, Species.SQUIRTLE, Species.CHIKORITA, Species.CYNDAQUIL, Species.TOTODILE, Species.TREECKO, Species.TORCHIC, Species.MUDKIP, Species.TURTWIG, Species.CHIMCHAR, Species.PIPLUP, Species.SNIVY, Species.TEPIG, Species.OSHAWOTT ])) .setPartyMemberFunc(1, getRandomPartyMemberFunc([ Species.PIDGEY, Species.HOOTHOOT, Species.TAILLOW, Species.STARLY, Species.PIDOVE ])), [TrainerType.RIVAL_2]: new TrainerConfig(++t).setStaticParty().setMoneyMultiplier(1.25).setEncounterBgm(TrainerType.RIVAL).setBattleBgm('battle_rival').setPartyTemplates(trainerPartyTemplates.RIVAL_2).setEncounterMessages([ `Oh, fancy meeting you here. Looks like you're still undefeated. Right on! diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index 6e377a86ac0..729ec7a12fa 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -675,7 +675,7 @@ export const modifierTypes = { (type, _args) => new Modifiers.MultipleParticipantExpBonusModifier(type)), EXP_CHARM: () => new ExpBoosterModifierType('EXP. Charm', 25), - GOLDEN_EXP_CHARM: () => new ExpBoosterModifierType('Golden EXP. Charm', 75), + GOLDEN_EXP_CHARM: () => new ExpBoosterModifierType('Golden EXP. Charm', 100), LUCKY_EGG: () => new PokemonExpBoosterModifierType('Lucky Egg', 50), GOLDEN_EGG: () => new PokemonExpBoosterModifierType('Golden Egg', 150),