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

Merge branch 'beta' into beta

Browse Source
This commit is contained in:
Dean 2025-04-23 14:23:10 -07:00 committed by GitHub
commit a2be87f6f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7227,7 +7227,7 @@ export function initAbilities() {
new Ability(Abilities.CURIOUS_MEDICINE, 8) new Ability(Abilities.CURIOUS_MEDICINE, 8)
.attr(PostSummonClearAllyStatStagesAbAttr), .attr(PostSummonClearAllyStatStagesAbAttr),
new Ability(Abilities.TRANSISTOR, 8) new Ability(Abilities.TRANSISTOR, 8)
.attr(MoveTypePowerBoostAbAttr, PokemonType.ELECTRIC), .attr(MoveTypePowerBoostAbAttr, PokemonType.ELECTRIC, 1.3),
new Ability(Abilities.DRAGONS_MAW, 8) new Ability(Abilities.DRAGONS_MAW, 8)
.attr(MoveTypePowerBoostAbAttr, PokemonType.DRAGON), .attr(MoveTypePowerBoostAbAttr, PokemonType.DRAGON),
new Ability(Abilities.CHILLING_NEIGH, 8) new Ability(Abilities.CHILLING_NEIGH, 8)
@ -7412,4 +7412,4 @@ export function initAbilities() {
.unreplaceable() // TODO is this true? .unreplaceable() // TODO is this true?
.attr(ConfusionOnStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC) .attr(ConfusionOnStatusEffectAbAttr, StatusEffect.POISON, StatusEffect.TOXIC)
); );
} }

15
src/data/trainers/TrainerPartyTemplate.ts
View File

@ -167,11 +167,6 @@ export const trainerPartyTemplates = {
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
), ),
GYM_LEADER_5: new TrainerPartyCompoundTemplate( GYM_LEADER_5: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(4, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
),
GYM_LEADER_6: new TrainerPartyCompoundTemplate(
new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE), new TrainerPartyTemplate(3, PartyMemberStrength.AVERAGE),
new TrainerPartyTemplate(2, PartyMemberStrength.STRONG), new TrainerPartyTemplate(2, PartyMemberStrength.STRONG),
new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER), new TrainerPartyTemplate(1, PartyMemberStrength.STRONGER),
@ -239,7 +234,7 @@ export function getEvilGruntPartyTemplate(): TrainerPartyTemplate {
case ClassicFixedBossWaves.EVIL_ADMIN_1: case ClassicFixedBossWaves.EVIL_ADMIN_1:
return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger return trainerPartyTemplates.GYM_LEADER_4; // 3avg 1 strong 1 stronger
default: default:
return trainerPartyTemplates.GYM_LEADER_6; // 3 avg 2 strong 1 stronger return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
} }
} }
@ -269,14 +264,11 @@ export function getGymLeaderPartyTemplate() {
else if (currentBattle?.waveIndex <= 60) { // 50 and 60 else if (currentBattle?.waveIndex <= 60) { // 50 and 60
return trainerPartyTemplates.GYM_LEADER_3; // 2 avg 1 strong 1 stronger return trainerPartyTemplates.GYM_LEADER_3; // 2 avg 1 strong 1 stronger
} }
else if (currentBattle?.waveIndex <= 80) { else if (currentBattle?.waveIndex <= 90) { // 80 and 90
return trainerPartyTemplates.GYM_LEADER_4; // 3 avg 1 strong 1 stronger return trainerPartyTemplates.GYM_LEADER_4; // 3 avg 1 strong 1 stronger
} }
else if (currentBattle?.waveIndex <= 90) {
return trainerPartyTemplates.GYM_LEADER_5; // 4 avg 1 strong 1 stronger
}
// 110+ // 110+
return trainerPartyTemplates.GYM_LEADER_6; // 3 avg 2 strong 1 stronger return trainerPartyTemplates.GYM_LEADER_5; // 3 avg 2 strong 1 stronger
default: default:
return getWavePartyTemplate( return getWavePartyTemplate(
trainerPartyTemplates.GYM_LEADER_1, trainerPartyTemplates.GYM_LEADER_1,
@ -284,7 +276,6 @@ export function getGymLeaderPartyTemplate() {
trainerPartyTemplates.GYM_LEADER_3, trainerPartyTemplates.GYM_LEADER_3,
trainerPartyTemplates.GYM_LEADER_4, trainerPartyTemplates.GYM_LEADER_4,
trainerPartyTemplates.GYM_LEADER_5, trainerPartyTemplates.GYM_LEADER_5,
trainerPartyTemplates.GYM_LEADER_6,
); );
} }
} }