DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-10 14:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ui-redesign

Browse Source
This commit is contained in:
Maruno17
2024-11-22 19:55:58 +00:00
parent 098ca562d0 00d1e431b4
commit fcb4a1cec3
11 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/011_Battle/001_Battle/004_Battle_ActionAttacksPriority.rb
View File

@@ -162,6 +162,9 @@ class Battle
if b.abilityActive?
pri = Battle::AbilityEffects.triggerPriorityChange(b.ability, b, move, pri)
end
if b.itemActive?
pri = Battle::ItemEffects.triggerPriorityChange(b.item, b, move, pri)
end
entry[5] = pri
@choices[b.index][4] = pri
end
@@ -199,6 +202,9 @@ class Battle
if entry[0].abilityActive?
pri = Battle::AbilityEffects.triggerPriorityChange(entry[0].ability, entry[0], move, pri)
end
if entry[0].itemActive?
pri = Battle::ItemEffects.triggerPriorityChange(entry[0].item, entry[0], move, pri)
end
needRearranging = true if pri != entry[5]
entry[5] = pri
choice[4] = pri