mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-07 13:15:01 +00:00
Improved console messages when compiling didn't happen, egg crack graphics are now found in the same way as egg graphics
This commit is contained in:
@@ -627,7 +627,11 @@ module PluginManager
|
||||
# get the order of plugins to interpret
|
||||
order, plugins = self.getPluginOrder
|
||||
# compile if necessary
|
||||
self.compilePlugins(order, plugins) if self.needCompiling?(order, plugins)
|
||||
if self.needCompiling?(order, plugins)
|
||||
self.compilePlugins(order, plugins)
|
||||
else
|
||||
Console.echoln_li "Plugins were not compiled."
|
||||
end
|
||||
# load plugins
|
||||
scripts = load_data("Data/PluginScripts.rxdata")
|
||||
echoed_plugins = []
|
||||
|
||||
@@ -57,6 +57,11 @@ module GameData
|
||||
return (ret) ? ret : pbResolveBitmap("Graphics/Pokemon/Eggs/000")
|
||||
end
|
||||
|
||||
def self.egg_cracks_sprite_filename(species, form)
|
||||
ret = self.check_egg_graphic_file("Graphics/Pokemon/Eggs/", species, form, "_cracks")
|
||||
return (ret) ? ret : pbResolveBitmap("Graphics/Pokemon/Eggs/000_cracks")
|
||||
end
|
||||
|
||||
def self.sprite_filename(species, form = 0, gender = 0, shiny = false, shadow = false, back = false, egg = false)
|
||||
return self.egg_sprite_filename(species, form) if egg
|
||||
return self.back_sprite_filename(species, form, gender, shiny, shadow) if back
|
||||
|
||||
@@ -28,9 +28,7 @@ class PokemonEggHatch_Scene
|
||||
@pokemon.form, @pokemon.shiny?,
|
||||
false, false, true) # Egg sprite
|
||||
# Load egg cracks bitmap
|
||||
crackfilename = sprintf("Graphics/Pokemon/Eggs/%s_cracks", @pokemon.species)
|
||||
crackfilename = sprintf("Graphics/Pokemon/Eggs/000_cracks") if !pbResolveBitmap(crackfilename)
|
||||
crackfilename = pbResolveBitmap(crackfilename)
|
||||
crackfilename = GameData::Species.egg_cracks_sprite_filename(@pokemon.species, @pokemon.form)
|
||||
@hatchSheet = AnimatedBitmap.new(crackfilename)
|
||||
# Create egg cracks sprite
|
||||
@sprites["hatch"] = Sprite.new(@viewport)
|
||||
|
||||
@@ -778,9 +778,12 @@ module Compiler
|
||||
end
|
||||
|
||||
def compile_all(mustCompile)
|
||||
return if !mustCompile
|
||||
if !mustCompile
|
||||
Console.echo_h1(_INTL("Game did not compile data"))
|
||||
return
|
||||
end
|
||||
FileLineData.clear
|
||||
Console.echo_h1 _INTL("Starting full compile")
|
||||
Console.echo_h1 _INTL("Compiling all data")
|
||||
compile_pbs_files
|
||||
compile_animations
|
||||
compile_trainer_events(mustCompile)
|
||||
@@ -793,7 +796,7 @@ module Compiler
|
||||
System.reload_cache
|
||||
Console.echo_done(true)
|
||||
echoln ""
|
||||
Console.echo_h2("Successfully fully compiled", text: :green)
|
||||
Console.echo_h2("Successfully compiled all data", text: :green)
|
||||
end
|
||||
|
||||
def main
|
||||
|
||||
Reference in New Issue
Block a user