mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-09 06:04:59 +00:00
Merge branch 'dev' into ui-redesign
This commit is contained in:
@@ -264,10 +264,12 @@ class Battle::Move
|
||||
oldHP += b.damageState.hpLost
|
||||
end
|
||||
effectiveness = 0
|
||||
if Effectiveness.resistant?(b.damageState.typeMod)
|
||||
effectiveness = 1
|
||||
elsif Effectiveness.super_effective?(b.damageState.typeMod)
|
||||
effectiveness = 2
|
||||
if !self.is_a?(Battle::Move::FixedDamageMove)
|
||||
if Effectiveness.resistant?(b.damageState.typeMod)
|
||||
effectiveness = 1
|
||||
elsif Effectiveness.super_effective?(b.damageState.typeMod)
|
||||
effectiveness = 2
|
||||
end
|
||||
end
|
||||
animArray.push([b, oldHP, effectiveness])
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user