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

Battlers now make use of Ability objects to be consistent with Pokemon objects

Browse Source
This commit is contained in:
Maruno17
2020-11-04 21:27:56 +00:00
parent 9dc6da0742
commit ff70791104
26 changed files with 189 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1997,7 +1997,7 @@ end
#===============================================================================
class PokeBattle_Move_063 < PokeBattle_Move
def pbMoveFailed?(user,targets)
if !Data::Ability.exists?(:SIMPLE)
if !PokemonData::Ability.exists?(:SIMPLE)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2030,7 +2030,7 @@ end
#===============================================================================
class PokeBattle_Move_064 < PokeBattle_Move
def pbMoveFailed?(user,targets)
if !Data::Ability.exists?(:INSOMNIA)
if !PokemonData::Ability.exists?(:INSOMNIA)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2038,7 +2038,7 @@ class PokeBattle_Move_064 < PokeBattle_Move
end
def pbFailsAgainstTarget?(user,target)
if target.unstoppableAbility? || [:TRUANT, :INSOMNIA].include?(target.ability)
if target.unstoppableAbility? || [:TRUANT, :INSOMNIA].include?(target.ability_id)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2073,12 +2073,12 @@ class PokeBattle_Move_065 < PokeBattle_Move
end
def pbFailsAgainstTarget?(user,target)
if target.ability==0 || user.ability==target.ability
if !target.ability || user.ability==target.ability
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
if target.ungainableAbility? ||
[:POWEROFALCHEMY, :RECEIVER, :TRACE, :WONDERGUARD].include?(target.ability)
[:POWEROFALCHEMY, :RECEIVER, :TRACE, :WONDERGUARD].include?(target.ability_id)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2105,12 +2105,12 @@ end
#===============================================================================
class PokeBattle_Move_066 < PokeBattle_Move
def pbMoveFailed?(user,targets)
if user.ability==0
if !user.ability
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
if user.ungainableAbility? ||
[:POWEROFALCHEMY, :RECEIVER, :TRACE].include?(user.ability)
[:POWEROFALCHEMY, :RECEIVER, :TRACE].include?(user.ability_id)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2146,7 +2146,7 @@ class PokeBattle_Move_067 < PokeBattle_Move
def ignoresSubstitute?(user); return true; end
def pbMoveFailed?(user,targets)
if user.ability==0
if !user.ability
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2162,7 +2162,7 @@ class PokeBattle_Move_067 < PokeBattle_Move
end
def pbFailsAgainstTarget?(user,target)
if target.ability==0 ||
if !target.ability ||
(user.ability==target.ability && !NEWEST_BATTLE_MECHANICS)
@battle.pbDisplay(_INTL("But it failed!"))
return true