diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index 57552cb83..166acc0a7 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -31,9 +31,8 @@ module Settings VERSION_FILE_PATH = "Data/VERSION" CUSTOM_SPRITES_FILE_PATH = "Data/CUSTOM_SPRITES" - CREDITS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/sprites/main/Sprite Credits.csv" - SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/CUSTOM_SPRITES" - VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION" + HTTP_CONFIGS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/Scripts/RemoteUrls.rb" + HTTP_CONFIGS_FILE_PATH = "/Data/Scripts/RemoteUrls.rb" FRONTSPRITE_POSITION_OFFSET = 20 FRONTSPRITE_SCALE = 0.6666666666 diff --git a/Data/Scripts/050_AddOns/HttpCalls.rb b/Data/Scripts/050_AddOns/HttpCalls.rb index 42c4f0dbf..ba19ec81a 100644 --- a/Data/Scripts/050_AddOns/HttpCalls.rb +++ b/Data/Scripts/050_AddOns/HttpCalls.rb @@ -66,7 +66,7 @@ def download_sprite(base_path, head_id, body_id, saveLocation = "Graphics/temp", File.open(downloaded_file_name, "wb") do |file| file.write(response[:body]) end - echo _INTL("\nDownloaded file {1} to {2}", downloaded_file_name, saveLocation) + echo _INTL("\nDownloaded file from {1} to {2}", base_path, saveLocation) return downloaded_file_name end return nil @@ -77,7 +77,7 @@ end def download_autogen_sprite(head_id, body_id) return nil if $PokemonSystem.download_sprites != 0 - url = "https://raw.githubusercontent.com/infinitefusion/autogen-fusion-sprites/master/Battlers/{1}/{1}.{2}.png" + url = Settings::AUTOGEN_SPRITES_REPO_URL + "{1}/{1}.{2}.png" 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 @@ -86,7 +86,7 @@ end def download_custom_sprite(head_id, body_id) return nil if $PokemonSystem.download_sprites != 0 - url = "https://raw.githubusercontent.com/infinitefusion/sprites/main/CustomBattlers/{1}.{2}.png" + url = Settings::CUSTOM_SPRITES_REPO_URL + "{1}.{2}.png" destPath = _INTL("{1}{2}", Settings::CUSTOM_BATTLERS_FOLDER_INDEXED, head_id) if !Dir.exist?(destPath) Dir.mkdir(destPath) @@ -98,7 +98,7 @@ def download_custom_sprite(head_id, body_id) end def download_unfused_alt_sprites(dex_num) - base_url = "https://raw.githubusercontent.com/infinitefusion/sprites/main/Other/Base%20Sprites/{1}" + base_url = Settings::BASE_POKEMON_ALT_SPRITES_REPO_URL + "{1}" extension = ".png" destPath = _INTL("{1}", Settings::CUSTOM_BASE_SPRITES_FOLDER) if !Dir.exist?(destPath) @@ -115,7 +115,7 @@ def download_unfused_alt_sprites(dex_num) end def download_alt_sprites(head_id,body_id) - base_url = "https://raw.githubusercontent.com/infinitefusion/sprites/main/CustomBattlers/{1}.{2}" + base_url = Settings::CUSTOM_SPRITES_REPO_URL +"{1}.{2}" extension = ".png" destPath = _INTL("{1}{2}", Settings::CUSTOM_BATTLERS_FOLDER_INDEXED, head_id) if !Dir.exist?(destPath)