Yet more Rubocopping

2025-12-08 21:54:58 +00:00 · 2021-12-23 00:27:17 +00:00
parent 514fe13ca2
commit 132a16950d
171 changed files with 1455 additions and 1647 deletions
--- a/Data/Scripts/011_Battle/003_Move/009_MoveEffects_MultiHit.rb
+++ b/Data/Scripts/011_Battle/003_Move/009_MoveEffects_MultiHit.rb
@@ -221,13 +221,12 @@ end
 class Battle::Move::TwoTurnAttackOneTurnInSun < Battle::Move::TwoTurnMove
  def pbIsChargingTurn?(user)
    ret = super
-    if !user.effects[PBEffects::TwoTurnAttack]
-      if [:Sun, :HarshSun].include?(user.effectiveWeather)
-        @powerHerb = false
-        @chargingTurn = true
-        @damagingTurn = true
-        return false
-      end
+    if !user.effects[PBEffects::TwoTurnAttack] &&
+       [:Sun, :HarshSun].include?(user.effectiveWeather)
+      @powerHerb = false
+      @chargingTurn = true
+      @damagingTurn = true
+      return false
    end
    return ret
  end