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

Obsoleted battle methods that yield battlers in favour of ones that return all of them at once

Browse Source
This commit is contained in:
Maruno17
2021-10-27 22:45:34 +01:00
parent 6066797517
commit f3abcb7caf
38 changed files with 213 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/011_Battle/005_Battle scene/008_Scene_Commands.rb
View File

@@ -281,7 +281,7 @@ class PokeBattle_Scene
when 4 # Use on opposing battler (Poké Balls)
idxTarget = -1
if @battle.pbOpposingBattlerCount(idxBattler)==1
@battle.eachOtherSideBattler(idxBattler) { |b| idxTarget = b.index }
@battle.allOtherSideBattlers(idxBattler).each { |b| idxTarget = b.index }
break if yield item.id, useType, idxTarget, -1, itemScene
else
wasTargeting = true
@@ -351,12 +351,12 @@ class PokeBattle_Scene
def pbFirstTarget(idxBattler,target_data)
case target_data.id
when :NearAlly
@battle.eachSameSideBattler(idxBattler) do |b|
@battle.allSameSideBattlers(idxBattler).each do |b|
next if b.index==idxBattler || !@battle.nearBattlers?(b,idxBattler)
next if b.fainted?
return b.index
end
@battle.eachSameSideBattler(idxBattler) do |b|
@battle.allSameSideBattlers(idxBattler).each do |b|
next if b.index==idxBattler || !@battle.nearBattlers?(b,idxBattler)
return b.index
end