diff --git a/Data/Scripts/001_Technical/005_PluginManager.rb b/Data/Scripts/001_Technical/005_PluginManager.rb index cf7f2b692..eb8f4b437 100644 --- a/Data/Scripts/001_Technical/005_PluginManager.rb +++ b/Data/Scripts/001_Technical/005_PluginManager.rb @@ -644,7 +644,6 @@ module PluginManager # Check if plugins need compiling #----------------------------------------------------------------------------- def self.compilePlugins(order, plugins) - echoln "" echo 'Compiling plugin scripts...' scripts = [] # go through the entire order one by one @@ -680,6 +679,7 @@ module PluginManager self.compilePlugins(order, plugins) if self.needCompiling?(order, plugins) # load plugins scripts = load_data("Data/PluginScripts.rxdata") + echoed_plugins = [] for plugin in scripts # get the required data name, meta, script = plugin @@ -688,7 +688,7 @@ module PluginManager # go through each script and interpret for scr in script # turn code into plaintext - code = Zlib::Inflate.inflate(scr[1]) + code = Zlib::Inflate.inflate(scr[1]).force_encoding(Encoding::UTF_8) # get rid of tabs code.gsub!("\t", " ") # construct filename @@ -697,12 +697,15 @@ module PluginManager # try to run the code begin eval(code, TOPLEVEL_BINDING, fname) + echoln "Loaded plugin: #{name}" if !echoed_plugins.include?(name) + echoed_plugins.push(name) rescue Exception # format error message to display self.pluginErrorMsg(name, sname) Kernel.exit! true end end end + echoln "" if !echoed_plugins.empty? end #----------------------------------------------------------------------------- end diff --git a/Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb b/Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb index 629e2fb97..940303f0c 100644 --- a/Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb +++ b/Data/Scripts/020_Debug/002_Animation editor/005_AnimEditor_Functions.rb @@ -1016,9 +1016,9 @@ def animationEditorMain(animation) if Input.trigger?(Input::BACK) if pbConfirmMessage(_INTL("Save changes?")) save_data(animation,"Data/PkmnAnimations.rxdata") - $PokemonTemp.battleAnims = nil end if pbConfirmMessage(_INTL("Exit from the editor?")) + $PokemonTemp.battleAnims = nil break end end @@ -1113,6 +1113,10 @@ def animationEditorMain(animation) end if sliderwin.changed?(1) # Change frame count pbChangeMaximum(canvas) + if canvas.currentframe >= canvas.animation.length + canvas.currentframe = canvas.animation.length - 1 + sliderwin.controls[0].curvalue = canvas.currentframe + 1 + end sliderwin.refresh end if sliderwin.changed?(2) # Set Animation Sheet diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb index 086dcccfc..0e38652d4 100644 --- a/Data/Scripts/021_Compiler/001_Compiler.rb +++ b/Data/Scripts/021_Compiler/001_Compiler.rb @@ -681,7 +681,6 @@ module Compiler MessageTypes.loadMessageFile("Data/messages.dat") end if mustCompile - echoln "" echoln _INTL("*** Starting full compile ***") echoln "" yield(_INTL("Compiling town map data"))