Lots of rubocop

This commit is contained in:
Maruno17
2023-01-28 15:21:12 +00:00
parent 2d056052ce
commit 13aab8d911
159 changed files with 1679 additions and 1931 deletions

View File

@@ -344,7 +344,7 @@ end
#===============================================================================
def pbTrainerTypeEditor
properties = GameData::TrainerType.editor_properties
pbListScreenBlock(_INTL("Trainer Types"), TrainerTypeLister.new(0, true)) { |button, tr_type|
pbListScreenBlock(_INTL("Trainer Types"), TrainerTypeLister.new(0, true)) do |button, tr_type|
if tr_type
case button
when Input::ACTION
@@ -386,7 +386,7 @@ def pbTrainerTypeEditor
end
end
end
}
end
end
def pbTrainerTypeEditorNew(default_name)
@@ -477,7 +477,7 @@ end
#===============================================================================
def pbTrainerBattleEditor
modified = false
pbListScreenBlock(_INTL("Trainer Battles"), TrainerBattleLister.new(0, true)) { |button, trainer_id|
pbListScreenBlock(_INTL("Trainer Battles"), TrainerBattleLister.new(0, true)) do |button, trainer_id|
if trainer_id
case button
when Input::ACTION
@@ -589,7 +589,7 @@ def pbTrainerBattleEditor
end
end
end
}
end
if modified && pbConfirmMessage(_INTL("Save changes?"))
GameData::Trainer.save
pbConvertTrainerData
@@ -821,7 +821,7 @@ end
#===============================================================================
def pbItemEditor
properties = GameData::Item.editor_properties
pbListScreenBlock(_INTL("Items"), ItemLister.new(0, true)) { |button, item|
pbListScreenBlock(_INTL("Items"), ItemLister.new(0, true)) do |button, item|
if item
case button
when Input::ACTION
@@ -863,7 +863,7 @@ def pbItemEditor
end
end
end
}
end
end
def pbItemEditorNew(default_name)
@@ -925,7 +925,7 @@ end
#===============================================================================
def pbPokemonEditor
properties = GameData::Species.editor_properties
pbListScreenBlock(_INTL("Pokémon species"), SpeciesLister.new(0, false)) { |button, species|
pbListScreenBlock(_INTL("Pokémon species"), SpeciesLister.new(0, false)) do |button, species|
if species
case button
when Input::ACTION
@@ -983,7 +983,7 @@ def pbPokemonEditor
end
end
end
}
end
end
#===============================================================================

View File

@@ -227,12 +227,12 @@ end
#
#===============================================================================
def pbTilesetScreen
pbFadeOutIn {
pbFadeOutIn do
Graphics.resize_screen(Settings::SCREEN_WIDTH, Settings::SCREEN_HEIGHT * 2)
pbSetResizeFactor(1)
scene = PokemonTilesetScene.new
scene.pbStartScene
Graphics.resize_screen(Settings::SCREEN_WIDTH, Settings::SCREEN_HEIGHT)
pbSetResizeFactor($PokemonSystem.screensize)
}
end
end

View File

@@ -271,9 +271,7 @@ class MapScreenScene
while j < ret.length && !connectionsSymmetric?(ret[j], conn)
j += 1
end
if j == ret.length
ret.push(conn)
end
ret.push(conn) if j == ret.length
end
end
return ret
@@ -567,7 +565,7 @@ end
#
#===============================================================================
def pbConnectionsEditor
pbCriticalCode {
pbCriticalCode do
Graphics.resize_screen(Settings::SCREEN_WIDTH + 288, Settings::SCREEN_HEIGHT + 288)
pbSetResizeFactor(1)
mapscreen = MapScreenScene.new
@@ -576,5 +574,5 @@ def pbConnectionsEditor
mapscreen.close
Graphics.resize_screen(Settings::SCREEN_WIDTH, Settings::SCREEN_HEIGHT)
pbSetResizeFactor($PokemonSystem.screensize)
}
end
end