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

changed isSameBracket check p3

Browse Source
This commit is contained in:
Frutescens 2024-08-14 12:54:38 -07:00 committed by frutescens
parent ac3fda92dc
commit d42a6499a4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/phases.ts
View File

@ -2341,7 +2341,7 @@ export class TurnStartPhase extends FieldPhase {
// The game now considers priority and applies the relevant move and ability attributes // The game now considers priority and applies the relevant move and ability attributes
const aPriority = new Utils.IntegerHolder(aMove.priority); const aPriority = new Utils.IntegerHolder(aMove.priority);
const bPriority = new Utils.IntegerHolder(bMove.priority); const bPriority = new Utils.IntegerHolder(bMove.priority);
const isSameBracket = Math.abs(aPriority.value - bPriority.value) === 0.5;
applyMoveAttrs(IncrementMovePriorityAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === a)!, null, aMove, aPriority); //TODO: is the bang correct here? applyMoveAttrs(IncrementMovePriorityAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === a)!, null, aMove, aPriority); //TODO: is the bang correct here?
applyMoveAttrs(IncrementMovePriorityAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === b)!, null, bMove, bPriority); //TODO: is the bang correct here? applyMoveAttrs(IncrementMovePriorityAttr, this.scene.getField().find(p => p?.isActive() && p.getBattlerIndex() === b)!, null, bMove, bPriority); //TODO: is the bang correct here?
@ -2353,6 +2353,7 @@ export class TurnStartPhase extends FieldPhase {
// If the moves share the same original priority bracket, it can check for differences in battlerBypassSpeed and return the result. // If the moves share the same original priority bracket, it can check for differences in battlerBypassSpeed and return the result.
// This conditional is used to ensure that Quick Claw can still activate with abilities like Stall and Mycelium Might (attack moves only) // This conditional is used to ensure that Quick Claw can still activate with abilities like Stall and Mycelium Might (attack moves only)
// Otherwise, the game returns the user of the move with the highest priority. // Otherwise, the game returns the user of the move with the highest priority.
const isSameBracket = Math.abs(aPriority.value - bPriority.value) === 0.5;
if (aPriority.value !== bPriority.value) { if (aPriority.value !== bPriority.value) {
if (isSameBracket && battlerBypassSpeed[a].value !== battlerBypassSpeed[b].value) { if (isSameBracket && battlerBypassSpeed[a].value !== battlerBypassSpeed[b].value) {
return battlerBypassSpeed[a].value ? -1 : 1; return battlerBypassSpeed[a].value ? -1 : 1;