random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-02-12 19:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'beta' into bgm-changes

Browse Source
This commit is contained in:
damocleas 2025-02-01 22:29:36 -05:00 committed by GitHub
commit 0d4d25b1e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/data/mystery-encounters/encounters/clowning-around-encounter.ts
View File

@ -127,6 +127,13 @@ export const ClowningAroundEncounter: MysteryEncounter =
encounter.setDialogueToken("ability", new Ability(ability, 3).name); encounter.setDialogueToken("ability", new Ability(ability, 3).name);
encounter.misc = { ability }; encounter.misc = { ability };
// Decide the random types for Blacephalon. They should not be the same.
const firstType: number = randSeedInt(18);
let secondType: number = randSeedInt(17);
if ( secondType >= firstType ) {
secondType++;
}
encounter.enemyPartyConfigs.push({ encounter.enemyPartyConfigs.push({
trainerConfig: clownConfig, trainerConfig: clownConfig,
pokemonConfigs: [ // Overrides first 2 pokemon to be Mr. Mime and Blacephalon pokemonConfigs: [ // Overrides first 2 pokemon to be Mr. Mime and Blacephalon
@ -137,7 +144,7 @@ export const ClowningAroundEncounter: MysteryEncounter =
}, },
{ // Blacephalon has the random ability from pool, and 2 entirely random types to fit with the theme of the encounter { // Blacephalon has the random ability from pool, and 2 entirely random types to fit with the theme of the encounter
species: getPokemonSpecies(Species.BLACEPHALON), species: getPokemonSpecies(Species.BLACEPHALON),
customPokemonData: new CustomPokemonData({ ability: ability, types: [ randSeedInt(18), randSeedInt(18) ]}), customPokemonData: new CustomPokemonData({ ability: ability, types: [ firstType, secondType ]}),
isBoss: true, isBoss: true,
moveSet: [ Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN ] moveSet: [ Moves.TRICK, Moves.HYPNOSIS, Moves.SHADOW_BALL, Moves.MIND_BLOWN ]
}, },