DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88 from Jodiark/main

Browse Source 
fix to bug regarding same icon for multiple fusions
This commit is contained in:
infinitefusion
2023-07-01 17:43:06 -04:00
committed by GitHub
parent 9c8f9e9437 42b36eaf90
commit 45c323bdb0
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Data/Scripts/013_Items/004_1_PokeradarUI.rb
View File

@@ -112,14 +112,20 @@ class PokeRadar_UI
bitmap1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
bitmap2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", pokemonId)
headPokeFileName = GameData::Species.icon_filename(headPoke)
bitmapPath = sprintf("%s.png", bitmapFileName)
IO.copy_stream(headPokeFileName, bitmapPath)
result_bitmap = AnimatedBitmap.new(bitmapPath)
for i in 0..bitmap1.width-1
for j in ((bitmap1.height / 2) + Settings::FUSION_ICON_SPRITE_OFFSET)..bitmap1.height-1
temp = bitmap2.bitmap.get_pixel(i, j)
bitmap1.bitmap.set_pixel(i, j, temp)
result_bitmap.bitmap.set_pixel(i, j, temp)
end
end
icon = IconSprite.new(x, y)
icon.setBitmapDirectly(bitmap1)
icon.setBitmapDirectly(result_bitmap)
return icon
end

11
Data/Scripts/014_Pokemon/001_Pokemon-related/003_Pokemon_Sprites.rb
View File

@@ -187,13 +187,20 @@ class PokemonIconSprite < SpriteWrapper
icon1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
icon2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
dexNum = getDexNumberForSpecies(@pokemon.species)
bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
headPokeFileName = GameData::Species.icon_filename(headPoke)
bitmapPath = sprintf("%s.png", bitmapFileName)
IO.copy_stream(headPokeFileName, bitmapPath)
result_icon = AnimatedBitmap.new(bitmapPath)
for i in 0..icon1.width-1
for j in ((icon1.height / 2) + Settings::FUSION_ICON_SPRITE_OFFSET)..icon1.height-1
temp = icon2.bitmap.get_pixel(i, j)
icon1.bitmap.set_pixel(i, j, temp)
result_icon.bitmap.set_pixel(i, j, temp)
end
end
return icon1
return result_icon
end
def setOffset(offset = PictureOrigin::Center)

11
Data/Scripts/016_UI/017_UI_PokemonStorage.rb
View File

@@ -34,13 +34,20 @@ class PokemonBoxIcon < IconSprite
icon1 = AnimatedBitmap.new(GameData::Species.icon_filename(headPoke))
icon2 = AnimatedBitmap.new(GameData::Species.icon_filename(bodyPoke))
dexNum = getDexNumberForSpecies(species)
bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
headPokeFileName = GameData::Species.icon_filename(headPoke)
bitmapPath = sprintf("%s.png", bitmapFileName)
IO.copy_stream(headPokeFileName, bitmapPath)
result_icon = AnimatedBitmap.new(bitmapPath)
for i in 0..icon1.width - 1
for j in ((icon1.height / 2) + Settings::FUSION_ICON_SPRITE_OFFSET)..icon1.height - 1
temp = icon2.bitmap.get_pixel(i, j)
icon1.bitmap.set_pixel(i, j, temp)
result_icon.bitmap.set_pixel(i, j, temp)
end
end
return icon1
return result_icon
end
def release