rvpacker-txt 1.10.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d581405430f6d78e8269bc9f3310903bdc76e889d38c59a67ec6726a6927d33
-  data.tar.gz: 8492c8a320492902c0d8696dfcdf9bb1b2191fb6567c92e6086ee143ea6c25a5
+  metadata.gz: dc893f5cf25ad608e961d2b85408d1acaedaed3e508eaf74688bc0814f4a740c
+  data.tar.gz: 8c157c1d2446add716a05615e1f1d10dd758bcbb30feba4938a2420b350e892d
 SHA512:
-  metadata.gz: 3b1cdf8a790a950a7669206356542f41697d3c0389df088ba1482fdd4fa83051c15be5883520d5c26a12f0098563545abc4af3e36970e1c5760d63abda493177
-  data.tar.gz: 13a78b005d438e8c3d67543de90bb1c5fccb7bfd7845b7b81f10d7487fcad43d71a61588e494e53e3ce8a4a4f4804f92a95f42932a502ab9129c6b22ec5376d0
+  metadata.gz: 3dd75b346fa21bcbc16b15c7e081b7fbd72a97796afac4343fc43c656b9d84ff504cdfc51962a771e4a54a9a17c29134a0e23fc3e158cab245c8226935c23035
+  data.tar.gz: 5fe5adf14cc73bd8681c61e16186a4652e22223581265784b207553ecc592252b574b15881f0f6964074c90fdd45b58a455ccb10469932248477ef79a91c07e5

data/README.md

@@ -36,7 +36,10 @@ 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.
+        --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

@@ -85,19 +85,19 @@ def self.parse_options
         end
 
         cmd.on('--disable-custom-processing',
-               'Disables built-in custom parsing/writing for some games.',
+               '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
 
-        if options[:action] == 'read'
-            cmd.on('-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.',
-                   'This flag will automatically be used when writing if you parsed game text with it.') do
-                options[:romanize] = true
-            end
+        cmd.on('-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.') do
+            options[:romanize] = true
+        end
 
+        if options[:action] == 'read'
             cmd.on('-f', '--force',
                    'Force rewrite all files. Cannot be used with --append.',
                    'USE WITH CAUTION!') do
@@ -256,7 +256,7 @@ else
         end
 
         if metadata[:disable_custom_processing] && !game_type.nil?
-            puts 'Disabling custom parsing according to the metadata from previous read.'
+            puts 'Disabling custom processing according to the metadata from previous read.'
             game_type = nil
         end
     end

data/lib/classes.rb

@@ -75,40 +75,13 @@ class Rect
     end
 end
 
-# Fuck using an array with set, that's just straight dumb and not efficient
-class IndexSet
-    def initialize
-        @hash = Hash.new
-    end
-
-    def add(item)
-        return if @hash.include?(item)
-        @hash[item] = @hash.size
-        @hash
-    end
-
-    def include?(item)
-        @hash.include?(item)
-    end
-
-    def each(&block)
-        @hash.each_key(&block)
-    end
-
-    def to_a
-        @hash.dup
-    end
-
-    def join(delimiter = '')
-        @hash.keys.join(delimiter)
-    end
-
-    def length
-        @hash.size
-    end
+class Hash
+    def insert_at_index(index, key, value)
+        return self[key] = value if index >= size
 
-    def empty?
-        @hash.empty?
+        temp_array = to_a
+        temp_array.insert(index, [key, value])
+        replace(temp_array.to_h)
     end
 end
 

data/lib/extensions.rb

@@ -43,6 +43,8 @@ def self.romanize_string(string)
                 string[i] = '!'
             when '※'
                 string[i] = '*'
+            when '　'
+                string[i] = ' '
             when 'Ⅰ'
                 string[i] = 'I'
             when 'ⅰ'
@@ -114,3 +116,90 @@ 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
+
+def escaped?(line, index)
+    backslash_count = 0
+
+    (0..index).reverse_each do |i|
+        break if line[i] != '\\'
+        backslash_count += 1
+    end
+
+    backslash_count.even?
+end
+
+# @param [String] ruby_code
+def extract_strings(ruby_code, mode = false)
+    strings = mode ? [] : Set.new
+    indices = []
+    inside_string = false
+    inside_multiline_comment = false
+    string_start_index = 0
+    current_quote_type = ''
+
+    global_index = 0
+    ruby_code.each_line do |line|
+        stripped = line.strip
+
+        unless inside_string
+            if stripped[0] == '#'
+                global_index += line.length
+                next
+            end
+
+            if stripped.start_with?('=begin')
+                inside_multiline_comment = true
+            elsif stripped.start_with?('=end')
+                inside_multiline_comment = false
+            end
+        end
+
+        if inside_multiline_comment
+            global_index += line.length
+            next
+        end
+
+        i = 0
+        while i < line.length
+            char = line[i]
+
+            if !inside_string && char == '#'
+                break
+            end
+
+            if !inside_string && ['"', "'"].include?(char)
+                inside_string = true
+                string_start_index = global_index + i
+                current_quote_type = char
+            elsif inside_string && char == current_quote_type && escaped?(line, i - 1)
+                extracted_string = ruby_code[string_start_index + 1...global_index + i].gsub(/\r?\n/, '\#')
+
+                if mode
+                    strings << extracted_string
+                    indices << string_start_index + 1
+                else
+                    strings.add(extracted_string)
+                end
+
+                inside_string = false
+                current_quote_type = ''
+            end
+
+            i += 1
+        end
+
+        global_index += line.length
+    end
+
+    mode ? [strings, indices] : strings.to_a
+end

data/lib/read.rb

@@ -3,72 +3,9 @@
 require 'zlib'
 require_relative 'extensions'
 
-STRING_IS_ONLY_SYMBOLS_RE = /^[.()+\-:;\[\]^~%&!№$@`*\/→×？?ｘ％▼|♥♪！：〜『』「」〽。…‥＝゠、，【】［］｛｝（）〔〕｟｠〘〙〈〉《》・\\#'"<>=_ー※▶ⅠⅰⅡⅱⅢⅲⅣⅳⅤⅴⅥⅵⅦⅶⅧⅷⅨⅸⅩⅹⅪⅺⅫⅻⅬⅼⅭⅽⅮⅾⅯⅿ\s]+$/
+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
@@ -108,21 +45,19 @@ end
 # @param [String] _game_type
 # @return [String]
 def self.parse_variable(variable, type, _game_type)
-    variable = variable.gsub(/\r?\n/, '\#')
-    return nil if variable.match?(STRING_IS_ONLY_SYMBOLS_RE) # for some reason it returns true if multi-line string contains carriage returns (wtf?)
-
-    only_html_elements = true
-
-    variable.split('\#').each do |line|
-        unless line.strip.match?(/^(#? ?<.*>\.?)$|^$/)
-            only_html_elements = false
-            break
-        end
+    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)
+
+    if variable.split("\n").all? do |line|
+        line.empty? ||
+            line.match?(/^#? ?<.*>.?$/) ||
+            line.match?(/^[a-z][0-9]$/)
+    end
+        return nil
     end
 
-    return nil if only_html_elements
-
-    return nil if variable.match?(/^[+-]?[0-9]*$/) ||
+    return nil if variable.match?(/^[+-]?[0-9]+$/) ||
         variable.match?(/---/) ||
         variable.match?(/restrict eval/)
 
@@ -157,8 +92,8 @@ def self.read_map(maps_files_paths, output_path, romanize, logging, game_type, p
 
     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
+    maps_lines = Set.new
+    names_lines = Set.new
 
     maps_translation_map = nil
     names_translation_map = nil
@@ -213,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?
@@ -225,21 +160,23 @@ 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
+
+                            line.clear
                         end
-                        next
+
+                        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)
@@ -264,7 +201,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 &&
@@ -327,7 +263,7 @@ def self.read_other(other_files_paths, output_path, romanize, logging, game_type
             next
         end
 
-        other_lines = IndexSet.new
+        other_lines = Set.new
         other_translation_map = nil
 
         if processing_mode == :append
@@ -350,22 +286,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_with_index do |variable, type|
-                    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, type, game_type)
 
-                    parsed = parse_variable(variable, type, game_type)
-                    next if parsed.nil?
+                        if !parsed.nil?
+                            parsed = romanize_string(parsed) if romanize
 
-                    parsed = parsed.gsub(/\r?\n/, '\#')
-                    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
@@ -385,9 +327,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?
@@ -397,21 +339,23 @@ 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
+
+                                line.clear
                             end
-                            next
+
+                            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)
@@ -436,7 +380,6 @@ def self.read_other(other_files_paths, output_path, romanize, logging, game_type
                             parsed = parse_parameter(code, parameter, game_type)
                             next if parsed.nil?
 
-                            parsed = parsed.gsub(/\r?\n/, '\#')
                             parsed = romanize_string(parsed) if romanize
 
                             other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
@@ -450,7 +393,6 @@ def self.read_other(other_files_paths, output_path, romanize, logging, game_type
                             parsed = parse_parameter(code, parameter, game_type)
                             next if parsed.nil?
 
-                            parsed = parsed.gsub(/\r?\n/, '\#')
                             parsed = romanize_string(parsed) if romanize
 
                             other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
@@ -509,7 +451,7 @@ def self.read_system(system_file_path, ini_file_path, output_path, romanize, log
 
     system_object = Marshal.load(File.binread(system_file_path))
 
-    system_lines = IndexSet.new
+    system_lines = Set.new
     system_translation_map = nil
 
     if processing_mode == :append
@@ -635,7 +577,7 @@ def self.read_scripts(scripts_file_path, output_path, romanize, logging, process
 
     script_entries = Marshal.load(File.binread(scripts_file_path))
 
-    scripts_lines = IndexSet.new
+    scripts_lines = Set.new
     scripts_translation_map = nil
 
     if processing_mode == :append
@@ -653,8 +595,6 @@ def self.read_scripts(scripts_file_path, output_path, romanize, logging, process
     # This code was fun before `that` game used Windows-1252 degree symbol
     script_entries.each do |script|
         code = Zlib::Inflate.inflate(script[2]).force_encoding('UTF-8')
-        # we're fucking cloning because of encoding issue
-        codes_content.push(code.clone)
 
         # I figured how String#encode works - now everything is good
         unless code.valid_encoding?
@@ -670,62 +610,35 @@ def self.read_scripts(scripts_file_path, output_path, romanize, logging, process
             end
         end
 
-        extract_quoted_strings(code).each do |string|
-            # Removes the U+3000 Japanese typographical space to check if string, when stripped, is truly empty
-            string = string.strip.delete('　')
+        codes_content.push(code)
+    end
 
-            next if string.empty?
+    extracted = extract_strings(codes_content.join)
 
-            # Maybe this mess will remove something that mustn't be removed, but it needs to be tested
-            next if string.start_with?(/([#!?$@]|(\.\/)?(Graphics|Data|Audio|CG|Movies|Save)\/)/) ||
-                string.match?(/^[^\p{L}]+$/) ||
-                string.match?(/^\d+$/) ||
-                string.match?(/%.*(\d|\+|\*)d\]?:?$/) ||
-                string.match?(/^\[((ON|OFF)|P[EMRT])\]$/) ||
-                string.match?(/^\[\]$/) ||
-                string.match?(/^(.)\1{2,}$/) ||
-                string.match?(/^(false|true)$/) ||
-                string.match?(/^[wr]b$/) ||
-                string.match?(/^(?=.*\d)[A-Za-z0-9-]+$/) ||
-                string.match?(/^[a-z\-()\/ +'&]*$/) ||
-                string.match?(/^[A-Za-z]+[+-]$/) ||
-                string.match?(STRING_IS_ONLY_SYMBOLS_RE) ||
-                string.match?(/^Tile.*[A-Z]$/) ||
-                string.match?(/^[a-zA-Z][a-z]+([A-Z][a-z]*)+$/) ||
-                string.match?(/^Cancel Action$|^Invert$|^End$|^Individual$|^Missed File$|^Bitmap$|^Audio$/) ||
-                string.match?(/^(?=.*%d)(?=.*%m)(?=.*%Y).*$/) ||
-                string.match?(/^\\\\ALPHAC/) ||
-                string.match?(/^[A-Z]{,3}-[A-Z][A-Za-z]+/) ||
-                string.match?(/\.(mp3|ogg|jpg|png|ini|txt)$/i) ||
-                string.match?(/\/(\d.*)?$/) ||
-                string.match?(/FILE$/) ||
-                string.match?(/#\{/) ||
-                string.match?(/(?<!\\)\\(?![\\G#])/) ||
-                string.match?(/\+?=?=/) ||
-                string.match?(/[}{_<>]/) ||
-                string.match?(/r[vx]data/) ||
-                string.match?(/No such file or directory/) ||
-                string.match?(/level \*\*/) ||
-                string.match?(/Courier New|Comic Sans|Lucida|Verdana|Tahoma|Arial|Times New Roman/) ||
-                string.match?(/Player start location/) ||
-                string.match?(/Common event call has exceeded/) ||
-                string.match?(/se-/) ||
-                string.match?(/Start Pos/) ||
-                string.match?(/An error has occurred/) ||
-                string.match?(/Define it first/) ||
-                string.match?(/Process Skill/) ||
-                string.match?(/Wpn Only/) ||
-                string.match?(/Don't Wait/) ||
-                string.match?(/Clear image/) ||
-                string.match?(/Can Collapse/)
+    extracted.each do |string|
+        # Removes the U+3000 Japanese typographical space to check if string, when stripped, is truly empty
+        string = string.gsub('　', ' ').strip
 
-            string = romanize_string(string) if romanize
+        next if string.empty?
 
-            scripts_translation_map.insert_at_index(scripts_lines.length, string, '') if processing_mode == :append &&
-                !scripts_translation_map.include?(string)
+        next if string.match?(/(Graphics|Data|Audio|Movies|System)\/.*\/?/) ||
+            string.match?(/r[xv]data2?$/) ||
+            string.match?(STRING_IS_ONLY_SYMBOLS_RE) ||
+            string.match?(/@window/) ||
+            string.match?(/\$game/) ||
+            string.match?(/_/) ||
+            string.match?(/^\\e/) ||
+            string.match?(/.*\(/) ||
+            string.match?(/^([d\d\p{P}+-]*|[d\p{P}+-]*)$/) ||
+            string.match?(/ALPHAC/) ||
+            string.match?(/^(Actor<id>|ExtraDropItem|EquipLearnSkill|GameOver|Iconset|Window|true|false|MActor%d|w[rb]|\\f|\\n|\[[A-Z]*\])$/)
 
-            scripts_lines.add(string)
-        end
+        string = romanize_string(string) if romanize
+
+        scripts_translation_map.insert_at_index(scripts_lines.length, string, '') if processing_mode == :append &&
+            !scripts_translation_map.include?(string)
+
+        scripts_lines.add(string)
     end
 
     puts "Parsed #{scripts_filename}" if logging

data/lib/write.rb

@@ -3,79 +3,21 @@
 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\(.*\)$/]
-    parameter = parameter.chomp(ends_with_if) if ends_with_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?
         case game_type
@@ -85,11 +27,8 @@ def self.get_parameter_translated(code, parameter, hashmap, game_type)
                         prefix = parameter[/^(\\et\[[0-9]+\]|\\nbt)/]
                         parameter = parameter.sub(prefix, '') if prefix
 
-                        translated = hashmap[parameter]
-                        return nil if translated.nil? || translated.empty?
-
-                        translated = prefix + translated if prefix
-                        return translated
+                        remaining_strings.push(prefix)
+                        insert_positions.push(0)
                     when 102, 402
                         # Implement some custom parsing
                     when 356
@@ -105,16 +44,26 @@ def self.get_parameter_translated(code, parameter, hashmap, game_type)
 
     translated = hashmap[parameter]
     return nil if translated.nil? || translated.empty?
-    translated += ends_with_if if ends_with_if
+
+    remaining_strings.zip(insert_positions).each do |string, position|
+        case position
+            when 0
+                translated = string + translated
+            when 1
+                translated += string
+        end
+    end
+
     translated
 end
 
 # @param [String] variable
-# # @param [Integer] type
+# @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, type, hashmap, _game_type)
+def self.get_variable_translated(variable, type, _filename, hashmap, _game_type)
     variable = variable.gsub(/\r?\n/, "\n")
 
     case type
@@ -197,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
@@ -215,20 +164,24 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
                                 end
 
                                 if split_length > line_length
-                                    list[item_indices.last].parameters[0] = split[line_length..].join("\n")
+                                    list[item_indices.last].parameters[0] = split[line_length - 1..].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|
@@ -240,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
@@ -249,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?
@@ -257,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
@@ -328,9 +281,12 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                     next if variable.empty?
 
                     variable = romanize_string(variable) if romanize
-                    translated = get_variable_translated(variable, type, other_translation_map, game_type)
 
-                    unless translated.nil? || translated.empty?
+                    variable = variable.split("\n").map(&:strip).join("\n")
+
+                    translated = get_variable_translated(variable, type, filename, other_translation_map, game_type)
+
+                    if !translated.nil? && !translated.empty?
                         if type.zero?
                             object.name = translated
                         elsif type == 1
@@ -361,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
@@ -379,20 +335,24 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                                     end
 
                                     if split_length > line_length
-                                        list[item_indices.last].parameters[0] = split[line_length..].join("\n")
+                                        list[item_indices.last].parameters[0] = split[line_length - 1..].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|
@@ -404,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
@@ -413,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?
@@ -421,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
@@ -498,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?
@@ -527,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
@@ -536,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
 
@@ -576,15 +536,10 @@ def self.write_scripts(scripts_file_path, other_path, output_path, romanize, log
 
     scripts_translation_map = Hash[scripts_original_text.zip(scripts_translated_text)]
 
-    # Shuffle can possibly break the game in scripts, so no shuffling
-    codes = []
-
-    # This code was fun before `that` game used Windows-1252 degree symbol
     script_entries.each do |script|
         code = Zlib::Inflate.inflate(script[2])
         code.force_encoding('UTF-8')
 
-        # I figured how String#encode works - now everything is good
         unless code.valid_encoding?
             [Encoding::UTF_8, Encoding::WINDOWS_1252, Encoding::SHIFT_JIS].each do |encoding|
                 encoded = code.encode(code.encoding, encoding)
@@ -599,23 +554,21 @@ 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_strings(code, true)
 
         string_array.zip(index_array).reverse_each do |string, index|
-            string = string.strip.delete('　')
+            string = string.gsub('　', '').strip
             next if string.empty? || !scripts_translation_map.include?(string)
 
             string = romanize_string(string) if romanize
 
             gotten = scripts_translation_map[string]
-            code[index - string.length, string.length] = gotten unless gotten.nil? || gotten.empty?
+            code[index, string.length] = gotten unless gotten.nil? || gotten.empty?
         end
 
-        codes.push(code)
         script[2] = Zlib::Deflate.deflate(code, Zlib::BEST_COMPRESSION)
     end
 
-    # File.binwrite(File.join(output_path, 'scripts_plain.txt'), codes.join("\n")) - debug line
     File.binwrite(File.join(output_path, scripts_basename), Marshal.dump(script_entries))
     puts "Written #{scripts_basename}" if logging
 end

data/rvpacker-txt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
     spec.name = 'rvpacker-txt'
-    spec.version = '1.10.0'
+    spec.version = '1.12.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.10.0
+  version: 1.12.0
 platform: ruby
 authors:
 - Howard Jeng
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-27 00:00:00.000000000 Z
+date: 2024-08-02 00:00:00.000000000 Z
 dependencies: []
 description:
 email: