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

Merge 85f97eba62 into 4b70fab608

Browse Source
This commit is contained in:
Jonathan Bankston 2025-06-20 05:12:43 +00:00 committed by GitHub
commit a43dcd1b12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/phases/attempt-run-phase.ts
View File

@ -18,16 +18,18 @@ export class AttemptRunPhase extends PokemonPhase {
const playerField = globalScene.getPlayerField(); const playerField = globalScene.getPlayerField();
const enemyField = globalScene.getEnemyField(); const enemyField = globalScene.getEnemyField();
const playerPokemon = this.getPokemon();
const escapeChance = new NumberHolder(0); const escapeChance = new NumberHolder(0);
this.attemptRunAway(playerField, enemyField, escapeChance); this.attemptRunAway(playerField, enemyField, escapeChance);
applyAbAttrs("RunSuccessAbAttr", playerPokemon, null, false, escapeChance); applyAbAttrs("RunSuccessAbAttr", playerField[0], null, false, escapeChance);
if (playerPokemon.randBattleSeedInt(100) < escapeChance.value && !this.forceFailEscape) { //TODO: needed?
if (globalScene.currentBattle.double) {
applyAbAttrs("RunSuccessAbAttr", playerField[1], null, false, escapeChance);
}
if (playerField[0].randBattleSeedInt(100) < escapeChance.value && !this.forceFailEscape) {
enemyField.forEach(enemyPokemon => applyPreLeaveFieldAbAttrs("PreLeaveFieldAbAttr", enemyPokemon)); enemyField.forEach(enemyPokemon => applyPreLeaveFieldAbAttrs("PreLeaveFieldAbAttr", enemyPokemon));
globalScene.playSound("se/flee"); globalScene.playSound("se/flee");
@ -60,7 +62,12 @@ export class AttemptRunPhase extends PokemonPhase {
globalScene.phaseManager.pushNew("NewBattlePhase"); globalScene.phaseManager.pushNew("NewBattlePhase");
} else { } else {
playerPokemon.turnData.failedRunAway = true; playerField[0].turnData.failedRunAway = true;
if (globalScene.currentBattle.double) {
playerField[1].turnData.failedRunAway = true;
}
globalScene.phaseManager.queueMessage(i18next.t("battle:runAwayCannotEscape"), null, true, 500); globalScene.phaseManager.queueMessage(i18next.t("battle:runAwayCannotEscape"), null, true, 500);
} }