DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 06:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed Graphics.delta_s and the usage thereof, tweaked credits screen code

Browse Source
This commit is contained in:
Maruno17
2023-05-17 18:50:38 +01:00
parent a96867d537
commit 28a2b7c9c1
17 changed files with 195 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Data/Scripts/012_Overworld/002_Battle triggering/002_Overworld_BattleIntroAnim.rb
View File

@@ -139,13 +139,12 @@ def pbBattleAnimation(bgm = nil, battletype = 0, foe = nil)
$PokemonEncounters.reset_step_count
# Fade back to the overworld in 0.4 seconds
viewport.color = Color.black
timer = 0.0
timer_start = System.uptime
loop do
Graphics.update
Input.update
pbUpdateSceneMap
timer += Graphics.delta_s
viewport.color.alpha = 255 * (1 - (timer / 0.4))
viewport.color.alpha = 255 * (1 - ((System.uptime - timer_start) / 0.4))
break if viewport.color.alpha <= 0
end
viewport.dispose
@@ -159,17 +158,16 @@ def pbBattleAnimationCore(anim, viewport, location, num_flashes = 2)
viewport.color = Color.new(c, c, c) # Fade to black/white a few times
half_flash_time = 0.2 # seconds
num_flashes.times do # 2 flashes
timer = 0.0
timer_start = System.uptime
loop do
if timer < half_flash_time
viewport.color.alpha = 255 * timer / half_flash_time
if System.uptime - timer_start < half_flash_time
viewport.color.alpha = 255 * (System.uptime - timer_start) / half_flash_time
else
viewport.color.alpha = 255 * (2 - (timer / half_flash_time))
viewport.color.alpha = 255 * (2 - ((System.uptime - timer_start) / half_flash_time))
end
timer += Graphics.delta_s
Graphics.update
pbUpdateSceneMap
break if timer >= half_flash_time * 2
break if System.uptime - timer_start >= half_flash_time * 2
end
end
viewport.color.alpha = 0