Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases

Data/Scripts/001_Settings.rb

@@ -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.3.0.5"
+  GAME_VERSION_NUMBER = "5.3.0.6"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

Data/Scripts/013_Items/004_1_PokeradarUI.rb

@@ -116,8 +116,8 @@ class PokeRadar_UI
     bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
     headPokeFileName = GameData::Species.icon_filename(headPoke)
     bitmapPath = sprintf("%s.png", bitmapFileName)
-    IO.copy_stream(headPokeFileName, bitmapPath)
+    generated_new_icon = generateFusionIcon(headPokeFileName,bitmapPath)
-    result_bitmap = AnimatedBitmap.new(bitmapPath)
+    result_bitmap = generated_new_icon ? AnimatedBitmap.new(bitmapPath) : bitmap1
 
     for i in 0..bitmap1.width-1
       for j in ((bitmap1.height / 2) + Settings::FUSION_ICON_SPRITE_OFFSET)..bitmap1.height-1

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

@@ -191,8 +191,8 @@ class PokemonIconSprite < SpriteWrapper
     bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
     headPokeFileName = GameData::Species.icon_filename(headPoke)
     bitmapPath = sprintf("%s.png", bitmapFileName)
-    IO.copy_stream(headPokeFileName, bitmapPath)
+    generated_new_icon = generateFusionIcon(headPokeFileName,bitmapPath)
-    result_icon = AnimatedBitmap.new(bitmapPath)
+    result_icon = generated_new_icon ? AnimatedBitmap.new(bitmapPath) : icon1
 
     for i in 0..icon1.width-1
       for j in ((icon1.height / 2) + Settings::FUSION_ICON_SPRITE_OFFSET)..icon1.height-1

Data/Scripts/016_UI/017_UI_PokemonStorage.rb

@@ -38,8 +38,8 @@ class PokemonBoxIcon < IconSprite
     bitmapFileName = sprintf("Graphics/Pokemon/FusionIcons/icon%03d", dexNum)
     headPokeFileName = GameData::Species.icon_filename(headPoke)
     bitmapPath = sprintf("%s.png", bitmapFileName)
-    IO.copy_stream(headPokeFileName, bitmapPath)
+    generated_new_icon = generateFusionIcon(headPokeFileName,bitmapPath)
-    result_icon = AnimatedBitmap.new(bitmapPath)
+    result_icon = generated_new_icon ? AnimatedBitmap.new(bitmapPath) : icon1
 
     for i in 0..icon1.width - 1
       for j in ((icon1.height / 2) + Settings::FUSION_ICON_SPRITE_OFFSET)..icon1.height - 1
@@ -1572,6 +1572,14 @@ class PokemonStorageScene
     end
     pbDrawTextPositions(overlay, textstrings)
     @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_y = Settings::FRONTSPRITE_SCALE
+    end
   end
 
   def update

Data/Scripts/050_AddOns/GeneralUtils.rb

@@ -47,6 +47,14 @@ def pbAddPokemonID(pokemon_id, level = 1, see_form = true, skip_randomize = fals
   return true
 end
 
+def generateFusionIcon(dexNum, path)
+  begin
+    IO.copy_stream(dexNum, path)
+    return true
+  rescue
+    return false
+  end
+end
 
 def ensureFusionIconExists
   directory_name = "Graphics/Pokemon/FusionIcons"
@@ -85,7 +93,6 @@ def pbHasSpecies?(species)
   return false
 end
 
-
 #ancienne methode qui est encore callée un peu partout dans les vieux scripts
 def getID(pbspecies_unused, species)
   if species.is_a?(String)
@@ -96,6 +103,7 @@ def getID(pbspecies_unused,species)
     id = species.dexNum
   end
 end
+
 #Check if the Pokemon can learn a TM
 def CanLearnMove(pokemon, move)
   species = getID(PBSpecies, pokemon)
@@ -138,8 +146,6 @@ def getDexNumberForSpecies(species)
   return dexNum
 end
 
-
-
 def getPokemon(dexNum)
   return GameData::Species.get(dexNum)
 end
@@ -152,7 +158,6 @@ def getSpeciesIdForFusion(head_id, body_id)
   return (body_id) * Settings::NB_POKEMON + head_id
 end
 
-
 #shortcut for using in game events because of script characters limit
 def dexNum(species)
   return getDexNumberForSpecies(species)
@@ -162,7 +167,6 @@ def isTripleFusion?(num)
   return num >= Settings::ZAPMOLCUNO_NB
 end
 
-
 def getRandomCustomFusionForIntro(returnRandomPokemonIfNoneFound = true, customPokeList = [], maxPoke = -1, recursionLimit = 3)
   if customPokeList.length == 0
     customPokeList = getCustomSpeciesList(false)
@@ -191,7 +195,6 @@ def getRandomCustomFusionForIntro(returnRandomPokemonIfNoneFound = true, customP
   return randPoke
 end
 
-
 def addShinyStarsToGraphicsArray(imageArray, xPos, yPos, shinyBody, shinyHead, debugShiny, srcx = nil, srcy = nil, width = nil, height = nil,
                                  showSecondStarUnder = false, showSecondStarAbove = false)
   color = debugShiny ? Color.new(0, 0, 0, 255) : nil
@@ -235,7 +238,6 @@ def getRandomCustomFusion(returnRandomPokemonIfNoneFound = true, customPokeList
   return randPoke
 end
 
-
 def getBodyID(species)
   dexNum = getDexNumberForSpecies(species)
   if dexNum % NB_POKEMON == 0
@@ -409,10 +411,6 @@ def obtainPokemonSpritePath(id, includeCustoms = true)
   return obtainPokemonSpritePath(body, head, includeCustoms)
 end
 
-
-
-
-
 def obtainPokemonSpritePath(bodyId, headId, include_customs = true)
   download_pokemon_sprite_if_missing(bodyId, headId)
   picturePath = _INTL("Graphics/Battlers/{1}/{1}.{2}.png", headId, bodyId)
@@ -443,7 +441,6 @@ def checkIfCustomSpriteExistsByPath(path)
   return true if pbResolveBitmap(path) != nil
 end
 
-
 def customSpriteExistsBodyHead(body, head)
   pathCustom = getCustomSpritePath(body, head)
 
@@ -562,8 +559,6 @@ def Kernel.getItemNamesAsString(list)
   return strList
 end
 
-
-
 def Kernel.getPlateType(item)
   return :FIGHTING if item == PBItems::FISTPLATE
   return :FLYING if item == PBItems::SKYPLATE
@@ -584,6 +579,7 @@ def Kernel.getPlateType(item)
   return :FAIRY if item == PBItems::PIXIEPLATE
   return -1
 end
+
 def get_default_moves_at_level(species, level)
   moveset = GameData::Species.get(species).moves
   knowable_moves = []
@@ -604,7 +600,6 @@ def get_default_moves_at_level(species,level)
   return moves
 end
 
-
 def find_newer_available_version
   latest_Version = fetch_latest_game_version
   return nil if !latest_Version
@@ -644,13 +639,11 @@ def change_game_difficulty(down_only=false)
   message = "The game is currently on " + get_difficulty_text() + " difficulty."
   pbMessage(message)
 
-
   choice_easy = "Easy"
   choice_normal = "Normal"
   choice_hard = "Hard"
   choice_cancel = "Cancel"
 
-
   available_difficulties = []
   currentDifficulty = get_current_game_difficulty
   if down_only