More Rubocop changes

This commit is contained in:
Maruno17
2022-02-13 00:57:54 +00:00
parent cca5989746
commit f68e699cc9
108 changed files with 708 additions and 808 deletions

View File

@@ -457,7 +457,7 @@ module RPG
end
# End fading
if @fade_time >= ((@target_type == :None) ? FADE_OLD_PARTICLES_END : FADE_NEW_TILES_END) - @time_shift &&
!@sprites.any? { |sprite| sprite.visible }
@sprites.none? { |sprite| sprite.visible }
@type = @target_type
@max = @target_max
@target_type = nil

View File

@@ -93,7 +93,7 @@ end
class LightEffect
def initialize(event, viewport = nil, map = nil, filename = nil)
@light = IconSprite.new(0, 0, viewport)
if filename != nil && filename != "" && pbResolveBitmap("Graphics/Pictures/" + filename)
if !nil_or_empty?(filename) && pbResolveBitmap("Graphics/Pictures/" + filename)
@light.setBitmap("Graphics/Pictures/" + filename)
else
@light.setBitmap("Graphics/Pictures/LE")
@@ -208,7 +208,7 @@ end
EventHandlers.add(:on_new_spriteset_map, :add_light_effects,
proc { |spriteset, viewport|
map = spriteset.map # Map associated with the spriteset (not necessarily the current map)
map.events.keys.each do |i|
map.events.each_key do |i|
if map.events[i].name[/^outdoorlight\((\w+)\)$/i]
filename = $~[1].to_s
spriteset.addUserSprite(LightEffect_DayNight.new(map.events[i], viewport, map, filename))