Fixed rendering of some tiles for certain sizes of tilesets, more rubocopping

2025-12-07 13:15:01 +00:00 · 2023-04-12 21:14:26 +01:00
parent 956a511ec5
commit a714086a39
42 changed files with 392 additions and 374 deletions
--- a/Data/Scripts/016_UI/001_Non-interactive
+++ b/Data/Scripts/016_UI/001_Non-interactive
@@ -592,7 +592,7 @@ class PokemonEvolutionScene
    newspeciesname = GameData::Species.get(@newspecies).name
    pbMessageDisplay(@sprites["msgwindow"],
                     "\\se[]" + _INTL("Congratulations! Your {1} evolved into {2}!\\wt[80]",
-                           @pokemon.name, newspeciesname)) { pbUpdate }
+                                      @pokemon.name, newspeciesname)) { pbUpdate }
    @sprites["msgwindow"].text = ""
    # Check for consumed item and check if Pokémon should be duplicated
    pbEvolutionMethodAfterEvolution
--- a/Data/Scripts/016_UI/001_Non-interactive
+++ b/Data/Scripts/016_UI/001_Non-interactive
@@ -45,59 +45,59 @@ class Scene_Credits

  # This next piece of code is the credits.
  # Start Editing
-  CREDIT = <<_END_
+  CREDIT = <<~_END_

-Your credits go here.
+    Your credits go here.

-Your credits go here.
+    Your credits go here.

-Your credits go here.
+    Your credits go here.

-Your credits go here.
+    Your credits go here.

-Your credits go here.
+    Your credits go here.

-{INSERTS_PLUGIN_CREDITS_DO_NOT_REMOVE}
+    {INSERTS_PLUGIN_CREDITS_DO_NOT_REMOVE}

-"Pokémon Essentials" was created by:
-Flameguru
-Poccil (Peter O.)
-Maruno
+    "Pokémon Essentials" was created by:
+    Poccil (Peter O.)
+    Maruno
+    Inspired by work by Flameguru

-With contributions from:
-AvatarMonkeyKirby<s>Marin
-Boushy<s>MiDas Mike
-Brother1440<s>Near Fantastica
-FL.<s>PinkMan
-Genzai Kawakami<s>Popper
-Golisopod User<s>Rataime
-help-14<s>Savordez
-IceGod64<s>SoundSpawn
-Jacob O. Wobbrock<s>the__end
-KitsuneKouta<s>Venom12
-Lisa Anthony<s>Wachunga
-Luka S.J.<s>
-and everyone else who helped out
+    With contributions from:
+    AvatarMonkeyKirby<s>Marin
+    Boushy<s>MiDas Mike
+    Brother1440<s>Near Fantastica
+    FL.<s>PinkMan
+    Genzai Kawakami<s>Popper
+    Golisopod User<s>Rataime
+    help-14<s>Savordez
+    IceGod64<s>SoundSpawn
+    Jacob O. Wobbrock<s>the__end
+    KitsuneKouta<s>Venom12
+    Lisa Anthony<s>Wachunga
+    Luka S.J.<s>
+    and everyone else who helped out

-"mkxp-z" by:
-Roza
-Based on "mkxp" by Ancurio et al.
+    "mkxp-z" by:
+    Roza
+    Based on "mkxp" by Ancurio et al.

-"RPG Maker XP" by:
-Enterbrain
+    "RPG Maker XP" by:
+    Enterbrain

-Pokémon is owned by:
-The Pokémon Company
-Nintendo
-Affiliated with Game Freak
+    Pokémon is owned by:
+    The Pokémon Company
+    Nintendo
+    Affiliated with Game Freak



-This is a non-profit fan-made game.
-No copyright infringements intended.
-Please support the official games!
+    This is a non-profit fan-made game.
+    No copyright infringements intended.
+    Please support the official games!

-_END_
+  _END_
 # Stop Editing

  def main
@@ -150,29 +150,31 @@ _END_
      lines_per_bitmap.times do |j|
        line = credit_lines[(i * lines_per_bitmap) + j]
        next if !line
+        line += " " if line.end_with?("<s>")
        line = line.split("<s>")
        xpos = 0
        align = 1   # Centre align
        linewidth = Graphics.width
        line.length.times do |k|
+          text = line[k].strip
          if line.length > 1
            xpos = (k == 0) ? 0 : 20 + (Graphics.width / 2)
            align = (k == 0) ? 2 : 0   # Right align : left align
            linewidth = (Graphics.width / 2) - 20
          end
          credit_bitmap.font.color = TEXT_SHADOW_COLOR
-          credit_bitmap.draw_text(xpos, (j * 32) + 12, linewidth, 32, line[k], align)
+          credit_bitmap.draw_text(xpos, (j * 32) + 12, linewidth, 32, text, align)
          credit_bitmap.font.color = TEXT_OUTLINE_COLOR
-          credit_bitmap.draw_text(xpos + 2, (j * 32) + 2, linewidth, 32, line[k], align)
-          credit_bitmap.draw_text(xpos,     (j * 32) + 2, linewidth, 32, line[k], align)
-          credit_bitmap.draw_text(xpos - 2, (j * 32) + 2, linewidth, 32, line[k], align)
-          credit_bitmap.draw_text(xpos + 2, (j * 32) + 4, linewidth, 32, line[k], align)
-          credit_bitmap.draw_text(xpos - 2, (j * 32) + 4, linewidth, 32, line[k], align)
-          credit_bitmap.draw_text(xpos + 2, (j * 32) + 6, linewidth, 32, line[k], align)
-          credit_bitmap.draw_text(xpos,     (j * 32) + 6, linewidth, 32, line[k], align)
-          credit_bitmap.draw_text(xpos - 2, (j * 32) + 6, linewidth, 32, line[k], align)
+          credit_bitmap.draw_text(xpos + 2, (j * 32) + 2, linewidth, 32, text, align)
+          credit_bitmap.draw_text(xpos,     (j * 32) + 2, linewidth, 32, text, align)
+          credit_bitmap.draw_text(xpos - 2, (j * 32) + 2, linewidth, 32, text, align)
+          credit_bitmap.draw_text(xpos + 2, (j * 32) + 4, linewidth, 32, text, align)
+          credit_bitmap.draw_text(xpos - 2, (j * 32) + 4, linewidth, 32, text, align)
+          credit_bitmap.draw_text(xpos + 2, (j * 32) + 6, linewidth, 32, text, align)
+          credit_bitmap.draw_text(xpos,     (j * 32) + 6, linewidth, 32, text, align)
+          credit_bitmap.draw_text(xpos - 2, (j * 32) + 6, linewidth, 32, text, align)
          credit_bitmap.font.color = TEXT_BASE_COLOR
-          credit_bitmap.draw_text(xpos, (j * 32) + 4, linewidth, 32, line[k], align)
+          credit_bitmap.draw_text(xpos, (j * 32) + 4, linewidth, 32, text, align)
        end
      end
      credit_sprite = Sprite.new(text_viewport)
--- a/Data/Scripts/016_UI/006_UI_Summary.rb
+++ b/Data/Scripts/016_UI/006_UI_Summary.rb
@@ -546,7 +546,7 @@ class PokemonSummary_Scene
    showNature = !@pokemon.shadowPokemon? || @pokemon.heartStage <= 3
    if showNature
      nature_name = red_text_tag + @pokemon.nature.name + black_text_tag
-      memo += _INTL("{1} nature.", @pokemon.nature.name) + "\n"
+      memo += _INTL("{1} nature.", nature_name) + "\n"
    end
    # Write date received
    if @pokemon.timeReceived
--- a/Data/Scripts/016_UI/014_UI_Save.rb
+++ b/Data/Scripts/016_UI/014_UI_Save.rb
@@ -114,10 +114,10 @@ class PokemonSaveScreen
      $game_temp.begun_new_game = false
      pbSEPlay("GUI save choice")
      if Game.save
-        pbMessage("\\se[]" +_INTL("{1} saved the game.\\me[GUI save game]\\wtnp[30]", $player.name))
+        pbMessage("\\se[]" + _INTL("{1} saved the game.\\me[GUI save game]\\wtnp[30]", $player.name))
        ret = true
      else
-        pbMessage("\\se[]" +_INTL("Save failed.\\wtnp[30]"))
+        pbMessage("\\se[]" + _INTL("Save failed.\\wtnp[30]"))
        ret = false
      end
    else
--- a/Data/Scripts/016_UI/019_UI_PC.rb
+++ b/Data/Scripts/016_UI/019_UI_PC.rb
@@ -5,14 +5,14 @@ def pbPCItemStorage
  command = 0
  loop do
    command = pbShowCommandsWithHelp(nil,
-       [_INTL("Withdraw Item"),
-        _INTL("Deposit Item"),
-        _INTL("Toss Item"),
-        _INTL("Exit")],
-       [_INTL("Take out items from the PC."),
-        _INTL("Store items in the PC."),
-        _INTL("Throw away items stored in the PC."),
-        _INTL("Go back to the previous menu.")], -1, command)
+                                     [_INTL("Withdraw Item"),
+                                      _INTL("Deposit Item"),
+                                      _INTL("Toss Item"),
+                                      _INTL("Exit")],
+                                     [_INTL("Take out items from the PC."),
+                                      _INTL("Store items in the PC."),
+                                      _INTL("Throw away items stored in the PC."),
+                                      _INTL("Go back to the previous menu.")], -1, command)
    case command
    when 0   # Withdraw Item
      if !$PokemonGlobal.pcItemStorage
@@ -170,14 +170,14 @@ MenuHandlers.add(:pc_menu, :pokemon_storage, {
    command = 0
    loop do
      command = pbShowCommandsWithHelp(nil,
-         [_INTL("Organize Boxes"),
-          _INTL("Withdraw Pokémon"),
-          _INTL("Deposit Pokémon"),
-          _INTL("See ya!")],
-         [_INTL("Organize the Pokémon in Boxes and in your party."),
-          _INTL("Move Pokémon stored in Boxes to your party."),
-          _INTL("Store Pokémon in your party in Boxes."),
-          _INTL("Return to the previous menu.")], -1, command)
+                                       [_INTL("Organize Boxes"),
+                                        _INTL("Withdraw Pokémon"),
+                                        _INTL("Deposit Pokémon"),
+                                        _INTL("See ya!")],
+                                       [_INTL("Organize the Pokémon in Boxes and in your party."),
+                                        _INTL("Move Pokémon stored in Boxes to your party."),
+                                        _INTL("Store Pokémon in your party in Boxes."),
+                                        _INTL("Return to the previous menu.")], -1, command)
      break if command < 0
      case command
      when 0   # Organize
--- a/Data/Scripts/016_UI/020_UI_PokeMart.rb
+++ b/Data/Scripts/016_UI/020_UI_PokeMart.rb
@@ -616,7 +616,7 @@ class PokemonMartScreen
      end
      if GameData::Item.get(item).is_important?
        next if !pbConfirm(_INTL("So you want the {1}?\nIt'll be ${2}. All right?",
-                            itemname, price.to_s_formatted))
+                                 itemname, price.to_s_formatted))
        quantity = 1
      else
        maxafford = (price <= 0) ? Settings::BAG_MAX_PER_SLOT : @adapter.getMoney / price
--- a/Data/Scripts/016_UI/023_UI_PurifyChamber.rb
+++ b/Data/Scripts/016_UI/023_UI_PurifyChamber.rb
@@ -681,7 +681,7 @@ class DirectFlowDiagram
    @distance = 96
  end

-# 0=none, 1=weak, 2=strong
+  # 0=none, 1=weak, 2=strong
  def setFlowStrength(strength)
    @strength = strength
  end
@@ -755,7 +755,7 @@ class FlowDiagram
    @distance = 96
  end

-# 0=none, 1=weak, 2=strong
+  # 0=none, 1=weak, 2=strong
  def setFlowStrength(strength)
    @strength = strength
  end