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

Yet more Rubocopping

Browse Source
This commit is contained in:
Maruno17
2021-12-23 00:27:17 +00:00
parent 514fe13ca2
commit 132a16950d
171 changed files with 1455 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
Data/Scripts/019_Utilities/001_Utilities.rb
View File

@@ -130,45 +130,41 @@ end
#===============================================================================
# Event utilities
#===============================================================================
def pbTimeEvent(variableNumber, secs = 86400)
if variableNumber && variableNumber >= 0
if $game_variables
secs = 0 if secs < 0
timenow = pbGetTimeNow
$game_variables[variableNumber] = [timenow.to_f, secs]
$game_map.refresh if $game_map
end
end
def pbTimeEvent(variableNumber, secs = 86_400)
return if !$game_variables
return if !variableNumber || variableNumber < 0
secs = 0 if secs < 0
timenow = pbGetTimeNow
$game_variables[variableNumber] = [timenow.to_f, secs]
$game_map&.refresh
end
def pbTimeEventDays(variableNumber, days = 0)
if variableNumber && variableNumber >= 0
if $game_variables
days = 0 if days < 0
timenow = pbGetTimeNow
time = timenow.to_f
expiry = (time % 86400.0) + (days * 86400.0)
$game_variables[variableNumber] = [time, expiry - time]
$game_map.refresh if $game_map
end
end
return if !$game_variables
return if !variableNumber || variableNumber < 0
days = 0 if days < 0
timenow = pbGetTimeNow
time = timenow.to_f
expiry = (time % 86_400.0) + (days * 86_400.0)
$game_variables[variableNumber] = [time, expiry - time]
$game_map&.refresh
end
def pbTimeEventValid(variableNumber)
retval = false
if variableNumber && variableNumber >= 0 && $game_variables
value = $game_variables[variableNumber]
if value.is_a?(Array)
timenow = pbGetTimeNow
retval = (timenow.to_f - value[0] > value[1]) # value[1] is age in seconds
retval = false if value[1] <= 0 # zero age
end
if !retval
$game_variables[variableNumber] = 0
$game_map.refresh if $game_map
end
return false if !$game_variables
return false if !variableNumber || variableNumber < 0
ret = false
value = $game_variables[variableNumber]
if value.is_a?(Array)
timenow = pbGetTimeNow
ret = (timenow.to_f - value[0] > value[1]) # value[1] is age in seconds
ret = false if value[1] <= 0 # zero age
end
return retval
if !ret
$game_variables[variableNumber] = 0
$game_map&.refresh
end
return ret
end
def pbExclaim(event, id = Settings::EXCLAMATION_ANIMATION_ID, tinting = false)
@@ -184,7 +180,7 @@ def pbExclaim(event, id = Settings::EXCLAMATION_ANIMATION_ID, tinting = false)
else
sprite = $scene.spriteset.addUserAnimation(id, event.x, event.y, tinting, 2)
end
while !sprite.disposed?
until sprite.disposed?
Graphics.update
Input.update
pbUpdateSceneMap
@@ -408,7 +404,7 @@ def pbMoveTutorAnnotations(move, movelist = nil)
ret[i] = _INTL("LEARNED")
else
species = pkmn.species
if movelist && movelist.any? { |j| j == species }
if movelist&.any? { |j| j == species }
# Checked data from movelist given in parameter
ret[i] = _INTL("ABLE")
elsif pkmn.compatible_with_move?(move)

39
Data/Scripts/019_Utilities/002_Utilities_Pokemon.rb
View File

@@ -6,12 +6,11 @@ def pbBoxesFull?
end
def pbNickname(pkmn)
return if $PokemonSystem.givenicknames != 0
species_name = pkmn.speciesName
if $PokemonSystem.givenicknames == 0
if pbConfirmMessage(_INTL("Would you like to give a nickname to {1}?", species_name))
pkmn.name = pbEnterPokemonName(_INTL("{1}'s nickname?", species_name),
0, Pokemon::MAX_NAME_SIZE, "", pkmn)
end
if pbConfirmMessage(_INTL("Would you like to give a nickname to {1}?", species_name))
pkmn.name = pbEnterPokemonName(_INTL("{1}'s nickname?", species_name),
0, Pokemon::MAX_NAME_SIZE, "", pkmn)
end
end
@@ -210,22 +209,22 @@ def pbSize(pkmn)
m = pkmn.personalID & 0xFF
n = (pkmn.personalID >> 8) & 0xFF
s = ((((ativ ^ dfiv) * hpiv) ^ m) * 256) + (((saiv ^ sdiv) * spiv) ^ n)
xyz = [1700, 1, 65510]
xyz = [1700, 1, 65_510]
case s
when 0...10 then xyz = [ 290, 1, 0]
when 10...110 then xyz = [ 300, 1, 10]
when 110...310 then xyz = [ 400, 2, 110]
when 310...710 then xyz = [ 500, 4, 310]
when 710...2710 then xyz = [ 600, 20, 710]
when 2710...7710 then xyz = [ 700, 50, 2710]
when 7710...17710 then xyz = [ 800, 100, 7710]
when 17710...32710 then xyz = [ 900, 150, 17710]
when 32710...47710 then xyz = [1000, 150, 32710]
when 47710...57710 then xyz = [1100, 100, 47710]
when 57710...62710 then xyz = [1200, 50, 57710]
when 62710...64710 then xyz = [1300, 20, 62710]
when 64710...65210 then xyz = [1400, 5, 64710]
when 65210...65410 then xyz = [1500, 2, 65210]
when 0...10 then xyz = [ 290, 1, 0]
when 10...110 then xyz = [ 300, 1, 10]
when 110...310 then xyz = [ 400, 2, 110]
when 310...710 then xyz = [ 500, 4, 310]
when 710...2710 then xyz = [ 600, 20, 710]
when 2710...7710 then xyz = [ 700, 50, 2710]
when 7710...17_710 then xyz = [ 800, 100, 7710]
when 17_710...32_710 then xyz = [ 900, 150, 17_710]
when 32_710...47_710 then xyz = [1000, 150, 32_710]
when 47_710...57_710 then xyz = [1100, 100, 47_710]
when 57_710...62_710 then xyz = [1200, 50, 57_710]
when 62_710...64_710 then xyz = [1300, 20, 62_710]
when 64_710...65_210 then xyz = [1400, 5, 64_710]
when 65_210...65_410 then xyz = [1500, 2, 65_210]
end
return ((((s - xyz[2]) / xyz[1]) + xyz[0]).floor * baseheight / 10).floor
end