diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 7967a5432..41edc8e26 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 8e67182ba..826e1e8a6 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 2249bec14..901f2bb2b 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 447c30ec0..a36d05622 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index 004ee903d..be622f513 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index 3e62ba6d2..fe767fa0b 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map095.rxdata b/Data/Map095.rxdata index 376ffd870..202e1bd4b 100644 Binary files a/Data/Map095.rxdata and b/Data/Map095.rxdata differ diff --git a/Data/Map413.rxdata b/Data/Map413.rxdata index e71d7fe5f..19f32ec11 100644 Binary files a/Data/Map413.rxdata and b/Data/Map413.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 1a09d4c49..9fa31c9c1 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts.rxdata b/Data/Scripts.rxdata index 8a325db7f..4a85ad9a7 100644 Binary files a/Data/Scripts.rxdata and b/Data/Scripts.rxdata differ diff --git a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb index ea06207a7..175b51858 100644 --- a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb +++ b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb @@ -419,10 +419,7 @@ def getCustomSpeciesList(allowOnline=true) for i in 0..maxVal path = filesList[i] file = File.basename(path, ".*") - splitPoke = file.split(".") - head = splitPoke[0].to_i - body = splitPoke[1].to_i - fused = (body * NB_POKEMON) + head + fused = getDexNumFromFilename(file) if fused <= maxDexNumber && fused > 0 speciesList << fused end @@ -435,12 +432,26 @@ def getCustomSpeciesList(allowOnline=true) #try to get list from github print "let's try it online bruh" online_list = list_online_custom_sprites - return online_list if online_list !=nil + return nil if !online_list + species_id_list = [] + for file in online_list + species_id_list << getDexNumFromFilename(file) + end + return species_id_list end return speciesList end + +#input: ex: 10.10.png +def getDexNumFromFilename(filename) + splitPoke = filename.split(".") + head = splitPoke[0].to_i + body = splitPoke[1].to_i + return (body * NB_POKEMON) + head +end + # def getCustomSpeciesList() # filesList = Dir["./Graphics/CustomBattlers/*"] # maxDexNumber = (NB_POKEMON * NB_POKEMON) + NB_POKEMON diff --git a/Data/Scripts/050_AddOns/HttpCalls.rb b/Data/Scripts/050_AddOns/HttpCalls.rb index eda1d610b..bc0ec8585 100644 --- a/Data/Scripts/050_AddOns/HttpCalls.rb +++ b/Data/Scripts/050_AddOns/HttpCalls.rb @@ -45,6 +45,7 @@ def download_custom_sprite(head_id, body_id) return nil end +#format: [1.1.png, 1.2.png, etc.] def list_online_custom_sprites repo = "Aegide/custom-fusion-sprites" folder = "CustomBattlers" diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index 61cba7ea2..a45219f5e 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 0f9b4ae5d..868d49e59 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index 6664efc1b..9ca4214f1 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index ec292660a..acaa59516 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index d9bd35260..c7ea19a7a 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ