mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-10 22:54:59 +00:00
Lots of rubocop
This commit is contained in:
@@ -264,9 +264,7 @@ MultipleForms.register(:ROTOM, {
|
||||
MultipleForms.register(:GIRATINA, {
|
||||
"getForm" => proc { |pkmn|
|
||||
next 1 if pkmn.hasItem?(:GRISEOUSORB)
|
||||
if $game_map && $game_map.metadata&.has_flag?("DistortionWorld")
|
||||
next 1
|
||||
end
|
||||
next 1 if $game_map&.metadata&.has_flag?("DistortionWorld")
|
||||
next 0
|
||||
}
|
||||
})
|
||||
|
||||
@@ -1,17 +1,15 @@
|
||||
=begin
|
||||
All types except Shadow have Shadow as a weakness.
|
||||
Shadow has Shadow as a resistance.
|
||||
On a side note, the Shadow moves in Colosseum will not be affected by Weaknesses
|
||||
or Resistances, while in XD the Shadow-type is Super-Effective against all other
|
||||
types.
|
||||
2/5 - display nature
|
||||
|
||||
XD - Shadow Rush -- 55, 100 - Deals damage.
|
||||
Colosseum - Shadow Rush -- 90, 100
|
||||
If this attack is successful, user loses half of HP lost by opponent due to this
|
||||
attack (recoil). If user is in Hyper Mode, this attack has a good chance for a
|
||||
critical hit.
|
||||
=end
|
||||
# All types except Shadow have Shadow as a weakness.
|
||||
# Shadow has Shadow as a resistance.
|
||||
# On a side note, the Shadow moves in Colosseum will not be affected by
|
||||
# Weaknesses or Resistances, while in XD the Shadow-type is Super-Effective
|
||||
# against all other types.
|
||||
# 2/5 - display nature
|
||||
#
|
||||
# XD - Shadow Rush -- 55, 100 - Deals damage.
|
||||
# Colosseum - Shadow Rush -- 90, 100
|
||||
# If this attack is successful, user loses half of HP lost by opponent due to
|
||||
# this attack (recoil). If user is in Hyper Mode, this attack has a good chance
|
||||
# for a critical hit.
|
||||
|
||||
#===============================================================================
|
||||
# Purify a Shadow Pokémon.
|
||||
@@ -63,8 +61,7 @@ end
|
||||
# Relic Stone scene.
|
||||
#===============================================================================
|
||||
class RelicStoneScene
|
||||
def pbPurify
|
||||
end
|
||||
def pbPurify; end
|
||||
|
||||
def pbUpdate
|
||||
pbUpdateSpriteHash(@sprites)
|
||||
@@ -136,11 +133,11 @@ end
|
||||
#===============================================================================
|
||||
def pbRelicStoneScreen(pkmn)
|
||||
retval = true
|
||||
pbFadeOutIn {
|
||||
pbFadeOutIn do
|
||||
scene = RelicStoneScene.new
|
||||
screen = RelicStoneScreen.new(scene)
|
||||
retval = screen.pbStartScreen(pkmn)
|
||||
}
|
||||
end
|
||||
return retval
|
||||
end
|
||||
|
||||
@@ -187,9 +184,7 @@ class Battle::Battler
|
||||
alias __shadow__pbInitPokemon pbInitPokemon unless method_defined?(:__shadow__pbInitPokemon)
|
||||
|
||||
def pbInitPokemon(*arg)
|
||||
if self.pokemonIndex > 0 && inHyperMode?
|
||||
self.pokemon.hyper_mode = false
|
||||
end
|
||||
self.pokemon.hyper_mode = false if self.pokemonIndex > 0 && inHyperMode?
|
||||
__shadow__pbInitPokemon(*arg)
|
||||
# Called into battle
|
||||
if shadowPokemon?
|
||||
|
||||
@@ -284,9 +284,7 @@ class RegionalStorage
|
||||
if @rgnmap < 0
|
||||
raise _INTL("The current map has no region set. Please set the MapPosition metadata setting for this map.")
|
||||
end
|
||||
if !@storages[@rgnmap]
|
||||
@storages[@rgnmap] = PokemonStorage.new
|
||||
end
|
||||
@storages[@rgnmap] = PokemonStorage.new if !@storages[@rgnmap]
|
||||
return @storages[@rgnmap]
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user