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

2
Data/Scripts/001_Settings.rb
View File

@@ -22,7 +22,7 @@ module Settings
#Infinite fusion settings #Infinite fusion settings
NB_POKEMON = 420 NB_POKEMON = 420
CUSTOM_BATTLERS_FOLDER = "Graphics/CustomBattlers/" CUSTOM_BATTLERS_FOLDER = "Graphics/CustomBattlers/"
CUSTOM_BATTLERS_FOLDER_INDEXED = "Graphics/CustomBattlers/indexed" CUSTOM_BATTLERS_FOLDER_INDEXED = "Graphics/CustomBattlers/indexed/"
BATTLERS_FOLDER = "Graphics/Battlers/" BATTLERS_FOLDER = "Graphics/Battlers/"
DOWNLOADED_SPRITES_FOLDER = "Graphics/temp/" DOWNLOADED_SPRITES_FOLDER = "Graphics/temp/"
DEFAULT_SPRITE_PATH = "Graphics/Battlers/Special/000.png" DEFAULT_SPRITE_PATH = "Graphics/Battlers/Special/000.png"

3
Data/Scripts/025-Randomizer/randomizer gym leader edit.rb
View File

@@ -412,7 +412,7 @@ def getCustomSpeciesList(allowOnline=true)
speciesList = [] speciesList = []
for num in 1..NB_POKEMON for num in 1..NB_POKEMON
path = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + num.to_s + "/*" path = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + num.to_s + "/*"
filesList = Dir[path] filesList = Dir[path]
maxDexNumber = (NB_POKEMON * NB_POKEMON) + NB_POKEMON maxDexNumber = (NB_POKEMON * NB_POKEMON) + NB_POKEMON
maxVal = filesList.length - 1 maxVal = filesList.length - 1
@@ -738,4 +738,3 @@ def fixRivalStarter()
pbSet(250, rivalStarter) pbSet(250, rivalStarter)
$game_switches[840] = true $game_switches[840] = true
end end

4
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) filename = sprintf("%s.png", dex_number)
normal_path = Settings::BATTLERS_FOLDER + folder + "/" + filename 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 normal_path if pbResolveBitmap(normal_path)
return lightmode_path return lightmode_path
end end
@@ -203,7 +203,7 @@ end
def get_fusion_sprite_path(head_id,body_id) def get_fusion_sprite_path(head_id,body_id)
#Try local custom sprite #Try local custom sprite
filename = sprintf("%s.%s.png", head_id, body_id) 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) return local_custom_path if pbResolveBitmap(local_custom_path)
#Try to download custom sprite if none found locally #Try to download custom sprite if none found locally

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

@@ -34,7 +34,7 @@ end
def download_autogen_sprite(head_id, body_id) def download_autogen_sprite(head_id, body_id)
return nil if $PokemonSystem.download_sprites != 0 return nil if $PokemonSystem.download_sprites != 0
url = "https://raw.githubusercontent.com/Aegide/autogen-fusion-sprites/master/Battlers/{1}/{1}.{2}.png" 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) sprite = download_sprite(_INTL(url,head_id,body_id),head_id,body_id,destPath)
return sprite if sprite return sprite if sprite
return nil return nil
@@ -44,7 +44,7 @@ def download_custom_sprite(head_id, body_id)
return nil if $PokemonSystem.download_sprites != 0 return nil if $PokemonSystem.download_sprites != 0
#base_path = "https://raw.githubusercontent.com/Aegide/custom-fusion-sprites/main/CustomBattlers/{1}.{2}.png" #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" 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) sprite = download_sprite(_INTL(url,head_id,body_id),head_id,body_id,destPath)
return sprite if sprite return sprite if sprite
return nil return nil

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

@@ -14,12 +14,12 @@ class PokedexUtils
head_id = getHeadID(species, body_id) head_id = getHeadID(species, body_id)
baseFilename = head_id.to_s + "." + body_id.to_s 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) if pbResolveBitmap(baseFilePath)
ret << baseFilePath ret << baseFilePath
end end
POSSIBLE_ALTS.each { |alt_letter| 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) if pbResolveBitmap(altFilePath)
ret << altFilePath ret << altFilePath
end end

4
Data/Scripts/999_Main/999_Main.rb
View File

@@ -74,8 +74,8 @@ def sortCustomBattlers()
next if filename == '.' or filename == '..' next if filename == '.' or filename == '..'
next if !filename.end_with?(".png") next if !filename.end_with?(".png")
headNum = filename.split('.')[0] headNum = filename.split('.')[0]
oldPath = Settings::CUSTOM_BATTLERS_FOLDER + "/" + filename oldPath = Settings::CUSTOM_BATTLERS_FOLDER + filename
newPath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + headNum.to_s + "/" +filename newPath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + headNum.to_s + "/" + filename
begin begin
if File.file?(newPath) if File.file?(newPath)
alreadyExists[oldPath] = newPath alreadyExists[oldPath] = newPath