From 48327a61ff0903592e50a2ae88a8bbdacadc3501 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Sun, 19 Nov 2023 10:27:40 -0500 Subject: [PATCH] Fixes sprites not being downloaded before form change --- Data/Map001.rxdata | Bin 39883 -> 39882 bytes Data/MapInfos.rxdata | Bin 43615 -> 43615 bytes .../001_Battler/007_Battler_UseMove.rb | 7 ++++++- Data/Scripts/050_AddOns/FusionSprites.rb | 2 +- Data/Scripts/050_AddOns/GeneralUtils.rb | 1 - Data/Scripts/050_AddOns/HttpCalls.rb | 11 ++++++++--- Data/System.rxdata | Bin 28462 -> 28460 bytes 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Data/Map001.rxdata b/Data/Map001.rxdata index 7690aa580ab9aab65e040274ee91a679b971425e..9f890695af3a8899861f9e250ba996eb3f0ef74f 100644 GIT binary patch literal 39882 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 literal 39883 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 diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 8a377201a0a981e81a3b01037d737d384690706a..df577978ccacef881fc41c028f9bfb86f6bb025c 100644 GIT binary patch delta 16 XcmcbAh3WnkrVX0ujBcB?(oLNKLmmdM delta 16 XcmcbAh3WnkrVX0uj3Jw~(oLNKLvjYZ diff --git a/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb b/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb index 049eb7dfc..37d4395a9 100644 --- a/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb +++ b/Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb @@ -595,10 +595,16 @@ class PokeBattle_Battler end end + def ensure_form_has_sprite(pokemon,spriteform_body,spriteform_head) + GameData::Species.sprite_filename(pokemon.dexNum, spriteform_body,spriteform_head) + end + def changeForm(newForm, formChangingSpecies, animation = "UltraBurst2") spriteform_body = newForm if @pokemon.hasBodyOf?(formChangingSpecies) spriteform_head = newForm if @pokemon.hasHeadOf?(formChangingSpecies) + ensure_form_has_sprite(@pokemon,spriteform_body,spriteform_head) + if self.isFusion? current_form_has_custom = customSpriteExists(@pokemon.species) new_form_has_custom = customSpriteExistsForm(@pokemon.species, spriteform_head, spriteform_body) @@ -607,7 +613,6 @@ class PokeBattle_Battler should_change_sprite=true end - if should_change_sprite @pokemon.spriteform_body = spriteform_body @pokemon.spriteform_head = spriteform_head diff --git a/Data/Scripts/050_AddOns/FusionSprites.rb b/Data/Scripts/050_AddOns/FusionSprites.rb index 9d2651e4f..9bfd7cdda 100644 --- a/Data/Scripts/050_AddOns/FusionSprites.rb +++ b/Data/Scripts/050_AddOns/FusionSprites.rb @@ -298,7 +298,7 @@ def get_fusion_sprite_path(head_id, body_id, spriteform_body = nil, spriteform_h return local_generated_path if pbResolveBitmap(local_generated_path) #Download generated sprite if nothing else found - autogen_path = download_autogen_sprite(head_id, body_id) + autogen_path = download_autogen_sprite(head_id, body_id,spriteform_body,spriteform_head) return autogen_path if pbResolveBitmap(autogen_path) return Settings::DEFAULT_SPRITE_PATH diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb index 710e97bf9..9b7d79def 100644 --- a/Data/Scripts/050_AddOns/GeneralUtils.rb +++ b/Data/Scripts/050_AddOns/GeneralUtils.rb @@ -480,7 +480,6 @@ def customSpriteExistsForm(species,form_id_head=nil, form_id_body=nil) spritename += "_" + form_id_body.to_s if form_id_body pathCustom = _INTL("Graphics/CustomBattlers/indexed/{1}/{2}.png", folder, spritename) - return true if pbResolveBitmap(pathCustom) != nil return download_custom_sprite(head, body,form_id_head,form_id_body) != nil end diff --git a/Data/Scripts/050_AddOns/HttpCalls.rb b/Data/Scripts/050_AddOns/HttpCalls.rb index bce596e56..18a7dac32 100644 --- a/Data/Scripts/050_AddOns/HttpCalls.rb +++ b/Data/Scripts/050_AddOns/HttpCalls.rb @@ -81,11 +81,16 @@ def download_sprite(base_path, head_id, body_id, saveLocation = "Graphics/temp", end end -def download_autogen_sprite(head_id, body_id) +def download_autogen_sprite(head_id, body_id,spriteformBody_suffix=nil,spriteformHead_suffix=nil) return nil if $PokemonSystem.download_sprites != 0 - url = Settings::AUTOGEN_SPRITES_REPO_URL + "{1}/{1}.{2}.png" + template_url = Settings::AUTOGEN_SPRITES_REPO_URL + "{1}/{1}.{2}.png" + + head_id = (head_id.to_s) + "_" + spriteformHead_suffix.to_s if spriteformHead_suffix + body_id = (body_id.to_s) + "_" + spriteformBody_suffix.to_s if spriteformBody_suffix + destPath = _INTL("{1}{2}", Settings::BATTLERS_FOLDER, head_id) - sprite = download_sprite(_INTL(url, head_id, body_id), head_id, body_id, destPath) + url = _INTL(template_url, head_id, body_id) + sprite = download_sprite(url, head_id, body_id, destPath) return sprite if sprite return nil end diff --git a/Data/System.rxdata b/Data/System.rxdata index ea02376d601a02956876ff2d5f1d520f5467a62c..187213d48e541c5d0087ee072af1324fb3052e3e 100644 GIT binary patch delta 25 hcmZ2?k8#aC#tm+g%nZB^n>{6W2Qjj3X3tS)1^{{52k`&^ delta 27 jcmZ2;k8#~S#tm+g%(Jx=HhW6$4q|3H%Cwm^N1Yh}mZ}L%