rvpacker-txt 1.6.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e7d7d8c4329390fb8ffd7bf1f8cf3edaf6f8cd19319ab64d10731a84f021d4b
-  data.tar.gz: d9db81d1f003f20ce10fb1cb064c60cab274980f26c8931e1c98bbfdf4042b58
+  metadata.gz: 74aada023c293bbfcc7d1f6ae5938daadaf3fd0b021df0828d9ac6cd7b6c2ff5
+  data.tar.gz: 609a0d4ebb873b9162f3999d3620419757c60724a316c6716311b3f6268fe32e
 SHA512:
-  metadata.gz: 9ec02c23d5fe3b8a66bc8b858607028d54f04119c4fb1ffa73d947eebf4bcc738d4b7c952e4e107d0783271790282f19b0262f9bfebe0738cd02813edcbae86c
-  data.tar.gz: 2396ac744536f2fc268fa98dd503d81c58df20cc797ef0cbfb77b793a89137828224a834c67b56697d7527d7de82c016cf6d9b87fb89d0bb0c0914284529a83f
+  metadata.gz: 94d500defcefee3f20a86b8ff7adc7b25379cec0561b0ef675e00b4c1153fc23e00f8e897a425848c2be77bdcb59fa3931fb8ec647a64a6b0d768d231f3161cd
+  data.tar.gz: 00b7582689da125e19e2ec21d9b8543e40ea1d2c19a382e719a0d81a42dfd4069f65bf4ec2cee7da4ad9a8fc635bfb79747f5c6201437f20c3d4a6746348a295

data/bin/rvpacker-txt

@@ -45,7 +45,8 @@ 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
+        cmd.on('-a', '--append', 'When you update the rvpacker-txt, you probably should re-read',
+               'your files with append, as some new text might be added to parser', 'Cannot be used with --force') do
             raise '--append cannot be used beside --force.' if options[:force]
             options[:append] = true
         end
@@ -83,7 +84,7 @@ disable_processing = options[:disable_processing]
 force = options[:force]
 append = options[:append]
 
-extensions = { xp: '.rxdata', vx: 'rvdata', ace: 'rvdata2' }
+extensions = { xp: 'rxdata', vx: 'rvdata', ace: 'rvdata2' }
 
 original_directory = Dir.glob(File.join(input_dir, '{data,original}'), File::FNM_CASEFOLD).first
 raise '"Data" or "original" directory not found within input directory.' unless original_directory
@@ -94,11 +95,11 @@ other_path = File.join(input_dir, 'translation', 'other')
 FileUtils.mkdir_p(maps_path)
 FileUtils.mkdir_p(other_path)
 
-engine = extensions.find do |_symbol, extension|
-    File.exist?(File.join(original_directory, "System.#{extension}"))
+engine = extensions.each do |symbol, extension|
+    break symbol if File.exist?(File.join(original_directory, "System.#{extension}"))
 end || (raise "Couldn't determine project engine.")
 
-files = Dir.glob("#{original_directory}/*#{extensions[engine[0]]}")
+files = Dir.glob("#{original_directory}/*#{extensions[engine]}")
 
 maps_files_paths = []
 other_files_paths = []
@@ -107,7 +108,7 @@ scripts_file_path = nil
 
 files.each do |file|
     basename = File.basename(file)
-    next unless basename.end_with?(extensions[engine[0]])
+    next unless basename.end_with?(extensions[engine])
 
     if basename.start_with?(/Map[0-9]/)
         maps_files_paths.push(file)
@@ -132,9 +133,9 @@ processing_type = if force
                       exit unless gets.chomp == 'Y'
 
                       wait_time = Time.now - wait_time_start
-                      'force'
+                      :force
                   else
-                      append ? 'append' : 'default'
+                      append ? :append : :default
                   end
 
 puts 'Custom processing for this game is enabled. Use --disable-custom-processing to disable it.' unless game_type.nil?

data/lib/classes.rb

@@ -113,6 +113,69 @@ class IndexSet
 end
 
 module RPG
+    class Map
+        attr_accessor :display_name, :events
+    end
+
+    class Event
+        attr_accessor :pages
+
+        class Page
+            attr_accessor :list
+        end
+    end
+
+    class EventCommand
+        attr_accessor :code, :parameters
+    end
+
+    class Actor
+        attr_accessor :name, :nickname, :description, :note
+    end
+
+    class Armor
+        attr_accessor :name, :nickname, :description, :note
+    end
+
+    class Class
+        attr_accessor :name, :nickname, :description, :note
+    end
+
+    class Enemy
+        attr_accessor :name, :nickname, :description, :note
+    end
+
+    class Item
+        attr_accessor :name, :nickname, :description, :note
+    end
+
+    class Skill
+        attr_accessor :name, :nickname, :description, :note
+    end
+
+    class State
+        attr_accessor :name, :nickname, :description, :note
+    end
+
+    class Weapon
+        attr_accessor :name, :nickname, :description, :note
+    end
+
+    class CommonEvent
+        attr_accessor :pages, :list
+    end
+
+    class Troop
+        attr_accessor :pages
+
+        class Page
+            attr_accessor :list
+        end
+    end
+
+    class System
+        attr_accessor :elements, :skill_types, :weapon_types, :armor_types, :currency_unit, :terms, :words, :game_title
+    end
 end
 
 module RGSS

data/lib/read.rb

@@ -25,7 +25,10 @@ def self.extract_quoted_strings(string)
     string.each_line do |line|
         stripped = line.strip
 
-        next if stripped[0] == '#' || stripped.start_with?(/(Win|Lose)|_Fanfare/)
+        next if stripped[0] == '#' ||
+            !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')
@@ -34,7 +37,7 @@ def self.extract_quoted_strings(string)
 
         buffer.push('\#') if in_quotes
 
-        line.each_char.each_with_index do |char, index|
+        line.each_char do |char|
             if %w[' "].include?(char)
                 unless quote_type.nil? || char == quote_type
                     buffer.push(char)
@@ -115,7 +118,7 @@ def self.read_map(maps_files_paths, output_path, logging, game_type, processing_
     maps_trans_output_path = File.join(output_path, 'maps_trans.txt')
     names_trans_output_path = File.join(output_path, 'names_trans.txt')
 
-    if processing_type == 'default' && (File.exist?(maps_trans_output_path) || File.exist?(names_trans_output_path))
+    if processing_type == :default && (File.exist?(maps_trans_output_path) || File.exist?(names_trans_output_path))
         puts 'maps_trans.txt or names_trans.txt file already exists. If you want to forcefully re-read all files, use --force flag, or --append if you want append new text to already existing files.'
         return
     end
@@ -130,7 +133,7 @@ def self.read_map(maps_files_paths, output_path, logging, game_type, processing_
     maps_translation_map = nil
     names_translation_map = nil
 
-    if processing_type == 'append'
+    if processing_type == :append
         if File.exist?(maps_trans_output_path)
             maps_translation_map = Hash[File.readlines(maps_output_path, chomp: true)
                                             .zip(File.readlines(maps_trans_output_path, chomp: true))]
@@ -138,96 +141,98 @@ def self.read_map(maps_files_paths, output_path, logging, game_type, processing_
                                              .zip(File.readlines(names_trans_output_path, chomp: true))]
         else
             puts "Files aren't already parsed. Continuing as if --append flag was omitted."
-            processing_type = 'default'
+            processing_type = :default
         end
     end
 
+    # 401 - dialogue lines
+    # 102 - dialogue choices array
+    # 402 - one of the dialogue choices from the array
+    # 356 - system lines/special texts (do they even exist before mv?)
+    allowed_codes = [401, 102, 402, 356].freeze
+
     maps_object_map.each do |filename, object|
-        display_name = object.instance_variable_get(:@display_name)
+        display_name = object.display_name
 
         if display_name.is_a?(String)
             display_name = display_name.strip
 
             unless display_name.empty?
-                names_translation_map.insert_at_index(names_lines.length, display_name, '') if processing_type == 'append' &&
+                names_translation_map.insert_at_index(names_lines.length, display_name, '') if processing_type == :append &&
                     !names_translation_map.include?(display_name)
 
                 names_lines.add(display_name)
             end
         end
 
-        events = object.instance_variable_get(:@events)
+        events = object.events
         next if events.nil?
 
         events.each_value do |event|
-            pages = event.instance_variable_get(:@pages)
+            pages = event.pages
             next if pages.nil?
 
             pages.each do |page|
-                list = page.instance_variable_get(:@list)
+                list = page.list
                 next if list.nil?
 
                 in_sequence = false
                 line = []
 
                 list.each do |item|
-                    code = item.instance_variable_get(:@code)
-                    parameters = item.instance_variable_get(:@parameters)
-
-                    parameters.each do |parameter|
-                        if code == 401
-                            next unless parameter.is_a?(String) && !parameter.empty?
-
-                            in_sequence = true
-                            line.push(parameter)
-                        else
-                            if in_sequence
-                                joined = line.join('\#').strip
-                                parsed = parse_parameter(401, joined, game_type)
-
-                                maps_translation_map.insert_at_index(maps_lines.length, parsed, '') if processing_type == 'append' &&
-                                    !maps_translation_map.include?(parsed)
+                    code = item.code
 
-                                maps_lines.add(parsed)
+                    unless allowed_codes.include?(code)
+                        if in_sequence
+                            joined = line.join('\#').strip
+                            parsed = parse_parameter(401, joined, game_type)
 
-                                line.clear
-                                in_sequence = false
-                            end
+                            maps_translation_map.insert_at_index(maps_lines.length, parsed, '') if processing_type == :append &&
+                                !maps_translation_map.include?(parsed)
 
-                            if code == 102 && parameter.is_a?(Array)
-                                parameter.each do |subparameter|
-                                    next unless subparameter.is_a?(String)
+                            maps_lines.add(parsed)
 
-                                    subparameter = subparameter.strip
+                            line.clear
+                            in_sequence = false
+                        end
+                        next
+                    end
 
-                                    next if subparameter.empty?
+                    parameters = item.parameters
 
-                                    parsed = parse_parameter(code, subparameter, game_type)
+                    if code == 401
+                        next unless parameters[0].is_a?(String) && !parameters[0].empty?
 
-                                    next if parsed.nil?
+                        in_sequence = true
+                        line.push(parameters[0])
+                    elsif parameters[0].is_a?(Array)
+                        parameters[0].each do |subparameter|
+                            next unless subparameter.is_a?(String)
 
-                                    maps_translation_map.insert_at_index(maps_lines.length, parsed, '') if processing_type == 'append' &&
-                                        !maps_translation_map.include?(parsed)
+                            subparameter = subparameter.strip
+                            next if subparameter.empty?
 
-                                    maps_lines.add(parsed)
-                                end
-                            elsif code == 356 && parameter.is_a?(String)
-                                parameter = parameter.strip
+                            parsed = parse_parameter(code, subparameter, game_type)
+                            next if parsed.nil?
 
-                                next if parameter.empty?
+                            maps_translation_map.insert_at_index(maps_lines.length, parsed, '') if processing_type == :append &&
+                                !maps_translation_map.include?(parsed)
 
-                                parsed = parse_parameter(code, parameter, game_type)
+                            maps_lines.add(parsed)
+                        end
+                    elsif parameters[0].is_a?(String)
+                        parameter = parameters[0].strip
+                        next if parameter.empty?
 
-                                next if parsed.nil?
+                        parsed = parse_parameter(code, parameter, game_type)
+                        next if parsed.nil?
 
-                                parsed = parsed.gsub(/\r?\n/, '\#')
+                        parsed = parsed.gsub(/\r?\n/, '\#')
 
-                                maps_translation_map.insert_at_index(maps_lines.length, parsed, '') if processing_type == 'append' &&
-                                    !maps_translation_map.include?(parsed)
+                        maps_translation_map.insert_at_index(maps_lines.length, parsed, '') if processing_type == :append &&
+                            !maps_translation_map.include?(parsed)
 
-                                maps_lines.add(parsed)
-                            end
-                        end
+                        maps_lines.add(parsed)
                     end
                 end
             end
@@ -239,7 +244,7 @@ def self.read_map(maps_files_paths, output_path, logging, game_type, processing_
     maps_original_content,
         maps_translated_content,
         names_original_content,
-        names_translated_content = if processing_type == 'append'
+        names_translated_content = if processing_type == :append
                                        [maps_translation_map.keys.join("\n"),
                                         maps_translation_map.values.join("\n"),
                                         names_translation_map.keys.join("\n"),
@@ -268,6 +273,12 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
     end]
 
     inner_processing_type = processing_type
+    # 401 - dialogue lines
+    # 405 - credits lines
+    # 102 - dialogue choices array
+    # 402 - one of the dialogue choices from the array
+    # 356 - system lines/special texts (do they even exist before mv?)
+    allowed_codes = [401, 405, 102, 402, 356].freeze
 
     other_object_array_map.each do |filename, other_object_array|
         processed_filename = File.basename(filename, '.*').downcase
@@ -275,7 +286,7 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
         other_output_path = File.join(output_path, "#{processed_filename}.txt")
         other_trans_output_path = File.join(output_path, "#{processed_filename}_trans.txt")
 
-        if processing_type == 'default' && File.exist?(other_trans_output_path)
+        if processing_type == :default && File.exist?(other_trans_output_path)
             puts "#{processed_filename}_trans.txt file already exists. If you want to forcefully re-read all files, use --force flag, or --append if you want append new text to already existing files."
             next
         end
@@ -283,38 +294,38 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
         other_lines = IndexSet.new
         other_translation_map = nil
 
-        if processing_type == 'append'
+        if processing_type == :append
             if File.exist?(other_trans_output_path)
-                inner_processing_type == 'append'
+                inner_processing_type == :append
                 other_translation_map = Hash[File.readlines(other_output_path, chomp: true)
                                                  .zip(File.readlines(other_trans_output_path, chomp: true))]
             else
                 puts "Files aren't already parsed. Continuing as if --append flag was omitted."
-                inner_processing_type = 'default'
+                inner_processing_type = :default
             end
         end
 
         if !filename.start_with?(/Common|Troops/)
             other_object_array.each do |object|
-                name = object.instance_variable_get(:@name)
-                nickname = object.instance_variable_get(:@nickname)
-                description = object.instance_variable_get(:@description)
-                note = object.instance_variable_get(:@note)
+                next if object.nil?
+
+                name = object.name
+                nickname = object.nickname
+                description = object.description
+                note = object.note
 
                 [name, nickname, description, note].each do |variable|
                     next unless variable.is_a?(String)
 
                     variable = variable.strip
-
                     next if variable.empty?
 
                     parsed = parse_variable(variable, game_type)
-
                     next if parsed.nil?
 
                     parsed = parsed.gsub(/\r?\n/, '\#')
 
-                    other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == 'append' &&
+                    other_translation_map.insert_at_index(other_lines.length, parsed, '') if inner_processing_type == :append &&
                         !other_translation_map.include?(parsed)
 
                     other_lines.add(parsed)
@@ -322,72 +333,75 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
             end
         else
             other_object_array.each do |object|
-                pages = object.instance_variable_get(:@pages)
+                next if object.nil?
+
+                pages = object.pages
                 pages_length = pages.nil? ? 1 : pages.length
 
                 (0..pages_length).each do |i|
-                    list = pages.nil? ? object.instance_variable_get(:@list) : pages[i].instance_variable_get(:@list)
+                    list = pages.nil? ? object.list : pages[i].instance_variable_get(:@list)
                     next if list.nil?
 
                     in_sequence = false
                     line = []
 
                     list.each do |item|
-                        code = item.instance_variable_get(:@code)
-                        parameters = item.instance_variable_get(:@parameters)
+                        code = item.code
 
-                        parameters.each do |parameter|
-                            if [401, 405].include?(code)
-                                next unless parameter.is_a?(String) && !parameter.empty?
+                        unless allowed_codes.include?(code)
+                            if in_sequence
+                                joined = line.join('\#').strip
+
+                                other_translation_map.insert_at_index(other_lines.length, joined, '') if inner_processing_type == :append &&
+                                    !other_translation_map.include?(joined)
 
-                                in_sequence = true
-                                line.push(parameter.gsub(/\r?\n/, '\#'))
-                            else
-                                if in_sequence
-                                    joined = line.join('\#').strip
+                                other_lines.add(joined)
 
-                                    other_translation_map.insert_at_index(other_lines.length, joined, '') if inner_processing_type == 'append' &&
-                                        !other_translation_map.include?(joined)
+                                line.clear
+                                in_sequence = false
+                            end
+                            next
+                        end
 
-                                    other_lines.add(joined)
+                        parameters = item.parameters
 
-                                    line.clear
-                                    in_sequence = false
-                                end
+                        if [401, 405].include?(code)
+                            next unless parameters[0].is_a?(String) && !parameters[0].empty?
 
-                                case code
-                                    when 102
-                                        if parameter.is_a?(Array)
-                                            parameter.each do |subparameter|
-                                                next unless subparameter.is_a?(String)
+                            in_sequence = true
+                            line.push(parameters[0].gsub(/\r?\n/, '\#'))
+                        elsif parameters[0].is_a?(Array)
+                            parameters[0].each do |subparameter|
+                                next unless subparameter.is_a?(String)
 
-                                                subparameter = subparameter.strip
+                                subparameter = subparameter.strip
+                                next if subparameter.empty?
 
-                                                next if subparameter.empty?
+                                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, subparameter, '') if inner_processing_type == 'append' &&
-                                                    !other_translation_map.include?(subparameter)
+                                other_lines.add(subparameter)
+                            end
+                        elsif parameters[0].is_a?(String)
+                            parameter = parameters[0].strip
+                            next if parameter.empty?
 
-                                                other_lines.add(subparameter)
-                                            end
-                                        end
-                                    when 356
-                                        next unless parameter.is_a?(String)
+                            parameter = parameter.gsub(/\r?\n/, '\#')
 
-                                        parameter = parameter.strip
+                            other_translation_map.insert_at_index(other_lines.length, parameter, '') if inner_processing_type == :append &&
+                                !other_translation_map.include?(parameter)
 
-                                        next if parameter.empty?
+                            other_lines.add(parameter)
+                        elsif parameters[1].is_a?(String)
+                            parameter = parameters[1].strip
+                            next if parameter.empty?
 
-                                        parameter = parameter.gsub(/\r?\n/, '\#')
+                            parameter = parameter.gsub(/\r?\n/, '\#')
 
-                                        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, parameter, '') if inner_processing_type == :append &&
+                                !other_translation_map.include?(parameter)
 
-                                        other_lines.add(parameter)
-                                    else
-                                        nil
-                                end
-                            end
+                            other_lines.add(parameter)
                         end
                     end
                 end
@@ -396,7 +410,7 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
 
         puts "Parsed #{filename}" if logging
 
-        original_content, translated_content = if processing_type == 'append'
+        original_content, translated_content = if processing_type == :append
                                                    [other_translation_map.keys.join("\n"),
                                                     other_translation_map.values.join("\n")]
                                                else
@@ -413,7 +427,7 @@ end
 def self.read_ini_title(ini_file_path)
     file_lines = File.readlines(ini_file_path, chomp: true)
     file_lines.each do |line|
-        if line.start_with?('title')
+        if line.downcase.start_with?('title')
             parts = line.partition('=')
             break parts[2].strip
         end
@@ -432,7 +446,7 @@ def self.read_system(system_file_path, ini_file_path, output_path, logging, proc
     system_output_path = File.join(output_path, "#{system_basename}.txt")
     system_trans_output_path = File.join(output_path, "#{system_basename}_trans.txt")
 
-    if processing_type == 'default' && File.exist?(system_trans_output_path)
+    if processing_type == :default && File.exist?(system_trans_output_path)
         puts 'system_trans.txt file already exists. If you want to forcefully re-read all files, use --force flag, or --append if you want append new text to already existing files.'
         return
     end
@@ -442,22 +456,22 @@ def self.read_system(system_file_path, ini_file_path, output_path, logging, proc
     system_lines = IndexSet.new
     system_translation_map = nil
 
-    if processing_type == 'append'
+    if processing_type == :append
         if File.exist?(system_trans_output_path)
             system_translation_map = Hash[File.readlines(system_output_path, chomp: true)
                                               .zip(File.readlines(system_trans_output_path, chomp: true))]
         else
             puts "Files aren't already parsed. Continuing as if --append flag was omitted."
-            processing_type = 'default'
+            processing_type = :default
         end
     end
 
-    elements = system_object.instance_variable_get(:@elements)
-    skill_types = system_object.instance_variable_get(:@skill_types)
-    weapon_types = system_object.instance_variable_get(:@weapon_types)
-    armor_types = system_object.instance_variable_get(:@armor_types)
-    currency_unit = system_object.instance_variable_get(:@currency_unit)
-    terms = system_object.instance_variable_get(:@terms) || system_object.instance_variable_get(:@words)
+    elements = system_object.elements
+    skill_types = system_object.skill_types
+    weapon_types = system_object.weapon_types
+    armor_types = system_object.armor_types
+    currency_unit = system_object.currency_unit
+    terms = system_object.terms || system_object.words
 
     [elements, skill_types, weapon_types, armor_types].each do |array|
         next if array.nil?
@@ -466,10 +480,9 @@ def self.read_system(system_file_path, ini_file_path, output_path, logging, proc
             next unless string.is_a?(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.insert_at_index(system_lines.length, string, '') if processing_type == :append &&
                 !system_translation_map.include?(string)
 
             system_lines.add(string)
@@ -480,7 +493,7 @@ def self.read_system(system_file_path, ini_file_path, output_path, logging, proc
         currency_unit = currency_unit.strip
 
         unless currency_unit.empty?
-            system_translation_map.insert_at_index(system_lines.length, currency_unit, '') if processing_type == 'append' &&
+            system_translation_map.insert_at_index(system_lines.length, currency_unit, '') if processing_type == :append &&
                 !system_translation_map.include?(currency_unit)
 
             system_lines.add(currency_unit)
@@ -494,7 +507,7 @@ def self.read_system(system_file_path, ini_file_path, output_path, logging, proc
             value = value.strip
 
             unless value.empty?
-                system_translation_map.insert_at_index(system_lines.length, value, '') if processing_type == 'append' &&
+                system_translation_map.insert_at_index(system_lines.length, value, '') if processing_type == :append &&
                     !system_translation_map.include?(value)
 
                 system_lines.add(value)
@@ -507,10 +520,9 @@ def self.read_system(system_file_path, ini_file_path, output_path, logging, proc
             next unless string.is_a?(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.insert_at_index(system_lines.length, string, '') if processing_type == :append &&
                 !system_translation_map.include?(string)
 
             system_lines.add(string)
@@ -519,17 +531,16 @@ def self.read_system(system_file_path, ini_file_path, output_path, logging, proc
 
     # Game title from System file and ini file may differ, but requesting user request to determine which line do they want is LAME
     # So just throw that ini ass and continue
-    _game_title = system_object.instance_variable_get(:@game_title)
     ini_game_title = read_ini_title(ini_file_path).strip
 
-    system_translation_map.insert_at_index(system_lines.length, ini_game_title, '') if processing_type == 'append' &&
+    system_translation_map.insert_at_index(system_lines.length, ini_game_title, '') if processing_type == :append &&
         !system_translation_map.include?(ini_game_title)
 
     system_lines.add(ini_game_title)
 
     puts "Parsed #{system_filename}" if logging
 
-    original_content, translated_content = if processing_type == 'append'
+    original_content, translated_content = if processing_type == :append
                                                [system_translation_map.keys.join("\n"),
                                                 system_translation_map.values.join("\n")]
                                            else
@@ -553,7 +564,7 @@ def self.read_scripts(scripts_file_path, output_path, logging, processing_type)
     scripts_output_path = File.join(output_path, "#{scripts_basename}.txt")
     scripts_trans_output_path = File.join(output_path, "#{scripts_basename}_trans.txt")
 
-    if processing_type == 'default' && File.exist?(scripts_trans_output_path)
+    if processing_type == :default && File.exist?(scripts_trans_output_path)
         puts 'scripts_trans.txt file already exists. If you want to forcefully re-read all files, use --force flag, or --append if you want append new text to already existing files.'
         return
     end
@@ -563,21 +574,37 @@ def self.read_scripts(scripts_file_path, output_path, logging, processing_type)
     scripts_lines = IndexSet.new
     scripts_translation_map = nil
 
-    if processing_type == 'append'
+    if processing_type == :append
         if File.exist?(scripts_trans_output_path)
             scripts_translation_map = Hash[File.readlines(scripts_output_path, chomp: true)
                                                .zip(File.readlines(scripts_trans_output_path, chomp: true))]
         else
             puts "Files aren't already parsed. Continuing as if --append flag was omitted."
-            processing_type = 'default'
+            processing_type = :default
         end
     end
 
     codes_content = []
 
+    # 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')
-        codes_content.push(code)
+        # 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?
+            [Encoding::UTF_8, Encoding::WINDOWS_1252, Encoding::SHIFT_JIS].each do |encoding|
+                encoded = code.encode(code.encoding, encoding)
+
+                if encoded.valid_encoding?
+                    code.force_encoding(encoding)
+                    break
+                end
+            rescue Encoding::InvalidByteSequenceError
+                next
+            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
@@ -586,9 +613,12 @@ def self.read_scripts(scripts_file_path, output_path, logging, processing_type)
             next if string.empty?
 
             # 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)\]$/) ||
+                string.match?(/^\[\]$/) ||
                 string.match?(/^(.)\1{2,}$/) ||
                 string.match?(/^(false|true)$/) ||
                 string.match?(/^[wr]b$/) ||
@@ -599,22 +629,17 @@ def self.read_scripts(scripts_file_path, output_path, logging, processing_type)
                 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?(/\.(mp3|ogg|jpg|png|ini)$/) ||
+                string.match?(/\.(mp3|ogg|jpg|png|ini|txt)$/i) ||
                 string.match?(/\/(\d.*)?$/) ||
                 string.match?(/FILE$/) ||
                 string.match?(/#\{/) ||
-                string.match?(/(?<!\\)\\(?!\\|G|#)/) ||
+                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/) ||
-                string.match?(/Comic Sans/) ||
-                string.match?(/Lucida/) ||
-                string.match?(/Verdana/) ||
-                string.match?(/Tahoma/) ||
-                string.match?(/Arial/) ||
+                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-/) ||
@@ -627,7 +652,7 @@ def self.read_scripts(scripts_file_path, output_path, logging, processing_type)
                 string.match?(/Clear image/) ||
                 string.match?(/Can Collapse/)
 
-            scripts_translation_map.insert_at_index(scripts_lines.length, string, '') if processing_type == 'append' &&
+            scripts_translation_map.insert_at_index(scripts_lines.length, string, '') if processing_type == :append &&
                 !scripts_translation_map.include?(string)
 
             scripts_lines.add(string)
@@ -638,7 +663,7 @@ def self.read_scripts(scripts_file_path, output_path, logging, processing_type)
 
     File.binwrite(scripts_plain_output_path, codes_content.join("\n"))
 
-    original_content, translated_content = if processing_type == 'append'
+    original_content, translated_content = if processing_type == :append
                                                [scripts_translation_map.keys.join("\n"),
                                                 scripts_translation_map.values.join("\n")]
                                            else

data/lib/write.rb

@@ -161,98 +161,89 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
     maps_translation_map = Hash[maps_original_text.zip(maps_translated_text)].freeze
     names_translation_map = Hash[names_original_text.zip(names_translated_text)].freeze
 
-    allowed_codes = [401, 402, 356, 102].freeze
+    # 401 - dialogue lines
+    # 102 - dialogue choices array
+    # 402 - one of the dialogue choices from the array
+    # 356 - system lines/special texts (do they even exist before mv?)
+    allowed_codes = [401, 102, 402, 356].freeze
 
     maps_object_map.each do |filename, object|
-        display_name = object.instance_variable_get(:@display_name)
+        display_name = object.display_name
         display_name_gotten = names_translation_map[display_name]
-        object.instance_variable_set(:@display_name, display_name_gotten) unless display_name_gotten.nil?
+        object.display_name = display_name_gotten unless display_name_gotten.nil?
 
-        events = object.instance_variable_get(:@events)
+        events = object.events
         next if events.nil?
 
         events.each_value do |event|
-            pages = event.instance_variable_get(:@pages)
+            pages = event.pages
             next if pages.nil?
 
             pages.each do |page|
-                list = page.instance_variable_get(:@list)
+                list = page.list
                 next if list.nil?
 
                 in_sequence = false
                 line = []
                 item_indices = []
-                parameter_indices = []
 
                 list.each_with_index do |item, it|
-                    code = item.instance_variable_get(:@code)
-                    next unless allowed_codes.include?(code)
+                    code = item.code
 
-                    parameters = item.instance_variable_get(:@parameters)
+                    unless allowed_codes.include?(code)
+                        if in_sequence
+                            joined = line.join('\#').strip
+                            translated = get_parameter_translated(401, joined, maps_translation_map, game_type)
 
-                    parameters.each_with_index do |parameter, pr|
-                        if code == 401
-                            next unless parameter.is_a?(String) && !parameter.empty?
+                            unless translated.nil? || translated.empty?
+                                split = translated.split('\#')
 
-                            in_sequence = true
-                            line.push(parameter)
-                            item_indices.push(it)
-                            parameter_indices.push(pr)
-                        else
-                            if in_sequence
-                                joined = line.join('\#').strip
-                                translated = get_parameter_translated(401, joined, maps_translation_map, game_type)
+                                split_length = split.length
+                                line_length = line.length
 
-                                unless translated.nil? || translated.empty?
-                                    split = translated.split('\#')
-
-                                    (0..line.length - 1).each do |i|
-                                        list[item_indices[i]].instance_variable_get(:@parameters)[parameter_indices[i]] = split[i]
-                                    end
+                                item_indices.each_with_index do |index, i|
+                                    list[index].parameters[0] = i < split_length ? split[i] : ''
                                 end
 
-                                line.clear
-                                item_indices.clear
-                                parameter_indices.clear
-                                in_sequence = false
+                                list[item_indices.last].parameters[0] = split[line_length..].join("\n") if split_length > line_length
                             end
+                        end
+                        next
+                    end
 
-                            case code
-                                when 402
-                                    next unless parameter.is_a?(String)
-
-                                    parameter = parameter.strip
-                                    next if parameter.empty?
-
-                                    translated = get_parameter_translated(code, parameter, maps_translation_map, game_type)
-                                    parameters[pr] = translated unless translated.nil? || translated.empty?
-                                when 102
-                                    next unless parameter.is_a?(Array)
-
-                                    parameter.each_with_index do |subparameter, sp|
-                                        next unless subparameter.is_a?(String)
+                    parameters = item.parameters
 
-                                        subparameter = subparameter.strip
-                                        next if subparameter.empty?
+                    if code == 401
+                        next unless parameters[0].is_a?(String) && !parameters[0].empty?
 
-                                        translated = get_parameter_translated(code, subparameter, maps_translation_map, game_type)
-                                        parameters[pr][sp] = translated unless translated.nil? || translated.empty?
-                                    end
-                                when 356
-                                    next unless parameter.is_a?(String)
+                        in_sequence = true
+                        line.push(parameters[0])
+                        item_indices.push(it)
+                    elsif parameters[0].is_a?(Array)
+                        parameters[0].each_with_index do |subparameter, sp|
+                            next unless subparameter.is_a?(String)
 
-                                    parameter = parameter.strip
-                                    next if parameter.empty?
+                            subparameter = subparameter.strip
+                            next if subparameter.empty?
 
-                                    translated = get_parameter_translated(code, parameter, maps_translation_map, game_type)
-                                    parameters[pr] = translated unless translated.nil? || translated.empty?
-                                else
-                                    nil
-                            end
+                            translated = get_parameter_translated(code, subparameter, maps_translation_map, game_type)
+                            parameters[0][sp] = translated unless translated.nil? || translated.empty?
                         end
+                    elsif parameters[0].is_a?(String)
+                        parameter = parameters[0].strip
+                        next if parameter.empty?
+
+                        translated = get_parameter_translated(code, parameter, maps_translation_map, game_type)
+                        parameters[0] = translated unless translated.nil? || translated.empty?
+                    elsif parameters[1].is_a?(String)
+                        parameter = parameters[1].strip
+                        next if parameter.empty?
+
+                        translated = get_parameter_translated(code, parameter, maps_translation_map, game_type)
+                        parameters[1] = translated unless translated.nil? || translated.empty?
                     end
 
-                    item.instance_variable_set(:@parameters, parameters)
+                    item.parameters = parameters
                 end
             end
         end
@@ -271,13 +262,15 @@ end
 # @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|
-        basename = File.basename(filename)
-        object = Marshal.load(File.binread(filename))
-
-        [basename, object]
+        [File.basename(filename), Marshal.load(File.binread(filename))]
     end]
 
-    allowed_codes = [401, 402, 405, 356, 102].freeze
+    # 401 - dialogue lines
+    # 405 - credits lines
+    # 102 - dialogue choices array
+    # 402 - one of the dialogue choices from the array
+    # 356 - system lines/special texts (do they even exist before mv?)
+    allowed_codes = [401, 405, 102, 402, 356].freeze
 
     other_object_array_map.each do |filename, other_object_array|
         other_filename = File.basename(filename, '.*').downcase
@@ -299,111 +292,105 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
             other_object_array.each do |object|
                 next if object.nil?
 
-                variables_symbols = %i[@name @nickname @description @note].freeze
-
-                name = object.instance_variable_get(variables_symbols[0])
-                nickname = object.instance_variable_get(variables_symbols[1])
-                description = object.instance_variable_get(variables_symbols[2])
-                note = object.instance_variable_get(variables_symbols[3])
+                name = object.name
+                nickname = object.nickname
+                description = object.description
+                note = object.note
 
-                [[variables_symbols[0], name],
-                 [variables_symbols[1], nickname],
-                 [variables_symbols[2], description],
-                 [variables_symbols[3], note]].each do |symbol, variable|
+                [name, nickname, description, note].each_with_index do |variable, i|
                     next unless variable.is_a?(String)
 
                     variable = variable.strip
                     next if variable.empty?
 
                     variable = variable.gsub(/\r\n/, "\n")
-
                     translated = get_variable_translated(variable, other_translation_map, game_type)
-                    object.instance_variable_set(symbol, translated) unless translated.nil? || translated.empty?
+
+                    unless translated.nil? || translated.empty?
+                        if i.zero?
+                            object.name = translated
+                        elsif i == 1
+                            object.nickname = translated
+                        elsif i == 2
+                            object.description = translated
+                        else
+                            object.note = translated
+                        end
+                    end
                 end
             end
         else
             other_object_array.each do |object|
-                pages = object.instance_variable_get(:@pages)
+                next if object.nil?
+
+                pages = object.pages
                 pages_length = pages.nil? ? 1 : pages.length
 
                 (0..pages_length).each do |pg|
-                    list = pages.nil? ? object.instance_variable_get(:@list) : pages[pg].instance_variable_get(:@list)
+                    list = pages.nil? ? object.list : pages[pg].instance_variable_get(:@list) # for some reason .list access doesn't work (wtf?)
                     next if list.nil?
 
                     in_sequence = false
                     line = []
                     item_indices = []
-                    parameter_indices = []
 
                     list.each_with_index do |item, it|
-                        code = item.instance_variable_get(:@code)
-                        next unless allowed_codes.include?(code)
-
-                        parameters = item.instance_variable_get(:@parameters)
-
-                        parameters.each_with_index do |parameter, pr|
-                            if [401, 405].include?(code)
-                                next unless parameter.is_a?(String) && !parameter.empty?
-
-                                in_sequence = true
-                                line.push(parameter)
-                                item_indices.push(it)
-                                parameter_indices.push(pr)
-                            else
-                                if in_sequence
-                                    joined = line.join('\#').strip
-                                    translated = get_parameter_translated(401, joined, other_translation_map, game_type)
-
-                                    unless translated.nil? || translated.empty?
-                                        split = translated.split('\#')
-
-                                        (0..line.length - 1).each do |i|
-                                            list[item_indices[i]].instance_variable_get(:@parameters)[parameter_indices[i]] = split[i]
-                                        end
-                                    end
+                        code = item.code
 
-                                    line.clear
-                                    item_indices.clear
-                                    parameter_indices.clear
-                                    in_sequence = false
-                                end
+                        unless allowed_codes.include?(code)
+                            if in_sequence
+                                joined = line.join('\#').strip
+                                translated = get_parameter_translated(401, joined, other_translation_map, game_type)
+
+                                unless translated.nil? || translated.empty?
+                                    split = translated.split('\#')
 
-                                case code
-                                    when 402
-                                        next unless parameter.is_a?(String)
+                                    split_length = split.length
+                                    line_length = line.length
 
-                                        parameter = parameter.strip
-                                        next if parameter.empty?
+                                    item_indices.each_with_index do |index, i|
+                                        list[index].parameters[0] = i < split_length ? split[i] : ''
+                                    end
 
-                                        translated = get_parameter_translated(code, parameter, other_translation_map, game_type)
-                                        parameters[pr] = translated unless translated.nil? || translated.empty?
-                                    when 102
-                                        next unless parameter.is_a?(Array)
+                                    list[item_indices.last].parameters[0] = split[line_length..].join("\n") if split_length > line_length
+                                end
+                            end
+                            next
+                        end
 
-                                        parameter.each_with_index do |subparameter, sp|
-                                            next unless subparameter.is_a?(String)
+                        parameters = item.parameters
 
-                                            subparameter = subparameter.strip
-                                            next if subparameter.empty?
+                        if [401, 405].include?(code)
+                            next unless parameters[0].is_a?(String) && !parameters[0].empty?
 
-                                            translated = get_parameter_translated(code, subparameter, other_translation_map, game_type)
-                                            parameters[pr][sp] = translated unless translated.nil? || translated.empty?
-                                        end
-                                    when 356
-                                        next unless parameter.is_a?(String)
+                            in_sequence = true
+                            line.push(parameters[0])
+                            item_indices.push(it)
+                        elsif parameters[0].is_a?(Array)
+                            parameters[0].each_with_index do |subparameter, sp|
+                                next unless subparameter.is_a?(String)
 
-                                        parameter = parameter.strip
-                                        next if parameter.empty?
+                                subparameter = subparameter.strip
+                                next if subparameter.empty?
 
-                                        translated = get_parameter_translated(code, parameter, other_translation_map, game_type)
-                                        parameters[pr] = translated unless translated.nil? || translated.empty?
-                                    else
-                                        nil
-                                end
+                                translated = get_parameter_translated(code, subparameter, other_translation_map, game_type)
+                                parameters[0][sp] = translated unless translated.nil? || translated.empty?
                             end
+                        elsif parameters[0].is_a?(String)
+                            parameter = parameters[0].strip
+                            next if parameter.empty?
+
+                            translated = get_parameter_translated(code, parameter, other_translation_map, game_type)
+                            parameters[0] = translated unless translated.nil? || translated.empty?
+                        elsif parameters[1].is_a?(String)
+                            parameter = parameters[1].strip
+                            next if parameter.empty?
+
+                            translated = get_parameter_translated(code, parameter, other_translation_map, game_type)
+                            parameters[1] = translated unless translated.nil? || translated.empty?
                         end
 
-                        item.instance_variable_set(:@parameters, parameters)
+                        item.parameters = parameters
                     end
                 end
             end
@@ -420,7 +407,7 @@ end
 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.start_with?('title')
+        break i if line.downcase.start_with?('title')
     end
 
     file_lines[title_line_index] = translated
@@ -451,14 +438,12 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
 
     system_translation_map = Hash[system_original_text.zip(system_translated_text)].freeze
 
-    system_symbols = %i[@elements @skill_types @weapon_types @armor_types @currency_unit @terms @words @game_title].freeze
-
-    elements = system_object.instance_variable_get(system_symbols[0])
-    skill_types = system_object.instance_variable_get(system_symbols[1])
-    weapon_types = system_object.instance_variable_get(system_symbols[2])
-    armor_types = system_object.instance_variable_get(system_symbols[3])
-    currency_unit = system_object.instance_variable_get(system_symbols[4])
-    terms = system_object.instance_variable_get(system_symbols[5]) || system_object.instance_variable_get(system_symbols[6])
+    elements = system_object.elements
+    skill_types = system_object.skill_types
+    weapon_types = system_object.weapon_types
+    armor_types = system_object.armor_types
+    currency_unit = system_object.currency_unit
+    terms = system_object.terms || system_object.words
 
     [elements, skill_types, weapon_types, armor_types].each_with_index.each do |array, i|
         next unless array.is_a?(Array)
@@ -471,11 +456,19 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
             !translated.nil? && !translated.empty? ? translated : stripped
         end
 
-        system_object.instance_variable_set(system_symbols[i], array)
+        if i.zero?
+            system_object.elements = array
+        elsif i == 1
+            system_object.skill_types = array
+        elsif i == 2
+            system_object.weapon_types = array
+        else
+            system_object.armor_types = array
+        end
     end
 
     currency_unit_translated = system_translation_map[currency_unit]
-    system_object.instance_variable_set(system_symbols[4], currency_unit_translated) if currency_unit.is_a?(String) &&
+    system_object.currency_unit = currency_unit_translated if currency_unit.is_a?(String) &&
         (!currency_unit_translated.nil? && !currency_unit_translated.empty?)
 
     terms.instance_variables.each do |variable|
@@ -500,12 +493,12 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
         terms.instance_variable_set(variable, value)
     end
 
-    system_object.instance_variable_defined?(system_symbols[5]) ?
-        system_object.instance_variable_set(system_symbols[5], terms) :
-        system_object.instance_variable_set(system_symbols[6], terms)
+    system_object.terms.nil? ?
+        system_object.words = terms :
+        system_object.terms = terms
 
     game_title_translated = system_translated_text[-1]
-    system_object.instance_variable_set(system_symbols[7], game_title_translated)
+    system_object.game_title = game_title_translated
     write_ini_title(ini_file_path, game_title_translated)
 
     puts "Written #{system_basename}" if logging
@@ -531,8 +524,24 @@ def self.write_scripts(scripts_file_path, other_path, output_path, logging)
     # 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]).force_encoding('UTF-8')
+        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)
+
+                if encoded.valid_encoding?
+                    code.force_encoding(encoding)
+                    break
+                end
+            rescue Encoding::InvalidByteSequenceError
+                next
+            end
+        end
 
         # this shit finally works and requires NO further changes
         string_array, index_array = extract_quoted_strings(code)
@@ -551,6 +560,6 @@ def self.write_scripts(scripts_file_path, other_path, output_path, logging)
 
     puts "Written #{scripts_basename}" if logging
 
-    File.binwrite(File.join(output_path, 'scripts_plain.txt'), codes.join("\n"))
+    # 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))
 end

data/rvpacker-txt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
     spec.name = 'rvpacker-txt'
-    spec.version = '1.6.0'
+    spec.version = '1.7.1'
     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.6.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Howard Jeng
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies: []
 description:
 email: