mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-15 03:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/beta' into wimp-out

Browse Source
This commit is contained in:
Bertie690 2025-08-08 17:46:27 -04:00
commit bee2a41e1e
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/data/abilities/ability.ts
View File

@ -5492,7 +5492,7 @@ export class PostFaintContactDamageAbAttr extends PostFaintAbAttr {
* Attribute used for abilities that damage opponents causing the user to faint
* equal to the amount of damage the last attack inflicted.
*
* Used for {@linkcode Abilities.INNARDS_OUT}.
* Used for {@linkcode AbilityId.INNARDS_OUT | Innards Out}.
* @sealed
*/
export class PostFaintHPDamageAbAttr extends PostFaintAbAttr {
@ -7151,7 +7151,7 @@ export function initAbilities() {
.attr(HealFromBerryUseAbAttr, 1 / 3),
new Ability(AbilityId.PROTEAN, 6)
.attr(PokemonTypeChangeAbAttr)
// .condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.PROTEAN)) //Gen 9 Implementation
// .condition((p) => !p.summonData.abilitiesApplied.includes(AbilityId.PROTEAN)) //Gen 9 Implementation
// TODO: needs testing on interaction with weather blockage
.edgeCase(),
new Ability(AbilityId.FUR_COAT, 6)
@ -7410,7 +7410,7 @@ export function initAbilities() {
.attr(PostSummonStatStageChangeAbAttr, [ Stat.DEF ], 1, true),
new Ability(AbilityId.LIBERO, 8)
.attr(PokemonTypeChangeAbAttr)
//.condition((p) => !p.summonData.abilitiesApplied.includes(Abilities.LIBERO)), //Gen 9 Implementation
//.condition((p) => !p.summonData.abilitiesApplied.includes(AbilityId.LIBERO)), //Gen 9 Implementation
// TODO: needs testing on interaction with weather blockage
.edgeCase(),
new Ability(AbilityId.BALL_FETCH, 8)

6
src/data/trainers/trainer-config.ts
View File

@ -1593,9 +1593,9 @@ export const trainerConfigs: TrainerConfigs = {
.setSpeciesFilter(s => tmSpecies[MoveId.FLY].indexOf(s.speciesId) > -1),
[TrainerType.POKEFAN]: new TrainerConfig(++t)
.setMoneyMultiplier(1.4)
.setName("PokéFan")
.setHasGenders("PokéFan Female")
.setHasDouble("PokéFan Family")
.setName("Pokéfan")
.setHasGenders("Pokéfan Female")
.setHasDouble("Pokéfan Family")
.setEncounterBgm(TrainerType.POKEFAN)
.setPartyTemplates(
trainerPartyTemplates.SIX_WEAKER,

1
src/field/arena.ts
View File

@ -536,6 +536,7 @@ export class Arena {
case BiomeId.ABYSS:
case BiomeId.SPACE:
case BiomeId.TEMPLE:
case BiomeId.LABORATORY:
return 16;
default:
return 0;