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

Code tidying with Rubocop

Browse Source
This commit is contained in:
Maruno17
2023-07-18 22:42:10 +01:00
parent 6053363715
commit a5734eaf46
68 changed files with 276 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/017_Minigames/002_Minigame_TripleTriad.rb
View File

@@ -614,7 +614,7 @@ class TriadScreen
if numcards.odd?
numcards = (numcards / 2) + 1
else
numcards = numcards / 2
numcards /= 2
end
return numcards
end

5
Data/Scripts/017_Minigames/003_Minigame_SlotMachine.rb
View File

@@ -46,10 +46,11 @@ class SlotMachineReel < BitmapSprite
def stopSpinning(noslipping = false)
@stopping = true
@slipping = SLIPPING.sample
if @difficulty == 0 # Easy
case @difficulty
when 0 # Easy
second_slipping = SLIPPING.sample
@slipping = [@slipping, second_slipping].min
elsif @difficulty == 2 # Hard
when 2 # Hard
second_slipping = SLIPPING.sample
@slipping = [@slipping, second_slipping].max
end

3
Data/Scripts/017_Minigames/006_Minigame_Mining.rb
View File

@@ -82,7 +82,8 @@ class MiningGameCursor < BitmapSprite
TOOL_POSITIONS = [[1, 0], [1, 1], [1, 1], [0, 0], [0, 0],
[0, 2], [0, 2], [0, 0], [0, 0], [0, 2], [0, 2]] # Graphic, position
def initialize(position, mode, viewport) # mode: 0=pick, 1=hammer
# mode: 0=pick, 1=hammer.
def initialize(position, mode, viewport)
@viewport = viewport
super(Graphics.width, Graphics.height, @viewport)
@position = position

15
Data/Scripts/017_Minigames/007_Minigame_TilePuzzles.rb
View File

@@ -385,7 +385,7 @@ class TilePuzzleScene
pbUpdateSpriteHash(@sprites)
Graphics.update
Input.update
break if @sprites["tile#{@tiles[movetile]}"].y == start_sprite_pos + @tileheight * dist
break if @sprites["tile#{@tiles[movetile]}"].y == start_sprite_pos + (@tileheight * dist)
end
else # Swap horizontally
start_sprite_pos = @sprites["tile#{@tiles[movetile]}"].x
@@ -398,7 +398,7 @@ class TilePuzzleScene
pbUpdateSpriteHash(@sprites)
Graphics.update
Input.update
break if @sprites["tile#{@tiles[movetile]}"].x == start_sprite_pos - @tilewidth * dist
break if @sprites["tile#{@tiles[movetile]}"].x == start_sprite_pos - (@tilewidth * dist)
end
end
@tiles[cursor], @tiles[movetile] = @tiles[movetile], @tiles[cursor]
@@ -446,29 +446,28 @@ class TilePuzzleScene
end
duration = 0.3
timer_start = System.uptime
start_pos = []
if [2, 8].include?(dir)
start_pos = []
tiles.each { |i| start_pos.push(@sprites["tile#{@tiles[i]}"].y) }
loop do
tiles.each_with_index do |idx, i|
@sprites["tile#{@tiles[idx]}"].y = lerp(start_pos[i], start_pos[i] - @tileheight * dist, duration, timer_start, System.uptime)
@sprites["tile#{@tiles[idx]}"].y = lerp(start_pos[i], start_pos[i] - (@tileheight * dist), duration, timer_start, System.uptime)
end
pbUpdateSpriteHash(@sprites)
Graphics.update
Input.update
break if @sprites["tile#{@tiles[tiles[0]]}"].y == start_pos[0] - @tileheight * dist
break if @sprites["tile#{@tiles[tiles[0]]}"].y == start_pos[0] - (@tileheight * dist)
end
else
start_pos = []
tiles.each { |i| start_pos.push(@sprites["tile#{@tiles[i]}"].x) }
loop do
tiles.each_with_index do |idx, i|
@sprites["tile#{@tiles[idx]}"].x = lerp(start_pos[i], start_pos[i] + @tilewidth * dist, duration, timer_start, System.uptime)
@sprites["tile#{@tiles[idx]}"].x = lerp(start_pos[i], start_pos[i] + (@tilewidth * dist), duration, timer_start, System.uptime)
end
pbUpdateSpriteHash(@sprites)
Graphics.update
Input.update
break if @sprites["tile#{@tiles[tiles[0]]}"].x == start_pos[0] + @tilewidth * dist
break if @sprites["tile#{@tiles[tiles[0]]}"].x == start_pos[0] + (@tilewidth * dist)
end
end
end