rvpacker-txt 1.8.2 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa47130be6188bd6cc7e662a705d3967640b9c20d359d6f1004cd8f87567c6fa
-  data.tar.gz: 73107db4657b4f2790c6b1bbcbec6784c244729218eb9b0a26565a2371b3f985
+  metadata.gz: b61d150da547df7d50d3920d89812ccbd4f238fd49b17524693ac78870018818
+  data.tar.gz: 8bdcf3ec6fef656d1b8e883a485f29d9ff56466c53bfbb1d5208adee13fb218d
 SHA512:
-  metadata.gz: 1ca284ed2546b82c36113e324c246af68d3f61f7365ee8a37dd6559dba81ef612027160e957935435e20532c36fe184ad4cb791bc389fb8f6a607f84eb489537
-  data.tar.gz: 578030edf1a599864badba6f4ae5ba889d721aa5644731a7a462c438023fb5f5795543c7ccafd3468e8140243767523eb0dad8fecbfe5eafc42dae3fbaaa5f87
+  metadata.gz: 6fe8e5c012762b40c85b843f428b966d24fadd5129fce757ce8f164f0779c27affda5959e85914f0d3e98dd920a85c4b50a4384004685558e6d2bd032b3916eb
+  data.tar.gz: b36cd1b4af5a0ec1e0fccfd520472ecc4596ac6a93bc88d30c51170f690d4269bd8bb0d9d0414b26b16e3301fec7b78943202b826bd2d91f6cff4faafc24d815

data/bin/rvpacker-txt

@@ -24,12 +24,12 @@ def self.parse_options
         cmd.on('--disable-processing FILES', Array, "Don't process specified files (maps, other, system, scripts)") do |files|
             files.each do |file|
                 files = %w[maps other system scripts]
-                index = files.index(file)
+                index = files.find_index(file)
                 options[:disable_processing][files[index]] = true if index
             end
         end
 
-        cmd.on('-s', '--shuffle NUM', Integer, 'Shuffle level (1: lines, 2: lines and words)') do |num|
+        cmd.on('-s', '--shuffle NUM', Integer, 'Shuffle level when writing (1: lines, 2: lines and words)') do |num|
             options[:shuffle_level] = num
         end
 
@@ -45,9 +45,10 @@ def self.parse_options
             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
-            raise '--append cannot be used beside --force.' if options[:force]
+        cmd.on('-a', '--append', "When the rvpacker-txt or the game which files you've parsed receives an update,",
+               'you probably should re-read game files with --append, which will append any new text to your files without overwriting the progress',
+               'Cannot be used with --force') do
+            raise '--append cannot be used with --force.' if options[:force]
             options[:append] = true
         end
 
@@ -95,9 +96,8 @@ other_path = File.join(input_dir, 'translation', 'other')
 FileUtils.mkdir_p(maps_path)
 FileUtils.mkdir_p(other_path)
 
-engine = extensions.each do |symbol, extension|
-    break symbol if File.exist?(File.join(original_directory, "System.#{extension}"))
-end || (raise "Couldn't determine project engine.")
+engine = extensions.each { |sym, ext| break sym if File.exist?(File.join(original_directory, "System.#{ext}")) } ||
+    (raise "Couldn't determine project engine.")
 
 files = Dir.glob("#{original_directory}/*#{extensions[engine]}")
 
@@ -129,7 +129,9 @@ 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.",
+                           "If 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.",
+                           "Input 'Y' to continue."
                       exit unless gets.chomp == 'Y'
 
                       wait_time = Time.now - wait_time_start

data/lib/read.rb

@@ -75,8 +75,9 @@ def self.parse_parameter(code, parameter, game_type)
             when 401, 405
                 case game_type
                     when 'lisa'
-                        match = parameter.scan(/^(\\et\[[0-9]+\]|\\nbt)/)
-                        parameter = parameter.slice((match[0].length)..) unless match.empty?
+                        match = parameter.scan(/^\\et\[[0-9]+\]/)
+                        match = parameter.scan(/^\\nbt/) if match.empty?
+                        parameter = parameter[match[0].length..] unless match.empty?
                     else
                         nil
                 end
@@ -93,23 +94,15 @@ def self.parse_parameter(code, parameter, game_type)
 end
 
 # @param [String] variable
-# @param [String] game_type
+# @param [String] _game_type
 # @return [String]
-def self.parse_variable(variable, game_type)
-    unless game_type.nil?
-        lines_count = variable.count("\n")
+def self.parse_variable(variable, _game_type)
+    variable = variable.gsub(/\r?\n/, '\#') if variable.count("\n").positive?
 
-        if lines_count.positive?
-            variable = variable.gsub(/\r?\n/, '\#')
-
-            case game_type
-                when 'lisa'
-                    return nil unless variable.split('\#').all? { |line| line.match?(/^<.*>\.?$/) || line.empty? }
-                else
-                    nil
-            end
-        end
-    end
+    return nil if variable.split('\#').all? { |line| line.strip.match?(/(^#? ?<.*>\.?$)|^$/) }
+    return nil if variable.match?(/^[+-]?[0-9]*$/) ||
+        variable.match?(/---/) ||
+        variable.match?(/restrict eval/)
 
     variable
 end
@@ -130,9 +123,7 @@ def self.read_map(maps_files_paths, output_path, logging, game_type, processing_
         return
     end
 
-    maps_object_map = Hash[maps_files_paths.map do |filename|
-        [File.basename(filename), Marshal.load(File.binread(filename))]
-    end]
+    maps_object_map = Hash[maps_files_paths.map { |f| [File.basename(f), Marshal.load(File.binread(f))] }]
 
     maps_lines = IndexSet.new
     names_lines = IndexSet.new
@@ -274,9 +265,7 @@ end
 # @param [String] game_type
 # @param [String] processing_type
 def self.read_other(other_files_paths, output_path, logging, game_type, processing_type)
-    other_object_array_map = Hash[other_files_paths.map do |filename|
-        [File.basename(filename), Marshal.load(File.binread(filename))]
-    end]
+    other_object_array_map = Hash[other_files_paths.map { |f| [File.basename(f), Marshal.load(File.binread(f))] }]
 
     inner_processing_type = processing_type
     # 401 - dialogue lines
@@ -356,11 +345,12 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
                         unless allowed_codes.include?(code)
                             if in_sequence
                                 joined = line.join('\#').strip
+                                parsed = parse_parameter(401, joined, game_type)
 
-                                other_translation_map.insert_at_index(other_lines.length, joined, '') if inner_processing_type == :append &&
-                                    !other_translation_map.include?(joined)
+                                other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
+                                    !other_translation_map.include?(parsed)
 
-                                other_lines.add(joined)
+                                other_lines.add(parsed)
 
                                 line.clear
                                 in_sequence = false
@@ -517,20 +507,18 @@ def self.read_system(system_file_path, ini_file_path, output_path, logging, proc
 
                 system_lines.add(value)
             end
+        elsif value.is_a?(Array)
+            value.each do |string|
+                next unless string.is_a?(String)
 
-            next
-        end
+                string = string.strip
+                next if string.empty?
 
-        value.each do |string|
-            next unless string.is_a?(String)
+                system_translation_map.insert_at_index(system_lines.length, string, '') if processing_type == :append &&
+                    !system_translation_map.include?(string)
 
-            string = string.strip
-            next if string.empty?
-
-            system_translation_map.insert_at_index(system_lines.length, string, '') if processing_type == :append &&
-                !system_translation_map.include?(string)
-
-            system_lines.add(string)
+                system_lines.add(string)
+            end
         end
     end
 

data/lib/write.rb

@@ -3,7 +3,7 @@
 require 'zlib'
 
 # @param [String] string A parsed scripts code string, containing raw Ruby code
-# @return [[Array<String>, Array<Integer>]] Hash of parsed from code strings and their start indices
+# @return [Array<Array<String, Integer>>] Hash of parsed from code strings and their start indices
 def self.extract_quoted_strings(string)
     strings_array = []
     indices_array = []
@@ -80,7 +80,8 @@ def self.get_parameter_translated(code, parameter, hashmap, game_type)
             when 401, 405
                 case game_type
                     when 'lisa'
-                        match = parameter.scan(/^(\\et\[[0-9]+\]|\\nbt)/)
+                        match = parameter.scan(/^\\et\[[0-9]+\]/)
+                        match = parameter.scan(/^\\nbt/) if match.empty?
 
                         unless match.empty?
                             lisa_start = match[0]
@@ -98,6 +99,7 @@ def self.get_parameter_translated(code, parameter, hashmap, game_type)
         end
 
         gotten = hashmap[parameter]
+        return nil if gotten.nil?
 
         case game_type
             when 'lisa'
@@ -127,9 +129,7 @@ end
 # @param [Boolean] logging
 # @param [String] game_type
 def self.write_map(original_files_paths, maps_path, output_path, shuffle_level, logging, game_type)
-    maps_object_map = Hash[original_files_paths.map do |filename|
-        [File.basename(filename), Marshal.load(File.binread(filename))]
-    end]
+    maps_object_map = Hash[original_files_paths.map { |f| [File.basename(f), Marshal.load(File.binread(f))] }]
 
     maps_original_text = File.readlines(File.join(maps_path, 'maps.txt'), encoding: 'UTF-8', chomp: true).map do |line|
         line.gsub('\#', "\n").strip
@@ -268,9 +268,7 @@ end
 # @param [Boolean] logging
 # @param [String] game_type
 def self.write_other(original_files_paths, other_path, output_path, shuffle_level, logging, game_type)
-    other_object_array_map = Hash[original_files_paths.map do |filename|
-        [File.basename(filename), Marshal.load(File.binread(filename))]
-    end]
+    other_object_array_map = Hash[original_files_paths.map { |f| [File.basename(f), Marshal.load(File.binread(f))] }]
 
     # 401 - dialogue lines
     # 405 - credits lines
@@ -422,9 +420,7 @@ end
 # @param [String] translated
 def self.write_ini_title(ini_file_path, translated)
     file_lines = File.readlines(ini_file_path, chomp: true)
-    title_line_index = file_lines.each_with_index do |line, i|
-        break i if line.downcase.start_with?('title')
-    end
+    title_line_index = file_lines.each_with_index { |line, i| break i if line.downcase.start_with?('title') }
 
     file_lines[title_line_index] = translated
     File.binwrite(ini_file_path, file_lines.join("\n"))
@@ -520,9 +516,8 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
         write_ini_title(ini_file_path, game_title_translated)
     end
 
-    puts "Written #{system_basename}" if logging
-
     File.binwrite(File.join(output_path, system_basename), Marshal.dump(system_object))
+    puts "Written #{system_basename}" if logging
 end
 
 # @param [String] scripts_file_path Path to Scripts.*data file

data/rvpacker-txt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
     spec.name = 'rvpacker-txt'
-    spec.version = '1.8.2'
+    spec.version = '1.8.4'
     spec.authors = ['Howard Jeng', 'Andrew Kesterson', 'Solistra', 'Darkness9724', 'savannstm']
     spec.email = ['savannstm@gmail.com']
     spec.summary = 'Reads or writes RPG Maker XP/VX/VXAce game text to .txt files'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rvpacker-txt
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.4
 platform: ruby
 authors:
 - Howard Jeng
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-07-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email: