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

Added class GameData::Target

Browse Source
This commit is contained in:
Maruno17
2021-02-24 21:05:04 +00:00
parent 823e7eb8ec
commit 87285a2a1f
20 changed files with 301 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Data/Scripts/012_Battle/001_Battler/007_Battler_UseMove.rb
View File

@@ -269,7 +269,7 @@ class PokeBattle_Battler
PBDebug.log("[Ability triggered] #{b.pbThis}'s #{b.abilityName}")
user.pbReducePP(move)
end
if PBTargets.targetsFoeSide?(move.pbTarget(user))
if move.pbTarget(user).affects_foe_side
@battle.eachOtherSideBattler(user) do |b|
next unless b.hasActiveAbility?(:PRESSURE)
PBDebug.log("[Ability triggered] #{b.pbThis}'s #{b.abilityName}")
@@ -379,8 +379,7 @@ class PokeBattle_Battler
#---------------------------------------------------------------------------
magicCoater = -1
magicBouncer = -1
if targets.length==0 && !PBTargets.noTargets?(move.pbTarget(user)) &&
!move.worksWithNoTargets?
if targets.length == 0 && move.pbTarget(user).num_targets > 0 && !move.worksWithNoTargets?
# def pbFindTargets should have found a target(s), but it didn't because
# they were all fainted
# All target types except: None, User, UserSide, FoeSide, BothSides

36
Data/Scripts/012_Battle/001_Battler/008_Battler_UseMove_Targeting.rb
View File

@@ -36,18 +36,21 @@ class PokeBattle_Battler
preTarget = choice[3] # A target that was already chosen
targets = []
# Get list of targets
case move.pbTarget(user) # Curse can change its target type
when PBTargets::NearAlly
case move.pbTarget(user).id # Curse can change its target type
when :NearAlly
targetBattler = (preTarget>=0) ? @battle.battlers[preTarget] : nil
if !pbAddTarget(targets,user,targetBattler,move)
pbAddTargetRandomAlly(targets,user,move)
end
when PBTargets::UserOrNearAlly
when :UserOrNearAlly
targetBattler = (preTarget>=0) ? @battle.battlers[preTarget] : nil
if !pbAddTarget(targets,user,targetBattler,move,true,true)
pbAddTarget(targets,user,user,move,true,true)
end
when PBTargets::NearFoe, PBTargets::NearOther
when :UserAndAllies
pbAddTarget(targets,user,user,move,true,true)
@battle.eachSameSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move,false,true) }
when :NearFoe, :NearOther
targetBattler = (preTarget>=0) ? @battle.battlers[preTarget] : nil
if !pbAddTarget(targets,user,targetBattler,move)
if preTarget>=0 && !user.opposes?(preTarget)
@@ -56,13 +59,11 @@ class PokeBattle_Battler
pbAddTargetRandomFoe(targets,user,move)
end
end
when PBTargets::AllNearFoes
@battle.eachOtherSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move) }
when PBTargets::RandomNearFoe
when :RandomNearFoe
pbAddTargetRandomFoe(targets,user,move)
when PBTargets::AllNearOthers
@battle.eachBattler { |b| pbAddTarget(targets,user,b,move) }
when PBTargets::Other
when :AllNearFoes
@battle.eachOtherSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move) }
when :Foe, :Other
targetBattler = (preTarget>=0) ? @battle.battlers[preTarget] : nil
if !pbAddTarget(targets,user,targetBattler,move,false)
if preTarget>=0 && !user.opposes?(preTarget)
@@ -71,12 +72,11 @@ class PokeBattle_Battler
pbAddTargetRandomFoe(targets,user,move,false)
end
end
when PBTargets::UserAndAllies
pbAddTarget(targets,user,user,move,true,true)
@battle.eachSameSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move,false,true) }
when PBTargets::AllFoes
when :AllFoes
@battle.eachOtherSideBattler(user.index) { |b| pbAddTarget(targets,user,b,move,false) }
when PBTargets::AllBattlers
when :AllNearOthers
@battle.eachBattler { |b| pbAddTarget(targets,user,b,move) }
when :AllBattlers
@battle.eachBattler { |b| pbAddTarget(targets,user,b,move,false,true) }
else
# Used by Counter/Mirror Coat/Metal Burst/Bide
@@ -89,12 +89,12 @@ class PokeBattle_Battler
# Redirect attack to another target
#=============================================================================
def pbChangeTargets(move,user,targets)
targetType = move.pbTarget(user)
target_data = move.pbTarget(user)
return targets if @battle.switching # For Pursuit interrupting a switch
return targets if move.cannotRedirect?
return targets if !PBTargets.canChooseOneFoeTarget?(targetType) || targets.length!=1
return targets if !target_data.can_target_one_foe? || targets.length != 1
priority = @battle.pbPriority(true)
nearOnly = !PBTargets.canChooseDistantTarget?(move.target)
nearOnly = !target_data.can_choose_distant_target?
# Spotlight (takes priority over Follow Me/Rage Powder/Lightning Rod/Storm Drain)
newTarget = nil; strength = 100 # Lower strength takes priority
priority.each do |b|

7
Data/Scripts/012_Battle/001_Battler/009_Battler_UseMove_SuccessChecks.rb
View File

@@ -302,7 +302,7 @@ class PokeBattle_Battler
end
# Crafty Shield
if target.pbOwnSide.effects[PBEffects::CraftyShield] && user.index!=target.index &&
move.statusMove? && move.pbTarget(user)!=PBTargets::AllBattlers
move.statusMove? && !move.pbTarget(user).targets_all
@battle.pbCommonAnimation("CraftyShield",target)
@battle.pbDisplay(_INTL("Crafty Shield protected {1}!",target.pbThis(true)))
target.damageState.protected = true
@@ -311,7 +311,7 @@ class PokeBattle_Battler
end
# Wide Guard
if target.pbOwnSide.effects[PBEffects::WideGuard] && user.index!=target.index &&
PBTargets.multipleTargets?(move.pbTarget(user)) &&
move.pbTarget(user).num_targets > 1 &&
(Settings::MECHANICS_GENERATION >= 7 || move.damagingMove?)
@battle.pbCommonAnimation("WideGuard",target)
@battle.pbDisplay(_INTL("Wide Guard protected {1}!",target.pbThis(true)))
@@ -527,8 +527,7 @@ class PokeBattle_Battler
# Message shown when a move fails the per-hit success check above.
#=============================================================================
def pbMissMessage(move,user,target)
tar = move.pbTarget(user)
if PBTargets.multipleTargets?(tar)
if move.pbTarget(user).num_targets > 1
@battle.pbDisplay(_INTL("{1} avoided the attack!",target.pbThis))
elsif target.effects[PBEffects::TwoTurnAttack]
@battle.pbDisplay(_INTL("{1} avoided the attack!",target.pbThis))

2
Data/Scripts/012_Battle/002_Move/001_PokeBattle_Move.rb
View File

@@ -60,7 +60,7 @@ class PokeBattle_Move
#=============================================================================
# About the move
#=============================================================================
def pbTarget(_user); return @target; end
def pbTarget(_user); return GameData::Target.get(@target); end
def total_pp
return @total_pp if @total_pp && @total_pp>0 # Usually undefined

2
Data/Scripts/012_Battle/002_Move/005_Move_Effects_000-07F.rb
View File

@@ -458,7 +458,7 @@ class PokeBattle_Move_019 < PokeBattle_Move
def pbEffectGeneral(user)
# Cure all Pokémon in battle on the user's side. For the benefit of the Gen
# 5 version of this move, to make Pokémon out in battle get cured first.
if pbTarget(user)!=PBTargets::UserAndAllies
if pbTarget(user) == :UserSide
@battle.eachSameSideBattler(user) do |b|
next if b.status == :NONE
pbAromatherapyHeal(b.pokemon,b)

12
Data/Scripts/012_Battle/002_Move/007_Move_Effects_100-17F.rb
View File

@@ -261,8 +261,8 @@ class PokeBattle_Move_10D < PokeBattle_Move
def ignoresSubstitute?(user); return true; end
def pbTarget(user)
return PBTargets::NearFoe if user.pbHasType?(:GHOST)
super
return GameData::Target.get(:NearFoe) if user.pbHasType?(:GHOST)
return super
end
def pbMoveFailed?(user,targets)
@@ -1132,7 +1132,7 @@ class PokeBattle_Move_137 < PokeBattle_Move
end
def pbEffectGeneral(user)
return if pbTarget(user)==PBTargets::UserAndAllies
return if pbTarget(user) != :UserSide
@validTargets.each { |b| pbEffectAgainstTarget(user,b) }
end
end
@@ -1978,7 +1978,7 @@ class PokeBattle_Move_15C < PokeBattle_Move
end
def pbEffectGeneral(user)
return if pbTarget(user)==PBTargets::UserAndAllies
return if pbTarget(user) != :UserSide
@validTargets.each { |b| pbEffectAgainstTarget(user,b) }
end
end
@@ -2423,8 +2423,8 @@ end
#===============================================================================
class PokeBattle_Move_16F < PokeBattle_Move
def pbTarget(user)
return PBTargets::NearFoe if user.effects[PBEffects::HealBlock]>0
super
return GameData::Target.get(:NearFoe) if user.effects[PBEffects::HealBlock]>0
return super
end
def pbOnStartUse(user,targets)

34
Data/Scripts/012_Battle/003_Battle/005_Battle_Action_AttacksPriority.rb
View File

@@ -99,31 +99,31 @@ class PokeBattle_Battle
@choices[idxBattler][3] = idxTarget # Set target of move
end
# Returns whether the idxTarget will be targeted by a move with targetType
# Returns whether the idxTarget will be targeted by a move with target_data
# used by a battler in idxUser.
def pbMoveCanTarget?(idxUser,idxTarget,targetType)
return false if PBTargets.noTargets?(targetType)
case targetType
when PBTargets::NearAlly
def pbMoveCanTarget?(idxUser,idxTarget,target_data)
return false if target_data.num_targets == 0
case target_data.id
when :NearAlly
return false if opposes?(idxUser,idxTarget)
return false if !nearBattlers?(idxUser,idxTarget)
when PBTargets::UserOrNearAlly
when :UserOrNearAlly
return true if idxUser==idxTarget
return false if opposes?(idxUser,idxTarget)
return false if !nearBattlers?(idxUser,idxTarget)
when PBTargets::NearFoe, PBTargets::AllNearFoes, PBTargets::RandomNearFoe
return false if !opposes?(idxUser,idxTarget)
return false if !nearBattlers?(idxUser,idxTarget)
when PBTargets::Foe
return false if !opposes?(idxUser,idxTarget)
when PBTargets::NearOther, PBTargets::AllNearOthers
return false if !nearBattlers?(idxUser,idxTarget)
when PBTargets::Other
return false if idxUser==idxTarget
when PBTargets::UserAndAllies
when :UserAndAllies
return false if opposes?(idxUser,idxTarget)
when PBTargets::AllFoes
when :NearFoe, :RandomNearFoe, :AllNearFoes
return false if !opposes?(idxUser,idxTarget)
return false if !nearBattlers?(idxUser,idxTarget)
when :Foe
return false if !opposes?(idxUser,idxTarget)
when :AllFoes
return false if !opposes?(idxUser,idxTarget)
when :NearOther, :AllNearOthers
return false if !nearBattlers?(idxUser,idxTarget)
when :Other
return false if idxUser==idxTarget
end
return true
end

4
Data/Scripts/012_Battle/003_Battle/010_Battle_Phase_Command.rb
View File

@@ -90,8 +90,8 @@ class PokeBattle_Battle
def pbAutoFightMenu(idxBattler); return false; end
def pbChooseTarget(battler,move)
targetType = move.pbTarget(battler)
idxTarget = @scene.pbChooseTarget(battler.index,targetType)
target_data = move.pbTarget(battler)
idxTarget = @scene.pbChooseTarget(battler.index,target_data)
return false if idxTarget<0
pbRegisterTarget(battler.index,idxTarget)
return true

2
Data/Scripts/012_Battle/003_Battle/011_Battle_Phase_Attack.rb
View File

@@ -27,7 +27,7 @@ class PokeBattle_Battle
next if b.fainted? || !b.opposes?(idxSwitcher) # Shouldn't hit an ally
next if b.movedThisRound? || !pbChoseMoveFunctionCode?(b.index,"088") # Pursuit
# Check whether Pursuit can be used
next unless pbMoveCanTarget?(b.index,idxSwitcher,@choices[b.index][2].target)
next unless pbMoveCanTarget?(b.index,idxSwitcher,@choices[b.index][2].pbTarget(b))
next unless pbCanChooseMove?(b.index,@choices[b.index][1],false)
next if b.status == :SLEEP || b.status == :FROZEN
next if b.effects[PBEffects::SkyDrop]>=0

12
Data/Scripts/012_Battle/004_AI/004_AI_Move.rb
View File

@@ -118,17 +118,17 @@ class PokeBattle_AI
# Trainer Pokémon calculate how much they want to use each of their moves.
def pbRegisterMoveTrainer(user,idxMove,choices,skill)
move = user.moves[idxMove]
targetType = move.pbTarget(user)
if PBTargets.multipleTargets?(targetType)
target_data = move.pbTarget(user)
if target_data.num_targets > 1
# If move affects multiple battlers and you don't choose a particular one
totalScore = 0
@battle.eachBattler do |b|
next if !@battle.pbMoveCanTarget?(user.index,b.index,targetType)
next if !@battle.pbMoveCanTarget?(user.index,b.index,target_data)
score = pbGetMoveScore(move,user,b,skill)
totalScore += ((user.opposes?(b)) ? score : -score)
end
choices.push([idxMove,totalScore,-1]) if totalScore>0
elsif PBTargets.noTargets?(targetType)
elsif target_data.num_targets == 0
# If move has no targets, affects the user, a side or the whole field
score = pbGetMoveScore(move,user,user,skill)
choices.push([idxMove,score,-1]) if score>0
@@ -136,8 +136,8 @@ class PokeBattle_AI
# If move affects one battler and you have to choose which one
scoresAndTargets = []
@battle.eachBattler do |b|
next if !@battle.pbMoveCanTarget?(user.index,b.index,targetType)
next if PBTargets.canChooseFoeTarget?(targetType) && !user.opposes?(b)
next if !@battle.pbMoveCanTarget?(user.index,b.index,target_data)
next if target_data.targets_foe && !user.opposes?(b)
score = pbGetMoveScore(move,user,b,skill)
scoresAndTargets.push([score,b.index]) if score>0
end

4
Data/Scripts/012_Battle/004_AI/005_AI_Move_EffectScores.rb
View File

@@ -1775,10 +1775,10 @@ class PokeBattle_AI
else
moveData = GameData::Move.get(target.lastRegularMoveUsed)
if moveData.category == 2 && # Status move
[PBTargets::User, PBTargets::BothSides].include?(moveData.target)
[:User, :BothSides].include?(moveData.target)
score += 60
elsif moveData.category != 2 && # Damaging move
moveData.target == PBTargets::NearOther &&
moveData.target == :NearOther &&
PBTypeEffectiveness.ineffective?(pbCalcTypeMod(moveData.type, target, user))
score += 60
end

33
Data/Scripts/012_Battle/004_AI/006_AI_Move_Utilities.rb
View File

@@ -3,25 +3,22 @@ class PokeBattle_AI
#
#=============================================================================
def pbTargetsMultiple?(move,user)
numTargets = 0
case move.pbTarget(user)
when PBTargets::AllNearFoes
@battle.eachOtherSideBattler(user) { |b| numTargets += 1 if b.near?(user) }
return numTargets>1
when PBTargets::AllNearOthers
@battle.eachBattler { |b| numTargets += 1 if b.near?(user) }
return numTargets>1
when PBTargets::UserAndAllies
@battle.eachSameSideBattler(user) { |_b| numTargets += 1 }
return numTargets>1
when PBTargets::AllFoes
@battle.eachOtherSideBattler(user) { |_b| numTargets += 1 }
return numTargets>1
when PBTargets::AllBattlers
@battle.eachBattler { |_b| numTargets += 1 }
return numTargets>1
target_data = move.pbTarget(user)
return false if target_data.num_targets <= 1
num_targets = 0
case target_data.id
when :UserAndAllies
@battle.eachSameSideBattler(user) { |_b| num_targets += 1 }
when :AllNearFoes
@battle.eachOtherSideBattler(user) { |b| num_targets += 1 if b.near?(user) }
when :AllFoes
@battle.eachOtherSideBattler(user) { |_b| num_targets += 1 }
when :AllNearOthers
@battle.eachBattler { |b| num_targets += 1 if b.near?(user) }
when :AllBattlers
@battle.eachBattler { |_b| num_targets += 1 }
end
return false
return num_targets > 1
end
#=============================================================================

41
Data/Scripts/012_Battle/005_Battle scene/008_Scene_Commands.rb
View File

@@ -296,7 +296,7 @@ class PokeBattle_Scene
tempVisibleSprites = visibleSprites.clone
tempVisibleSprites["commandWindow"] = false
tempVisibleSprites["targetWindow"] = true
idxTarget = pbChooseTarget(idxBattler,PBTargets::Foe,tempVisibleSprites)
idxTarget = pbChooseTarget(idxBattler,GameData::Target.get(:Foe),tempVisibleSprites)
if idxTarget>=0
break if yield item.id, useType, idxTarget, -1, self
end
@@ -326,21 +326,24 @@ class PokeBattle_Scene
# target.
# nil means can't select that position, "" means can select that position but
# there is no battler there, otherwise is a battler's name.
def pbCreateTargetTexts(idxBattler,targetType)
def pbCreateTargetTexts(idxBattler,target_data)
texts = Array.new(@battle.battlers.length) do |i|
next nil if !@battle.battlers[i]
showName = false
case targetType
when PBTargets::None, PBTargets::User, PBTargets::RandomNearFoe
# NOTE: Targets listed here are ones with num_targets of 0, plus
# RandomNearFoe which should look like it targets the user. All
# other targets are handled by the "else" part.
case target_data.id
when :None, :User, :RandomNearFoe
showName = (i==idxBattler)
when PBTargets::UserSide, PBTargets::UserAndAllies
when :UserSide
showName = !@battle.opposes?(i,idxBattler)
when PBTargets::FoeSide, PBTargets::AllFoes
when :FoeSide
showName = @battle.opposes?(i,idxBattler)
when PBTargets::BothSides, PBTargets::AllBattlers
when :BothSides
showName = true
else
showName = @battle.pbMoveCanTarget?(i,idxBattler,targetType)
showName = @battle.pbMoveCanTarget?(i,idxBattler,target_data)
end
next nil if !showName
next (@battle.battlers[i].fainted?) ? "" : @battle.battlers[i].name
@@ -350,9 +353,9 @@ class PokeBattle_Scene
# Returns the initial position of the cursor when choosing a target for a move
# in a non-single battle.
def pbFirstTarget(idxBattler,targetType)
case targetType
when PBTargets::NearAlly
def pbFirstTarget(idxBattler,target_data)
case target_data.id
when :NearAlly
@battle.eachSameSideBattler(idxBattler) do |b|
next if b.index==idxBattler || !@battle.nearBattlers?(b,idxBattler)
next if b.fainted?
@@ -362,27 +365,27 @@ class PokeBattle_Scene
next if b.index==idxBattler || !@battle.nearBattlers?(b,idxBattler)
return b.index
end
when PBTargets::NearFoe, PBTargets::NearOther
when :NearFoe, :NearOther
indices = @battle.pbGetOpposingIndicesInOrder(idxBattler)
indices.each { |i| return i if @battle.nearBattlers?(i,idxBattler) && !@battle.battlers[i].fainted? }
indices.each { |i| return i if @battle.nearBattlers?(i,idxBattler) }
when PBTargets::Foe, PBTargets::Other
when :Foe, :Other
indices = @battle.pbGetOpposingIndicesInOrder(idxBattler)
indices.each { |i| return i if !@battle.battlers[i].fainted? }
indices.each { |i| return i }
end
return idxBattler
return idxBattler # Target the user initially
end
def pbChooseTarget(idxBattler,targetType,visibleSprites=nil)
def pbChooseTarget(idxBattler,target_data,visibleSprites=nil)
pbShowWindow(TARGET_BOX)
cw = @sprites["targetWindow"]
# Create an array of battler names (only valid targets are named)
texts = pbCreateTargetTexts(idxBattler,targetType)
# Determine mode based on targetType
mode = (PBTargets.oneTarget?(targetType)) ? 0 : 1
texts = pbCreateTargetTexts(idxBattler,target_data)
# Determine mode based on target_data
mode = (target_data.num_targets == 1) ? 0 : 1
cw.setDetails(texts,mode)
cw.index = pbFirstTarget(idxBattler,targetType)
cw.index = pbFirstTarget(idxBattler,target_data)
pbSelectBattler((mode==0) ? cw.index : texts,2) # Select initial battler/data box
pbFadeInAndShow(@sprites,visibleSprites) if visibleSprites
ret = -1

7
Data/Scripts/012_Battle/005_Battle scene/009_Scene_Animations.rb
View File

@@ -409,12 +409,11 @@ class PokeBattle_Scene
return anim if anim
# Actual animation not found, get the default animation for the move's type
moveData = GameData::Move.get(moveID)
target_data = moveData.pbTarget(@battle.battlers[idxUser])
moveType = moveData.type
moveKind = moveData.category
moveKind += 3 if PBTargets.multipleTargets?(moveData.target) ||
PBTargets.targetsFoeSide?(moveData.target)
moveKind += 3 if moveKind == 2 && moveData.target != PBTargets::User &&
moveData.target != PBTargets::UserSide
moveKind += 3 if target_data.num_targets > 1 || target_data.affects_foe_side
moveKind += 3 if moveKind == 2 && target_data.num_targets > 0
# [one target physical, one target special, user status,
# multiple targets physical, multiple targets special, non-user status]
typeDefaultAnim = {

4
Data/Scripts/012_Battle/006_Other battle types/004_PokeBattle_BattlePalace.rb
View File

@@ -64,10 +64,10 @@ class PokeBattle_BattlePalace < PokeBattle_Battle
end
def pbMoveCategory(move)
if move.target==PBTargets::User || move.function=="0D4" # Bide
if move.target == :User || move.function == "0D4" # Bide
return 1
elsif move.statusMove? ||
move.function=="071" || move.function=="072" # Counter, Mirror Coat
move.function == "071" || move.function == "072" # Counter, Mirror Coat
return 2
else
return 0

2
Data/Scripts/012_Battle/006_Other battle types/007_PokeBattle_DebugScene.rb
View File

@@ -64,7 +64,7 @@ class PokeBattle_DebugSceneNoLogging
end
end
def pbChooseTarget(idxBattler,targetType,visibleSprites=nil)
def pbChooseTarget(idxBattler,target_data,visibleSprites=nil)
targets = []
@battle.eachOtherSideBattler(idxBattler) { |b| targets.push(b.index) }
return -1 if targets.length==0