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

Added class Data::Ability and made all code use symbols for abilities instead of numbers. Also added class Data::Item but it's unused.

Browse Source
This commit is contained in:
Maruno17
2020-11-01 20:10:28 +00:00
parent c4e69d0a2e
commit 213347b938
34 changed files with 590 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,7 @@ class PokeBattle_Move
end
# Disguise will take the damage
if !@battle.moldBreaker && target.isSpecies?(:MIMIKYU) &&
target.form==0 && isConst?(target.ability,PBAbilities,:DISGUISE)
target.form==0 && target.ability == :DISGUISE
target.damageState.disguise = true
return
end

31
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 !hasConst?(PBAbilities,:SIMPLE) # Ability isn't defined
if !Data::Ability.exists?(:SIMPLE)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2005,9 +2005,7 @@ class PokeBattle_Move_063 < PokeBattle_Move
end
def pbFailsAgainstTarget?(user,target)
if target.unstoppableAbility? ||
isConst?(target.ability, PBAbilities, :TRUANT) || # For some reason
isConst?(target.ability, PBAbilities, :SIMPLE)
if target.unstoppableAbility? || [:TRUANT, :SIMPLE].include?(target.ability)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2017,7 +2015,7 @@ class PokeBattle_Move_063 < PokeBattle_Move
def pbEffectAgainstTarget(user,target)
@battle.pbShowAbilitySplash(target,true,false)
oldAbil = target.ability
target.ability = getConst(PBAbilities,:SIMPLE)
target.ability = :SIMPLE
@battle.pbReplaceAbilitySplash(target)
@battle.pbDisplay(_INTL("{1} acquired {2}!",target.pbThis,target.abilityName))
@battle.pbHideAbilitySplash(target)
@@ -2032,7 +2030,7 @@ end
#===============================================================================
class PokeBattle_Move_064 < PokeBattle_Move
def pbMoveFailed?(user,targets)
if !hasConst?(PBAbilities,:INSOMNIA) # Ability isn't defined
if !Data::Ability.exists?(:INSOMNIA)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2040,9 +2038,7 @@ class PokeBattle_Move_064 < PokeBattle_Move
end
def pbFailsAgainstTarget?(user,target)
if target.unstoppableAbility? ||
isConst?(target.ability, PBAbilities, :TRUANT) || # For some reason
isConst?(target.ability, PBAbilities, :INSOMNIA)
if target.unstoppableAbility? || [:TRUANT, :INSOMNIA].include?(target.ability)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2052,7 +2048,7 @@ class PokeBattle_Move_064 < PokeBattle_Move
def pbEffectAgainstTarget(user,target)
@battle.pbShowAbilitySplash(target,true,false)
oldAbil = target.ability
target.ability = getConst(PBAbilities,:INSOMNIA)
target.ability = :INSOMNIA
@battle.pbReplaceAbilitySplash(target)
@battle.pbDisplay(_INTL("{1} acquired {2}!",target.pbThis,target.abilityName))
@battle.pbHideAbilitySplash(target)
@@ -2082,10 +2078,7 @@ class PokeBattle_Move_065 < PokeBattle_Move
return true
end
if target.ungainableAbility? ||
isConst?(target.ability, PBAbilities, :POWEROFALCHEMY) ||
isConst?(target.ability, PBAbilities, :RECEIVER) ||
isConst?(target.ability, PBAbilities, :TRACE) ||
isConst?(target.ability, PBAbilities, :WONDERGUARD)
[:POWEROFALCHEMY, :RECEIVER, :TRACE, :WONDERGUARD].include?(target.ability)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2117,9 +2110,7 @@ class PokeBattle_Move_066 < PokeBattle_Move
return true
end
if user.ungainableAbility? ||
isConst?(user.ability, PBAbilities, :POWEROFALCHEMY) ||
isConst?(user.ability, PBAbilities, :RECEIVER) ||
isConst?(user.ability, PBAbilities, :TRACE)
[:POWEROFALCHEMY, :RECEIVER, :TRACE].include?(user.ability)
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2127,7 +2118,7 @@ class PokeBattle_Move_066 < PokeBattle_Move
end
def pbFailsAgainstTarget?(user,target)
if target.unstoppableAbility? || isConst?(target.ability, PBAbilities, :TRUANT)
if target.unstoppableAbility? || target.ability == :TRUANT
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2163,7 +2154,7 @@ class PokeBattle_Move_067 < PokeBattle_Move
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
if user.ungainableAbility? || isConst?(user.ability, PBAbilities, :WONDERGUARD)
if user.ungainableAbility? || user.ability == :WONDERGUARD
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
@@ -2180,7 +2171,7 @@ class PokeBattle_Move_067 < PokeBattle_Move
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
if target.ungainableAbility? || isConst?(target.ability, PBAbilities, :WONDERGUARD)
if target.ungainableAbility? || target.ability == :WONDERGUARD
@battle.pbDisplay(_INTL("But it failed!"))
return true
end