IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move weather effects to the end of the turn

pull/2/head
Flashfyre 2023-07-04 16:16:50 -04:00
parent 64da443fa6
commit 9212d3642a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle-phases.ts
View File

@ -928,9 +928,6 @@ export class TurnStartPhase extends FieldPhase {
start() { start() {
super.start(); super.start();
if (this.scene.arena.weather)
this.scene.unshiftPhase(new WeatherEffectPhase(this.scene, this.scene.arena.weather));
const field = this.scene.getField(); const field = this.scene.getField();
const order = this.getOrder(); const order = this.getOrder();
@ -994,6 +991,9 @@ export class TurnStartPhase extends FieldPhase {
} }
} }
if (this.scene.arena.weather)
this.scene.pushPhase(new WeatherEffectPhase(this.scene, this.scene.arena.weather));
for (let o of order) { for (let o of order) {
if (field[o].status && field[o].status.isPostTurn()) if (field[o].status && field[o].status.isPostTurn())
this.scene.pushPhase(new PostTurnStatusEffectPhase(this.scene, o)); this.scene.pushPhase(new PostTurnStatusEffectPhase(this.scene, o));

7
src/data/biome.ts
View File

@ -249,12 +249,11 @@ export const biomePools: BiomePools = {
{ 1: [ Species.RATTATA ], 20: [ Species.RATICATE ] }, { 1: [ Species.RATTATA ], 20: [ Species.RATICATE ] },
Species.GRIMER, Species.GRIMER,
{ 1: [ Species.KOFFING ], 35: [ Species.WEEZING ] }, { 1: [ Species.KOFFING ], 35: [ Species.WEEZING ] },
{ 1: [ Species.STUNKY ], 34: [ Species.SKUNTANK ] },
{ 1: [ Species.PATRAT ], 20: [ Species.WATCHOG ] }, { 1: [ Species.PATRAT ], 20: [ Species.WATCHOG ] },
{ 1: [ Species.LILLIPUP ], 16: [ Species.HERDIER ], 32: [ Species.STOUTLAND ] }, { 1: [ Species.LILLIPUP ], 16: [ Species.HERDIER ], 32: [ Species.STOUTLAND ] },
{ 1: [ Species.TRUBBISH ], 36: [ Species.GARBODOR ] } { 1: [ Species.TRUBBISH ], 36: [ Species.GARBODOR ] }
], ],
[BiomePoolTier.UNCOMMON]: [ { 1: [ Species.BURMY ], 20: [ Species.WORMADAM ] } ], [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.BURMY ], 20: [ Species.WORMADAM ] }, { 1: [ Species.STUNKY ], 34: [ Species.SKUNTANK ] } ],
[BiomePoolTier.RARE]: [], [BiomePoolTier.RARE]: [],
[BiomePoolTier.SUPER_RARE]: [ Species.EEVEE, Species.SMEARGLE ], [BiomePoolTier.SUPER_RARE]: [ Species.EEVEE, Species.SMEARGLE ],
[BiomePoolTier.ULTRA_RARE]: [ Species.DITTO, Species.CASTFORM ], [BiomePoolTier.ULTRA_RARE]: [ Species.DITTO, Species.CASTFORM ],
@ -2808,11 +2807,11 @@ export const biomePools: BiomePools = {
] ]
], ],
[ Species.STUNKY, Type.POISON, Type.DARK, [ [ Species.STUNKY, Type.POISON, Type.DARK, [
[ Biome.CITY, BiomePoolTier.COMMON ] [ Biome.CITY, BiomePoolTier.UNCOMMON ]
] ]
], ],
[ Species.SKUNTANK, Type.POISON, Type.DARK, [ [ Species.SKUNTANK, Type.POISON, Type.DARK, [
[ Biome.CITY, BiomePoolTier.COMMON ], [ Biome.CITY, BiomePoolTier.UNCOMMON ],
[ Biome.CITY, BiomePoolTier.BOSS ] [ Biome.CITY, BiomePoolTier.BOSS ]
] ]
], ],