mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-17 22:02:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Basculin white stripe evolves by taking 294 recoil damage

Browse Source
This commit is contained in:
AJ Fontaine 2025-04-29 11:54:22 -04:00
parent 07f76e729d
commit 17b21d12b9
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/data/balance/pokemon-evolutions.ts
View File

@ -100,7 +100,8 @@ export enum EvoCondKey {
SPECIES_CAUGHT, SPECIES_CAUGHT,
GENDER, GENDER,
NATURE, NATURE,
MOVE_USE_COUNT MOVE_USE_COUNT,
RECOIL_DAMAGE_COUNT,
} }
export interface EvolutionConditionData { export interface EvolutionConditionData {
@ -138,7 +139,7 @@ export class SpeciesEvolutionCondition {
(cond === EvoCondKey.MOVE_TYPE && isNullOrUndefined(this.data.moveType)) || (cond === EvoCondKey.MOVE_TYPE && isNullOrUndefined(this.data.moveType)) ||
(cond === EvoCondKey.PARTY_TYPE && isNullOrUndefined(this.data.partyType)) || (cond === EvoCondKey.PARTY_TYPE && isNullOrUndefined(this.data.partyType)) ||
(cond === EvoCondKey.GENDER && isNullOrUndefined(this.data.gender)) || (cond === EvoCondKey.GENDER && isNullOrUndefined(this.data.gender)) ||
(cond === EvoCondKey.EVO_TREASURE_TRACKER && isNullOrUndefined(this.data.evoCount)) || ((cond === EvoCondKey.EVO_TREASURE_TRACKER || cond === EvoCondKey.RECOIL_DAMAGE_COUNT) && isNullOrUndefined(this.data.evoCount)) ||
(cond === EvoCondKey.RANDOM_FORM && isNullOrUndefined(this.data.randomFormChance)) || (cond === EvoCondKey.RANDOM_FORM && isNullOrUndefined(this.data.randomFormChance)) ||
(cond === EvoCondKey.GENDER && isNullOrUndefined(this.data.gender)) || (cond === EvoCondKey.GENDER && isNullOrUndefined(this.data.gender)) ||
(cond === EvoCondKey.SPECIES_CAUGHT && isNullOrUndefined(this.data.speciesCaught)) || (cond === EvoCondKey.SPECIES_CAUGHT && isNullOrUndefined(this.data.speciesCaught)) ||
@ -194,6 +195,9 @@ export class SpeciesEvolutionCondition {
case EvoCondKey.MOVE_USE_COUNT: case EvoCondKey.MOVE_USE_COUNT:
str.push(i18next.t("pokemonEvolutions:useMoveCount", {move: allMoves[this.data.move!].name, count: this.data.evoCount!})); str.push(i18next.t("pokemonEvolutions:useMoveCount", {move: allMoves[this.data.move!].name, count: this.data.evoCount!}));
break; break;
case EvoCondKey.RECOIL_DAMAGE_COUNT:
str.push(i18next.t("pokemonEvolutions:recoil"));
break;
} }
}); });
return str.join(i18next.t("pokemonEvolutions:connector")); return str.join(i18next.t("pokemonEvolutions:connector"));
@ -237,6 +241,7 @@ export class SpeciesEvolutionCondition {
case EvoCondKey.SPECIES_CAUGHT: case EvoCondKey.SPECIES_CAUGHT:
return !!globalScene.gameData.dexData[this.data.speciesCaught!].caughtAttr; return !!globalScene.gameData.dexData[this.data.speciesCaught!].caughtAttr;
case EvoCondKey.MOVE_USE_COUNT: case EvoCondKey.MOVE_USE_COUNT:
case EvoCondKey.RECOIL_DAMAGE_COUNT:
return pokemon.evoCounter >= this.data.evoCount!; return pokemon.evoCounter >= this.data.evoCount!;
} }
}); });
@ -1606,8 +1611,8 @@ export const pokemonEvolutions: PokemonEvolutions = {
new SpeciesEvolution(Species.LILLIGANT, 1, EvolutionItem.SUN_STONE, null, SpeciesWildEvolutionDelay.LONG) new SpeciesEvolution(Species.LILLIGANT, 1, EvolutionItem.SUN_STONE, null, SpeciesWildEvolutionDelay.LONG)
], ],
[Species.BASCULIN]: [ [Species.BASCULIN]: [
new SpeciesFormEvolution(Species.BASCULEGION, "white-striped", "female", 40, null, {key: EvoCondKey.GENDER, gender: Gender.FEMALE}, SpeciesWildEvolutionDelay.VERY_LONG), new SpeciesFormEvolution(Species.BASCULEGION, "white-striped", "female", 1, null, {key: [EvoCondKey.GENDER, EvoCondKey.RECOIL_DAMAGE_COUNT], gender: Gender.FEMALE, evoCount: 294}, SpeciesWildEvolutionDelay.VERY_LONG),
new SpeciesFormEvolution(Species.BASCULEGION, "white-striped", "male", 40, null, {key: EvoCondKey.GENDER, gender: Gender.MALE}, SpeciesWildEvolutionDelay.VERY_LONG) new SpeciesFormEvolution(Species.BASCULEGION, "white-striped", "male", 1, null, {key: [EvoCondKey.GENDER, EvoCondKey.RECOIL_DAMAGE_COUNT], gender: Gender.MALE, evoCount: 294}, SpeciesWildEvolutionDelay.VERY_LONG)
], ],
[Species.MINCCINO]: [ [Species.MINCCINO]: [
new SpeciesEvolution(Species.CINCCINO, 1, EvolutionItem.SHINY_STONE, null, SpeciesWildEvolutionDelay.LONG) new SpeciesEvolution(Species.CINCCINO, 1, EvolutionItem.SHINY_STONE, null, SpeciesWildEvolutionDelay.LONG)

8
src/data/moves/move.ts
View File

@ -1679,6 +1679,14 @@ export class RecoilAttr extends MoveEffectAttr {
user.damageAndUpdate(recoilDamage, { result: HitResult.INDIRECT, ignoreSegments: true }); user.damageAndUpdate(recoilDamage, { result: HitResult.INDIRECT, ignoreSegments: true });
globalScene.queueMessage(i18next.t("moveTriggers:hitWithRecoil", { pokemonName: getPokemonNameWithAffix(user) })); globalScene.queueMessage(i18next.t("moveTriggers:hitWithRecoil", { pokemonName: getPokemonNameWithAffix(user) }));
user.turnData.damageTaken += recoilDamage; user.turnData.damageTaken += recoilDamage;
if (!user.isFainted() && user.hasSpecies(Species.BASCULIN, "white-striped")) {
if (isNullOrUndefined(user.evoCounter)) {
user.evoCounter = recoilDamage;
}
else {
user.evoCounter += recoilDamage;
}
}
return true; return true;
} }