mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 13:15:01 +00:00
The Great Enspacening begins!
This commit is contained in:
@@ -91,7 +91,7 @@ module ItemHandlers
|
||||
return [UseOnPokemonMaximum.trigger(item, pkmn), 1].max
|
||||
end
|
||||
|
||||
def self.triggerCanUseInBattle(item,pkmn,battler,move,firstAction,battle,scene,showMessages=true)
|
||||
def self.triggerCanUseInBattle(item,pkmn,battler,move,firstAction,battle,scene,showMessages = true)
|
||||
return true if !CanUseInBattle[item] # Can use the item by default
|
||||
return CanUseInBattle.trigger(item,pkmn,battler,move,firstAction,battle,scene,showMessages)
|
||||
end
|
||||
@@ -640,7 +640,7 @@ end
|
||||
# Use an item from the Bag and/or on a Pokémon
|
||||
#===============================================================================
|
||||
# @return [Integer] 0 = item wasn't used; 1 = item used; 2 = close Bag to use in field
|
||||
def pbUseItem(bag,item,bagscene=nil)
|
||||
def pbUseItem(bag,item,bagscene = nil)
|
||||
itm = GameData::Item.get(item)
|
||||
useType = itm.field_use
|
||||
if itm.is_machine? # TM or TR or HM
|
||||
@@ -794,7 +794,7 @@ end
|
||||
#===============================================================================
|
||||
# Give an item to a Pokémon to hold, and take a held item from a Pokémon
|
||||
#===============================================================================
|
||||
def pbGiveItemToPokemon(item,pkmn,scene,pkmnid=0)
|
||||
def pbGiveItemToPokemon(item,pkmn,scene,pkmnid = 0)
|
||||
newitemname = GameData::Item.get(item).name
|
||||
if pkmn.egg?
|
||||
scene.pbDisplay(_INTL("Eggs can't hold items."))
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#===============================================================================
|
||||
# Register contacts
|
||||
#===============================================================================
|
||||
def pbPhoneRegisterNPC(ident,name,mapid,showmessage=true)
|
||||
def pbPhoneRegisterNPC(ident,name,mapid,showmessage = true)
|
||||
$PokemonGlobal.phoneNumbers = [] if !$PokemonGlobal.phoneNumbers
|
||||
exists = pbFindPhoneTrainer(ident,name)
|
||||
if exists
|
||||
|
||||
@@ -55,7 +55,7 @@ def pbPokeRadarCancel
|
||||
$game_temp.poke_radar_data = nil
|
||||
end
|
||||
|
||||
def pbPokeRadarHighlightGrass(showmessage=true)
|
||||
def pbPokeRadarHighlightGrass(showmessage = true)
|
||||
grasses = [] # x, y, ring (0-3 inner to outer), rarity
|
||||
# Choose 1 random tile from each ring around the player
|
||||
for i in 0...4
|
||||
|
||||
@@ -23,12 +23,12 @@ def pbMoveToMailbox(pokemon)
|
||||
return true
|
||||
end
|
||||
|
||||
def pbStoreMail(pkmn,item,message,poke1=nil,poke2=nil,poke3=nil)
|
||||
def pbStoreMail(pkmn,item,message,poke1 = nil,poke2 = nil,poke3 = nil)
|
||||
raise _INTL("Pokémon already has mail") if pkmn.mail
|
||||
pkmn.mail = Mail.new(item, message, $player.name, poke1, poke2, poke3)
|
||||
end
|
||||
|
||||
def pbDisplayMail(mail,_bearer=nil)
|
||||
def pbDisplayMail(mail,_bearer = nil)
|
||||
sprites = {}
|
||||
viewport = Viewport.new(0,0,Graphics.width,Graphics.height)
|
||||
viewport.z = 99999
|
||||
|
||||
@@ -7,7 +7,7 @@ class ItemIconSprite < SpriteWrapper
|
||||
ANIM_ICON_SIZE = 48
|
||||
FRAMES_PER_CYCLE = Graphics.frame_rate
|
||||
|
||||
def initialize(x,y,item,viewport=nil)
|
||||
def initialize(x,y,item,viewport = nil)
|
||||
super(viewport)
|
||||
@animbitmap = nil
|
||||
@animframe = 0
|
||||
@@ -42,7 +42,7 @@ class ItemIconSprite < SpriteWrapper
|
||||
@forceitemchange = false
|
||||
end
|
||||
|
||||
def setOffset(offset=PictureOrigin::Center)
|
||||
def setOffset(offset = PictureOrigin::Center)
|
||||
@offset = offset
|
||||
changeOrigin
|
||||
end
|
||||
@@ -116,7 +116,7 @@ end
|
||||
# Item held icon (used in the party screen)
|
||||
#===============================================================================
|
||||
class HeldItemIconSprite < SpriteWrapper
|
||||
def initialize(x,y,pokemon,viewport=nil)
|
||||
def initialize(x,y,pokemon,viewport = nil)
|
||||
super(viewport)
|
||||
self.x = x
|
||||
self.y = y
|
||||
|
||||
Reference in New Issue
Block a user