DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Rubocop changes

Browse Source
This commit is contained in:
Maruno17
2022-02-13 00:57:54 +00:00
parent cca5989746
commit f68e699cc9
108 changed files with 708 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Data/Scripts/020_Debug/001_Editor screens/003_EditorScreens_MapConnections.rb
View File

@@ -302,7 +302,7 @@ class MapScreenScene
def saveMapSpritePos
@mapspritepos.clear
@mapsprites.keys.each do |i|
@mapsprites.each_key do |i|
s = @mapsprites[i]
@mapspritepos[i] = [s.x, s.y] if s && !s.disposed?
end
@@ -335,7 +335,7 @@ class MapScreenScene
conns.each do |map_conns|
next if !map_conns
map_conns.each do |c|
@mapconns.push(c.clone) if !@mapconns.any? { |x| x[0] == c[0] && x[3] == c[3] }
@mapconns.push(c.clone) if @mapconns.none? { |x| x[0] == c[0] && x[3] == c[3] }
end
end
if $game_map
@@ -347,7 +347,7 @@ class MapScreenScene
end
def setTopSprite(id)
@mapsprites.keys.each do |i|
@mapsprites.each_key do |i|
@mapsprites[i].z = (i == id) ? 1 : 0
end
end
@@ -441,7 +441,7 @@ class MapScreenScene
else
xpos = x - @dragOffsetX
ypos = y - @dragOffsetY
@mapspritepos.keys.each do |i|
@mapspritepos.each_key do |i|
sprite = getMapSprite(i)
sprite.x = (@mapspritepos[i][0] + xpos) & ~3
sprite.y = (@mapspritepos[i][1] + ypos) & ~3
@@ -456,7 +456,7 @@ class MapScreenScene
end
def hittest(x, y)
@mapsprites.keys.each do |i|
@mapsprites.each_key do |i|
sx = @mapsprites[i].x
sy = @mapsprites[i].y
sr = sx + @mapsprites[i].bitmap.width

17
Data/Scripts/020_Debug/001_Editor screens/004_EditorScreens_SpritePositioning.rb
View File

@@ -123,16 +123,15 @@ class SpritePositioner
@sprites["pokemon_#{i}"].y = pos[1]
metrics_data.apply_metrics_to_sprite(@sprites["pokemon_#{i}"], i)
@sprites["pokemon_#{i}"].visible = true
if i == 1
@sprites["shadow_1"].x = pos[0]
@sprites["shadow_1"].y = pos[1]
if @sprites["shadow_1"].bitmap
@sprites["shadow_1"].x -= @sprites["shadow_1"].bitmap.width / 2
@sprites["shadow_1"].y -= @sprites["shadow_1"].bitmap.height / 2
end
metrics_data.apply_metrics_to_sprite(@sprites["shadow_1"], i, true)
@sprites["shadow_1"].visible = true
next if i != 1
@sprites["shadow_1"].x = pos[0]
@sprites["shadow_1"].y = pos[1]
if @sprites["shadow_1"].bitmap
@sprites["shadow_1"].x -= @sprites["shadow_1"].bitmap.width / 2
@sprites["shadow_1"].y -= @sprites["shadow_1"].bitmap.height / 2
end
metrics_data.apply_metrics_to_sprite(@sprites["shadow_1"], i, true)
@sprites["shadow_1"].visible = true
end
end

11
Data/Scripts/020_Debug/001_Editor_Utilities.rb
View File

@@ -62,7 +62,7 @@ def pbMapTree
mapinfos = pbLoadMapInfos
maplevels = []
retarray = []
mapinfos.keys.each do |i|
mapinfos.each_key do |i|
info = mapinfos[i]
level = -1
while info
@@ -98,11 +98,10 @@ def pbMapTree
end
retarray.push([maplevel[0], mapinfos[maplevel[0]].name, maplevel[1]])
(index + 1...maplevels.length).each do |i|
if maplevels[i][2] == maplevel[0]
stack.push(i)
stack.push(maplevel[0])
break
end
next if maplevels[i][2] != maplevel[0]
stack.push(i)
stack.push(maplevel[0])
break
end
end
return retarray

30
Data/Scripts/020_Debug/002_Animation editor/001_AnimEditor_SceneElements.rb
View File

@@ -269,12 +269,11 @@ class AnimationWindow < SpriteWrapper
swatchrects.push(Rect.new(arrowwidth + (i * 96) + self.x, self.y, 96, 96))
end
NUMFRAMES.times do |i|
if swatchrects[i].contains(mousepos[0], mousepos[1])
@selected = @start + i
@changed = true
refresh
return
end
next if !swatchrects[i].contains(mousepos[0], mousepos[1])
@selected = @start + i
@changed = true
refresh
return
end
# Left arrow
if left.contains(mousepos[0], mousepos[1])
@@ -924,17 +923,16 @@ class AnimationCanvas < Sprite
# self.bitmap=@testscreen.bitmap
if @currentframe < @animation.length
PBAnimation::MAX_SPRITES.times do |i|
if @dirty[i]
if @celsprites[i]
setBitmap(i, @currentframe)
pbSpriteSetAnimFrame(@celsprites[i], @animation[@currentframe][i], @celsprites[0], @celsprites[1], true)
@celsprites[i].x += BORDERSIZE
@celsprites[i].y += BORDERSIZE
end
setPreviousFrame(i)
setFrame(i)
@dirty[i] = false
next if !@dirty[i]
if @celsprites[i]
setBitmap(i, @currentframe)
pbSpriteSetAnimFrame(@celsprites[i], @animation[@currentframe][i], @celsprites[0], @celsprites[1], true)
@celsprites[i].x += BORDERSIZE
@celsprites[i].y += BORDERSIZE
end
setPreviousFrame(i)
setFrame(i)
@dirty[i] = false
end
else
PBAnimation::MAX_SPRITES.times do |i|

14
Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb
View File

@@ -644,13 +644,13 @@ def pbEditBG(canvas, timing)
maxsizewindow.addOptionalSlider(_INTL("Alpha:"), 0, 255, timing.colorAlpha || 0)
maxsizewindow.addButton(_INTL("OK"))
maxsizewindow.addButton(_INTL("Cancel"))
maxsizewindow.controls[1].checked = (timing.bgX != nil)
maxsizewindow.controls[2].checked = (timing.bgY != nil)
maxsizewindow.controls[3].checked = (timing.opacity != nil)
maxsizewindow.controls[4].checked = (timing.colorRed != nil)
maxsizewindow.controls[5].checked = (timing.colorGreen != nil)
maxsizewindow.controls[6].checked = (timing.colorBlue != nil)
maxsizewindow.controls[7].checked = (timing.colorAlpha != nil)
maxsizewindow.controls[1].checked = !timing.bgX.nil?
maxsizewindow.controls[2].checked = !timing.bgY.nil?
maxsizewindow.controls[3].checked = !timing.opacity.nil?
maxsizewindow.controls[4].checked = !timing.colorRed.nil?
maxsizewindow.controls[5].checked = !timing.colorGreen.nil?
maxsizewindow.controls[6].checked = !timing.colorBlue.nil?
maxsizewindow.controls[7].checked = !timing.colorAlpha.nil?
maxsizewindow.opacity = 200
maxsizewindow.viewport = canvas.viewport
loop do

10
Data/Scripts/020_Debug/002_Editor_DataTypes.rb
View File

@@ -147,7 +147,7 @@ module BooleanProperty2
end
def self.format(value)
return (value) ? _INTL("True") : (value != nil) ? _INTL("False") : "-"
return (value) ? _INTL("True") : (!value.nil?) ? _INTL("False") : "-"
end
end
@@ -578,7 +578,7 @@ class IVsProperty
next if s.pbs_order < 0
array[s.pbs_order] = value[s.id] || 0
end
return array.join(',')
return array.join(",")
end
end
@@ -624,7 +624,7 @@ class EVsProperty
next if s.pbs_order < 0
array[s.pbs_order] = value[s.id] || 0
end
return array.join(',')
return array.join(",")
end
end
@@ -913,7 +913,7 @@ module BaseStatsProperty
next if s.pbs_order < 0
array[s.pbs_order] = value[s.id] || 0
end
return array.join(',')
return array.join(",")
end
end
@@ -952,7 +952,7 @@ module EffortValuesProperty
next if s.pbs_order < 0
array[s.pbs_order] = value[s.id] || 0
end
return array.join(',')
return array.join(",")
end
end

2
Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb
View File

@@ -368,7 +368,7 @@ MenuHandlers.add(:debug_menu, :reset_trainers, {
"description" => _INTL("Turn off Self Switches A and B for all events with \"Trainer\" in their name."),
"effect" => proc {
if $game_map
$game_map.events.values.each do |event|
$game_map.events.each_value do |event|
if event.name[/trainer/i]
$game_self_switches[[$game_map.map_id, event.id, "A"]] = false
$game_self_switches[[$game_map.map_id, event.id, "B"]] = false

17
Data/Scripts/020_Debug/003_Debug menus/003_Debug_MenuExtraCode.rb
View File

@@ -20,7 +20,7 @@ def pbWarpToMap
y = rand(map.height)
next if !map.passableStrict?(x, y, 0, $game_player)
blocked = false
map.events.values.each do |event|
map.events.each_value do |event|
if event.at_coordinate?(x, y) && !event.through && event.character_name != ""
blocked = true
end
@@ -101,7 +101,7 @@ class SpriteWindow_DebugVariables < Window_DrawableCommand
status = $game_variables[index + 1].to_s
status = "\"__\"" if nil_or_empty?(status)
end
name = '' if name.nil?
name ||= ""
id_text = sprintf("%04d:", index + 1)
rect = drawCursor(index, rect)
totalWidth = rect.width
@@ -655,12 +655,11 @@ def pbImportAllAnimations
missingFiles.push(textdata.graphic)
end
textdata.timing.each do |timing|
if timing.name && timing.name != "" &&
!safeExists?(folder + "/" + timing.name) &&
!FileTest.audio_exist?("Audio/SE/Anim/" + timing.name)
timing.name = ""
missingFiles.push(timing.name)
end
next if !timing.name || timing.name == "" ||
safeExists?(folder + "/" + timing.name) ||
FileTest.audio_exist?("Audio/SE/Anim/" + timing.name)
timing.name = ""
missingFiles.push(timing.name)
end
animations[index] = textdata
end
@@ -706,7 +705,7 @@ def pbDebugFixInvalidTiles
end
end
# Check all events in map for page graphics using a non-existent tile
map.events.keys.each do |key|
map.events.each_key do |key|
event = map.events[key]
event.pages.each do |page|
next if page.graphic.tile_id <= 0

10
Data/Scripts/020_Debug/003_Debug menus/006_Debug_FilenameUpdater.rb
View File

@@ -24,8 +24,8 @@ module FilenameUpdater
# starts automatic renaming
files.each_with_index do |file, i|
next if file[/^berrytree_/]
next if ["berrytreewet", "berrytreedamp", "berrytreedry", "berrytreeplanted"].include?(file.split('.')[0])
new_file = file.gsub('berrytree', 'berrytree_')
next if ["berrytreewet", "berrytreedamp", "berrytreedry", "berrytreeplanted"].include?(file.split(".")[0])
new_file = file.gsub("berrytree", "berrytree_")
File.move(src_dir + file, src_dir + new_file)
ret = true
end
@@ -47,7 +47,7 @@ module FilenameUpdater
map = mapData.getMap(id)
next if !map || !mapData.mapinfos[id]
changed = false
map.events.keys.each do |key|
map.events.each_key do |key|
if Time.now.to_i - t >= 5
Graphics.update
t = Time.now.to_i
@@ -56,8 +56,8 @@ module FilenameUpdater
next if nil_or_empty?(page.graphic.character_name)
char_name = page.graphic.character_name
next if !char_name[/^berrytree[^_]+/]
next if ["berrytreewet", "berrytreedamp", "berrytreedry", "berrytreeplanted"].include?(char_name.split('.')[0])
new_file = page.graphic.character_name.gsub('berrytree', 'berrytree_')
next if ["berrytreewet", "berrytreedamp", "berrytreedry", "berrytreeplanted"].include?(char_name.split(".")[0])
new_file = page.graphic.character_name.gsub("berrytree", "berrytree_")
page.graphic.character_name = new_file
changed = true
end

2
Data/Scripts/020_Debug/003_Debug menus/007_Debug_BattleCommands.rb
View File

@@ -77,7 +77,7 @@ MenuHandlers.add(:battle_debug_menu, :list_foe_battlers, {
MenuHandlers.add(:battle_debug_menu, :field, {
"name" => _INTL("Field Effects..."),
"parent" => :main,
"description" => _INTL("Effects that apply to the whole battlefield."),
"description" => _INTL("Effects that apply to the whole battlefield.")
})
MenuHandlers.add(:battle_debug_menu, :weather, {

15
Data/Scripts/020_Debug/003_Debug menus/008_Debug_BattlePkmnCommands.rb
View File

@@ -707,15 +707,14 @@ MenuHandlers.add(:battle_pokemon_debug_menu, :set_form, {
cmd = pbMessage("\\ts[]" + _INTL("Form is {1}.", pkmn.form), formcmds[1], -1, nil, cmd)
next if cmd < 0
f = formcmds[0][cmd]
if f != pkmn.form
pkmn.forced_form = nil
if MultipleForms.hasFunction?(pkmn, "getForm")
next if !pbConfirmMessage(_INTL("This species decides its own form. Override?"))
pkmn.forced_form = f
end
pkmn.form_simple = f
battler.form = pkmn.form if battler
next if f == pkmn.form
pkmn.forced_form = nil
if MultipleForms.hasFunction?(pkmn, "getForm")
next if !pbConfirmMessage(_INTL("This species decides its own form. Override?"))
pkmn.forced_form = f
end
pkmn.form_simple = f
battler.form = pkmn.form if battler
end
}
})