mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-01-30 10:11:03 +00:00
egg scale in summary fix
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -6,7 +6,7 @@
|
|||||||
module Settings
|
module Settings
|
||||||
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
|
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
|
||||||
GAME_VERSION = '5.0.0'
|
GAME_VERSION = '5.0.0'
|
||||||
GAME_VERSION_NUMBER = "5.0.19.1 - beta"
|
GAME_VERSION_NUMBER = "5.0.20 - beta"
|
||||||
|
|
||||||
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
|
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
|
||||||
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
|
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
|
||||||
|
|||||||
@@ -122,9 +122,14 @@ class PokemonSummary_Scene
|
|||||||
@sprites["pokemon"].setOffset(PictureOrigin::Center)
|
@sprites["pokemon"].setOffset(PictureOrigin::Center)
|
||||||
@sprites["pokemon"].x = 104
|
@sprites["pokemon"].x = 104
|
||||||
@sprites["pokemon"].y = 206
|
@sprites["pokemon"].y = 206
|
||||||
|
@sprites["pokemon"].setPokemonBitmap(@pokemon)
|
||||||
|
if @pokemon.egg?
|
||||||
|
@sprites["pokemon"].zoom_x = Settings::EGGSPRITE_SCALE
|
||||||
|
@sprites["pokemon"].zoom_y = Settings::EGGSPRITE_SCALE
|
||||||
|
else
|
||||||
@sprites["pokemon"].zoom_x = Settings::FRONTSPRITE_SCALE
|
@sprites["pokemon"].zoom_x = Settings::FRONTSPRITE_SCALE
|
||||||
@sprites["pokemon"].zoom_y = Settings::FRONTSPRITE_SCALE
|
@sprites["pokemon"].zoom_y = Settings::FRONTSPRITE_SCALE
|
||||||
@sprites["pokemon"].setPokemonBitmap(@pokemon)
|
end
|
||||||
@sprites["pokeicon"] = PokemonIconSprite.new(@pokemon, @viewport)
|
@sprites["pokeicon"] = PokemonIconSprite.new(@pokemon, @viewport)
|
||||||
@sprites["pokeicon"].setOffset(PictureOrigin::Center)
|
@sprites["pokeicon"].setOffset(PictureOrigin::Center)
|
||||||
@sprites["pokeicon"].x = 46
|
@sprites["pokeicon"].x = 46
|
||||||
@@ -363,11 +368,16 @@ class PokemonSummary_Scene
|
|||||||
drawMarkings(overlay, 84, 292)
|
drawMarkings(overlay, 84, 292)
|
||||||
# Draw page-specific information
|
# Draw page-specific information
|
||||||
case page
|
case page
|
||||||
when 1 then drawPageOne
|
when 1 then
|
||||||
when 2 then drawPageTwo
|
drawPageOne
|
||||||
when 3 then drawPageThree
|
when 2 then
|
||||||
when 4 then drawPageFour
|
drawPageTwo
|
||||||
when 5 then drawPageFive
|
when 3 then
|
||||||
|
drawPageThree
|
||||||
|
when 4 then
|
||||||
|
drawPageFour
|
||||||
|
when 5 then
|
||||||
|
drawPageFive
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -712,9 +722,12 @@ class PokemonSummary_Scene
|
|||||||
if move.total_pp > 0
|
if move.total_pp > 0
|
||||||
textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow])
|
textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow])
|
||||||
ppfraction = 0
|
ppfraction = 0
|
||||||
if move.pp==0; ppfraction = 3
|
if move.pp == 0;
|
||||||
elsif move.pp*4<=move.total_pp; ppfraction = 2
|
ppfraction = 3
|
||||||
elsif move.pp*2<=move.total_pp; ppfraction = 1
|
elsif move.pp * 4 <= move.total_pp;
|
||||||
|
ppfraction = 2
|
||||||
|
elsif move.pp * 2 <= move.total_pp;
|
||||||
|
ppfraction = 1
|
||||||
end
|
end
|
||||||
textpos.push([sprintf("%d/%d", move.pp, move.total_pp), 460, yPos + 32, 1, ppBase[ppfraction], ppShadow[ppfraction]])
|
textpos.push([sprintf("%d/%d", move.pp, move.total_pp), 460, yPos + 32, 1, ppBase[ppfraction], ppShadow[ppfraction]])
|
||||||
end
|
end
|
||||||
@@ -775,9 +788,12 @@ class PokemonSummary_Scene
|
|||||||
if move.total_pp > 0
|
if move.total_pp > 0
|
||||||
textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow])
|
textpos.push([_INTL("PP"), 342, yPos + 32, 0, moveBase, moveShadow])
|
||||||
ppfraction = 0
|
ppfraction = 0
|
||||||
if move.pp==0; ppfraction = 3
|
if move.pp == 0;
|
||||||
elsif move.pp*4<=move.total_pp; ppfraction = 2
|
ppfraction = 3
|
||||||
elsif move.pp*2<=move.total_pp; ppfraction = 1
|
elsif move.pp * 4 <= move.total_pp;
|
||||||
|
ppfraction = 2
|
||||||
|
elsif move.pp * 2 <= move.total_pp;
|
||||||
|
ppfraction = 1
|
||||||
end
|
end
|
||||||
textpos.push([sprintf("%d/%d", move.pp, move.total_pp), 460, yPos + 32, 1, ppBase[ppfraction], ppShadow[ppfraction]])
|
textpos.push([sprintf("%d/%d", move.pp, move.total_pp), 460, yPos + 32, 1, ppBase[ppfraction], ppShadow[ppfraction]])
|
||||||
end
|
end
|
||||||
@@ -817,9 +833,12 @@ class PokemonSummary_Scene
|
|||||||
textpos = []
|
textpos = []
|
||||||
# Write power and accuracy values for selected move
|
# Write power and accuracy values for selected move
|
||||||
case selected_move.base_damage
|
case selected_move.base_damage
|
||||||
when 0 then textpos.push(["---", 216, 148, 1, base, shadow]) # Status move
|
when 0 then
|
||||||
when 1 then textpos.push(["???", 216, 148, 1, base, shadow]) # Variable power move
|
textpos.push(["---", 216, 148, 1, base, shadow]) # Status move
|
||||||
else textpos.push([selected_move.base_damage.to_s, 216, 148, 1, base, shadow])
|
when 1 then
|
||||||
|
textpos.push(["???", 216, 148, 1, base, shadow]) # Variable power move
|
||||||
|
else
|
||||||
|
textpos.push([selected_move.base_damage.to_s, 216, 148, 1, base, shadow])
|
||||||
end
|
end
|
||||||
if selected_move.accuracy == 0
|
if selected_move.accuracy == 0
|
||||||
textpos.push(["---", 216, 180, 1, base, shadow])
|
textpos.push(["---", 216, 180, 1, base, shadow])
|
||||||
@@ -1143,17 +1162,25 @@ class PokemonSummary_Scene
|
|||||||
redraw = true
|
redraw = true
|
||||||
end
|
end
|
||||||
elsif Input.trigger?(Input::UP)
|
elsif Input.trigger?(Input::UP)
|
||||||
if index==7; index = 6
|
if index == 7;
|
||||||
elsif index==6; index = 4
|
index = 6
|
||||||
elsif index<3; index = 7
|
elsif index == 6;
|
||||||
else; index -= 3
|
index = 4
|
||||||
|
elsif index < 3;
|
||||||
|
index = 7
|
||||||
|
else
|
||||||
|
; index -= 3
|
||||||
end
|
end
|
||||||
pbPlayCursorSE
|
pbPlayCursorSE
|
||||||
elsif Input.trigger?(Input::DOWN)
|
elsif Input.trigger?(Input::DOWN)
|
||||||
if index==7; index = 1
|
if index == 7;
|
||||||
elsif index==6; index = 7
|
index = 1
|
||||||
elsif index>=3; index = 6
|
elsif index == 6;
|
||||||
else; index += 3
|
index = 7
|
||||||
|
elsif index >= 3;
|
||||||
|
index = 6
|
||||||
|
else
|
||||||
|
; index += 3
|
||||||
end
|
end
|
||||||
pbPlayCursorSE
|
pbPlayCursorSE
|
||||||
elsif Input.trigger?(Input::LEFT)
|
elsif Input.trigger?(Input::LEFT)
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user