More aligning of code

2025-12-09 22:24:58 +00:00 · 2021-12-19 12:19:08 +00:00
parent 13a238cc6a
commit 33781493f4
121 changed files with 977 additions and 838 deletions
--- a/Frontier/001_Challenge_BattleChallenge.rb
+++ b/Frontier/001_Challenge_BattleChallenge.rb
@@ -20,8 +20,8 @@ class BattleChallenge
    @numRounds = numrounds
    @rules = rules
    register(id, id[/double/], 3,
-       id[/^factory/] ? BattleFactoryID : BattleTowerID,
-       id[/open$/] ? 1 : 0)
+             id[/^factory/] ? BattleFactoryID : BattleTowerID,
+             id[/open$/] ? 1 : 0)
    pbWriteCup(id, rules)
  end

@@ -99,8 +99,8 @@ class BattleChallenge
    bttrainers = pbGetBTTrainers(@id)
    trainerdata = bttrainers[self.nextTrainer]
    ret = pbOrganizedBattleEx(opponent, self.rules,
-       pbGetMessageFromHash(MessageTypes::EndSpeechLose, trainerdata[4]),
-       pbGetMessageFromHash(MessageTypes::EndSpeechWin, trainerdata[3]))
+                              pbGetMessageFromHash(MessageTypes::EndSpeechLose, trainerdata[4]),
+                              pbGetMessageFromHash(MessageTypes::EndSpeechWin, trainerdata[3]))
    return ret
  end

@@ -372,8 +372,9 @@ class BattleFactoryData
    bttrainers = pbGetBTTrainers(pbBattleChallenge.currentChallenge)
    trainerdata = bttrainers[@trainerid]
    @opponent = NPCTrainer.new(
-       pbGetMessageFromHash(MessageTypes::TrainerNames, trainerdata[1]),
-       trainerdata[0])
+      pbGetMessageFromHash(MessageTypes::TrainerNames, trainerdata[1]),
+      trainerdata[0]
+    )
    opponentPkmn = pbBattleFactoryPokemon(pbBattleChallenge.rules, @bcdata.wins, @bcdata.swaps, @rentals)
    @opponent.party = opponentPkmn.sample(3)
  end
@@ -394,10 +395,11 @@ class BattleFactoryData
    bttrainers = pbGetBTTrainers(pbBattleChallenge.currentChallenge)
    trainerdata = bttrainers[trainerid]
    @opponent = NPCTrainer.new(
-       pbGetMessageFromHash(MessageTypes::TrainerNames, trainerdata[1]),
-       trainerdata[0])
+      pbGetMessageFromHash(MessageTypes::TrainerNames, trainerdata[1]),
+      trainerdata[0]
+    )
    opponentPkmn = pbBattleFactoryPokemon(pbBattleChallenge.rules, @bcdata.wins, @bcdata.swaps,
-       [].concat(@rentals).concat(@oldopponent))
+                                          [].concat(@rentals).concat(@oldopponent))
    @opponent.party = opponentPkmn.sample(3)
  end

@@ -417,7 +419,7 @@ class BattleFactoryData
    bttrainers = pbGetBTTrainers(pbBattleChallenge.currentChallenge)
    trainerdata = bttrainers[@trainerid]
    return pbOrganizedBattleEx(@opponent, challenge.rules,
-       pbGetMessageFromHash(MessageTypes::EndSpeechLose, trainerdata[4]),
-       pbGetMessageFromHash(MessageTypes::EndSpeechWin, trainerdata[3]))
+                               pbGetMessageFromHash(MessageTypes::EndSpeechLose, trainerdata[4]),
+                               pbGetMessageFromHash(MessageTypes::EndSpeechWin, trainerdata[3]))
  end
 end
--- a/Frontier/002_Challenge_Data.rb
+++ b/Frontier/002_Challenge_Data.rb
@@ -148,7 +148,7 @@ class PBPokemon
      ev_array.push(s.id) if pkmn.ev[s.id] > 60
    end
    return self.new(pkmn.species, pkmn.item_id, pkmn.nature,
-       mov1, mov2, mov3, mov4, ev_array)
+                    mov1, mov2, mov3, mov4, ev_array)
  end

  def initialize(species, item, nature, move1, move2, move3, move4, ev)
--- a/Frontier/003_Challenge_ChooseFoes.rb
+++ b/Frontier/003_Challenge_ChooseFoes.rb
@@ -43,8 +43,9 @@ def pbGenerateBattleTrainer(idxTrainer, rules)
  # Create the trainer
  trainerdata = bttrainers[idxTrainer]
  opponent = NPCTrainer.new(
-     pbGetMessageFromHash(MessageTypes::TrainerNames, trainerdata[1]),
-     trainerdata[0])
+    pbGetMessageFromHash(MessageTypes::TrainerNames, trainerdata[1]),
+    trainerdata[0]
+  )
  # Determine how many IVs the trainer's Pokémon will have
  indvalues = 31
  indvalues = 21 if idxTrainer < 220
--- a/Frontier/005_UI_BattleSwap.rb
+++ b/Frontier/005_UI_BattleSwap.rb
@@ -7,13 +7,17 @@ class BattleSwapScene
    @sprites = {}
    addBackgroundPlane(@sprites, "bg", "rentbg", @viewport)
    @sprites["title"] = Window_UnformattedTextPokemon.newWithSize(
-       _INTL("RENTAL POKéMON"), 0, 0, Graphics.width, 64, @viewport)
+      _INTL("RENTAL POKéMON"), 0, 0, Graphics.width, 64, @viewport
+    )
    @sprites["list"] = Window_AdvancedCommandPokemonEx.newWithSize(
-       [], 0, 64, Graphics.width, Graphics.height - 128, @viewport)
-    @sprites["help"] = Window_UnformattedTextPokemon.newWithSize("",
-       0, Graphics.height - 64, Graphics.width, 64, @viewport)
-    @sprites["msgwindow"] = Window_AdvancedTextPokemon.newWithSize("",
-       0, Graphics.height - 64, Graphics.height, 64, @viewport)
+      [], 0, 64, Graphics.width, Graphics.height - 128, @viewport
+    )
+    @sprites["help"] = Window_UnformattedTextPokemon.newWithSize(
+      "", 0, Graphics.height - 64, Graphics.width, 64, @viewport
+    )
+    @sprites["msgwindow"] = Window_AdvancedTextPokemon.newWithSize(
+      "", 0, Graphics.height - 64, Graphics.height, 64, @viewport
+    )
    @sprites["msgwindow"].visible = false
    pbUpdateChoices([])
    pbDeactivateWindows(@sprites)
@@ -29,13 +33,17 @@ class BattleSwapScene
    @sprites = {}
    addBackgroundPlane(@sprites, "bg", "swapbg", @viewport)
    @sprites["title"] = Window_UnformattedTextPokemon.newWithSize(
-       _INTL("POKéMON SWAP"), 0, 0, Graphics.width, 64, @viewport)
+      _INTL("POKéMON SWAP"), 0, 0, Graphics.width, 64, @viewport
+    )
    @sprites["list"] = Window_AdvancedCommandPokemonEx.newWithSize(
-       [], 0, 64, Graphics.width, Graphics.height - 128, @viewport)
+      [], 0, 64, Graphics.width, Graphics.height - 128, @viewport
+    )
    @sprites["help"] = Window_UnformattedTextPokemon.newWithSize(
-       "", 0, Graphics.height - 64, Graphics.width, 64, @viewport)
+      "", 0, Graphics.height - 64, Graphics.width, 64, @viewport
+    )
    @sprites["msgwindow"] = Window_AdvancedTextPokemon.newWithSize(
-       "", 0, Graphics.height - 64, Graphics.width, 64, @viewport)
+      "", 0, Graphics.height - 64, Graphics.width, 64, @viewport
+    )
    @sprites["msgwindow"].visible = false
    pbInitSwapScreen
    pbDeactivateWindows(@sprites)
--- a/Data/Scripts/018_Alternate
+++ b/Data/Scripts/018_Alternate
@@ -293,9 +293,10 @@ Events.onMapChange += proc { |_sender, _e|
 Events.onMapSceneChange += proc { |_sender, e|
  scene = e[0]
  if pbInBugContest? && pbBugContestState.decision == 0 && BugContestState::TIME_ALLOWED > 0
-    scene.spriteset.addUserSprite(TimerDisplay.new(
-       pbBugContestState.timer,
-       BugContestState::TIME_ALLOWED * Graphics.frame_rate))
+    scene.spriteset.addUserSprite(
+      TimerDisplay.new(pbBugContestState.timer,
+                       BugContestState::TIME_ALLOWED * Graphics.frame_rate)
+    )
  end
 }

--- a/generator/001_ChallengeGenerator_Data.rb
+++ b/generator/001_ChallengeGenerator_Data.rb
@@ -295,10 +295,10 @@ def pbWriteCup(id, rules)
  cmd = 0
  if trlists.length != 0
    cmd = pbMessage(_INTL("Generate Pokémon teams for this challenge?"),
-       [_INTL("NO"), _INTL("YES, USE EXISTING"), _INTL("YES, USE NEW")], 1)
+                    [_INTL("NO"), _INTL("YES, USE EXISTING"), _INTL("YES, USE NEW")], 1)
  else
    cmd = pbMessage(_INTL("Generate Pokémon teams for this challenge?"),
-       [_INTL("YES"), _INTL("NO")], 2)
+                    [_INTL("YES"), _INTL("NO")], 2)
    case cmd
    when 0
      cmd = 2
--- a/generator/004_ChallengeGenerator_BattleSim.rb
+++ b/generator/004_ChallengeGenerator_BattleSim.rb
@@ -342,8 +342,9 @@ def pbDecideWinnerScore(party0, party1, rating)
    for move in party0[i].moves
      next if !move
      for j in 0...party1.length
-        score += pbDecideWinnerEffectiveness(move.id,
-           types1[j], types2[j], abilities[j], [-16, -8, 0, 4, 12, 20])
+        score += pbDecideWinnerEffectiveness(
+          move.id, types1[j], types2[j], abilities[j], [-16, -8, 0, 4, 12, 20]
+        )
      end
    end
    basestatsum = baseStatTotal(party0[i].species)