Yet more Rubocopping

Data/Scripts/007_Objects and windows/001_RPG_Cache.rb

@@ -27,7 +27,7 @@ module RPG
     def self.fromCache(i)
       return nil if !@cache.include?(i)
       obj = @cache[i]
-      return nil if obj && obj.disposed?
+      return nil if obj&.disposed?
       return obj
     end
 

Data/Scripts/007_Objects and windows/002_MessageConfig.rb

@@ -177,7 +177,7 @@ end
 
 def pbBottomLeftLines(window, lines, width = nil)
   window.x = 0
-  window.width = width ? width : Graphics.width
+  window.width = width || Graphics.width
   window.height = (window.borderY rescue 32) + (lines * 32)
   window.y = Graphics.height - window.height
 end
@@ -393,10 +393,10 @@ end
 def pbDoEnsureBitmap(bitmap, dwidth, dheight)
   if !bitmap || bitmap.disposed? || bitmap.width < dwidth || bitmap.height < dheight
     oldfont = (bitmap && !bitmap.disposed?) ? bitmap.font : nil
-    bitmap.dispose if bitmap
+    bitmap&.dispose
     bitmap = Bitmap.new([1, dwidth].max, [1, dheight].max)
     (oldfont) ? bitmap.font = oldfont : pbSetSystemFont(bitmap)
-    bitmap.font.shadow = false if bitmap.font && bitmap.font.respond_to?("shadow")
+    bitmap.font.shadow = false if bitmap.font&.respond_to?("shadow")
   end
   return bitmap
 end
@@ -666,7 +666,7 @@ end
 def pbRestoreActivations(sprites, activeStatuses)
   return if !sprites || !activeStatuses
   activeStatuses.keys.each do |k|
-    if sprites[k] && sprites[k].is_a?(Window) && !pbDisposed?(sprites[k])
+    if sprites[k].is_a?(Window) && !pbDisposed?(sprites[k])
       sprites[k].active = activeStatuses[k] ? true : false
     end
   end
@@ -689,7 +689,7 @@ def pbActivateWindow(sprites, key)
   return if !sprites
   activeStatuses = {}
   sprites.each do |i|
-    if i[1] && i[1].is_a?(Window) && !pbDisposed?(i[1])
+    if i[1].is_a?(Window) && !pbDisposed?(i[1])
       activeStatuses[i[0]] = i[1].active
       i[1].active = (i[0] == key)
     end
@@ -717,7 +717,7 @@ end
 def addBackgroundPlane(sprites, planename, background, viewport = nil)
   sprites[planename] = AnimatedPlane.new(viewport)
   bitmapName = pbResolveBitmap("Graphics/Pictures/#{background}")
-  if bitmapName == nil
+  if bitmapName.nil?
     # Plane should exist in any case
     sprites[planename].bitmap = nil
     sprites[planename].visible = false
@@ -739,7 +739,7 @@ end
 # _viewport_ is a viewport to place the background in.
 def addBackgroundOrColoredPlane(sprites, planename, background, color, viewport = nil)
   bitmapName = pbResolveBitmap("Graphics/Pictures/#{background}")
-  if bitmapName == nil
+  if bitmapName.nil?
     # Plane should exist in any case
     sprites[planename] = ColoredPlane.new(color, viewport)
   else
@@ -773,7 +773,7 @@ if !defined?(_INTL)
   def _INTL(*args)
     string = args[0].clone
     (1...args.length).each do |i|
-      string.gsub!(/\{#{i}\}/, "#{args[i]}")
+      string.gsub!(/\{#{i}\}/, args[i].to_s)
     end
     return string
   end
@@ -795,7 +795,7 @@ if !defined?(_MAPINTL)
   def _MAPINTL(*args)
     string = args[1].clone
     (2...args.length).each do |i|
-      string.gsub!(/\{#{i}\}/, "#{args[i + 1]}")
+      string.gsub!(/\{#{i}\}/, args[i + 1].to_s)
     end
     return string
   end

Data/Scripts/007_Objects and windows/003_Window.rb

@@ -127,16 +127,16 @@ class Window
   def dispose
     if !self.disposed?
       @sprites.each do |i|
-        i[1].dispose if i[1]
+        i[1]&.dispose
         @sprites[i[0]] = nil
       end
       @sidebitmaps.each_with_index do |bitmap, i|
-        bitmap.dispose if bitmap
+        bitmap&.dispose
         @sidebitmaps[i] = nil
       end
       @blankcontents.dispose
-      @cursorbitmap.dispose if @cursorbitmap
-      @backbitmap.dispose if @backbitmap
+      @cursorbitmap&.dispose
+      @backbitmap&.dispose
       @sprites.clear
       @sidebitmaps.clear
       @_windowskin = nil
@@ -191,7 +191,7 @@ class Window
 
   def windowskin=(value)
     @_windowskin = value
-    if value && value.is_a?(Bitmap) && !value.disposed? && value.width == 128
+    if value.is_a?(Bitmap) && !value.disposed? && value.width == 128
       @rpgvx = true
     else
       @rpgvx = false
@@ -210,10 +210,10 @@ class Window
   end
 
   def cursor_rect=(value)
-    if !value
-      @cursor_rect.empty
-    else
+    if value
       @cursor_rect.set(value.x, value.y, value.width, value.height)
+    else
+      @cursor_rect.empty
     end
   end
 
@@ -322,7 +322,7 @@ class Window
 
   def ensureBitmap(bitmap, dwidth, dheight)
     if !bitmap || bitmap.disposed? || bitmap.width < dwidth || bitmap.height < dheight
-      bitmap.dispose if bitmap
+      bitmap&.dispose
       bitmap = Bitmap.new([1, dwidth].max, [1, dheight].max)
     end
     return bitmap
@@ -571,7 +571,12 @@ class Window
         @sprites["back"].src_rect.set(0, 0, 0, 0)
       end
     end
-    if @openness != 255
+    if @openness == 255
+      @spritekeys.each do |k|
+        sprite = @sprites[k]
+        sprite.zoom_y = 1.0
+      end
+    else
       opn = @openness / 255.0
       @spritekeys.each do |k|
         sprite = @sprites[k]
@@ -580,11 +585,6 @@ class Window
         sprite.oy = 0
         sprite.y = (@y + (@height / 2.0) + (@height * ratio * opn) - (@height / 2 * opn)).floor
       end
-    else
-      @spritekeys.each do |k|
-        sprite = @sprites[k]
-        sprite.zoom_y = 1.0
-      end
     end
     i = 0
     # Ensure Z order

Data/Scripts/007_Objects and windows/004_SpriteWindow.rb

@@ -113,16 +113,16 @@ class SpriteWindow < Window
   def dispose
     if !self.disposed?
       @sprites.each do |i|
-        i[1].dispose if i[1]
+        i[1]&.dispose
         @sprites[i[0]] = nil
       end
       @sidebitmaps.each_with_index do |bitmap, i|
-        bitmap.dispose if bitmap
+        bitmap&.dispose
         @sidebitmaps[i] = nil
       end
       @blankcontents.dispose
-      @cursorbitmap.dispose if @cursorbitmap
-      @backbitmap.dispose if @backbitmap
+      @cursorbitmap&.dispose
+      @backbitmap&.dispose
       @sprites.clear
       @sidebitmaps.clear
       @_windowskin = nil
@@ -143,7 +143,7 @@ class SpriteWindow < Window
   def viewport=(value)
     @viewport = value
     @spritekeys.each do |i|
-      @sprites[i].dispose if @sprites[i]
+      @sprites[i]&.dispose
       if @sprites[i].is_a?(Sprite)
         @sprites[i] = Sprite.new(@viewport)
       else
@@ -189,10 +189,10 @@ class SpriteWindow < Window
   end
 
   def cursor_rect=(value)
-    if !value
-      @cursor_rect.empty
-    else
+    if value
       @cursor_rect.set(value.x, value.y, value.width, value.height)
+    else
+      @cursor_rect.empty
     end
   end
 
@@ -358,7 +358,7 @@ class SpriteWindow < Window
         @trim = [16, 16, 16, 16]
       end
     else
-      if value && value.is_a?(Bitmap) && !value.disposed? && value.width == 128
+      if value.is_a?(Bitmap) && !value.disposed? && value.width == 128
         @rpgvx = true
       else
         @rpgvx = false
@@ -442,7 +442,7 @@ class SpriteWindow < Window
 
   def ensureBitmap(bitmap, dwidth, dheight)
     if !bitmap || bitmap.disposed? || bitmap.width < dwidth || bitmap.height < dheight
-      bitmap.dispose if bitmap
+      bitmap&.dispose
       bitmap = Bitmap.new([1, dwidth].max, [1, dheight].max)
     end
     return bitmap
@@ -631,15 +631,13 @@ class SpriteWindow < Window
     end
     @sprites["contents"].x = @x + trimStartX
     @sprites["contents"].y = @y + trimStartY
-    if (@compat & CompatBits::ShowScrollArrows) > 0 && @skinformat == 0
-      # Compatibility mode: Make scroll arrows visible
-      if @skinformat == 0 && @_windowskin && !@_windowskin.disposed? &&
-         @contents && !@contents.disposed?
-        @sprites["scroll0"].visible = @visible && hascontents && @oy > 0
-        @sprites["scroll1"].visible = @visible && hascontents && @ox > 0
-        @sprites["scroll2"].visible = @visible && (@contents.width - @ox) > @width - trimWidth
-        @sprites["scroll3"].visible = @visible && (@contents.height - @oy) > @height - trimHeight
-      end
+    if (@compat & CompatBits::ShowScrollArrows) > 0 && @skinformat == 0 &&
+       @_windowskin && !@_windowskin.disposed? &&
+       @contents && !@contents.disposed?
+      @sprites["scroll0"].visible = @visible && hascontents && @oy > 0
+      @sprites["scroll1"].visible = @visible && hascontents && @ox > 0
+      @sprites["scroll2"].visible = @visible && (@contents.width - @ox) > @width - trimWidth
+      @sprites["scroll3"].visible = @visible && (@contents.height - @oy) > @height - trimHeight
     end
     if @_windowskin && !@_windowskin.disposed?
       borderX = startX + endX
@@ -781,7 +779,13 @@ class SpriteWindow < Window
         @sprites["back"].src_rect.set(0, 0, 0, 0)
       end
     end
-    if @openness != 255
+    if @openness == 255
+      @spritekeys.each do |k|
+        sprite = @sprites[k]
+        sprite.zoom_x = 1.0
+        sprite.zoom_y = 1.0
+      end
+    else
       opn = @openness / 255.0
       @spritekeys.each do |k|
         sprite = @sprites[k]
@@ -791,12 +795,6 @@ class SpriteWindow < Window
         sprite.oy = 0
         sprite.y = (@y + (@height / 2.0) + (@height * ratio * opn) - (@height / 2 * opn)).floor
       end
-    else
-      @spritekeys.each do |k|
-        sprite = @sprites[k]
-        sprite.zoom_x = 1.0
-        sprite.zoom_y = 1.0
-      end
     end
     i = 0
     # Ensure Z order
@@ -861,7 +859,7 @@ class SpriteWindow_Base < SpriteWindow
   end
 
   def setSkin(skin)   # Filename of windowskin to apply. Supports XP, VX, and animated skins.
-    @customskin.dispose if @customskin
+    @customskin&.dispose
     @customskin = nil
     resolvedName = pbResolveBitmap(skin)
     return if nil_or_empty?(resolvedName)
@@ -875,7 +873,7 @@ class SpriteWindow_Base < SpriteWindow
   end
 
   def setSystemFrame
-    @customskin.dispose if @customskin
+    @customskin&.dispose
     @customskin = nil
     __setWindowskin(@sysframe.bitmap)
     __resolveSystemFrame
@@ -899,7 +897,7 @@ class SpriteWindow_Base < SpriteWindow
     if @curframe != MessageConfig.pbGetSystemFrame
       @curframe = MessageConfig.pbGetSystemFrame
       if @sysframe && !@customskin
-        @sysframe.dispose if @sysframe
+        @sysframe&.dispose
         @sysframe = AnimatedBitmap.new(@curframe)
         RPG::Cache.retain(@curframe) if @curframe && !@curframe.empty?
         @resolvedFrame = nil
@@ -924,9 +922,9 @@ class SpriteWindow_Base < SpriteWindow
   end
 
   def dispose
-    self.contents.dispose if self.contents
+    self.contents&.dispose
     @sysframe.dispose
-    @customskin.dispose if @customskin
+    @customskin&.dispose
     super
   end
 end

Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb

@@ -160,7 +160,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
 
   def dispose
     return if disposed?
-    @pausesprite.dispose if @pausesprite
+    @pausesprite&.dispose
     @pausesprite = nil
     super
   end
@@ -490,10 +490,8 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
       drawSingleFormattedChar(self.contents, @fmtchars[i])
       @lastDrawnChar = i
     end
-    if !self.letterbyletter
-      # all characters were drawn, reset old font
-      self.contents.font = @oldfont if @oldfont
-    end
+    # all characters were drawn, reset old font
+    self.contents.font = @oldfont if !self.letterbyletter && @oldfont
     if numchars > 0 && numchars != @numtextchars
       fch = @fmtchars[numchars - 1]
       if fch
@@ -579,7 +577,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
 
   def update
     super
-    @pausesprite.update if @pausesprite && @pausesprite.visible
+    @pausesprite.update if @pausesprite&.visible
     if @waitcount > 0
       @waitcount -= 1
       return
@@ -601,7 +599,7 @@ class Window_AdvancedTextPokemon < SpriteWindow_Base
       break if @textchars[@curchar] == "\n" ||   # newline
                @textchars[@curchar] == "\1" ||   # pause
                @textchars[@curchar] == "\2" ||   # letter-by-letter break
-               @textchars[@curchar] == nil
+               @textchars[@curchar].nil?
     end
   end
 end

Data/Scripts/007_Objects and windows/006_SpriteWindow_pictures.rb

@@ -26,7 +26,7 @@ class IconWindow < SpriteWindow_Base
   end
 
   def clearBitmaps
-    @_iconbitmap.dispose if @_iconbitmap
+    @_iconbitmap&.dispose
     @_iconbitmap = nil
     self.contents = nil if !self.disposed?
   end
@@ -40,13 +40,13 @@ class IconWindow < SpriteWindow_Base
   def setBitmap(file, hue = 0)
     clearBitmaps
     @name = file
-    return if file == nil
-    if file != ""
+    return if file.nil?
+    if file == ""
+      @_iconbitmap = nil
+    else
       @_iconbitmap = AnimatedBitmap.new(file, hue)
       # for compatibility
       self.contents = @_iconbitmap ? @_iconbitmap.bitmap : nil
-    else
-      @_iconbitmap = nil
     end
   end
 end
@@ -84,7 +84,7 @@ class PictureWindow < SpriteWindow_Base
   end
 
   def clearBitmaps
-    @_iconbitmap.dispose if @_iconbitmap
+    @_iconbitmap&.dispose
     @_iconbitmap = nil
     self.contents = nil if !self.disposed?
   end

Data/Scripts/007_Objects and windows/007_SpriteWrapper.rb

@@ -280,19 +280,19 @@ class IconSprite < SpriteWrapper
     oldrc = self.src_rect
     clearBitmaps
     @name = file
-    return if file == nil
-    if file != ""
+    return if file.nil?
+    if file == ""
+      @_iconbitmap = nil
+    else
       @_iconbitmap = AnimatedBitmap.new(file, hue)
       # for compatibility
       self.bitmap = @_iconbitmap ? @_iconbitmap.bitmap : nil
       self.src_rect = oldrc
-    else
-      @_iconbitmap = nil
     end
   end
 
   def clearBitmaps
-    @_iconbitmap.dispose if @_iconbitmap
+    @_iconbitmap&.dispose
     @_iconbitmap = nil
     self.bitmap = nil if !self.disposed?
   end
@@ -336,7 +336,7 @@ class ChangelingSprite < SpriteWrapper
   end
 
   def addBitmap(key, path)
-    @bitmaps[key].dispose if @bitmaps[key]
+    @bitmaps[key]&.dispose
     @bitmaps[key] = AnimatedBitmap.new(path)
   end
 

Data/Scripts/007_Objects and windows/009_Planes.rb

@@ -17,7 +17,7 @@ class ColoredPlane < Plane
   end
 
   def dispose
-    self.bitmap.dispose if self.bitmap
+    self.bitmap&.dispose
     super
   end
 
@@ -59,7 +59,7 @@ class AnimatedPlane < Plane
   private
 
   def clear_bitmap
-    @bitmap.dispose if @bitmap
+    @bitmap&.dispose
     @bitmap = nil
     self.bitmap = nil if !self.disposed?
   end

Data/Scripts/007_Objects and windows/010_DrawText.rb

@@ -174,7 +174,7 @@ def getFormattedTextFast(bitmap, xDst, yDst, widthDst, heightDst, text, lineheig
   characters = []
   textchunks = []
   textchunks.push(text)
-  text = textchunks.join("")
+  text = textchunks.join
   textchars = text.scan(/./m)
   lastword = [0, 0] # position of last word
   hadspace = false
@@ -406,7 +406,7 @@ def getFormattedText(bitmap, xDst, yDst, widthDst, heightDst, text, lineheight =
   if controls.length == 0
     ret = getFormattedTextFast(bitmap, xDst, yDst, widthDst, heightDst, text, lineheight,
                                newlineBreaks, explicitBreaksOnly)
-    dummybitmap.dispose if dummybitmap
+    dummybitmap&.dispose
     return ret
   end
   x = y = 0
@@ -414,7 +414,7 @@ def getFormattedText(bitmap, xDst, yDst, widthDst, heightDst, text, lineheight =
   charactersInternal = []
 #  realtext = nil
 #  realtextStart = ""
-#  if !explicitBreaksOnly && textchunks.join("").length == 0
+#  if !explicitBreaksOnly && textchunks.join.length == 0
 #    # All commands occurred at the beginning of the text string
 #    realtext = (newlineBreaks) ? text : text.gsub(/\n/, " ")
 #    realtextStart = oldtext[0, oldtext.length - realtext.length]
@@ -432,7 +432,7 @@ def getFormattedText(bitmap, xDst, yDst, widthDst, heightDst, text, lineheight =
     textlen += textchunks[i].scan(/./m).length
     control[2] = textlen
   end
-  text = textchunks.join("")
+  text = textchunks.join
   textchars = text.scan(/./m)
   colorstack = []
   boldcount = 0
@@ -830,7 +830,7 @@ def getFormattedText(bitmap, xDst, yDst, widthDst, heightDst, text, lineheight =
   # Remove all characters with Y greater or equal to _yDst_+_heightDst_
   characters.delete_if { |ch| ch[2] >= yDst + heightDst } if heightDst >= 0
   bitmap.font = oldfont
-  dummybitmap.dispose if dummybitmap
+  dummybitmap&.dispose
   return characters
 end
 
@@ -854,7 +854,7 @@ def getLineBrokenText(bitmap, value, width, dims)
   return ret if !bitmap || bitmap.disposed? || width <= 0
   textmsg = value.clone
   ret.push(["", 0, 0, 0, bitmap.text_size("X").height, 0, 0, 0, 0])
-  while ((c = textmsg.slice!(/\n|(\S*([ \r\t\f]?))/)) != nil)
+  while (c = textmsg.slice!(/\n|(\S*([ \r\t\f]?))/)) != nil
     break if c == ""
     length = c.scan(/./m).length
     ccheck = c
@@ -1083,8 +1083,8 @@ def drawTextEx(bitmap, x, y, width, numlines, text, baseColor, shadowColor)
 end
 
 def drawFormattedTextEx(bitmap, x, y, width, text, baseColor = nil, shadowColor = nil, lineheight = 32)
-  base = !baseColor ? Color.new(12 * 8, 12 * 8, 12 * 8) : baseColor.clone
-  shadow = !shadowColor ? Color.new(26 * 8, 26 * 8, 25 * 8) : shadowColor.clone
+  base = baseColor ? baseColor.clone : Color.new(12 * 8, 12 * 8, 12 * 8)
+  shadow = shadowColor ? shadowColor.clone : Color.new(26 * 8, 26 * 8, 25 * 8)
   text = "<c2=" + colorToRgb16(base) + colorToRgb16(shadow) + ">" + text
   chars = getFormattedText(bitmap, x, y, width, -1, text, lineheight)
   drawFormattedChars(bitmap, chars)

Data/Scripts/007_Objects and windows/011_Messages.rb

@@ -7,15 +7,15 @@ end
 
 def pbMapInterpreterRunning?
   interp = pbMapInterpreter
-  return interp && interp.running?
+  return interp&.running?
 end
 
 def pbRefreshSceneMap
-  $scene.miniupdate if $scene && $scene.is_a?(Scene_Map)
+  $scene.miniupdate if $scene.is_a?(Scene_Map)
 end
 
 def pbUpdateSceneMap
-  $scene.miniupdate if $scene && $scene.is_a?(Scene_Map) && !pbIsFaded?
+  $scene.miniupdate if $scene.is_a?(Scene_Map) && !pbIsFaded?
 end
 
 #===============================================================================
@@ -26,7 +26,7 @@ def pbEventCommentInput(*args)
   list = args[0].list   # List of commands for event or event page
   elements = args[1]    # Number of elements
   trigger = args[2]     # Trigger
-  return nil if list == nil
+  return nil if list.nil?
   return nil unless list.is_a?(Array)
   list.each do |item|
     next unless item.code == 108 || item.code == 408
@@ -186,7 +186,7 @@ def pbChooseNumber(msgwindow, params)
     Input.update
     pbUpdateSceneMap
     cmdwindow.update
-    msgwindow.update if msgwindow
+    msgwindow&.update
     yield if block_given?
     if Input.trigger?(Input::USE)
       ret = cmdwindow.number
@@ -220,7 +220,7 @@ class FaceWindowVX < SpriteWindow_Base
     faceinfo = face.split(",")
     facefile = pbResolveBitmap("Graphics/Faces/" + faceinfo[0])
     facefile = pbResolveBitmap("Graphics/Pictures/" + faceinfo[0]) if !facefile
-    self.contents.dispose if self.contents
+    self.contents&.dispose
     @faceIndex = faceinfo[1].to_i
     @facebitmaptmp = AnimatedBitmap.new(facefile)
     @facebitmap = BitmapWrapper.new(96, 96)
@@ -240,7 +240,7 @@ class FaceWindowVX < SpriteWindow_Base
 
   def dispose
     @facebitmaptmp.dispose
-    @facebitmap.dispose if @facebitmap
+    @facebitmap&.dispose
     super
   end
 end
@@ -374,10 +374,10 @@ end
 #===============================================================================
 def pbCreateStatusWindow(viewport = nil)
   msgwindow = Window_AdvancedTextPokemon.new("")
-  if !viewport
-    msgwindow.z = 99999
-  else
+  if viewport
     msgwindow.viewport = viewport
+  else
+    msgwindow.z = 99999
   end
   msgwindow.visible = false
   msgwindow.letterbyletter = false
@@ -389,10 +389,10 @@ end
 
 def pbCreateMessageWindow(viewport = nil, skin = nil)
   msgwindow = Window_AdvancedTextPokemon.new("")
-  if !viewport
-    msgwindow.z = 99999
-  else
+  if viewport
     msgwindow.viewport = viewport
+  else
+    msgwindow.z = 99999
   end
   msgwindow.visible = true
   msgwindow.letterbyletter = true
@@ -447,10 +447,10 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
   text.gsub!(/\\pm/i,  _INTL("${1}", $player.money.to_s_formatted)) if $player
   text.gsub!(/\\n/i,   "\n")
   text.gsub!(/\\\[([0-9a-f]{8,8})\]/i) { "<c2=" + $1 + ">" }
-  text.gsub!(/\\pg/i,  "\\b") if $player && $player.male?
-  text.gsub!(/\\pg/i,  "\\r") if $player && $player.female?
-  text.gsub!(/\\pog/i, "\\r") if $player && $player.male?
-  text.gsub!(/\\pog/i, "\\b") if $player && $player.female?
+  text.gsub!(/\\pg/i,  "\\b") if $player&.male?
+  text.gsub!(/\\pg/i,  "\\r") if $player&.female?
+  text.gsub!(/\\pog/i, "\\r") if $player&.male?
+  text.gsub!(/\\pog/i, "\\b") if $player&.female?
   text.gsub!(/\\pg/i,  "")
   text.gsub!(/\\pog/i, "")
   text.gsub!(/\\b/i,   "<c3=3050C8,D0D0C8>")
@@ -517,7 +517,7 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
     textlen += toUnformattedText(textchunks[i]).scan(/./m).length
     controls[i][2] = textlen
   end
-  text = textchunks.join("")
+  text = textchunks.join
   signWaitCount = 0
   signWaitTime = Graphics.frame_rate / 2
   haveSpecialClose = false
@@ -534,10 +534,10 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
       haveSpecialClose = true
       specialCloseSE = param
     when "f"
-      facewindow.dispose if facewindow
+      facewindow&.dispose
       facewindow = PictureWindow.new("Graphics/Pictures/#{param}")
     when "ff"
-      facewindow.dispose if facewindow
+      facewindow&.dispose
       facewindow = FaceWindowVX.new(param)
     when "ch"
       cmds = param.clone
@@ -588,25 +588,25 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
       param = controls[i][1]
       case control
       when "f"
-        facewindow.dispose if facewindow
+        facewindow&.dispose
         facewindow = PictureWindow.new("Graphics/Pictures/#{param}")
         pbPositionNearMsgWindow(facewindow, msgwindow, :left)
         facewindow.viewport = msgwindow.viewport
         facewindow.z        = msgwindow.z
       when "ff"
-        facewindow.dispose if facewindow
+        facewindow&.dispose
         facewindow = FaceWindowVX.new(param)
         pbPositionNearMsgWindow(facewindow, msgwindow, :left)
         facewindow.viewport = msgwindow.viewport
         facewindow.z        = msgwindow.z
       when "g"      # Display gold window
-        goldwindow.dispose if goldwindow
+        goldwindow&.dispose
         goldwindow = pbDisplayGoldWindow(msgwindow)
       when "cn"     # Display coins window
-        coinwindow.dispose if coinwindow
+        coinwindow&.dispose
         coinwindow = pbDisplayCoinsWindow(msgwindow, goldwindow)
       when "pt"     # Display battle points window
-        battlepointswindow.dispose if battlepointswindow
+        battlepointswindow&.dispose
         battlepointswindow = pbDisplayBattlePointsWindow(msgwindow)
       when "wu"
         msgwindow.y = 0
@@ -650,7 +650,7 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
     break if !letterbyletter
     Graphics.update
     Input.update
-    facewindow.update if facewindow
+    facewindow&.update
     if autoresume && msgwindow.waitcount == 0
       msgwindow.resume if msgwindow.busy?
       break if !msgwindow.busy?
@@ -677,11 +677,11 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
   if commandProc
     ret = commandProc.call(msgwindow)
   end
-  msgback.dispose if msgback
-  goldwindow.dispose if goldwindow
-  coinwindow.dispose if coinwindow
-  battlepointswindow.dispose if battlepointswindow
-  facewindow.dispose if facewindow
+  msgback&.dispose
+  goldwindow&.dispose
+  coinwindow&.dispose
+  battlepointswindow&.dispose
+  facewindow&.dispose
   if haveSpecialClose
     pbSEPlay(pbStringToAudioFile(specialCloseSE))
     atTop = (msgwindow.y == 0)
@@ -752,7 +752,7 @@ def pbShowCommands(msgwindow, commands = nil, cmdIfCancel = 0, defaultCmd = 0)
     Graphics.update
     Input.update
     cmdwindow.update
-    msgwindow.update if msgwindow
+    msgwindow&.update
     yield if block_given?
     if Input.trigger?(Input::BACK)
       if cmdIfCancel > 0
@@ -832,7 +832,7 @@ def pbMessageWaitForInput(msgwindow, frames, showPause = false)
   frames.times do
     Graphics.update
     Input.update
-    msgwindow.update if msgwindow
+    msgwindow&.update
     pbUpdateSceneMap
     if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
       break
@@ -863,7 +863,7 @@ def pbFreeText(msgwindow, currenttext, passwordbox, maxlength, width = 240)
       break
     end
     window.update
-    msgwindow.update if msgwindow
+    msgwindow&.update
     yield if block_given?
   end
   Input.text_input = false

Data/Scripts/007_Objects and windows/012_TextEntry.rb

@@ -23,7 +23,7 @@ class CharacterEntryHelper
   end
 
   def passwordChar=(value)
-    @passwordChar = value ? value : ""
+    @passwordChar = value || ""
   end
 
   def length
@@ -192,7 +192,7 @@ class Window_TextEntry < SpriteWindow_Base
     @helper.cursor = 0 if @helper.cursor < 0
     startpos = @helper.cursor
     fromcursor = 0
-    while (startpos > 0)
+    while startpos > 0
       c = (@helper.passwordChar != "") ? @helper.passwordChar : textscan[startpos - 1]
       fromcursor += bitmap.text_size(c).width
       break if fromcursor > width - 4
@@ -226,7 +226,7 @@ class Window_TextEntry_Keyboard < Window_TextEntry
   def update
     @frame += 1
     @frame %= 20
-    self.refresh if ((@frame % 10) == 0)
+    self.refresh if (@frame % 10) == 0
     return if !self.active
     # Moving cursor
     if Input.triggerex?(:LEFT) || Input.repeatex?(:LEFT)
@@ -460,7 +460,7 @@ class Window_MultilineTextEntry < SpriteWindow_Base
   def update
     @frame += 1
     @frame %= 20
-    self.refresh if ((@frame % 10) == 0)
+    self.refresh if (@frame % 10) == 0
     return if !self.active
     # Moving cursor
     if Input.triggerex?(:UP) || Input.repeatex?(:UP)
@@ -543,7 +543,7 @@ class Window_MultilineTextEntry < SpriteWindow_Base
           textheight = text[4]
           posToCursor = @cursorColumn - thiscolumn
           if posToCursor >= 0
-            partialString = text[0].scan(/./m)[0, posToCursor].join("")
+            partialString = text[0].scan(/./m)[0, posToCursor].join
             cursorX += bitmap.text_size(partialString).width
           end
           break