climbing gear + autosave fix

This commit is contained in:
infinitefusion
2022-11-30 17:54:33 -05:00
parent 7cd9760adf
commit 28c9c4ada2
17 changed files with 19 additions and 18 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -22,6 +22,7 @@ module Settings
#Infinite fusion settings
NB_POKEMON = 420
CUSTOM_BATTLERS_FOLDER = "Graphics/CustomBattlers/"
CUSTOM_BATTLERS_FOLDER_INDEXED = "Graphics/CustomBattlers/indexed"
BATTLERS_FOLDER = "Graphics/Battlers/"
FRONTSPRITE_POSITION_OFFSET = 20
FRONTSPRITE_SCALE = 0.6666666

View File

@@ -97,20 +97,20 @@ class PokeBattle_Scene
when 2 then time = "night"
end
# Put everything together into backdrop, bases and message bar filenames
backdropFilename = @battle.backdrop
baseFilename = @battle.backdrop
baseFilename = sprintf("%s_%s",baseFilename,@battle.backdropBase) if @battle.backdropBase
messageFilename = @battle.backdrop
backdropFilename = @battle.backdrop.downcase
baseFilename = @battle.backdrop.downcase
baseFilename = sprintf("%s_%s",baseFilename,@battle.backdropBase).downcase if @battle.backdropBase
messageFilename = @battle.backdrop.downcase
if time
trialName = sprintf("%s_%s",backdropFilename,time)
trialName = sprintf("%s_%s",backdropFilename,time).downcase
if pbResolveBitmap(sprintf("Graphics/Battlebacks/"+trialName+"_bg"))
backdropFilename = trialName
end
trialName = sprintf("%s_%s",baseFilename,time)
trialName = sprintf("%s_%s",baseFilename,time).downcase
if pbResolveBitmap(sprintf("Graphics/Battlebacks/"+trialName+"_base0"))
baseFilename = trialName
end
trialName = sprintf("%s_%s",messageFilename,time)
trialName = sprintf("%s_%s",messageFilename,time).downcase
if pbResolveBitmap(sprintf("Graphics/Battlebacks/"+trialName+"_message"))
messageFilename = trialName
end
@@ -119,7 +119,7 @@ class PokeBattle_Scene
@battle.backdropBase
baseFilename = @battle.backdropBase
if time
trialName = sprintf("%s_%s",baseFilename,time)
trialName = sprintf("%s_%s",baseFilename,time).downcase
if pbResolveBitmap(sprintf("Graphics/Battlebacks/"+trialName+"_base0"))
baseFilename = trialName
end

View File

@@ -27,6 +27,7 @@ end
def Kernel.tryAutosave()
return if !$Trainer.save_slot
Kernel.Autosave if $game_switches[AUTOSAVE_ENABLED_SWITCH]
end

View File

@@ -176,7 +176,7 @@ module GameData
filename = sprintf("%s.%s.png", head_id, body_id)
end
end
customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER + "/" + head_id.to_s + "/" +filename)
customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + head_id.to_s + "/" +filename)
species = getSpecies(dex_number)
use_custom = customPath && !species.always_use_generated
if use_custom

View File

@@ -106,7 +106,7 @@ BATTLERSPATH = "Battlers"
def GetSpritePath(poke1, poke2, isFused)
#Check if custom exists
spritename = GetSpriteName(poke1, poke2, isFused)
pathCustom = sprintf("Graphics/%s/%s/%s.png", DOSSIERCUSTOMSPRITES,poke2, spritename)
pathCustom = sprintf("Graphics/%s/indexed/%s/%s.png", DOSSIERCUSTOMSPRITES,poke2, spritename)
pathReg = sprintf("Graphics/%s/%s/%s.png", BATTLERSPATH, poke2, spritename)
path = pbResolveBitmap(pathCustom) && $game_variables[196] == 0 ? pathCustom : pathReg
return path
@@ -116,7 +116,7 @@ end
def GetSpritePathForced(poke1, poke2, isFused)
#Check if custom exists
spritename = GetSpriteName(poke1, poke2, isFused)
pathCustom = sprintf("Graphics/%s/%s.png", DOSSIERCUSTOMSPRITES, spritename)
pathCustom = sprintf("Graphics/%s/indexed/%s/%s.png", DOSSIERCUSTOMSPRITES, poke2, spritename)
pathReg = sprintf("Graphics/%s/%s/%s.png", BATTLERSPATH, poke2, spritename)
path = pbResolveBitmap(pathCustom) ? pathCustom : pathReg
return path

View File

@@ -23,22 +23,21 @@ def mainFunction
end
def sortCustomBattlers()
customBattlersFolder = 'Graphics/CustomBattlers'
echo "Sorting CustomBattlers files..."
Dir.foreach(customBattlersFolder) do |filename|
Dir.foreach(Settings::CUSTOM_BATTLERS_FOLDER) do |filename|
next if filename == '.' or filename == '..'
next if !filename.end_with?(".png")
headNum = filename.split('.')[0]
oldPath = customBattlersFolder + "/" + filename
newPath = customBattlersFolder + "/" + headNum.to_s + "/" +filename
echo "\n"
echo "Sorted " + filename + " into " + newPath
oldPath = Settings::CUSTOM_BATTLERS_FOLDER + "/" + filename
newPath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + headNum.to_s + "/" +filename
begin
File.rename(oldPath, newPath)
echo "\nSorted " + filename + " into " + newPath
rescue
echo "Could not sort "+ filename
echo "\nCould not sort "+ filename
end
end
echo "\nFinished sorting"
end

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 B