mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Show level in fusion preview + map fixes
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -6,7 +6,7 @@
|
||||
module Settings
|
||||
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
|
||||
GAME_VERSION = '5.0.0'
|
||||
GAME_VERSION_NUMBER = "5.0.29 - beta"
|
||||
GAME_VERSION_NUMBER = "5.0.30 - beta"
|
||||
|
||||
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
|
||||
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
|
||||
|
||||
@@ -138,7 +138,7 @@ class HallOfFame_Scene
|
||||
def xpointformula(battlernumber)
|
||||
ret = 0
|
||||
if !SINGLEROW
|
||||
ret = 72 + 160 * xpositionformula(battlernumber) #32
|
||||
ret = 92 + 160 * xpositionformula(battlernumber) #32
|
||||
else
|
||||
ret = (60 * (battlernumber / 2) + 48) * (xpositionformula(battlernumber) - 1)
|
||||
ret += Graphics.width / 2 - 56
|
||||
@@ -149,7 +149,7 @@ class HallOfFame_Scene
|
||||
def ypointformula(battlernumber)
|
||||
ret = 0
|
||||
if !SINGLEROW
|
||||
ret = 32 + 128 * ypositionformula(battlernumber) / 2
|
||||
ret = 92 + 128 * ypositionformula(battlernumber) / 2
|
||||
else
|
||||
ret = 96 - 8 * (battlernumber / 2)
|
||||
end
|
||||
|
||||
@@ -219,7 +219,6 @@ ItemHandlers::UseFromBag.add(:LANTERN, proc { |item|
|
||||
next true
|
||||
})
|
||||
|
||||
|
||||
ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
|
||||
if pokemon.gender == 0
|
||||
pokemon.makeFemale
|
||||
@@ -485,7 +484,6 @@ def reverseFusion(pokemon)
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
ItemHandlers::UseOnPokemon.add(:INFINITEREVERSERS, proc { |item, pokemon, scene|
|
||||
if !pokemon.isFusion?
|
||||
scene.pbDisplay(_INTL("It won't have any effect."))
|
||||
@@ -651,6 +649,14 @@ def calculateUnfuseLevelOldMethod(pokemon, supersplicers)
|
||||
return lev.floor
|
||||
end
|
||||
|
||||
def drawFusionPreviewText(viewport, text, x, y)
|
||||
label_base_color = Color.new(248, 248, 248)
|
||||
label_shadow_color = Color.new(104, 104, 104)
|
||||
overlay = BitmapSprite.new(Graphics.width, Graphics.height, viewport).bitmap
|
||||
textpos = [[text, x, y, 0, label_base_color, label_shadow_color]]
|
||||
pbDrawTextPositions(overlay, textpos)
|
||||
end
|
||||
|
||||
def drawPokemonType(pokemon_id, x_pos = 192, y_pos = 264)
|
||||
width = 66
|
||||
|
||||
@@ -983,8 +989,6 @@ ItemHandlers::UseOnPokemon.add(:GOLDENBANANA, proc { |item, pokemon, scene|
|
||||
next pbHPItem(pokemon, 50, scene)
|
||||
})
|
||||
|
||||
|
||||
|
||||
ItemHandlers::UseOnPokemon.add(:TRANSGENDERSTONE, proc { |item, pokemon, scene|
|
||||
if pokemon.gender == 0
|
||||
pokemon.makeFemale
|
||||
@@ -1297,7 +1301,9 @@ def pbFuse(pokemon, poke2, supersplicers = false)
|
||||
|
||||
previewwindow = PictureWindow.new(picturePath)
|
||||
|
||||
new_level = calculateFusedPokemonLevel(pokemon.level, poke2.level, supersplicers)
|
||||
typeWindow = drawPokemonType(newid)
|
||||
drawFusionPreviewText(typeWindow, "Lv. " + new_level.to_s, 232, 0,)
|
||||
|
||||
if hasCustom
|
||||
previewwindow.picture.pbSetColor(150, 255, 150, 200)
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user