Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Hotfix] Prevent crash if enemy Future Sight user is caught #4905

Merged
merged 4 commits into from
Nov 18, 2024
+15 −8
Merged

[Hotfix] Prevent crash if enemy Future Sight user is caught #4905

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6be3548
Prevent crash if enemy Future Sight user is caught
DayKev Nov 18, 2024
cb2ae7e
Prevent crash if enemy Future Sight user is caught
DayKev Nov 18, 2024
02133a7
Merge branch 'fix-future-sight' of https://github.com/DayKev/pokerogu…
DayKev Nov 18, 2024
090ffa1
Update patch version
DayKev Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/field/pokemon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3243,11 +3243,14 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
return null;
}

getMoveHistory(): TurnMove[] {
public getMoveHistory(): TurnMove[] {
return this.battleSummonData.moveHistory;
}

pushMoveHistory(turnMove: TurnMove) {
public pushMoveHistory(turnMove: TurnMove): void {
if (!this.isOnField()) {
return;
}
turnMove.turn = this.scene.currentBattle?.turn;
this.getMoveHistory().push(turnMove);
}
Expand Down
10 changes: 7 additions & 3 deletions src/phases/move-effect-phase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,12 @@ export class MoveEffectPhase extends PokemonPhase {

const isDelayedAttack = this.move.getMove().hasAttr(DelayedAttackAttr);
/** If the user was somehow removed from the field and it's not a delayed attack, end this phase */
if (!user.isOnField() && !isDelayedAttack) {
return super.end();
if (!user.isOnField()) {
if (!isDelayedAttack) {
return super.end();
} else {
user.resetTurnData();
}
}

/**
Expand Down Expand Up @@ -174,7 +178,7 @@ export class MoveEffectPhase extends PokemonPhase {

const playOnEmptyField = this.scene.currentBattle?.mysteryEncounter?.hasBattleAnimationsWithoutTargets ?? false;
// Move animation only needs one target
new MoveAnim(move.id as Moves, user, this.getFirstTarget()!.getBattlerIndex()!, playOnEmptyField).play(this.scene, move.hitsSubstitute(user, this.getFirstTarget()!), () => {
new MoveAnim(move.id as Moves, user, this.getFirstTarget()!.getBattlerIndex(), playOnEmptyField).play(this.scene, move.hitsSubstitute(user, this.getFirstTarget()!), () => {
/** Has the move successfully hit a target (for damage) yet? */
let hasHit: boolean = false;
for (const target of targets) {
Expand Down
Loading