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

Fixed inconsistency in

Browse Source 
Data/Scripts/001_Settings.rb sprite folder paths
and modified all references to these constants
to match the new convention. These paths will now
always contain the ending slash.
This commit is contained in:
Samppa Alatalo
2023-03-20 01:48:32 +02:00
parent 3849fac249
commit 579daa126d
6 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/050_AddOns/FusionSprites.rb
View File

@@ -195,7 +195,7 @@ def get_unfused_sprite_path(dex_number)
filename = sprintf("%s.png", dex_number)
normal_path = Settings::BATTLERS_FOLDER + folder + "/" + filename
lightmode_path = Settings::BATTLERS_FOLDER + filename
lightmode_path = Settings::BATTLERS_FOLDER + filename
return normal_path if pbResolveBitmap(normal_path)
return lightmode_path
end
@@ -203,7 +203,7 @@ end
def get_fusion_sprite_path(head_id,body_id)
#Try local custom sprite
filename = sprintf("%s.%s.png", head_id, body_id)
local_custom_path = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + head_id.to_s + "/" +filename
local_custom_path = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + head_id.to_s + "/" +filename
return local_custom_path if pbResolveBitmap(local_custom_path)
#Try to download custom sprite if none found locally
@@ -219,4 +219,4 @@ def get_fusion_sprite_path(head_id,body_id)
return autogen_path if pbResolveBitmap(autogen_path)
return Settings::DEFAULT_SPRITE_PATH
end
end

6
Data/Scripts/050_AddOns/HttpCalls.rb
View File

@@ -34,7 +34,7 @@ end
def download_autogen_sprite(head_id, body_id)
return nil if $PokemonSystem.download_sprites != 0
url = "https://raw.githubusercontent.com/Aegide/autogen-fusion-sprites/master/Battlers/{1}/{1}.{2}.png"
destPath = _INTL("{1}/{2}",Settings::BATTLERS_FOLDER,head_id)
destPath = _INTL("{1}{2}",Settings::BATTLERS_FOLDER,head_id)
sprite = download_sprite(_INTL(url,head_id,body_id),head_id,body_id,destPath)
return sprite if sprite
return nil
@@ -44,7 +44,7 @@ def download_custom_sprite(head_id, body_id)
return nil if $PokemonSystem.download_sprites != 0
#base_path = "https://raw.githubusercontent.com/Aegide/custom-fusion-sprites/main/CustomBattlers/{1}.{2}.png"
url = "https://raw.githubusercontent.com/infinitefusion/sprites/main/CustomBattlers/{1}.{2}.png"
destPath= _INTL("{1}/{2}",Settings::CUSTOM_BATTLERS_FOLDER_INDEXED,head_id)
destPath= _INTL("{1}{2}",Settings::CUSTOM_BATTLERS_FOLDER_INDEXED,head_id)
sprite = download_sprite(_INTL(url,head_id,body_id),head_id,body_id,destPath)
return sprite if sprite
return nil
@@ -64,4 +64,4 @@ def list_online_custom_sprites
# api_url = "https://api.github.com/repos/#{repo}/contents/#{folder}"
# response = HTTPLite.get(api_url)
# return HTTPLite::JSON.parse(response[:body]).map { |file| file['name'] }
end
end

4
Data/Scripts/050_AddOns/PokedexUtils.rb
View File

@@ -14,12 +14,12 @@ class PokedexUtils
head_id = getHeadID(species, body_id)
baseFilename = head_id.to_s + "." + body_id.to_s
baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + head_id.to_s + "/" + baseFilename + ".png"
baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + head_id.to_s + "/" + baseFilename + ".png"
if pbResolveBitmap(baseFilePath)
ret << baseFilePath
end
POSSIBLE_ALTS.each { |alt_letter|
altFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + head_id.to_s + "/" + baseFilename + alt_letter + ".png"
altFilePath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + head_id.to_s + "/" + baseFilename + alt_letter + ".png"
if pbResolveBitmap(altFilePath)
ret << altFilePath
end