From a47f40a85bca1f0f27f763185428859e443ad052 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 27 Sep 2020 21:06:04 +0100 Subject: [PATCH] Fixed Rollout doing maximum damage on its first turn --- .../012_Battle/002_Move/006_Move_Effects_080-0FF.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb b/Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb index 6e3140331..2e1ddbd69 100644 --- a/Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb +++ b/Data/Scripts/012_Battle/002_Move/006_Move_Effects_080-0FF.rb @@ -2403,18 +2403,19 @@ end #=============================================================================== class PokeBattle_Move_0D3 < PokeBattle_Move def pbBaseDamage(baseDmg,user,target) - shift = (4-user.effects[PBEffects::Rollout]) # 0-4, where 0 is most powerful + shift = (5 - user.effects[PBEffects::Rollout]) # 0-4, where 0 is most powerful + shift = 0 if user.effects[PBEffects::Rollout] == 0 # For first turn shift += 1 if user.effects[PBEffects::DefenseCurl] - baseDmg = baseDmg << shift + baseDmg *= 2**shift return baseDmg end def pbEffectAfterAllHits(user,target) - if !target.damageState.unaffected && user.effects[PBEffects::Rollout]==0 + if !target.damageState.unaffected && user.effects[PBEffects::Rollout] == 0 user.effects[PBEffects::Rollout] = 5 user.currentMove = @id end - user.effects[PBEffects::Rollout] -= 1 if user.effects[PBEffects::Rollout]>0 + user.effects[PBEffects::Rollout] -= 1 if user.effects[PBEffects::Rollout] > 0 end end