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

Fixed party order not being altered at the start of battle if there are unable Pokémon before the one(s) sent in initially

Browse Source
This commit is contained in:
Maruno17
2022-06-19 17:36:35 +01:00
parent 9a53ee8a0e
commit 9261851701
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/011_Battle/001_Battle/002_Battle_StartAndEnd.rb
View File

@@ -143,6 +143,8 @@ class Battle
# For each trainer in turn, find the needed number of Pokémon for them to # For each trainer in turn, find the needed number of Pokémon for them to
# send out, and initialize them # send out, and initialize them
battlerNumber = 0 battlerNumber = 0
partyOrder = pbPartyOrder(side)
starts = pbPartyStarts(side)
trainer.each_with_index do |_t, idxTrainer| trainer.each_with_index do |_t, idxTrainer|
ret[side][idxTrainer] = [] ret[side][idxTrainer] = []
eachInTeam(side, idxTrainer) do |pkmn, idxPkmn| eachInTeam(side, idxTrainer) do |pkmn, idxPkmn|
@@ -150,6 +152,10 @@ class Battle
idxBattler = (2 * battlerNumber) + side idxBattler = (2 * battlerNumber) + side
pbCreateBattler(idxBattler, pkmn, idxPkmn) pbCreateBattler(idxBattler, pkmn, idxPkmn)
ret[side][idxTrainer].push(idxBattler) ret[side][idxTrainer].push(idxBattler)
if idxPkmn != starts[idxTrainer] + battlerNumber
idxOther = starts[idxTrainer] + battlerNumber
partyOrder[idxPkmn], partyOrder[idxOther] = partyOrder[idxOther], partyOrder[idxPkmn]
end
battlerNumber += 1 battlerNumber += 1
break if ret[side][idxTrainer].length >= requireds[idxTrainer] break if ret[side][idxTrainer].length >= requireds[idxTrainer]
end end

2
Data/Scripts/011_Battle/001_Battle/006_Battle_ActionUseItem.rb
View File

@@ -8,7 +8,7 @@ class Battle
return false return false
end end
# Embargo # Embargo
if battler&.effects[PBEffects::Embargo] > 0 if battler && battler.effects[PBEffects::Embargo] > 0
if showMessages if showMessages
scene.pbDisplay(_INTL("Embargo's effect prevents the item's use on {1}!", scene.pbDisplay(_INTL("Embargo's effect prevents the item's use on {1}!",
battler.pbThis(true))) battler.pbThis(true)))