mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-19 13:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge 49b30f58ce into 7131e1fb01

Browse Source
This commit is contained in:
NightKev 2025-08-18 20:54:39 +01:00 committed by GitHub
commit 7a86b1acef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/field/pokemon.ts
View File

@ -4952,31 +4952,48 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
return true; return true;
} }
let sleepTurnsRemaining: NumberHolder; const sleepTurnsRemaining: NumberHolder = new NumberHolder(1);
if (effect === StatusEffect.SLEEP) { switch (effect) {
sleepTurnsRemaining = new NumberHolder(this.randBattleSeedIntRange(2, 4)); case StatusEffect.POISON:
case StatusEffect.TOXIC:
this.setFrameRate(8);
break;
case StatusEffect.PARALYSIS:
this.setFrameRate(5);
break;
case StatusEffect.SLEEP: {
sleepTurnsRemaining.value = this.randBattleSeedIntRange(2, 4);
this.setFrameRate(4); this.setFrameRate(3);
// If the user is invulnerable, lets remove their invulnerability when they fall asleep // If the user is invulnerable, lets remove their invulnerability when they fall asleep
const invulnerableTags = [ const invulnerableTags = [
BattlerTagType.UNDERGROUND, BattlerTagType.UNDERGROUND,
BattlerTagType.UNDERWATER, BattlerTagType.UNDERWATER,
BattlerTagType.HIDDEN, BattlerTagType.HIDDEN,
BattlerTagType.FLYING, BattlerTagType.FLYING,
]; ];
const tag = invulnerableTags.find(t => this.getTag(t)); const tag = invulnerableTags.find(t => this.getTag(t));
if (tag) { if (tag) {
this.removeTag(tag); this.removeTag(tag);
this.getMoveQueue().pop(); this.getMoveQueue().pop();
}
break;
} }
case StatusEffect.FREEZE:
this.setFrameRate(0);
break;
case StatusEffect.BURN:
this.setFrameRate(14);
break;
case StatusEffect.FAINT:
break;
} }
sleepTurnsRemaining = sleepTurnsRemaining!; // tell TS compiler it's defined this.status = new Status(effect, 0, sleepTurnsRemaining.value);
this.status = new Status(effect, 0, sleepTurnsRemaining?.value);
return true; return true;
} }
@ -5009,8 +5026,8 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
public clearStatus(confusion: boolean, reloadAssets: boolean) { public clearStatus(confusion: boolean, reloadAssets: boolean) {
const lastStatus = this.status?.effect; const lastStatus = this.status?.effect;
this.status = null; this.status = null;
this.setFrameRate(10);
if (lastStatus === StatusEffect.SLEEP) { if (lastStatus === StatusEffect.SLEEP) {
this.setFrameRate(10);
if (this.getTag(BattlerTagType.NIGHTMARE)) { if (this.getTag(BattlerTagType.NIGHTMARE)) {
this.lapseTag(BattlerTagType.NIGHTMARE); this.lapseTag(BattlerTagType.NIGHTMARE);
} }