rvpacker-txt 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3cdabd3e6867b3a5736a998345b2df35273565179c720c03acfb294bb121644
-  data.tar.gz: dd8ebfa554210a573d6aceef337ae4009759828a6fa53f5d19ad412c936165d0
+  metadata.gz: 7e7d7d8c4329390fb8ffd7bf1f8cf3edaf6f8cd19319ab64d10731a84f021d4b
+  data.tar.gz: d9db81d1f003f20ce10fb1cb064c60cab274980f26c8931e1c98bbfdf4042b58
 SHA512:
-  metadata.gz: 6146633f8ac594f5db5cdc7b9fd1914c3e011e242531f943c2dbcad48c00ee8bda79f06511db125e588be4cc6c6869e3c9bfccc24a7c1820418d4cd7688f5c6d
-  data.tar.gz: db7a233da1abe10a24c0c5180a06f022f46cf07685e33e3a7081ac8dc5082210c14042f7605482c7d5ad99a4efabad870a01c55e0efac3f3ec8249aec998d888
+  metadata.gz: 9ec02c23d5fe3b8a66bc8b858607028d54f04119c4fb1ffa73d947eebf4bcc738d4b7c952e4e107d0783271790282f19b0262f9bfebe0738cd02813edcbae86c
+  data.tar.gz: 2396ac744536f2fc268fa98dd503d81c58df20cc797ef0cbfb77b793a89137828224a834c67b56697d7527d7de82c016cf6d9b87fb89d0bb0c0914284529a83f

data/README.md

@@ -31,13 +31,14 @@ COMMANDS:
 OPTIONS:
     -i, --input-dir DIR              Input directory of RPG Maker project
     -o, --output-dir DIR             Output directory of parsed/written files
-        --disable-processing FILES   Don't process specified files (maps, other, system, plugins)
+        --disable-processing FILES   Don't process specified files (maps, other, system, scripts)
     -s, --shuffle NUM                Shuffle level (1: lines, 2: lines and words)
-        --disable_custom_processing  Disables built-in custom parsing/writing for some games
+        --disable-custom-processing  Disables built-in custom parsing/writing for some games
     -l, --log                        Log information while processing
-    -f, --force                      Force rewrite all files. Cannot be used with --append.
+    -f, --force                      Force rewrite all files. Cannot be used with --append
                                      USE WITH CAUTION!
-    -a, --append                     When you update the rvpacker-txt, you probably should re-read your files with append, as some new text might be added to parser.
+    -a, --append                     When you update the rvpacker-txt, you probably should re-read
+                                     your files with append, as some new text might be added to parser
                                      Cannot be used with --force
     -h, --help                       Show help message
 ```

data/bin/rvpacker-txt

@@ -5,11 +5,9 @@ require 'optparse'
 require 'fileutils'
 
 require 'classes'
-require 'read'
-require 'write'
 
 def self.parse_options
-    options = { disable_processing: Array.new(4, false) }
+    options = { disable_processing: {}, input_dir: './', output_dir: './', shuffle_level: 0 }
 
     OptionParser.new do |cmd|
         cmd.banner = "This tool allows to parse RPG Maker project to .txt files and back.\n\nUsage: rvpacker-txt COMMAND [options]\n\nCOMMANDS:\n    read - Parses RPG Maker game files to .txt\n    write - Writes parsed files back to their initial form\nOPTIONS:\n"
@@ -23,10 +21,11 @@ def self.parse_options
             options[:output_dir] = File.exist?(dir) ? File.realpath(dir) : (raise "#{dir} not found")
         end
 
-        cmd.on('--disable-processing FILES', Array, 'Don\'t process specified files (maps, other, system, plugins)') do |files|
+        cmd.on('--disable-processing FILES', Array, "Don't process specified files (maps, other, system, scripts)") do |files|
             files.each do |file|
-                index = %w[maps other system scripts].index(file)
-                options[:disable_processing][index] = true if index
+                files = %w[maps other system scripts]
+                index = files.index(file)
+                options[:disable_processing][files[index]] = true if index
             end
         end
 
@@ -34,7 +33,7 @@ def self.parse_options
             options[:shuffle_level] = num
         end
 
-        cmd.on('--disable_custom_processing', 'Disables built-in custom parsing/writing for some games') do
+        cmd.on('--disable-custom-processing', 'Disables built-in custom parsing/writing for some games') do
             options[:disable_custom_processing] = true
         end
 
@@ -42,11 +41,11 @@ def self.parse_options
             options[:logging] = true
         end
 
-        cmd.on('-f', '--force', 'Force rewrite all files. Cannot be used with --append.', 'USE WITH CAUTION!') do
+        cmd.on('-f', '--force', 'Force rewrite all files. Cannot be used with --append', 'USE WITH CAUTION!') do
             options[:force] = true
         end
 
-        cmd.on('-a', '--append', 'When you update the rvpacker-txt, you probably should re-read your files with append, as some new text might be added to parser.', 'Cannot be used with --force') do
+        cmd.on('-a', '--append', 'When you update the rvpacker-txt, you probably should re-read', 'your files with append, as some new text might be added to parser', 'Cannot be used with --force') do
             raise '--append cannot be used beside --force.' if options[:force]
             options[:append] = true
         end
@@ -64,6 +63,8 @@ def self.parse_options
     options
 end
 
+# @param [String] system_file_path
+# @return [String, nil]
 def self.get_game_type(system_file_path)
     object = Marshal.load(File.binread(system_file_path))
     game_title = object.instance_variable_get(:@game_title).to_s.downcase
@@ -87,21 +88,17 @@ extensions = { xp: '.rxdata', vx: 'rvdata', ace: 'rvdata2' }
 original_directory = Dir.glob(File.join(input_dir, '{data,original}'), File::FNM_CASEFOLD).first
 raise '"Data" or "original" directory not found within input directory.' unless original_directory
 
-paths = {
-    original_path: original_directory,
-    translation_path: File.join(input_dir, 'translation'),
-    maps_path: File.join(input_dir, 'translation', 'maps'),
-    other_path: File.join(input_dir, 'translation', 'other'),
-    output_path: File.join(output_dir, 'output')
-}
+maps_path = File.join(input_dir, 'translation', 'maps')
+other_path = File.join(input_dir, 'translation', 'other')
 
-paths.each_value { |path| FileUtils.mkdir_p(path) }
+FileUtils.mkdir_p(maps_path)
+FileUtils.mkdir_p(other_path)
 
-engine = extensions.find do |symbol, extension|
-    symbol if File.exist?(File.join(paths[:original_path], "System.#{extension}"))
+engine = extensions.find do |_symbol, extension|
+    File.exist?(File.join(original_directory, "System.#{extension}"))
 end || (raise "Couldn't determine project engine.")
 
-files = Dir.glob("#{paths[:original_path]}/*#{extensions[engine]}")
+files = Dir.glob("#{original_directory}/*#{extensions[engine[0]]}")
 
 maps_files_paths = []
 other_files_paths = []
@@ -110,6 +107,7 @@ scripts_file_path = nil
 
 files.each do |file|
     basename = File.basename(file)
+    next unless basename.end_with?(extensions[engine[0]])
 
     if basename.start_with?(/Map[0-9]/)
         maps_files_paths.push(file)
@@ -122,7 +120,7 @@ files.each do |file|
     end
 end
 
-ini_file_path = File.join(input_dir, "Game.ini")
+ini_file_path = File.join(input_dir, 'Game.ini')
 
 game_type = disable_custom_processing ? nil : get_game_type(system_file_path)
 
@@ -130,7 +128,7 @@ wait_time = 0
 processing_type = if force
                       wait_time_start = Time.now
 
-                      puts "WARNING! You\'re about to forcefully rewrite all your translation files, including _trans files.\nIf you really want to do it, make sure you've made a backup of your _trans files, if you made some changes in them already.\nInput 'Y' to continue."
+                      puts "WARNING! You're about to forcefully rewrite all your translation files, including _trans files.\nIf you really want to do it, make sure you've made a backup of your _trans files, if you made some changes in them already.\nInput 'Y' to continue."
                       exit unless gets.chomp == 'Y'
 
                       wait_time = Time.now - wait_time_start
@@ -142,18 +140,23 @@ processing_type = if force
 puts 'Custom processing for this game is enabled. Use --disable-custom-processing to disable it.' unless game_type.nil?
 
 if options[:action] == 'read'
-    read_map(maps_files_paths, paths[:maps_path], logging, game_type, processing_type) unless disable_processing[0]
-    read_other(other_files_paths, paths[:other_path], logging, game_type, processing_type) unless disable_processing[1]
-    read_system(system_file_path, ini_file_path, paths[:other_path], logging, processing_type) unless disable_processing[2]
-    read_scripts(scripts_file_path, paths[:other_path], logging, processing_type) unless disable_processing[3]
+    require 'read'
+    read_map(maps_files_paths, maps_path, logging, game_type, processing_type) unless disable_processing[:maps]
+    read_other(other_files_paths, other_path, logging, game_type, processing_type) unless disable_processing[:other]
+    read_system(system_file_path, ini_file_path, other_path, logging, processing_type) unless disable_processing[:system]
+    read_scripts(scripts_file_path, other_path, logging, processing_type) unless disable_processing[:scripts]
 else
-    write_map(maps_files_paths, paths[:maps_path], paths[:output_path], shuffle_level, logging, game_type, processing_type) unless disable_processing[0]
-    write_other(other_files_paths, paths[:other_path], paths[:output_path], shuffle_level, logging, game_type, processing_type) unless disable_processing[1]
-    write_system(system_file_path, ini_file_path, paths[:other_path], paths[:output_path], shuffle_level, logging, processing_type) unless disable_processing[2]
-    write_scripts(scripts_file_path, paths[:other_path], paths[:output_path], logging, processing_type) unless disable_processing[3]
+    require 'write'
+    output_path = File.join(output_dir, 'output')
+    FileUtils.mkdir_p(output_path)
+
+    write_map(maps_files_paths, maps_path, output_path, shuffle_level, logging, game_type) unless disable_processing[:maps]
+    write_other(other_files_paths, other_path, output_path, shuffle_level, logging, game_type) unless disable_processing[:other]
+    write_system(system_file_path, ini_file_path, other_path, output_path, shuffle_level, logging) unless disable_processing[:system]
+    write_scripts(scripts_file_path, other_path, output_path, logging) unless disable_processing[:scripts]
 end
 
 $wait_time = 0 if $wait_time.nil?
-end_time = Time.now - start_time - wait_time - $wait_time
+elapsed_time = Time.now - start_time - wait_time - $wait_time
 
-puts "Done in #{end_time}"
+puts "Done in #{elapsed_time}"

data/lib/classes.rb

@@ -21,7 +21,6 @@ DEALINGS IN THE SOFTWARE.
 class Table
     def initialize(bytes)
         @dim, @x, @y, @z, items, *@data = bytes.unpack('L5 S*')
-
         raise 'Size mismatch loading Table from data' unless items == @data.length && @x * @y * @z == items
     end