From 837208792a49710a414aee239fee1553c1a42824 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Tue, 19 Oct 2021 17:39:27 +0100 Subject: [PATCH] Fixed bug with Neutralizing Gas, fixed typo --- .../011_Battle/001_Battler/001_PokeBattle_Battler.rb | 7 ++++--- Data/Scripts/011_Battle/003_BattleHandlers_Abilities.rb | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb b/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb index cbcf2df55..523945068 100644 --- a/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb +++ b/Data/Scripts/011_Battle/001_Battler/001_PokeBattle_Battler.rb @@ -338,15 +338,16 @@ class PokeBattle_Battler # active, and the code for the two combined would cause an infinite loop # (regardless of whether any Pokémon actually has either the ability or # the item - the code existing is enough to cause the loop). - def abilityActive?(ignore_fainted = false) + def abilityActive?(ignore_fainted = false, check_ability = nil) return false if fainted? && !ignore_fainted return false if @effects[PBEffects::GastroAcid] - return false if self.ability != :NEUTRALIZINGGAS && @battle.pbCheckGlobalAbility(:NEUTRALIZINGGAS) + return false if check_ability != :NEUTRALIZINGGAS && self.ability != :NEUTRALIZINGGAS && + @battle.pbCheckGlobalAbility(:NEUTRALIZINGGAS) return true end def hasActiveAbility?(check_ability, ignore_fainted = false) - return false if !abilityActive?(ignore_fainted) + return false if !abilityActive?(ignore_fainted, check_ability) return check_ability.include?(@ability_id) if check_ability.is_a?(Array) return self.ability == check_ability end diff --git a/Data/Scripts/011_Battle/003_BattleHandlers_Abilities.rb b/Data/Scripts/011_Battle/003_BattleHandlers_Abilities.rb index fa06fee32..c956a1b41 100644 --- a/Data/Scripts/011_Battle/003_BattleHandlers_Abilities.rb +++ b/Data/Scripts/011_Battle/003_BattleHandlers_Abilities.rb @@ -1865,7 +1865,7 @@ BattleHandlers::UserAbilityEndOfMove.add(:MAGICIAN, end user.item = b.item b.item = nil - b.effects[PBEffects::Unburden] = true if n.hasActiveAbility?(:UNBURDEN) + b.effects[PBEffects::Unburden] = true if b.hasActiveAbility?(:UNBURDEN) if battle.wildBattle? && !user.initialItem && user.item == b.initialItem user.setInitialItem(user.item) b.setInitialItem(nil)