mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-09-04 13:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove Lock Capsule from Classic item pool

Browse Source
This commit is contained in:
ImperialSympathizer 2024-09-19 19:21:33 -04:00
parent 95e02fb55f
commit 300f3cb520
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modifier/modifier-type.ts
View File

@ -1762,7 +1762,7 @@ const modifierPool: ModifierPool = {
new WeightedModifierType(modifierTypes.FOCUS_BAND, 5),
new WeightedModifierType(modifierTypes.KINGS_ROCK, 3),
new WeightedModifierType(modifierTypes.LOCK_CAPSULE, skipInLastClassicWaveOrDefault(3)),
new WeightedModifierType(modifierTypes.SUPER_EXP_CHARM, skipInLastClassicWaveOrDefault(8)),
new WeightedModifierType(modifierTypes.SUPER_EXP_CHARM, (party: Pokemon[]) => party[0].scene.gameMode.isClassic ? 0 : 8),
new WeightedModifierType(modifierTypes.RARE_FORM_CHANGE_ITEM, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 6, 24),
new WeightedModifierType(modifierTypes.MEGA_BRACELET, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 9, 36),
new WeightedModifierType(modifierTypes.DYNAMAX_BAND, (party: Pokemon[]) => Math.min(Math.ceil(party[0].scene.currentBattle.waveIndex / 50), 4) * 9, 36),

6
src/phases/victory-phase.ts
View File

@ -11,7 +11,6 @@ import { ModifierRewardPhase } from "./modifier-reward-phase";
import { SelectModifierPhase } from "./select-modifier-phase";
import { TrainerVictoryPhase } from "./trainer-victory-phase";
import { handleMysteryEncounterVictory } from "#app/data/mystery-encounters/utils/encounter-phase-utils";
import { LockModifierTiersModifier } from "#app/modifier/modifier";
export class VictoryPhase extends PokemonPhase {
/** If true, indicates that the phase is intended for EXP purposes only, and not to continue a battle to next phase */
@ -43,9 +42,8 @@ export class VictoryPhase extends PokemonPhase {
}
if (this.scene.gameMode.isEndless || !this.scene.gameMode.isWaveFinal(this.scene.currentBattle.waveIndex)) {
this.scene.pushPhase(new EggLapsePhase(this.scene));
// If player doesn't have a lock capsule in Classic, they get in rewards on 165
if (this.scene.gameMode.isClassic && this.scene.currentBattle.waveIndex === 165 && !(this.scene.findModifier(m => m instanceof LockModifierTiersModifier))) {
// Should happen before shop phase so they can use the lock capsule
if (this.scene.gameMode.isClassic && this.scene.currentBattle.waveIndex === 165) {
// Should get Lock Capsule before shop phase so it can be used in the rewards shop
this.scene.pushPhase(new ModifierRewardPhase(this.scene, modifierTypes.LOCK_CAPSULE));
}
if (this.scene.currentBattle.waveIndex % 10) {