mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
evolution items overworld
This commit is contained in:
@@ -92,7 +92,7 @@ class PokeRadar_UI
|
||||
@sprites[iconId].z = 100
|
||||
|
||||
@current_x += ICON_MARGIN_X
|
||||
if @current_x > ICON_LINE_END
|
||||
if @current_x >= ICON_LINE_END
|
||||
@current_x = ICON_START_X
|
||||
@current_y +=ICON_MARGIN_Y
|
||||
@sprites["background"].zoom_y += 1
|
||||
|
||||
@@ -2156,7 +2156,8 @@ class PokemonStorageScreen
|
||||
pbDisplay(_INTL("{1} is already fused!", heldpoke.name))
|
||||
return
|
||||
end
|
||||
if(selected.egg? || heldpoke.egg?)
|
||||
p selected
|
||||
if(heldpoke.egg?)
|
||||
pbDisplay(_INTL("It's impossible to fuse an egg!"))
|
||||
return
|
||||
end
|
||||
|
||||
@@ -202,6 +202,9 @@ end
|
||||
|
||||
def getBodyID(species)
|
||||
dexNum = getDexNumberForSpecies(species)
|
||||
if dexNum % NB_POKEMON ==0
|
||||
return (dexNum/NB_POKEMON)-1
|
||||
end
|
||||
return (dexNum / NB_POKEMON).round
|
||||
end
|
||||
|
||||
@@ -209,9 +212,10 @@ def getHeadID(species, bodyId = nil)
|
||||
if bodyId == nil
|
||||
bodyId = getBodyID(species)
|
||||
end
|
||||
head_dexNum = getDexNumberForSpecies(species)
|
||||
fused_dexNum = getDexNumberForSpecies(species)
|
||||
body_dexNum = getDexNumberForSpecies(bodyId)
|
||||
calculated_number = (head_dexNum - (body_dexNum * NB_POKEMON)).round
|
||||
|
||||
calculated_number = (fused_dexNum - (body_dexNum * NB_POKEMON)).round
|
||||
return calculated_number == 0 ? 420 : calculated_number
|
||||
end
|
||||
|
||||
|
||||
@@ -1483,7 +1483,7 @@ def pbUnfuse(pokemon, scene, supersplicers, pcPosition = nil)
|
||||
end
|
||||
end
|
||||
pokemon.debug_shiny=true if pokemon.debug_shiny && pokemon.body_shiny
|
||||
poke2.debug_shiny=true if pokemon.debug_shiny || poke2.head_shiny
|
||||
poke2.debug_shiny=true if pokemon.debug_shiny && poke2.head_shiny
|
||||
|
||||
pokemon.body_shiny=false
|
||||
pokemon.head_shiny=false
|
||||
|
||||
@@ -145,7 +145,8 @@ QUESTS = [
|
||||
Quest.new(42, "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", questBranchHotels, "BW (21)","Cinnabar Island", defaultQuestColor),
|
||||
Quest.new(43, "Fallen Meteor", "Investigate a crater near Bond Bridge.", questBranchHotels, "BW009","Kin Island", defaultQuestColor),
|
||||
Quest.new(44, "First Contact", "Find the missing pieces of a fallen alien spaceship", questBranchHotels, "BW (92)","Bond Bridge", questBranchField),
|
||||
Quest.new(45, "First Contact (Part 2)", "Ask the sailor at Cinnabar Island's harbour to take you to the uncharted island where the spaceship might be located", questBranchHotels, "BW (92)","Bond Bridge", questBranchField),
|
||||
Quest.new(45, "First Contact (Part 2)", "Ask the sailor at Cinnabar Island's harbour to take you to the uncharted island where the spaceship might be located", questBranchHotels, "BW (92)","Bond Bridge", defaultQuestColor),
|
||||
Quest.new(46, "The rarest fish", "A fisherman wants you to show him a Feebas. Apparently they can be fished around the Sevii Islands when it rains.", questBranchField, "BW056","Kin Island", defaultQuestColor),
|
||||
|
||||
# attention: c'est un array et non un hash... l'id est en fait l'index, donc il est important de garder l'ordre
|
||||
#out of order quests
|
||||
|
||||
Reference in New Issue
Block a user