mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 21:54:58 +00:00
Merge branch 'dev' into ai
This commit is contained in:
@@ -366,8 +366,7 @@ class Battle::Move::TwoTurnMove < Battle::Move
|
||||
@battle.pbDisplay(_INTL("{1} began charging up!", user.pbThis))
|
||||
end
|
||||
|
||||
def pbAttackingTurnMessage(user, targets)
|
||||
end
|
||||
def pbAttackingTurnMessage(user, targets); end
|
||||
|
||||
def pbEffectAgainstTarget(user, target)
|
||||
if @damagingTurn
|
||||
@@ -382,8 +381,7 @@ class Battle::Move::TwoTurnMove < Battle::Move
|
||||
# the latter just records the target is being Sky Dropped
|
||||
end
|
||||
|
||||
def pbAttackingTurnEffect(user, target)
|
||||
end
|
||||
def pbAttackingTurnEffect(user, target); end
|
||||
|
||||
def pbShowAnimation(id, user, targets, hitNum = 0, showAnimation = true)
|
||||
hitNum = 1 if @chargingTurn && !@damagingTurn # Charging anim
|
||||
|
||||
Reference in New Issue
Block a user