DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 21:24:59 +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

35
Data/Scripts/013_Items/001_Item_Utilities.rb
View File

@@ -14,35 +14,35 @@ module ItemHandlers
BattleUseOnPokemon = ItemHandlerHash.new
def self.hasUseText(item)
return UseText[item] != nil
return !UseText[item].nil?
end
def self.hasOutHandler(item) # Shows "Use" option in Bag
return UseFromBag[item] != nil || UseInField[item] != nil || UseOnPokemon[item] != nil
return !UseFromBag[item].nil? || !UseInField[item].nil? || !UseOnPokemon[item].nil?
end
def self.hasUseInFieldHandler(item) # Shows "Register" option in Bag
return UseInField[item] != nil
return !UseInField[item].nil?
end
def self.hasUseOnPokemon(item)
return UseOnPokemon[item] != nil
return !UseOnPokemon[item].nil?
end
def self.hasUseOnPokemonMaximum(item)
return UseOnPokemonMaximum[item] != nil
return !UseOnPokemonMaximum[item].nil?
end
def self.hasUseInBattle(item)
return UseInBattle[item] != nil
return !UseInBattle[item].nil?
end
def self.hasBattleUseOnBattler(item)
return BattleUseOnBattler[item] != nil
return !BattleUseOnBattler[item].nil?
end
def self.hasBattleUseOnPokemon(item)
return BattleUseOnPokemon[item] != nil
return !BattleUseOnPokemon[item].nil?
end
# Returns text to display instead of "Use"
@@ -551,7 +551,7 @@ def pbClosestHiddenItem
result = []
playerX = $game_player.x
playerY = $game_player.y
$game_map.events.values.each do |event|
$game_map.events.each_value do |event|
next if !event.name[/hiddenitem/i]
next if (playerX - event.x).abs >= 8
next if (playerY - event.y).abs >= 6
@@ -674,16 +674,13 @@ def pbUseItem(bag, item, bagscene = nil)
)
screen.scene.pbSetHelpText("") if screen.is_a?(PokemonPartyScreen)
end
if qty >= 1
ret = ItemHandlers.triggerUseOnPokemon(item, qty, pkmn, screen)
if ret && itm.consumed_after_use?
bag.remove(item, qty)
if !bag.has?(item)
pbMessage(_INTL("You used your last {1}.", itm.name)) { screen.pbUpdate }
break
end
end
end
next if qty <= 0
ret = ItemHandlers.triggerUseOnPokemon(item, qty, pkmn, screen)
next unless ret && itm.consumed_after_use?
bag.remove(item, qty)
next if bag.has?(item)
pbMessage(_INTL("You used your last {1}.", itm.name)) { screen.pbUpdate }
break
end
screen.pbEndScene
bagscene&.pbRefresh

24
Data/Scripts/013_Items/005_Item_PokeRadar.rb
View File

@@ -74,20 +74,18 @@ def pbPokeRadarHighlightGrass(showmessage = true)
y = $game_player.y + i + 1
end
# Add tile to grasses array if it's a valid grass tile
if x >= 0 && x < $game_map.width &&
y >= 0 && y < $game_map.height
terrain = $game_map.terrain_tag(x, y)
if terrain.land_wild_encounters && terrain.shows_grass_rustle
# Choose a rarity for the grass (0=normal, 1=rare, 2=shiny)
s = (rand(100) < 25) ? 1 : 0
if $game_temp.poke_radar_data && $game_temp.poke_radar_data[2] > 0
v = [(65_536 / Settings::SHINY_POKEMON_CHANCE) - ([$game_temp.poke_radar_data[2], 40].min * 200), 200].max
v = (65_536 / v.to_f).ceil
s = 2 if rand(65_536) < v
end
grasses.push([x, y, i, s])
end
next if x < 0 || x >= $game_map.width ||
y < 0 || y >= $game_map.height
terrain = $game_map.terrain_tag(x, y)
next if !terrain.land_wild_encounters || !terrain.shows_grass_rustle
# Choose a rarity for the grass (0=normal, 1=rare, 2=shiny)
s = (rand(100) < 25) ? 1 : 0
if $game_temp.poke_radar_data && $game_temp.poke_radar_data[2] > 0
v = [(65_536 / Settings::SHINY_POKEMON_CHANCE) - ([$game_temp.poke_radar_data[2], 40].min * 200), 200].max
v = (65_536 / v.to_f).ceil
s = 2 if rand(65_536) < v
end
grasses.push([x, y, i, s])
end
if grasses.length == 0
# No shaking grass found, break the chain

30
Data/Scripts/013_Items/008_PokemonBag.rb
View File

@@ -339,91 +339,91 @@ end
class PokemonBag
# @deprecated This method is slated to be removed in v21.
def pbQuantity(item)
Deprecation.warn_method('pbQuantity', 'v21', '$bag.quantity(item)')
Deprecation.warn_method("pbQuantity", "v21", "$bag.quantity(item)")
return quantity(item)
end
# @deprecated This method is slated to be removed in v21.
def pbHasItem?(item)
Deprecation.warn_method('pbHasItem?', 'v21', '$bag.has?(item)')
Deprecation.warn_method("pbHasItem?", "v21", "$bag.has?(item)")
return has?(item)
end
# @deprecated This method is slated to be removed in v21.
def pbCanStore?(item, quantity = 1)
Deprecation.warn_method('pbCanStore?', 'v21', '$bag.can_add?(item, quantity)')
Deprecation.warn_method("pbCanStore?", "v21", "$bag.can_add?(item, quantity)")
return can_add?(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbStoreItem(item, quantity = 1)
Deprecation.warn_method('pbStoreItem', 'v21', '$bag.add(item, quantity)')
Deprecation.warn_method("pbStoreItem", "v21", "$bag.add(item, quantity)")
return add(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbStoreAllOrNone(item, quantity = 1)
Deprecation.warn_method('pbStoreAllOrNone', 'v21', '$bag.add_all(item, quantity)')
Deprecation.warn_method("pbStoreAllOrNone", "v21", "$bag.add_all(item, quantity)")
return add_all(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbChangeItem(old_item, new_item)
Deprecation.warn_method('pbChangeItem', 'v21', '$bag.replace_item(old_item, new_item)')
Deprecation.warn_method("pbChangeItem", "v21", "$bag.replace_item(old_item, new_item)")
return replace_item(old_item, new_item)
end
# @deprecated This method is slated to be removed in v21.
def pbDeleteItem(item, quantity = 1)
Deprecation.warn_method('pbDeleteItem', 'v21', '$bag.remove(item, quantity)')
Deprecation.warn_method("pbDeleteItem", "v21", "$bag.remove(item, quantity)")
return remove(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbIsRegistered?(item)
Deprecation.warn_method('pbIsRegistered?', 'v21', '$bag.registered?(item)')
Deprecation.warn_method("pbIsRegistered?", "v21", "$bag.registered?(item)")
return registered?(item)
end
# @deprecated This method is slated to be removed in v21.
def pbRegisterItem(item)
Deprecation.warn_method('pbRegisterItem', 'v21', '$bag.register(item)')
Deprecation.warn_method("pbRegisterItem", "v21", "$bag.register(item)")
register(item)
end
# @deprecated This method is slated to be removed in v21.
def pbUnregisterItem(item)
Deprecation.warn_method('pbUnregisterItem', 'v21', '$bag.unregister(item)')
Deprecation.warn_method("pbUnregisterItem", "v21", "$bag.unregister(item)")
unregister(item)
end
end
# @deprecated This method is slated to be removed in v21.
def pbQuantity(item)
Deprecation.warn_method('pbQuantity', 'v21', '$bag.quantity(item)')
Deprecation.warn_method("pbQuantity", "v21", "$bag.quantity(item)")
return $bag.quantity(item)
end
# @deprecated This method is slated to be removed in v21.
def pbHasItem?(item)
Deprecation.warn_method('pbHasItem?', 'v21', '$bag.has?(item)')
Deprecation.warn_method("pbHasItem?", "v21", "$bag.has?(item)")
return $bag.has?(item)
end
# @deprecated This method is slated to be removed in v21.
def pbCanStore?(item, quantity = 1)
Deprecation.warn_method('pbCanStore?', 'v21', '$bag.can_add?(item, quantity)')
Deprecation.warn_method("pbCanStore?", "v21", "$bag.can_add?(item, quantity)")
return $bag.can_add?(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbStoreItem(item, quantity = 1)
Deprecation.warn_method('pbStoreItem', 'v21', '$bag.add(item, quantity)')
Deprecation.warn_method("pbStoreItem", "v21", "$bag.add(item, quantity)")
return $bag.add(item, quantity)
end
# @deprecated This method is slated to be removed in v21.
def pbStoreAllOrNone(item, quantity = 1)
Deprecation.warn_method('pbStoreAllOrNone', 'v21', '$bag.add_all(item, quantity)')
Deprecation.warn_method("pbStoreAllOrNone", "v21", "$bag.add_all(item, quantity)")
return $bag.add_all(item, quantity)
end