Fixed Beak Blast/Shell Trap always failing, typo in Brick Break

This commit is contained in:
Maruno17
2021-04-18 16:30:17 +01:00
parent f10fe5c491
commit 66ee5937bc
17 changed files with 3 additions and 10 deletions

View File

@@ -76,7 +76,6 @@ class PokeBattle_Battler
@effects[PBEffects::Grudge] = false
@effects[PBEffects::MoveNext] = false
@effects[PBEffects::Quash] = 0
@effects[PBEffects::ShellTrap] = false
# Encore's effect ends if the encored move is no longer available
if @effects[PBEffects::Encore]>0 && pbEncoredMoveIndex<0
@effects[PBEffects::Encore] = 0
@@ -116,8 +115,10 @@ class PokeBattle_Battler
@effects[PBEffects::ChoiceBand] = @lastRegularMoveUsed
end
end
@effects[PBEffects::BeakBlast] = false
@effects[PBEffects::Charge] = 0 if @effects[PBEffects::Charge]==1
@effects[PBEffects::GemConsumed] = nil
@effects[PBEffects::ShellTrap] = false
@battle.eachBattler { |b| b.pbContinualAbilityChecks } # Trace, end primordial weathers
end

View File

@@ -174,7 +174,7 @@ class PokeBattle_Move_10A < PokeBattle_Move
def pbEffectGeneral(user)
if user.pbOpposingSide.effects[PBEffects::LightScreen]>0
user.pbOpposingSide.effects[PBEffects::LightScreen] = 0
@battle.pbDisplayP(_INTL("{1}'s Light Screen wore off!",user.pbOpposingTeam))
@battle.pbDisplay(_INTL("{1}'s Light Screen wore off!",user.pbOpposingTeam))
end
if user.pbOpposingSide.effects[PBEffects::Reflect]>0
user.pbOpposingSide.effects[PBEffects::Reflect] = 0
@@ -2538,14 +2538,6 @@ class PokeBattle_Move_172 < PokeBattle_Move
@battle.pbCommonAnimation("BeakBlast",user)
@battle.pbDisplay(_INTL("{1} started heating up its beak!",user.pbThis))
end
def pbMoveFailed?(user,targets)
if !user.effects[PBEffects::BeakBlast]
@battle.pbDisplay(_INTL("But it failed!"))
return true
end
return false
end
end