Validaciones animaciones de movimientos

SkyFangames · Jan 6, 2025 · 85417cf · 85417cf
1 parent 269d9c4
commit 85417cf
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/LA BASE DE SKY/Data/Scripts/034_Other battle code/008_BattleAnimationPlayer.rb b/LA BASE DE SKY/Data/Scripts/034_Other battle code/008_BattleAnimationPlayer.rb
@@ -481,10 +481,10 @@ def playTiming(frame, bgGraphic, bgColor, foGraphic, foColor, oldbg = [], oldfo
       when 2
         if bgGraphic.bitmap.nil?
           bgColor.opacity = oldbg[2] || 0 + ((i.opacity - (oldbg[2] || 0)) * fraction) if i.opacity
-          cr = i.colorRed ? oldbg[3].red + ((i.colorRed - (oldbg[3].red || Color.new(0, 0, 0, 0).red)) * fraction) : oldbg[3].red || Color.new(0, 0, 0, 0).red
-          cg = i.colorGreen ? oldbg[3].green + ((i.colorGreen - (oldbg[3].green || Color.new(0, 0, 0, 0).green)) * fraction) : oldbg[3].green || Color.new(0, 0, 0, 0).green
-          cb = i.colorBlue ? oldbg[3].blue + ((i.colorBlue - (oldbg[3].blue || Color.new(0, 0, 0, 0).blue)) * fraction) : oldbg[3].blue || Color.new(0, 0, 0, 0).blue
-          ca = i.colorAlpha ? oldbg[3].alpha + ((i.colorAlpha - (oldbg[3].alpha || Color.new(0, 0, 0, 0).alpha)) * fraction) : oldbg[3].alpha || Color.new(0, 0, 0, 0).alpha
+          cr = i.colorRed ? oldbg[3]&.red || 0 + ((i.colorRed - (oldbg[3].red || Color.new(0, 0, 0, 0).red)) * fraction) : oldbg[3]&.red || Color.new(0, 0, 0, 0).red
+          cg = i.colorGreen ? oldbg[3]&.green || 0 + ((i.colorGreen - (oldbg[3]&.green || Color.new(0, 0, 0, 0).green)) * fraction) : oldbg[3]&.green || Color.new(0, 0, 0, 0).green
+          cb = i.colorBlue ? oldbg[3]&.blue || 0  + ((i.colorBlue - (oldbg[3]&.blue || Color.new(0, 0, 0, 0).blue)) * fraction) : oldbg[3]&.blue || Color.new(0, 0, 0, 0).blue
+          ca = i.colorAlpha ? oldbg[3]&.alpha || 0 + ((i.colorAlpha - (oldbg[3]&.alpha || Color.new(0, 0, 0, 0).alpha)) * fraction) : oldbg[3]&.alpha || Color.new(0, 0, 0, 0).alpha
           bgColor.color = Color.new(cr, cg, cb, ca)
         else
           bgGraphic.ox      = oldbg[0] - ((i.bgX - oldbg[0]) * fraction) if i.bgX
@@ -498,11 +498,11 @@ def playTiming(frame, bgGraphic, bgColor, foGraphic, foColor, oldbg = [], oldfo
         end
       when 4
         if foGraphic.bitmap.nil?
-          foColor.opacity = oldfo[2] + ((i.opacity - oldfo[2]) * fraction) if i.opacity
-          cr = i.colorRed ? oldfo[3].red + ((i.colorRed - oldfo[3].red) * fraction) : oldfo[3].red
-          cg = i.colorGreen ? oldfo[3].green + ((i.colorGreen - oldfo[3].green) * fraction) : oldfo[3].green
-          cb = i.colorBlue ? oldfo[3].blue + ((i.colorBlue - oldfo[3].blue) * fraction) : oldfo[3].blue
-          ca = i.colorAlpha ? oldfo[3].alpha + ((i.colorAlpha - oldfo[3].alpha) * fraction) : oldfo[3].alpha
+          foColor.opacity = oldfo[2] || 0 + ((i.opacity - oldfo[2] || 0) * fraction) if i.opacity
+          cr = i.colorRed ? oldfo[3]&.red || 0 + ((i.colorRed - (oldfo[3]&.red || Color.new(0, 0, 0, 0).red)) * fraction) : oldfo[3]&.red || Color.new(0, 0, 0, 0).red
+          cg = i.colorGreen ? oldfo[3]&.green || 0 + ((i.colorGreen - (oldfo[3]&.green || Color.new(0, 0, 0, 0).green)) * fraction) : oldfo[3].green || Color.new(0, 0, 0, 0).green
+          cb = i.colorBlue ? oldfo[3]&.blue || 0 + ((i.colorBlue - (oldfo[3]&.blue || Color.new(0, 0, 0, 0).blue)) * fraction) : oldfo[3].blue || Color.new(0, 0, 0, 0).blue
+          ca = i.colorAlpha ? oldfo[3]&.alpha || 0 + ((i.colorAlpha - (oldfo[3]&.alpha || Color.new(0, 0, 0, 0).alpha)) * fraction) : oldfo[3].alpha || Color.new(0, 0, 0, 0).alpha
           foColor.color = Color.new(cr, cg, cb, ca)
         else
           foGraphic.ox      = oldfo[0] - ((i.bgX - oldfo[0]) * fraction) if i.bgX