From 117396f8e2a9e963ff3bf36068d6fb9fbcd51b99 Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Tue, 9 Mar 2021 21:31:17 +0000 Subject: [PATCH] Minor tidying --- .../004_Sprites/003_Sprite_Character.rb | 4 ++-- .../004_Sprites/005_Sprite_SurfBase.rb | 22 +++++++++++-------- .../007_Events and files/001_FileTests.rb | 4 ++-- .../001_BitmapCache.rb | 5 +++-- .../008_AnimatedBitmap.rb | 8 +++---- .../{002_PBStats.rb => 002_Stat.rb} | 0 .../002_PSystem_System.rb | 3 +-- .../003_Debug_MenuExtraCode.rb | 2 +- .../005_AnimEditor_Functions.rb | 10 ++++----- Data/Scripts/021_Debug/008_Editor_Listers.rb | 4 ++-- .../005_Compiler_Sprite renamer.rb | 10 ++++----- 11 files changed, 38 insertions(+), 34 deletions(-) rename Data/Scripts/011_Data/002_Hardcoded data/{002_PBStats.rb => 002_Stat.rb} (100%) diff --git a/Data/Scripts/004_Sprites/003_Sprite_Character.rb b/Data/Scripts/004_Sprites/003_Sprite_Character.rb index dc2de189e..037f2a7cc 100644 --- a/Data/Scripts/004_Sprites/003_Sprite_Character.rb +++ b/Data/Scripts/004_Sprites/003_Sprite_Character.rb @@ -106,7 +106,7 @@ class Sprite_Character < RPG::Sprite @oldbushdepth = @character.bush_depth if @tile_id>=384 @charbitmap.dispose if @charbitmap - @charbitmap = pbGetTileBitmap(@character.map.tileset_name,@tile_id,@character.character_hue) + @charbitmap = pbGetTileBitmap(@character.map.tileset_name,@tile_id,@character_hue) @charbitmapAnimated = false @bushbitmap.dispose if @bushbitmap @bushbitmap = nil @@ -120,7 +120,7 @@ class Sprite_Character < RPG::Sprite else @charbitmap.dispose if @charbitmap @charbitmap = AnimatedBitmap.new( - "Graphics/Characters/"+@character.character_name,@character.character_hue) + "Graphics/Characters/"+@character_name,@character_hue) @charbitmapAnimated = true @bushbitmap.dispose if @bushbitmap @bushbitmap = nil diff --git a/Data/Scripts/004_Sprites/005_Sprite_SurfBase.rb b/Data/Scripts/004_Sprites/005_Sprite_SurfBase.rb index 1d231ef19..d43080558 100644 --- a/Data/Scripts/004_Sprites/005_Sprite_SurfBase.rb +++ b/Data/Scripts/004_Sprites/005_Sprite_SurfBase.rb @@ -1,5 +1,5 @@ class Sprite_SurfBase - attr_reader :visible + attr_reader :visible attr_accessor :event def initialize(sprite,event,viewport=nil) @@ -18,12 +18,12 @@ class Sprite_SurfBase end def dispose - if !@disposed - @sprite.dispose if @sprite - @sprite = nil - @surfbitmap.dispose - @disposed = true - end + return if @disposed + @sprite.dispose if @sprite + @sprite = nil + @surfbitmap.dispose + @divebitmap.dispose + @disposed = true end def disposed? @@ -49,9 +49,13 @@ class Sprite_SurfBase @sprite = Sprite.new(@viewport) if !@sprite if @sprite if $PokemonGlobal.surfing - @sprite.bitmap = @surfbitmap.bitmap; cw = @cws; ch = @chs + @sprite.bitmap = @surfbitmap.bitmap + cw = @cws + ch = @chs elsif $PokemonGlobal.diving - @sprite.bitmap = @divebitmap.bitmap; cw = @cwd; ch = @chd + @sprite.bitmap = @divebitmap.bitmap + cw = @cwd + ch = @chd end sx = @event.pattern_surf*cw sy = ((@event.direction-2)/2)*ch diff --git a/Data/Scripts/007_Events and files/001_FileTests.rb b/Data/Scripts/007_Events and files/001_FileTests.rb index 4b0bf17a6..b2cd65561 100644 --- a/Data/Scripts/007_Events and files/001_FileTests.rb +++ b/Data/Scripts/007_Events and files/001_FileTests.rb @@ -90,7 +90,7 @@ module RTP end def self.getImagePath(filename) - return self.getPath(filename,["",".png",".gif"]) # ".jpg",".bmp",".jpeg" + return self.getPath(filename,["",".png",".gif"]) # ".jpg", ".jpeg", ".bmp" end def self.getAudioPath(filename) @@ -158,7 +158,7 @@ end module FileTest - Image_ext = ['.bmp', '.png', '.jpg', '.jpeg', '.gif'] + Image_ext = ['.png', '.gif'] # '.jpg', '.jpeg', '.bmp', Audio_ext = ['.mp3', '.mid', '.midi', '.ogg', '.wav', '.wma'] def self.audio_exist?(filename) diff --git a/Data/Scripts/009_Objects and windows/001_BitmapCache.rb b/Data/Scripts/009_Objects and windows/001_BitmapCache.rb index d4b62fed2..a1d5435c7 100644 --- a/Data/Scripts/009_Objects and windows/001_BitmapCache.rb +++ b/Data/Scripts/009_Objects and windows/001_BitmapCache.rb @@ -138,7 +138,6 @@ class BitmapWrapper < Bitmap end - module BitmapCache @cache = ObjectSpace::WeakMap.new @@ -154,7 +153,9 @@ module BitmapCache end def self.debug - File.open("bitmapcache2.txt", "wb") { |f| + t = Time.now + filename = t.strftime("%H %M %S.%L.txt") + File.open("bitmapcache_" + filename, "wb") { |f| for i in @cache.keys k = fromCache(i) if !k diff --git a/Data/Scripts/009_Objects and windows/008_AnimatedBitmap.rb b/Data/Scripts/009_Objects and windows/008_AnimatedBitmap.rb index 65264cfec..e309c6940 100644 --- a/Data/Scripts/009_Objects and windows/008_AnimatedBitmap.rb +++ b/Data/Scripts/009_Objects and windows/008_AnimatedBitmap.rb @@ -199,10 +199,10 @@ class GifBitmap filestrName=file+".gif" elsif (filestring=pbGetFileChar(file+".png")) filestrName=file+".png" - elsif (filestring=pbGetFileChar(file+".jpg")) - filestrName=file+".jpg" - elsif (filestring=pbGetFileChar(file+".bmp")) - filestrName=file+".bmp" +# elsif (filestring=pbGetFileChar(file+".jpg")) +# filestrName=file+".jpg" +# elsif (filestring=pbGetFileChar(file+".bmp")) +# filestrName=file+".bmp" end end end diff --git a/Data/Scripts/011_Data/002_Hardcoded data/002_PBStats.rb b/Data/Scripts/011_Data/002_Hardcoded data/002_Stat.rb similarity index 100% rename from Data/Scripts/011_Data/002_Hardcoded data/002_PBStats.rb rename to Data/Scripts/011_Data/002_Hardcoded data/002_Stat.rb diff --git a/Data/Scripts/020_System and utilities/002_PSystem_System.rb b/Data/Scripts/020_System and utilities/002_PSystem_System.rb index 66ec87dfe..070388d8c 100644 --- a/Data/Scripts/020_System and utilities/002_PSystem_System.rb +++ b/Data/Scripts/020_System and utilities/002_PSystem_System.rb @@ -8,8 +8,7 @@ end def pbScreenCapture t = pbGetTimeNow - filestart = t.strftime("[%Y-%m-%d] %H_%M_%S") - filestart = sprintf("%s.%03d", filestart, (t.to_f - t.to_i) * 1000) # milliseconds + filestart = t.strftime("[%Y-%m-%d] %H_%M_%S.%L") # capturefile = RTP.getSaveFileName(sprintf("%s.png", filestart)) # Graphics.snap_to_bitmap.save_to_png(capturefile) capturefile = RTP.getSaveFileName(sprintf("%s.bmp", filestart)) diff --git a/Data/Scripts/021_Debug/001_Debug menus/003_Debug_MenuExtraCode.rb b/Data/Scripts/021_Debug/001_Debug menus/003_Debug_MenuExtraCode.rb index 52eb8291b..95c3c4788 100644 --- a/Data/Scripts/021_Debug/001_Debug menus/003_Debug_MenuExtraCode.rb +++ b/Data/Scripts/021_Debug/001_Debug menus/003_Debug_MenuExtraCode.rb @@ -634,7 +634,7 @@ def pbImportAllAnimations pbSafeCopyFile(audio,RTP.getAudioPath("Audio/SE/Anim/"+File.basename(audio)),"Audio/SE/Anim/"+File.basename(audio)) end images = [] - %w( png jpg bmp gif ).each { |ext| + %w( png gif ).each { |ext| # jpg jpeg bmp upext = ext.upcase images.concat(files.find_all { |f| f[f.length-3,3]==ext }) images.concat(files.find_all { |f| f[f.length-3,3]==upext }) diff --git a/Data/Scripts/021_Debug/002_Animation editor/005_AnimEditor_Functions.rb b/Data/Scripts/021_Debug/002_Animation editor/005_AnimEditor_Functions.rb index 4622076db..1747827f2 100644 --- a/Data/Scripts/021_Debug/002_Animation editor/005_AnimEditor_Functions.rb +++ b/Data/Scripts/021_Debug/002_Animation editor/005_AnimEditor_Functions.rb @@ -582,11 +582,11 @@ def pbSelectBG(canvas,timing) animfiles[cmdErase=animfiles.length]=_INTL("[Erase background graphic]") ret=false pbRgssChdir(File.join("Graphics", "Animations")) { - animfiles.concat(Dir.glob("*.bmp")) - animfiles.concat(Dir.glob("*.png")) - animfiles.concat(Dir.glob("*.jpg")) - animfiles.concat(Dir.glob("*.jpeg")) - animfiles.concat(Dir.glob("*.gif")) + animfiles.concat(Dir.glob("*.png")) + animfiles.concat(Dir.glob("*.gif")) +# animfiles.concat(Dir.glob("*.jpg")) +# animfiles.concat(Dir.glob("*.jpeg")) +# animfiles.concat(Dir.glob("*.bmp")) } cmdwin=pbListWindow(animfiles,320) cmdwin.height=480 diff --git a/Data/Scripts/021_Debug/008_Editor_Listers.rb b/Data/Scripts/021_Debug/008_Editor_Listers.rb index 5c19b9fe0..e976afeda 100644 --- a/Data/Scripts/021_Debug/008_Editor_Listers.rb +++ b/Data/Scripts/021_Debug/008_Editor_Listers.rb @@ -149,12 +149,12 @@ class GraphicsLister Dir.glob("*.PNG") { |f| @commands.push(f) } Dir.glob("*.gif") { |f| @commands.push(f) } Dir.glob("*.GIF") { |f| @commands.push(f) } -# Dir.glob("*.bmp") { |f| @commands.push(f) } -# Dir.glob("*.BMP") { |f| @commands.push(f) } # Dir.glob("*.jpg") { |f| @commands.push(f) } # Dir.glob("*.JPG") { |f| @commands.push(f) } # Dir.glob("*.jpeg") { |f| @commands.push(f) } # Dir.glob("*.JPEG") { |f| @commands.push(f) } +# Dir.glob("*.bmp") { |f| @commands.push(f) } +# Dir.glob("*.BMP") { |f| @commands.push(f) } } @commands.sort! @commands.length.times do |i| diff --git a/Data/Scripts/022_Compiler/005_Compiler_Sprite renamer.rb b/Data/Scripts/022_Compiler/005_Compiler_Sprite renamer.rb index 52e3e7e71..3985de69d 100644 --- a/Data/Scripts/022_Compiler/005_Compiler_Sprite renamer.rb +++ b/Data/Scripts/022_Compiler/005_Compiler_Sprite renamer.rb @@ -79,7 +79,7 @@ module Compiler def convert_pokemon_sprites(src_dir, dest_dir) return if !FileTest.directory?(src_dir) # generates a list of all graphic files - files = readDirectoryFiles(src_dir, ["*.png", "*.gif"]) + files = readDirectoryFiles(src_dir, ["*.png"]) # starts automatic renaming files.each_with_index do |file, i| Graphics.update if i % 100 == 0 @@ -104,7 +104,7 @@ module Compiler def convert_pokemon_icons(src_dir, dest_dir) return if !FileTest.directory?(src_dir) # generates a list of all graphic files - files = readDirectoryFiles(src_dir, ["*.png", "*.gif"]) + files = readDirectoryFiles(src_dir, ["*.png"]) # starts automatic renaming files.each_with_index do |file, i| Graphics.update if i % 100 == 0 @@ -124,7 +124,7 @@ module Compiler def convert_pokemon_footprints(src_dir, dest_dir) return if !FileTest.directory?(src_dir) # generates a list of all graphic files - files = readDirectoryFiles(src_dir, ["*.png", "*.gif"]) + files = readDirectoryFiles(src_dir, ["*.png"]) # starts automatic renaming files.each_with_index do |file, i| Graphics.update if i % 100 == 0 @@ -140,7 +140,7 @@ module Compiler def convert_item_icons(src_dir, dest_dir) return if !FileTest.directory?(src_dir) # generates a list of all graphic files - files = readDirectoryFiles(src_dir, ["*.png", "*.gif"]) + files = readDirectoryFiles(src_dir, ["*.png"]) # starts automatic renaming files.each_with_index do |file, i| Graphics.update if i % 100 == 0 @@ -191,7 +191,7 @@ module Compiler def convert_trainer_sprites(src_dir) return if !FileTest.directory?(src_dir) # generates a list of all graphic files - files = readDirectoryFiles(src_dir, ["*.png", "*.gif"]) + files = readDirectoryFiles(src_dir, ["*.png"]) # starts automatic renaming files.each_with_index do |file, i| Graphics.update if i % 100 == 0