Updated to mkxp-z v2.2.3 (removed mp3 support)

This commit is contained in:
Maruno17
2021-11-02 21:14:31 +00:00
parent 5ad9f60d61
commit 50d999e7da
10 changed files with 35 additions and 49 deletions

View File

@@ -1,4 +1,4 @@
# Using mkxp-z v2.2.1 - https://gitlab.com/mkxp-z/mkxp-z/-/releases/v2.2.1
# Using mkxp-z v2.2.3 - https://gitlab.com/mkxp-z/mkxp-z/-/releases/v2.2.3
$VERBOSE = nil
Font.default_shadow = false if Font.respond_to?(:default_shadow)
Graphics.frame_rate = 40

View File

@@ -108,8 +108,8 @@ end
def pbResolveAudioSE(file)
return nil if !file
if RTP.exists?("Audio/SE/"+file,["",".wav",".mp3",".ogg"])
return RTP.getPath("Audio/SE/"+file,["",".wav",".mp3",".ogg"])
if RTP.exists?("Audio/SE/" + file, ["", ".wav", ".ogg"]) # ".mp3"
return RTP.getPath("Audio/SE/" + file, ["", ".wav", ".ogg"]) # ".mp3"
end
return nil
end
@@ -196,7 +196,7 @@ module RTP
end
def self.getAudioPath(filename)
return self.getPath(filename,["",".mp3",".wav",".wma",".mid",".ogg",".midi"])
return self.getPath(filename,["",".wav",".wma",".mid",".ogg",".midi"]) # ".mp3"
end
def self.getPath(filename,extensions=[])
@@ -261,7 +261,7 @@ end
module FileTest
Image_ext = ['.png', '.gif'] # '.jpg', '.jpeg', '.bmp',
Audio_ext = ['.mp3', '.mid', '.midi', '.ogg', '.wav', '.wma']
Audio_ext = ['.mid', '.midi', '.ogg', '.wav', '.wma'] # '.mp3'
def self.audio_exist?(filename)
return RTP.exists?(filename,Audio_ext)

View File

@@ -96,8 +96,8 @@ class PokemonJukeboxScreen
pbPlayDecisionSE
files = [_INTL("(Default)")]
Dir.chdir("Audio/BGM/") {
Dir.glob("*.mp3") { |f| files.push(f) }
Dir.glob("*.MP3") { |f| files.push(f) }
# Dir.glob("*.mp3") { |f| files.push(f) }
# Dir.glob("*.MP3") { |f| files.push(f) }
Dir.glob("*.ogg") { |f| files.push(f) }
Dir.glob("*.OGG") { |f| files.push(f) }
Dir.glob("*.wav") { |f| files.push(f) }

View File

@@ -519,7 +519,7 @@ def pbSelectSE(canvas,audio)
ret=false
pbRgssChdir(File.join("Audio", "SE", "Anim")) {
animfiles.concat(Dir.glob("*.wav"))
animfiles.concat(Dir.glob("*.mp3"))
# animfiles.concat(Dir.glob("*.mp3"))
animfiles.concat(Dir.glob("*.ogg"))
animfiles.concat(Dir.glob("*.wma"))
}
@@ -553,7 +553,7 @@ def pbSelectSE(canvas,audio)
end
if maxsizewindow.changed?(5) # OK
filename = File.basename(filename,".wav")
filename = File.basename(filename,".mp3")
# filename = File.basename(filename,".mp3")
filename = File.basename(filename,".ogg")
filename = File.basename(filename,".wma")
audio.name=filename

View File

@@ -614,7 +614,7 @@ def pbImportAllAnimations
Graphics.update
audios = []
files = Dir.glob(folder+"/*.*")
%w( wav ogg mid wma mp3 ).each { |ext|
%w( wav ogg mid wma ).each { |ext| # mp3
upext = ext.upcase
audios.concat(files.find_all { |f| f[f.length-3,3]==ext })
audios.concat(files.find_all { |f| f[f.length-3,3]==upext })

View File

@@ -221,8 +221,8 @@ class MusicFileLister
folder = (@bgm) ? "Audio/BGM/" : "Audio/ME/"
@commands.clear
Dir.chdir(folder) {
Dir.glob("*.mp3") { |f| @commands.push(f) }
Dir.glob("*.MP3") { |f| @commands.push(f) }
# Dir.glob("*.mp3") { |f| @commands.push(f) }
# Dir.glob("*.MP3") { |f| @commands.push(f) }
Dir.glob("*.ogg") { |f| @commands.push(f) }
Dir.glob("*.OGG") { |f| @commands.push(f) }
Dir.glob("*.wav") { |f| @commands.push(f) }