Lots of rubocop

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

@@ -145,6 +145,8 @@ class ChooseNumberParams
     end
   end
 
+  #-----------------------------------------------------------------------------
+
   private
 
   def clamp(v, mn, mx)
@@ -422,16 +424,13 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
   msgback = nil
   linecount = (Graphics.height > 400) ? 3 : 2
   ### Text replacement
-  text.gsub!(/\\sign\[([^\]]*)\]/i) {   # \sign[something] gets turned into
+  text.gsub!(/\\sign\[([^\]]*)\]/i) do      # \sign[something] gets turned into
     next "\\op\\cl\\ts[]\\w[" + $1 + "]"    # \op\cl\ts[]\w[something]
-  }
+  end
   text.gsub!(/\\\\/, "\5")
   text.gsub!(/\\1/, "\1")
   if $game_actors
-    text.gsub!(/\\n\[([1-8])\]/i) {
-      m = $1.to_i
-      next $game_actors[m].name
-    }
+    text.gsub!(/\\n\[([1-8])\]/i) { next $game_actors[$1.to_i].name }
   end
   text.gsub!(/\\pn/i,  $player.name) if $player
   text.gsub!(/\\pm/i,  _INTL("${1}", $player.money.to_s_formatted)) if $player
@@ -445,7 +444,7 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
   text.gsub!(/\\pog/i, "")
   text.gsub!(/\\b/i,   "<c3=3050C8,D0D0C8>")
   text.gsub!(/\\r/i,   "<c3=E00808,D0D0C8>")
-  text.gsub!(/\\[Ww]\[([^\]]*)\]/) {
+  text.gsub!(/\\[Ww]\[([^\]]*)\]/) do
     w = $1.to_s
     if w == ""
       msgwindow.windowskin = nil
@@ -453,12 +452,11 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
       msgwindow.setSkin("Graphics/Windowskins/#{w}", false)
     end
     next ""
-  }
+  end
   isDarkSkin = isDarkWindowskin(msgwindow.windowskin)
-  text.gsub!(/\\c\[([0-9]+)\]/i) {
-    m = $1.to_i
-    next getSkinColor(msgwindow.windowskin, m, isDarkSkin)
-  }
+  text.gsub!(/\\c\[([0-9]+)\]/i) do
+    next getSkinColor(msgwindow.windowskin, $1.to_i, isDarkSkin)
+  end
   loop do
     last_text = text.clone
     text.gsub!(/\\v\[([0-9]+)\]/i) { $game_variables[$1.to_i] }
@@ -466,10 +464,10 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
   end
   loop do
     last_text = text.clone
-    text.gsub!(/\\l\[([0-9]+)\]/i) {
+    text.gsub!(/\\l\[([0-9]+)\]/i) do
       linecount = [1, $1.to_i].max
       next ""
-    }
+    end
     break if text == last_text
   end
   colortag = ""
@@ -664,9 +662,7 @@ def pbMessageDisplay(msgwindow, message, letterbyletter = true, commandProc = ni
     $game_variables[cmdvariable] = pbShowCommands(msgwindow, commands, cmdIfCancel)
     $game_map.need_refresh = true if $game_map
   end
-  if commandProc
-    ret = commandProc.call(msgwindow)
-  end
+  ret = commandProc.call(msgwindow) if commandProc
   msgback&.dispose
   goldwindow&.dispose
   coinwindow&.dispose
@@ -698,8 +694,8 @@ def pbMessage(message, commands = nil, cmdIfCancel = 0, skin = nil, defaultCmd =
   msgwindow = pbCreateMessageWindow(nil, skin)
   if commands
     ret = pbMessageDisplay(msgwindow, message, true,
-                           proc { |msgwindow|
-                             next Kernel.pbShowCommands(msgwindow, commands, cmdIfCancel, defaultCmd, &block)
+                           proc { |msgwndw|
+                             next Kernel.pbShowCommands(msgwndw, commands, cmdIfCancel, defaultCmd, &block)
                            }, &block)
   else
     pbMessageDisplay(msgwindow, message, &block)
@@ -720,8 +716,8 @@ end
 def pbMessageChooseNumber(message, params, &block)
   msgwindow = pbCreateMessageWindow(nil, params.messageSkin)
   ret = pbMessageDisplay(msgwindow, message, true,
-                         proc { |msgwindow|
-                           next pbChooseNumber(msgwindow, params, &block)
+                         proc { |msgwndw|
+                           next pbChooseNumber(msgwndw, params, &block)
                          }, &block)
   pbDisposeMessageWindow(msgwindow)
   return ret
@@ -783,9 +779,7 @@ def pbShowCommandsWithHelp(msgwindow, commands, help, cmdIfCancel = 0, defaultCm
       Input.update
       oldindex = cmdwindow.index
       cmdwindow.update
-      if oldindex != cmdwindow.index
-        msgwin.text = help[cmdwindow.index]
-      end
+      msgwin.text = help[cmdwindow.index] if oldindex != cmdwindow.index
       msgwin.update
       yield if block_given?
       if Input.trigger?(Input::BACK)
@@ -822,9 +816,7 @@ def pbMessageWaitForInput(msgwindow, frames, showPause = false)
     Input.update
     msgwindow&.update
     pbUpdateSceneMap
-    if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
-      break
-    end
+    break if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK)
     yield if block_given?
   end
   msgwindow.stopPause if msgwindow && showPause
@@ -863,8 +855,8 @@ end
 def pbMessageFreeText(message, currenttext, passwordbox, maxlength, width = 240, &block)
   msgwindow = pbCreateMessageWindow
   retval = pbMessageDisplay(msgwindow, message, true,
-                            proc { |msgwindow|
-                              next pbFreeText(msgwindow, currenttext, passwordbox, maxlength, width, &block)
+                            proc { |msgwndw|
+                              next pbFreeText(msgwndw, currenttext, passwordbox, maxlength, width, &block)
                             }, &block)
   pbDisposeMessageWindow(msgwindow)
   return retval