Merge branch 'dev' into ai

This commit is contained in:
Maruno17
2023-04-13 19:36:18 +01:00
45 changed files with 449 additions and 382 deletions

View File

@@ -169,8 +169,8 @@ class Battle::Move::RemoveTargetItem < Battle::Move
def pbBaseDamage(baseDmg, user, target)
if Settings::MECHANICS_GENERATION >= 6 &&
target.item && !target.unlosableItem?(target.item)
# NOTE: Damage is still boosted even if target has Sticky Hold or a
# substitute.
# NOTE: Damage is still boosted even if target has Sticky Hold or a
# substitute.
baseDmg = (baseDmg * 1.5).round
end
return baseDmg