rvpacker-txt 1.9.4 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c57413528c8aa902963d9df851562c6dab33d8edbcdd8e19ef2c5dd0a3f5fbf0
-  data.tar.gz: 0aec862409028ee0f116a2ea98d08104c97bd3027969dd3ac830dbdbcf576c88
+  metadata.gz: 0be6dfc912a9d15dd4be7c37ecee0c316d650ca10f89eb99af19d5baf38addf2
+  data.tar.gz: a0ed09eac3d11c36db6d9014e4c0bc6ffa2408ac8c4a78f55fdfbb08285b759a
 SHA512:
-  metadata.gz: 7a31f9ba7db0bd30345637c7701282191d842d053ccf38355331e1375f270fb6558fbfae4b2378174655c8968f5edba97354c2cee05ff580760c260db149c8e9
-  data.tar.gz: 2af993afb94e8d29705014bba95f655c26eec161da56f5715f9e7a069231e57456cd37b01678bd8de1148ac5f2d5858ff6c5b759902916eeb151569c2de9cc41
+  metadata.gz: bfc00222eff1dc676c73e62bc9048a89a4ea01fdce63eda1e7373a8d4f5a4d9975418111844704127cae24f2d01848d8486ba544f8f2de409346801f9563325c
+  data.tar.gz: 473d0707b8359f54dd49ed665addf7cbfedf4a80ccadfaf6f7d997db9e4f691ae05a4882187a5dad3c8a6dc37231c11efb6e997a573bd89a70bc3f366f6e8695

data/README.md

@@ -36,10 +36,11 @@ OPTIONS:
         --disable-processing FILES   Skips processing specified files.
                                      Example: --disable-processing=maps,other,system.
                                      [Allowed values: maps, other, system, scripts]
-        --disable-custom-processing  Disables built-in custom parsing/writing for some games.
-    -r, --romanize                   When reading: If you parsing text from a Japanese game, that contains symbols like 「」,
-                                     which are just the Japanese quotation marks, it automatically replaces these symbols by their roman equivalents.
-                                     When writing: Use to correctly write files back if you have parsed them with --romanize flag.
+        --disable-custom-processing  Disables built-in custom text processing for some games.
+                                     This flag will automatically be used when writing if you parsed game text with it.
+    -r, --romanize                   If you parsing text from a Japanese game, that contains symbols like 「」, which are just the Japanese quotation marks,
+                                     it automatically replaces these symbols by their roman equivalents (in this case, "").
+                                     This flag will automatically be used when writing if you parsed game text with it.
     -l, --log                        Enables logging.
     -h, --help                       Prints the program's help message or for the entered subcommand.
 ```

data/bin/rvpacker-txt

@@ -43,29 +43,22 @@ def self.parse_options
 
     banner,
         input_dir_description,
-        output_dir_description,
-        romanize_description =
+        output_dir_description, =
         case options[:action]
             when 'read'
                 ["#{read_command_description}\n\nOPTIONS:\n",
                  ['Input directory, containing folders "original" or "data" with original game files.'],
-                 ['Output directory, where a "translation" folder will be created, containing parsed .txt files with the text from the game.'],
-                 ['If you parsing text from a Japanese game, that contains symbols like 「」, which are just the Japanese quotation marks,',
-                  'it automatically replaces these symbols by their roman equivalents.']]
+                 ['Output directory, where a "translation" folder will be created, containing parsed .txt files with the text from the game.']]
             when 'write'
                 ["#{write_command_description}\n\nOPTIONS:\n",
                  ['Input directory, containing folders "original" or "data" and "translation" with original game files and .txt files with translation respectively.'],
-                 ['Output directory, where an "output" folder will be created, containing compiled RPG Maker files with your translation.'],
-                 ['Use to correctly write files back if you have parsed them with --romanize flag.']]
+                 ['Output directory, where an "output" folder will be created, containing compiled RPG Maker files with your translation.']]
             else
                 [banner_text,
                  ['When reading: Input directory, containing folders "original" or "data" with original game files.',
                   'When writing: Input directory, containing folders "original" or "data" and "translation" with original game files and .txt files with translation respectively.'],
                  ['When reading: Output directory, where a "translation" folder will be created, containing parsed .txt files with the text from the game.',
-                  'When writing: Output directory, where an "output" folder will be created, containing compiled RPG Maker files with your translation.'],
-                 ['When reading: If you parsing text from a Japanese game, that contains symbols like 「」,',
-                  'which are just the Japanese quotation marks, it automatically replaces these symbols by their roman equivalents.',
-                  'When writing: Use to correctly write files back if you have parsed them with --romanize flag.']]
+                  'When writing: Output directory, where an "output" folder will be created, containing compiled RPG Maker files with your translation.']]
         end
 
     OptionParser.new(banner) do |cmd|
@@ -92,12 +85,15 @@ def self.parse_options
         end
 
         cmd.on('--disable-custom-processing',
-               'Disables built-in custom parsing/writing for some games.') do
+               'Disables built-in custom text processing for some games.',
+               'This flag will automatically be used when writing if you parsed game text with it.') do
             options[:disable_custom_processing] = true
         end
 
         cmd.on('-r', '--romanize',
-               *romanize_description) do
+               'If you parsing text from a Japanese game, that contains symbols like 「」, which are just the Japanese quotation marks,',
+               'it automatically replaces these symbols by their roman equivalents (in this case, "").',
+               'This flag will automatically be used when writing if you parsed game text with it.') do
             options[:romanize] = true
         end
 
@@ -110,7 +106,7 @@ def self.parse_options
 
             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.',
+                   '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
@@ -170,6 +166,7 @@ force = options[:force]
 append = options[:append]
 # @type [Boolean]
 romanize = options[:romanize]
+# @type [Boolean]
 silent = options[:silent]
 
 extensions = { xp: 'rxdata', vx: 'rvdata', ace: 'rvdata2' }
@@ -179,6 +176,7 @@ raise '"Data" or "original" directory not found within input directory.' unless
 
 maps_path = File.join(input_path, 'translation', 'maps')
 other_path = File.join(input_path, 'translation', 'other')
+metadata_file_path = File.join(input_path, 'translation', '.rvpacker-txt-metadata.marshal')
 
 FileUtils.mkdir_p(maps_path)
 FileUtils.mkdir_p(other_path)
@@ -220,7 +218,7 @@ if options[:action] == 'read'
     require 'read'
 
     processing_mode = if force
-                          unless options[:silent]
+                          unless silent
                               wait_time_start = Time.now
 
                               puts "WARNING! You're about to forcefully rewrite all your translation files, including _trans files.",
@@ -237,6 +235,8 @@ if options[:action] == 'read'
                           :default
                       end
 
+    File.binwrite(metadata_file_path, Marshal.dump({ romanize: romanize, disable_custom_processing: disable_custom_processing }))
+
     read_map(maps_files_paths, maps_path, romanize, logging, game_type, processing_mode) unless disable_processing[:maps]
     read_other(other_files_paths, other_path, romanize, logging, game_type, processing_mode) unless disable_processing[:other]
     read_system(system_file_path, ini_file_path, other_path, romanize, logging, processing_mode) unless disable_processing[:system]
@@ -247,6 +247,20 @@ else
     output_path = File.join(output_path, 'output')
     FileUtils.mkdir_p(output_path)
 
+    if File.exist?(metadata_file_path)
+        metadata = Marshal.load(File.binread(metadata_file_path))
+
+        if metadata[:romanize]
+            puts 'Enabling romanize according to the metadata from previous read.'
+            romanize = metadata[:romanize]
+        end
+
+        if metadata[:disable_custom_processing] && !game_type.nil?
+            puts 'Disabling custom processing according to the metadata from previous read.'
+            game_type = nil
+        end
+    end
+
     write_map(maps_files_paths, maps_path, output_path, shuffle_level, romanize, logging, game_type) unless disable_processing[:maps]
     write_other(other_files_paths, other_path, output_path, shuffle_level, romanize, logging, game_type) unless disable_processing[:other]
     write_system(system_file_path, ini_file_path, other_path, output_path, shuffle_level, romanize, logging) unless disable_processing[:system]

data/lib/classes.rb

@@ -112,6 +112,16 @@ class IndexSet
     end
 end
 
+class Hash
+    def insert_at_index(index, key, value)
+        return self[key] = value if index >= size
+
+        temp_array = to_a
+        temp_array.insert(index, [key, value])
+        replace(temp_array.to_h)
+    end
+end
+
 module RPG
     class Map
         attr_accessor :display_name, :events

data/lib/extensions.rb

@@ -7,13 +7,13 @@ def self.romanize_string(string)
         case char
             when '。'
                 string[i] = '.'
-            when '、'
+            when '、', '，'
                 string[i] = ','
             when '・'
                 string[i] = '·'
             when '゠'
                 string[i] = '–'
-            when '＝'
+            when '＝', 'ー'
                 string[i] = '—'
             when '…', '‥'
                 string[i, 3] = '...'
@@ -41,6 +41,74 @@ def self.romanize_string(string)
                 string[i] = ':'
             when '！'
                 string[i] = '!'
+            when '※'
+                string[i] = '*'
+            when '　'
+                string[i] = ' '
+            when 'Ⅰ'
+                string[i] = 'I'
+            when 'ⅰ'
+                string[i] = 'i'
+            when 'Ⅱ'
+                string[i, 2] = 'II'
+            when 'ⅱ'
+                string[i, 2] = 'ii'
+            when 'Ⅲ'
+                string[i, 3] = 'III'
+            when 'ⅲ'
+                string[i, 3] = 'iii'
+            when 'Ⅳ'
+                string[i, 2] = 'IV'
+            when 'ⅳ'
+                string[i, 2] = 'iv'
+            when 'Ⅴ'
+                string[i] = 'V'
+            when 'ⅴ'
+                string[i] = 'v'
+            when 'Ⅵ'
+                string[i, 2] = 'VI'
+            when 'ⅵ'
+                string[i, 2] = 'vi'
+            when 'Ⅶ'
+                string[i, 3] = 'VII'
+            when 'ⅶ'
+                string[i, 3] = 'vii'
+            when 'Ⅷ'
+                string[i, 4] = 'VIII'
+            when 'ⅷ'
+                string[i, 4] = 'viii'
+            when 'Ⅸ'
+                string[i, 2] = 'IX'
+            when 'ⅸ'
+                string[i, 2] = 'ix'
+            when 'Ⅹ'
+                string[i] = 'X'
+            when 'ⅹ'
+                string[i] = 'x'
+            when 'Ⅺ'
+                string[i, 2] = 'XI'
+            when 'ⅺ'
+                string[i, 2] = 'xi'
+            when 'Ⅻ'
+                string[i, 3] = 'XII'
+            when 'ⅻ'
+                string[i, 3] = 'xii'
+            when 'Ⅼ'
+                string[i] = 'L'
+            when 'ⅼ'
+                string[i] = 'l'
+            when 'Ⅽ'
+                string[i] = 'C'
+            when 'ⅽ'
+                string[i] = 'c'
+            when 'Ⅾ'
+                string[i] = 'D'
+            when 'ⅾ'
+                string[i] = 'd'
+            when 'Ⅿ'
+                string[i] = 'M'
+            when 'ⅿ'
+                string[i] = 'm'
             else
                 nil
         end
@@ -48,3 +116,121 @@ def self.romanize_string(string)
 
     string
 end
+
+# @param [Array<String>] array Array of strings
+# @return [Array<String>] Array of shuffled strings
+def self.shuffle_words(array)
+    array.each do |string|
+        select_words_re = /\S+/
+        words = string.scan(select_words_re).shuffle
+        string.gsub(select_words_re) { words.pop || '' }
+    end
+end
+
+# @param [String] string A parsed scripts code string, containing raw Ruby code
+# @param [Symbol] mode Mode to extract quoted strings
+# @return [IndexSet<String>] Set of extracted strings
+def extract_quoted_strings(string, mode)
+    if mode == :read
+        result = IndexSet.new
+
+        skip_block = false
+        in_quotes = false
+        quote_type = nil
+        buffer = []
+
+        string.each_line do |line|
+            stripped = line.strip
+
+            next if stripped[0] == '#' ||
+                (!in_quotes && !stripped.match?(/["']/)) ||
+                stripped.start_with?(/(Win|Lose)|_Fanfare/) ||
+                stripped.match?(/eval\(/)
+
+            skip_block = true if stripped.start_with?('=begin')
+            skip_block = false if stripped.start_with?('=end')
+
+            next if skip_block
+
+            line.each_char do |char|
+                if %w[' "].include?(char)
+                    unless quote_type.nil? || char == quote_type
+                        buffer.push(char)
+                        next
+                    end
+
+                    quote_type = char
+                    in_quotes = !in_quotes
+                    result.add(buffer.join)
+                    buffer.clear
+                    next
+                end
+
+                next unless in_quotes
+
+                if char == "\r"
+                    next
+                elsif char == "\n"
+                    buffer.push('\#')
+                    next
+                end
+
+                buffer.push(char)
+            end
+        end
+
+        result
+    else
+        strings_array = []
+        indices_array = []
+
+        skip_block = false
+        in_quotes = false
+        quote_type = nil
+        buffer = []
+
+        current_string_index = 0
+        string.each_line do |line|
+            stripped = line.strip
+
+            if stripped[0] == '#' || stripped.start_with?(/(Win|Lose)|_Fanfare/)
+                current_string_index += line.length
+                next
+            end
+
+            skip_block = true if stripped.start_with?('=begin')
+            skip_block = false if stripped.start_with?('=end')
+
+            if skip_block
+                current_string_index += line.length
+                next
+            end
+
+            buffer.push('\#') if in_quotes
+
+            line.each_char.each_with_index do |char, index|
+                if %w[' "].include?(char)
+                    unless quote_type.nil? || char == quote_type
+                        buffer.push(char)
+                        next
+                    end
+
+                    quote_type = char
+                    in_quotes = !in_quotes
+
+                    strings_array.push(buffer.join)
+                    indices_array.push(current_string_index + index)
+
+                    buffer.clear
+                    next
+                end
+
+                buffer.push(char) if in_quotes
+            end
+
+            current_string_index += line.length
+        end
+
+        [strings_array, indices_array]
+    end
+end

data/lib/read.rb

@@ -3,72 +3,9 @@
 require 'zlib'
 require_relative 'extensions'
 
-STRING_IS_ONLY_SYMBOLS_RE = /^[.()+-:;\[\]^~%&!*\/→×？?ｘ％▼| ]+$/
+STRING_IS_ONLY_SYMBOLS_RE = /^[.()+\-:;\[\]^~%&!№$@`*\/→×？?ｘ％▼|♥♪！：〜『』「」〽。…‥＝゠、，【】［］｛｝（）〔〕｟｠〘〙〈〉《》・\\#'"<>=_ー※▶ⅠⅰⅡⅱⅢⅲⅣⅳⅤⅴⅥⅵⅦⅶⅧⅷⅨⅸⅩⅹⅪⅺⅫⅻⅬⅼⅭⅽⅮⅾⅯⅿ\s0-9]+$/
 APPEND_FLAG_OMIT_MSG = "Files aren't already parsed. Continuing as if --append flag was omitted."
 
-class Hash
-    def insert_at_index(index, key, value)
-        return self[key] = value if index >= size
-
-        temp_array = to_a
-        temp_array.insert(index, [key, value])
-        replace(temp_array.to_h)
-    end
-end
-
-# @param [String] string A parsed scripts code string, containing raw Ruby code
-# @return [IndexSet<String>] Set of extracted strings
-def self.extract_quoted_strings(string)
-    result = IndexSet.new
-
-    skip_block = false
-    in_quotes = false
-    quote_type = nil
-    buffer = []
-
-    string.each_line do |line|
-        stripped = line.strip
-
-        next if stripped[0] == '#' ||
-            (!in_quotes && !stripped.match?(/["']/)) ||
-            stripped.start_with?(/(Win|Lose)|_Fanfare/) ||
-            stripped.match?(/eval\(/)
-
-        skip_block = true if stripped.start_with?('=begin')
-        skip_block = false if stripped.start_with?('=end')
-
-        next if skip_block
-
-        line.each_char do |char|
-            if %w[' "].include?(char)
-                unless quote_type.nil? || char == quote_type
-                    buffer.push(char)
-                    next
-                end
-
-                quote_type = char
-                in_quotes = !in_quotes
-                result.add(buffer.join)
-                buffer.clear
-                next
-            end
-
-            next unless in_quotes
-
-            if char == "\r"
-                next
-            elsif char == "\n"
-                buffer.push('\#')
-                next
-            end
-
-            buffer.push(char)
-        end
-    end
-
-    result
-end
-
 # @param [Integer] code
 # @param [String] parameter
 # @param [String] game_type
@@ -76,41 +13,63 @@ end
 def self.parse_parameter(code, parameter, game_type)
     return nil if parameter.match?(STRING_IS_ONLY_SYMBOLS_RE)
 
+    ends_with_if = parameter[/ if\(.*\)$/]
+    parameter = parameter.chomp(ends_with_if) if ends_with_if
+
     unless game_type.nil?
-        case code
-            when 401, 405
-                case game_type
-                    when 'lisa'
-                        match = parameter.scan(/^\\et\[[0-9]+\]/)
-                        match = parameter.scan(/^\\nbt/) if match.empty?
-                        parameter = parameter[match[0].length..] unless match.empty?
+        case game_type
+            when 'lisa'
+                case code
+                    when 401, 405
+                        prefix = parameter[/^(\\et\[[0-9]+\]|\\nbt)/]
+                        parameter = parameter.sub(prefix, '') if prefix
+                    when 102
+                        # Implement some custom parsing
+                    when 356
+                        # Implement some custom parsing
                     else
-                        nil
+                        return nil
                 end
-            when 102
-                # Implement some custom parsing
-            when 356
-                # Implement some custom parsing
+                # Implement cases for other games
             else
-                return nil
+                nil
         end
+
     end
 
     parameter
 end
 
 # @param [String] variable
+# @param [Integer] type
 # @param [String] _game_type
 # @return [String]
-def self.parse_variable(variable, _game_type)
+def self.parse_variable(variable, type, _game_type)
+    variable = variable.gsub(/\r?\n/, "\n")
+    # for some reason it returns true if multi-line string contains carriage returns (wtf?)
     return nil if variable.match?(STRING_IS_ONLY_SYMBOLS_RE)
-    variable = variable.gsub(/\r?\n/, '\#') if variable.count("\n").positive?
 
-    return nil if variable.split('\#').all? { |line| line.strip.match?(/(^#? ?<.*>\.?$)|^$/) }
-    return nil if variable.match?(/^[+-]?[0-9]*$/) ||
+    if variable.split("\n").all? do |line|
+        line.empty? ||
+            line.match?(/^#? ?<.*>.?$/) ||
+            line.match?(/^[a-z][0-9]$/)
+    end
+        return nil
+    end
+
+    return nil if variable.match?(/^[+-]?[0-9]+$/) ||
         variable.match?(/---/) ||
         variable.match?(/restrict eval/)
 
+    case type
+        when 0 # name
+        when 1 # nickname
+        when 2 # description
+        when 3 # note
+        else
+            nil
+    end
+
     variable
 end
 
@@ -189,9 +148,9 @@ def self.read_map(maps_files_paths, output_path, romanize, logging, game_type, p
                 list.each do |item|
                     code = item.code
 
-                    unless allowed_codes.include?(code)
-                        if in_sequence
-                            joined = line.join('\#').strip
+                    if in_sequence && code != 401
+                        unless line.empty?
+                            joined = line.join("\n").strip.gsub("\n", '\#')
                             parsed = parse_parameter(401, joined, game_type)
 
                             unless parsed.nil?
@@ -201,21 +160,22 @@ def self.read_map(maps_files_paths, output_path, romanize, logging, game_type, p
                                     !maps_translation_map.include?(parsed)
 
                                 maps_lines.add(parsed)
-
-                                line.clear
-                                in_sequence = false
                             end
                         end
-                        next
+
+                        line.clear
+                        in_sequence = false
                     end
 
+                    next unless allowed_codes.include?(code)
+
                     parameters = item.parameters
 
                     if code == 401
                         next unless parameters[0].is_a?(String) && !parameters[0].empty?
 
                         in_sequence = true
-                        line.push(parameters[0])
+                        line.push(parameters[0].gsub('　', ' ').strip)
                     elsif parameters[0].is_a?(Array)
                         parameters[0].each do |subparameter|
                             next unless subparameter.is_a?(String)
@@ -240,7 +200,6 @@ def self.read_map(maps_files_paths, output_path, romanize, logging, game_type, p
                         parsed = parse_parameter(code, parameter, game_type)
                         next if parsed.nil?
 
-                        parsed = parsed.gsub(/\r?\n/, '\#')
                         parsed = romanize_string(parsed) if romanize
 
                         maps_translation_map.insert_at_index(maps_lines.length, parsed, '') if processing_mode == :append &&
@@ -326,22 +285,28 @@ def self.read_other(other_files_paths, output_path, romanize, logging, game_type
                 description = object.description
                 note = object.note
 
-                [name, nickname, description, note].each do |variable|
-                    next unless variable.is_a?(String)
+                catch :next_object do
+                    [name, nickname, description, note].each_with_index do |variable, type|
+                        next unless variable.is_a?(String)
 
-                    variable = variable.strip
-                    next if variable.empty?
+                        variable = variable.strip
+                        next if variable.empty?
 
-                    parsed = parse_variable(variable, game_type)
-                    next if parsed.nil?
+                        parsed = parse_variable(variable, type, game_type)
 
-                    parsed = parsed.gsub(/\r?\n/, '\#')
-                    parsed = romanize_string(parsed) if romanize
+                        if !parsed.nil?
+                            parsed = romanize_string(parsed) if romanize
+
+                            parsed = parsed.split("\n").map(&:strip).join('\#')
 
-                    other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
-                        !other_translation_map.include?(parsed)
+                            other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
+                                !other_translation_map.include?(parsed)
 
-                    other_lines.add(parsed)
+                            other_lines.add(parsed)
+                        elsif type.zero?
+                            throw :next_object
+                        end
+                    end
                 end
             end
         else
@@ -361,9 +326,9 @@ def self.read_other(other_files_paths, output_path, romanize, logging, game_type
                     list.each do |item|
                         code = item.code
 
-                        unless allowed_codes.include?(code)
-                            if in_sequence
-                                joined = line.join('\#').strip
+                        if in_sequence && ![401, 405].include?(code)
+                            unless line.empty?
+                                joined = line.join("\n").strip.gsub("\n", '\#')
                                 parsed = parse_parameter(401, joined, game_type)
 
                                 unless parsed.nil?
@@ -373,21 +338,22 @@ def self.read_other(other_files_paths, output_path, romanize, logging, game_type
                                         !other_translation_map.include?(parsed)
 
                                     other_lines.add(parsed)
-
-                                    line.clear
-                                    in_sequence = false
                                 end
                             end
-                            next
+
+                            line.clear
+                            in_sequence = false
                         end
 
+                        next unless allowed_codes.include?(code)
+
                         parameters = item.parameters
 
                         if [401, 405].include?(code)
                             next unless parameters[0].is_a?(String) && !parameters[0].empty?
 
                             in_sequence = true
-                            line.push(parameters[0].gsub(/\r?\n/, '\#'))
+                            line.push(parameters[0].gsub('　', ' ').strip)
                         elsif parameters[0].is_a?(Array)
                             parameters[0].each do |subparameter|
                                 next unless subparameter.is_a?(String)
@@ -395,35 +361,42 @@ def self.read_other(other_files_paths, output_path, romanize, logging, game_type
                                 subparameter = subparameter.strip
                                 next if subparameter.empty?
 
-                                subparameter = romanize_string(subparameter) if romanize
+                                parsed = parse_parameter(code, subparameter, game_type)
+                                next if parsed.nil?
+
+                                parsed = romanize_string(parsed) if romanize
 
-                                other_translation_map.insert_at_index(other_lines.length, subparameter, '') if inner_processing_type == :append &&
-                                    !other_translation_map.include?(subparameter)
+                                other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
+                                    !other_translation_map.include?(parsed)
 
-                                other_lines.add(subparameter)
+                                other_lines.add(parsed)
                             end
                         elsif parameters[0].is_a?(String)
                             parameter = parameters[0].strip
                             next if parameter.empty?
 
-                            parameter = parameter.gsub(/\r?\n/, '\#')
-                            parameter = romanize_string(parameter) if romanize
+                            parsed = parse_parameter(code, parameter, game_type)
+                            next if parsed.nil?
+
+                            parsed = romanize_string(parsed) if romanize
 
-                            other_translation_map.insert_at_index(other_lines.length, parameter, '') if inner_processing_type == :append &&
-                                !other_translation_map.include?(parameter)
+                            other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
+                                !other_translation_map.include?(parsed)
 
-                            other_lines.add(parameter)
+                            other_lines.add(parsed)
                         elsif parameters[1].is_a?(String)
                             parameter = parameters[1].strip
                             next if parameter.empty?
 
-                            parameter = parameter.gsub(/\r?\n/, '\#')
-                            parameter = romanize_string(parameter) if romanize
+                            parsed = parse_parameter(code, parameter, game_type)
+                            next if parsed.nil?
+
+                            parsed = romanize_string(parsed) if romanize
 
-                            other_translation_map.insert_at_index(other_lines.length, parameter, '') if inner_processing_type == :append &&
-                                !other_translation_map.include?(parameter)
+                            other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
+                                !other_translation_map.include?(parsed)
 
-                            other_lines.add(parameter)
+                            other_lines.add(parsed)
                         end
                     end
                 end
@@ -637,7 +610,7 @@ def self.read_scripts(scripts_file_path, output_path, romanize, logging, process
             end
         end
 
-        extract_quoted_strings(code).each do |string|
+        extract_quoted_strings(code, :read).each do |string|
             # Removes the U+3000 Japanese typographical space to check if string, when stripped, is truly empty
             string = string.strip.delete('　')
 
@@ -653,7 +626,7 @@ def self.read_scripts(scripts_file_path, output_path, romanize, logging, process
                 string.match?(/^(.)\1{2,}$/) ||
                 string.match?(/^(false|true)$/) ||
                 string.match?(/^[wr]b$/) ||
-                string.match?(/^(?=.*\d)[A-Za-z0-9\-]+$/) ||
+                string.match?(/^(?=.*\d)[A-Za-z0-9-]+$/) ||
                 string.match?(/^[a-z\-()\/ +'&]*$/) ||
                 string.match?(/^[A-Za-z]+[+-]$/) ||
                 string.match?(STRING_IS_ONLY_SYMBOLS_RE) ||

data/lib/write.rb

@@ -3,123 +3,78 @@
 require 'zlib'
 require_relative 'extensions'
 
-# @param [String] string A parsed scripts code string, containing raw Ruby code
-# @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 = []
-
-    skip_block = false
-    in_quotes = false
-    quote_type = nil
-    buffer = []
-
-    current_string_index = 0
-    string.each_line do |line|
-        stripped = line.strip
-
-        if stripped[0] == '#' || stripped.start_with?(/(Win|Lose)|_Fanfare/)
-            current_string_index += line.length
-            next
-        end
-
-        skip_block = true if stripped.start_with?('=begin')
-        skip_block = false if stripped.start_with?('=end')
-
-        if skip_block
-            current_string_index += line.length
-            next
-        end
-
-        buffer.push('\#') if in_quotes
-
-        line.each_char.each_with_index do |char, index|
-            if %w[' "].include?(char)
-                unless quote_type.nil? || char == quote_type
-                    buffer.push(char)
-                    next
-                end
-
-                quote_type = char
-                in_quotes = !in_quotes
-
-                strings_array.push(buffer.join)
-                indices_array.push(current_string_index + index)
-
-                buffer.clear
-                next
-            end
-
-            buffer.push(char) if in_quotes
-        end
-
-        current_string_index += line.length
-    end
-
-    [strings_array, indices_array]
-end
-
-# @param [Array<String>] array Array of strings
-# @return [Array<String>] Array of shuffled strings
-def self.shuffle_words(array)
-    array.each do |string|
-        select_words_re = /\S+/
-        words = string.scan(select_words_re).shuffle
-        string.gsub(select_words_re) { words.pop || '' }
-    end
-end
-
 # @param [Integer] code
 # @param [String] parameter
 # @param [Hash{String => String}] hashmap Translation hashmap (as everything in Ruby passed by reference, this pass is free!)
 # @param [String] game_type
 def self.get_parameter_translated(code, parameter, hashmap, game_type)
+    remaining_strings = []
+    insert_positions = []
+
+    ends_with_if = parameter[/ if\(.*\)$/]
+
+    if ends_with_if
+        parameter = parameter.chomp(ends_with_if)
+        remaining_strings.push(ends_with_if)
+        insert_positions.push(1)
+    end
+
     unless game_type.nil?
-        lisa_start = nil
-
-        case code
-            when 401, 405
-                case game_type
-                    when 'lisa'
-                        match = parameter.scan(/^\\et\[[0-9]+\]/)
-                        match = parameter.scan(/^\\nbt/) if match.empty?
-
-                        unless match.empty?
-                            lisa_start = match[0]
-                            parameter = parameter.slice((match[0].length)..)
-                        end
+        case game_type
+            when 'lisa'
+                case code
+                    when 401, 405
+                        prefix = parameter[/^(\\et\[[0-9]+\]|\\nbt)/]
+                        parameter = parameter.sub(prefix, '') if prefix
+
+                        remaining_strings.push(prefix)
+                        insert_positions.push(0)
+                    when 102, 402
+                        # Implement some custom parsing
+                    when 356
+                        # Implement some custom parsing
                     else
                         nil
                 end
-            when 102, 402
-                # Implement some custom parsing
-            when 356
-                # Implement some custom parsing
+                # Implement cases for other games
             else
                 nil
         end
+    end
 
-        gotten = hashmap[parameter]
-        return nil if gotten.nil?
+    translated = hashmap[parameter]
+    return nil if translated.nil? || translated.empty?
 
-        case game_type
-            when 'lisa'
-                gotten = lisa_start + gotten unless lisa_start.nil?
-            else
-                nil
+    remaining_strings.zip(insert_positions).each do |string, position|
+        case position
+            when 0
+                translated = string + translated
+            when 1
+                translated += string
         end
-
-        return gotten
     end
 
-    hashmap[parameter]
+    translated
 end
 
 # @param [String] variable
+# @param [Integer] type
+# @param [String] filename
 # @param [Hash{String => String}] hashmap Translation hashmap (as everything in Ruby passed by reference, this pass is free!)
 # @param [String] _game_type
 # @return [String]
-def self.get_variable_translated(variable, hashmap, _game_type)
+def self.get_variable_translated(variable, type, _filename, hashmap, _game_type)
+    variable = variable.gsub(/\r?\n/, "\n")
+
+    case type
+        when 0 # name
+        when 1 # nickname
+        when 2 # description
+        when 3 # note
+        else
+            nil
+    end
+
     hashmap[variable]
 end
 
@@ -191,14 +146,14 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
                 list.each_with_index do |item, it|
                     code = item.code
 
-                    unless allowed_codes.include?(code)
-                        if in_sequence
-                            joined = line.join('\#').strip
+                    if in_sequence && code != 401
+                        unless line.empty?
+                            joined = line.join("\n").strip
                             joined = romanize_string(joined) if romanize
 
                             translated = get_parameter_translated(401, joined, maps_translation_map, game_type)
 
-                            unless translated.nil? || translated.empty?
+                            if !translated.nil? && !translated.empty?
                                 split = translated.split('\#')
 
                                 split_length = split.length
@@ -208,19 +163,25 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
                                     list[index].parameters[0] = i < split_length ? split[i] : ''
                                 end
 
-                                list[item_indices.last].parameters[0] = split[line_length..].join("\n") if split_length > line_length
+                                if split_length > line_length
+                                    list[item_indices.last].parameters[0] = split[line_length..].join("\n")
+                                end
                             end
                         end
-                        next
+
+                        line.clear
+                        in_sequence = false
                     end
 
+                    next unless allowed_codes.include?(code)
+
                     parameters = item.parameters
 
                     if code == 401
                         next unless parameters[0].is_a?(String) && !parameters[0].empty?
 
                         in_sequence = true
-                        line.push(parameters[0])
+                        line.push(parameters[0].gsub('　', ' ').strip)
                         item_indices.push(it)
                     elsif parameters[0].is_a?(Array)
                         parameters[0].each_with_index do |subparameter, sp|
@@ -232,7 +193,7 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
                             subparameter = romanize_string(subparameter) if romanize
 
                             translated = get_parameter_translated(code, subparameter, maps_translation_map, game_type)
-                            parameters[0][sp] = translated unless translated.nil? || translated.empty?
+                            parameters[0][sp] = translated if !translated.nil? && !translated.empty?
                         end
                     elsif parameters[0].is_a?(String)
                         parameter = parameters[0].strip
@@ -241,7 +202,7 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
                         parameter = romanize_string(parameter) if romanize
 
                         translated = get_parameter_translated(code, parameter, maps_translation_map, game_type)
-                        parameters[0] = translated unless translated.nil? || translated.empty?
+                        parameters[0] = translated if !translated.nil? && !translated.empty?
                     elsif parameters[1].is_a?(String)
                         parameter = parameters[1].strip
                         next if parameter.empty?
@@ -249,7 +210,7 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
                         parameter = romanize_string(parameter) if romanize
 
                         translated = get_parameter_translated(code, parameter, maps_translation_map, game_type)
-                        parameters[1] = translated unless translated.nil? || translated.empty?
+                        parameters[1] = translated if !translated.nil? && !translated.empty?
                     end
 
                     item.parameters = parameters
@@ -313,23 +274,24 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                 description = object.description
                 note = object.note
 
-                [name, nickname, description, note].each_with_index do |variable, i|
+                [name, nickname, description, note].each_with_index do |variable, type|
                     next unless variable.is_a?(String)
 
                     variable = variable.strip
                     next if variable.empty?
 
-                    variable = variable.gsub(/\r\n/, "\n")
                     variable = romanize_string(variable) if romanize
 
-                    translated = get_variable_translated(variable, other_translation_map, game_type)
+                    variable = variable.split("\n").map(&:strip).join("\n")
+
+                    translated = get_variable_translated(variable, type, filename, other_translation_map, game_type)
 
-                    unless translated.nil? || translated.empty?
-                        if i.zero?
+                    if !translated.nil? && !translated.empty?
+                        if type.zero?
                             object.name = translated
-                        elsif i == 1
+                        elsif type == 1
                             object.nickname = translated if object.is_a?(RPG::Actor)
-                        elsif i == 2
+                        elsif type == 2
                             object.description = translated
                         else
                             object.note = translated
@@ -355,14 +317,14 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                     list.each_with_index do |item, it|
                         code = item.code
 
-                        unless allowed_codes.include?(code)
-                            if in_sequence
-                                joined = line.join('\#').strip
+                        if in_sequence && ![401, 405].include?(code)
+                            unless line.empty?
+                                joined = line.join("\n").strip
                                 joined = romanize_string(joined) if romanize
 
                                 translated = get_parameter_translated(401, joined, other_translation_map, game_type)
 
-                                unless translated.nil? || translated.empty?
+                                if !translated.nil? && !translated.empty?
                                     split = translated.split('\#')
 
                                     split_length = split.length
@@ -372,19 +334,25 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                                         list[index].parameters[0] = i < split_length ? split[i] : ''
                                     end
 
-                                    list[item_indices.last].parameters[0] = split[line_length..].join("\n") if split_length > line_length
+                                    if split_length > line_length
+                                        list[item_indices.last].parameters[0] = split[line_length..].join("\n")
+                                    end
                                 end
                             end
-                            next
+
+                            line.clear
+                            in_sequence = false
                         end
 
+                        next unless allowed_codes.include?(code)
+
                         parameters = item.parameters
 
                         if [401, 405].include?(code)
                             next unless parameters[0].is_a?(String) && !parameters[0].empty?
 
                             in_sequence = true
-                            line.push(parameters[0])
+                            line.push(parameters[0].gsub('　', ' ').strip)
                             item_indices.push(it)
                         elsif parameters[0].is_a?(Array)
                             parameters[0].each_with_index do |subparameter, sp|
@@ -396,7 +364,7 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                                 subparameter = romanize_string(subparameter) if romanize
 
                                 translated = get_parameter_translated(code, subparameter, other_translation_map, game_type)
-                                parameters[0][sp] = translated unless translated.nil? || translated.empty?
+                                parameters[0][sp] = translated if !translated.nil? && !translated.empty?
                             end
                         elsif parameters[0].is_a?(String)
                             parameter = parameters[0].strip
@@ -405,7 +373,7 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                             parameter = romanize_string(parameter) if romanize
 
                             translated = get_parameter_translated(code, parameter, other_translation_map, game_type)
-                            parameters[0] = translated unless translated.nil? || translated.empty?
+                            parameters[0] = translated if !translated.nil? && !translated.empty?
                         elsif parameters[1].is_a?(String)
                             parameter = parameters[1].strip
                             next if parameter.empty?
@@ -413,7 +381,7 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                             parameter = romanize_string(parameter) if romanize
 
                             translated = get_parameter_translated(code, parameter, other_translation_map, game_type)
-                            parameters[1] = translated unless translated.nil? || translated.empty?
+                            parameters[1] = translated if !translated.nil? && !translated.empty?
                         end
 
                         item.parameters = parameters
@@ -490,7 +458,7 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
             string = romanize_string(string) if romanize
 
             translated = system_translation_map[string]
-            array[i] = translated unless translated.nil? || translated.empty?
+            array[i] = translated if !translated.nil? && !translated.empty?
         end
 
         if i.zero?
@@ -519,7 +487,7 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
             value = romanize_string(value) if romanize
 
             translated = system_translation_map[value]
-            value = translated unless translated.nil? || translated.empty?
+            value = translated if !translated.nil? && !translated.empty?
         elsif value.is_a?(Array)
             value.each_with_index do |string, i|
                 string = string.strip
@@ -528,7 +496,7 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
                 string = romanize_string(string) if romanize
 
                 translated = system_translation_map[string]
-                value[i] = translated unless translated.nil? || translated.empty?
+                value[i] = translated if !translated.nil? && !translated.empty?
             end
         end
 
@@ -591,7 +559,7 @@ def self.write_scripts(scripts_file_path, other_path, output_path, romanize, log
         end
 
         # this shit finally works and requires NO further changes
-        string_array, index_array = extract_quoted_strings(code)
+        string_array, index_array = extract_quoted_strings(code, :write)
 
         string_array.zip(index_array).reverse_each do |string, index|
             string = string.strip.delete('　')

data/rvpacker-txt.gemspec

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

metadata

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