diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index 4376e60bb..fb4508df0 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -22,7 +22,7 @@ module Settings #Infinite fusion settings NB_POKEMON = 420 CUSTOM_BATTLERS_FOLDER = "Graphics/CustomBattlers/" - CUSTOM_BATTLERS_FOLDER_INDEXED = "Graphics/CustomBattlers/indexed" + CUSTOM_BATTLERS_FOLDER_INDEXED = "Graphics/CustomBattlers/indexed/" BATTLERS_FOLDER = "Graphics/Battlers/" DOWNLOADED_SPRITES_FOLDER = "Graphics/temp/" DEFAULT_SPRITE_PATH = "Graphics/Battlers/Special/000.png" diff --git a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb index 937599121..12f727b3f 100644 --- a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb +++ b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb @@ -104,7 +104,7 @@ class PokeBattle_Battle end ####### -# end of class +# end of class ###### ####methodes utilitaires @@ -401,10 +401,10 @@ end # i = rand(filesList.length-1) # path = filesList[i] # file = File.basename(path, ".*") -# splitPoke = file.split(".") +# splitPoke = file.split(".") # head = splitPoke[0].to_i # body = splitPoke[1].to_i -# return (body*NB_POKEMON)+head +# return (body*NB_POKEMON)+head #end @@ -412,7 +412,7 @@ def getCustomSpeciesList(allowOnline=true) speciesList = [] 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] maxDexNumber = (NB_POKEMON * NB_POKEMON) + NB_POKEMON maxVal = filesList.length - 1 @@ -695,7 +695,7 @@ def replaceRivalStarterIfNecessary(species) end def fixRivalStarter() - #set starter baseform + #set starter baseform if $PokemonGlobal.psuedoBSTHash == nil psuedoHash = Hash.new for i in 0..NB_POKEMON @@ -738,4 +738,3 @@ def fixRivalStarter() pbSet(250, rivalStarter) $game_switches[840] = true end - \ No newline at end of file diff --git a/Data/Scripts/050_AddOns/FusionSprites.rb b/Data/Scripts/050_AddOns/FusionSprites.rb index 1519a12e9..5411d8a26 100644 --- a/Data/Scripts/050_AddOns/FusionSprites.rb +++ b/Data/Scripts/050_AddOns/FusionSprites.rb @@ -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 \ No newline at end of file +end diff --git a/Data/Scripts/050_AddOns/HttpCalls.rb b/Data/Scripts/050_AddOns/HttpCalls.rb index f2a07f3a5..7378ae83d 100644 --- a/Data/Scripts/050_AddOns/HttpCalls.rb +++ b/Data/Scripts/050_AddOns/HttpCalls.rb @@ -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 \ No newline at end of file +end diff --git a/Data/Scripts/050_AddOns/PokedexUtils.rb b/Data/Scripts/050_AddOns/PokedexUtils.rb index 4ca6de402..9c12f1c07 100644 --- a/Data/Scripts/050_AddOns/PokedexUtils.rb +++ b/Data/Scripts/050_AddOns/PokedexUtils.rb @@ -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 diff --git a/Data/Scripts/999_Main/999_Main.rb b/Data/Scripts/999_Main/999_Main.rb index de455ed8e..a5b8b1ebb 100644 --- a/Data/Scripts/999_Main/999_Main.rb +++ b/Data/Scripts/999_Main/999_Main.rb @@ -74,8 +74,8 @@ def sortCustomBattlers() next if filename == '.' or filename == '..' next if !filename.end_with?(".png") headNum = filename.split('.')[0] - oldPath = Settings::CUSTOM_BATTLERS_FOLDER + "/" + filename - newPath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + headNum.to_s + "/" +filename + oldPath = Settings::CUSTOM_BATTLERS_FOLDER + filename + newPath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + headNum.to_s + "/" + filename begin if File.file?(newPath) alreadyExists[oldPath] = newPath