Added class GameData::Target

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

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

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)

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)