mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 13:44:59 +00:00
More Rubocop changes
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user