Tidied up semicolon use, refactored random dungeon generation code, fixed visual bug in Day Care debug screen

Data/Scripts/011_Battle/002_Move/002_Move_Usage.rb

@@ -240,8 +240,10 @@ class PokeBattle_Move
         oldHP = b.hp+b.damageState.hpLost
         PBDebug.log("[Move damage] #{b.pbThis} lost #{b.damageState.hpLost} HP (#{oldHP}=>#{b.hp})")
         effectiveness = 0
-        if Effectiveness.resistant?(b.damageState.typeMod);          effectiveness = 1
-        elsif Effectiveness.super_effective?(b.damageState.typeMod); effectiveness = 2
+        if Effectiveness.resistant?(b.damageState.typeMod)
+          effectiveness = 1
+        elsif Effectiveness.super_effective?(b.damageState.typeMod)
+          effectiveness = 2
         end
         animArray.push([b,oldHP,effectiveness])
       end

Data/Scripts/011_Battle/002_Move/004_Move_Effects_Generic.rb

@@ -492,8 +492,10 @@ class PokeBattle_TwoTurnMove < PokeBattle_Move
   end
 
   def pbEffectAgainstTarget(user,target)
-    if @damagingTurn;    pbAttackingTurnEffect(user,target)
-    elsif @chargingTurn; pbChargingTurnEffect(user,target)
+    if @damagingTurn
+      pbAttackingTurnEffect(user,target)
+    elsif @chargingTurn
+      pbChargingTurnEffect(user,target)
     end
   end
 
@@ -652,14 +654,20 @@ end
 #===============================================================================
 class PokeBattle_PledgeMove < PokeBattle_Move
   def pbOnStartUse(user,targets)
-    @pledgeSetup = false; @pledgeCombo = false; @pledgeOtherUser = nil
-    @comboEffect = nil; @overrideType = nil; @overrideAnim = nil
+    @pledgeSetup = false
+    @pledgeCombo = false
+    @pledgeOtherUser = nil
+    @comboEffect = nil
+    @overrideType = nil
+    @overrideAnim = nil
     # Check whether this is the use of a combo move
     @combos.each do |i|
       next if i[0]!=user.effects[PBEffects::FirstPledge]
       @battle.pbDisplay(_INTL("The two moves have become one! It's a combined move!"))
       @pledgeCombo = true
-      @comboEffect = i[1]; @overrideType = i[2]; @overrideAnim = i[3]
+      @comboEffect = i[1]
+      @overrideType = i[2]
+      @overrideAnim = i[3]
       @overrideType = nil if !GameData::Type.exists?(@overrideType)
       break
     end
@@ -706,7 +714,8 @@ class PokeBattle_PledgeMove < PokeBattle_Move
 
   def pbEffectAfterAllHits(user,target)
     return if !@pledgeCombo
-    msg = nil; animName = nil
+    msg = nil
+    animName = nil
     case @comboEffect
     when :SeaOfFire   # Grass + Fire
       if user.pbOpposingSide.effects[PBEffects::SeaOfFire]==0

Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb

@@ -927,12 +927,14 @@ class PokeBattle_Move_035 < PokeBattle_Move
     failed = true
     for i in 0...@statUp.length/2
       if user.pbCanRaiseStatStage?(@statUp[i*2],user,self)
-        failed = false; break
+        failed = false
+        break
       end
     end
     for i in 0...@statDown.length/2
       if user.pbCanLowerStatStage?(@statDown[i*2],user,self)
-        failed = false; break
+        failed = false
+        break
       end
     end
     if failed
@@ -1686,11 +1688,15 @@ end
 class PokeBattle_Move_05A < PokeBattle_Move
   def pbEffectAgainstTarget(user,target)
     newHP = (user.hp+target.hp)/2
-    if user.hp>newHP;    user.pbReduceHP(user.hp-newHP,false,false)
-    elsif user.hp<newHP; user.pbRecoverHP(newHP-user.hp,false)
+    if user.hp>newHP
+      user.pbReduceHP(user.hp-newHP,false,false)
+    elsif user.hp<newHP
+      user.pbRecoverHP(newHP-user.hp,false)
     end
-    if target.hp>newHP;    target.pbReduceHP(target.hp-newHP,false,false)
-    elsif target.hp<newHP; target.pbRecoverHP(newHP-target.hp,false)
+    if target.hp>newHP
+      target.pbReduceHP(target.hp-newHP,false,false)
+    elsif target.hp<newHP
+      target.pbRecoverHP(newHP-target.hp,false)
     end
     @battle.pbDisplay(_INTL("The battlers shared their pain!"))
     user.pbItemHPHealCheck

Data/Scripts/011_Battle/002_Move/006_Move_Effects_080-0FF.rb

@@ -260,7 +260,8 @@ def pbHiddenPower(pkmn)
   # NOTE: This allows Hidden Power to be Fairy-type (if you have that type in
   #       your game). I don't care that the official games don't work like that.
   iv = pkmn.iv
-  idxType = 0; power = 60
+  idxType = 0
+  power = 60
   types = []
   GameData::Type.each do |t|
     types[t.icon_position] ||= []
@@ -355,9 +356,12 @@ class PokeBattle_Move_094 < PokeBattle_Move
   def pbOnStartUse(user,targets)
     @presentDmg = 0   # 0 = heal, >0 = damage
     r = @battle.pbRandom(100)
-    if r<40;    @presentDmg = 40
-    elsif r<70; @presentDmg = 80
-    elsif r<80; @presentDmg = 120
+    if r<40
+      @presentDmg = 40
+    elsif r<70
+      @presentDmg = 80
+    elsif r<80
+      @presentDmg = 120
     end
   end
 
@@ -549,11 +553,16 @@ class PokeBattle_Move_098 < PokeBattle_Move
   def pbBaseDamage(baseDmg,user,target)
     ret = 20
     n = 48*user.hp/user.totalhp
-    if n<2;     ret = 200
-    elsif n<5;  ret = 150
-    elsif n<10; ret = 100
-    elsif n<17; ret = 80
-    elsif n<33; ret = 40
+    if n<2
+      ret = 200
+    elsif n<5
+      ret = 150
+    elsif n<10
+      ret = 100
+    elsif n<17
+      ret = 80
+    elsif n<33
+      ret = 40
     end
     return ret
   end
@@ -568,10 +577,14 @@ class PokeBattle_Move_099 < PokeBattle_Move
   def pbBaseDamage(baseDmg,user,target)
     ret = 40
     n = user.pbSpeed/target.pbSpeed
-    if n>=4;    ret = 150
-    elsif n>=3; ret = 120
-    elsif n>=2; ret = 80
-    elsif n>=1; ret = 60
+    if n>=4
+      ret = 150
+    elsif n>=3
+      ret = 120
+    elsif n>=2
+      ret = 80
+    elsif n>=1
+      ret = 60
     end
     return ret
   end
@@ -586,11 +599,16 @@ class PokeBattle_Move_09A < PokeBattle_Move
   def pbBaseDamage(baseDmg,user,target)
     ret = 20
     weight = target.pbWeight
-    if weight>=2000;    ret = 120
-    elsif weight>=1000; ret = 100
-    elsif weight>=500;  ret = 80
-    elsif weight>=250;  ret = 60
-    elsif weight>=100;  ret = 40
+    if weight>=2000
+      ret = 120
+    elsif weight>=1000
+      ret = 100
+    elsif weight>=500
+      ret = 80
+    elsif weight>=250
+      ret = 60
+    elsif weight>=100
+      ret = 40
     end
     return ret
   end
@@ -611,10 +629,14 @@ class PokeBattle_Move_09B < PokeBattle_Move
   def pbBaseDamage(baseDmg,user,target)
     ret = 40
     n = (user.pbWeight/target.pbWeight).floor
-    if n>=5;    ret = 120
-    elsif n>=4; ret = 100
-    elsif n>=3; ret = 80
-    elsif n>=2; ret = 60
+    if n>=5
+      ret = 120
+    elsif n>=4
+      ret = 100
+    elsif n>=3
+      ret = 80
+    elsif n>=2
+      ret = 60
     end
     return ret
   end
@@ -3324,8 +3346,10 @@ class PokeBattle_Move_0F2 < PokeBattle_Move
   end
 
   def pbEffectAgainstTarget(user,target)
-    oldUserItem = user.item;     oldUserItemName = user.itemName
-    oldTargetItem = target.item; oldTargetItemName = target.itemName
+    oldUserItem = user.item
+    oldUserItemName = user.itemName
+    oldTargetItem = target.item
+    oldTargetItemName = target.itemName
     user.item                             = oldTargetItem
     user.effects[PBEffects::ChoiceBand]   = nil if user.ability_id != :GORILLATACTICS
     user.effects[PBEffects::Unburden]     = (!user.item && oldUserItem)

Data/Scripts/011_Battle/002_Move/007_Move_Effects_100-17F.rb

@@ -1017,7 +1017,9 @@ end
 #===============================================================================
 class PokeBattle_Move_125 < PokeBattle_Move
   def pbFailsAgainstTarget?(user,target)
-    hasThisMove = false; hasOtherMoves = false; hasUnusedMoves = false
+    hasThisMove = false
+    hasOtherMoves = false
+    hasUnusedMoves = false
     user.eachMove do |m|
       hasThisMove    = true if m.id==@id
       hasOtherMoves  = true if m.id!=@id