mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Fixed Beak Blast/Shell Trap always failing, typo in Brick Break
This commit is contained in:
@@ -76,7 +76,6 @@ class PokeBattle_Battler
|
|||||||
@effects[PBEffects::Grudge] = false
|
@effects[PBEffects::Grudge] = false
|
||||||
@effects[PBEffects::MoveNext] = false
|
@effects[PBEffects::MoveNext] = false
|
||||||
@effects[PBEffects::Quash] = 0
|
@effects[PBEffects::Quash] = 0
|
||||||
@effects[PBEffects::ShellTrap] = false
|
|
||||||
# Encore's effect ends if the encored move is no longer available
|
# Encore's effect ends if the encored move is no longer available
|
||||||
if @effects[PBEffects::Encore]>0 && pbEncoredMoveIndex<0
|
if @effects[PBEffects::Encore]>0 && pbEncoredMoveIndex<0
|
||||||
@effects[PBEffects::Encore] = 0
|
@effects[PBEffects::Encore] = 0
|
||||||
@@ -116,8 +115,10 @@ class PokeBattle_Battler
|
|||||||
@effects[PBEffects::ChoiceBand] = @lastRegularMoveUsed
|
@effects[PBEffects::ChoiceBand] = @lastRegularMoveUsed
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@effects[PBEffects::BeakBlast] = false
|
||||||
@effects[PBEffects::Charge] = 0 if @effects[PBEffects::Charge]==1
|
@effects[PBEffects::Charge] = 0 if @effects[PBEffects::Charge]==1
|
||||||
@effects[PBEffects::GemConsumed] = nil
|
@effects[PBEffects::GemConsumed] = nil
|
||||||
|
@effects[PBEffects::ShellTrap] = false
|
||||||
@battle.eachBattler { |b| b.pbContinualAbilityChecks } # Trace, end primordial weathers
|
@battle.eachBattler { |b| b.pbContinualAbilityChecks } # Trace, end primordial weathers
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ class PokeBattle_Move_10A < PokeBattle_Move
|
|||||||
def pbEffectGeneral(user)
|
def pbEffectGeneral(user)
|
||||||
if user.pbOpposingSide.effects[PBEffects::LightScreen]>0
|
if user.pbOpposingSide.effects[PBEffects::LightScreen]>0
|
||||||
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
|
end
|
||||||
if user.pbOpposingSide.effects[PBEffects::Reflect]>0
|
if user.pbOpposingSide.effects[PBEffects::Reflect]>0
|
||||||
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.pbCommonAnimation("BeakBlast",user)
|
||||||
@battle.pbDisplay(_INTL("{1} started heating up its beak!",user.pbThis))
|
@battle.pbDisplay(_INTL("{1} started heating up its beak!",user.pbThis))
|
||||||
end
|
end
|
||||||
|
|
||||||
def pbMoveFailed?(user,targets)
|
|
||||||
if !user.effects[PBEffects::BeakBlast]
|
|
||||||
@battle.pbDisplay(_INTL("But it failed!"))
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user