rvpacker-txt 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b723edca892d423ad6b4dcd7800a904244fddfa8e7a68bfc823db6be676c0c82
-  data.tar.gz: 2acde66ea3d5f6643ed0e5a81ab12f66ec066952f8bc797d13337d0499db764d
+  metadata.gz: 74aada023c293bbfcc7d1f6ae5938daadaf3fd0b021df0828d9ac6cd7b6c2ff5
+  data.tar.gz: 609a0d4ebb873b9162f3999d3620419757c60724a316c6716311b3f6268fe32e
 SHA512:
-  metadata.gz: 7ba34d8ca913bc93073b322cf3c19d2492438e57cac203161df3c9332176f7b4078e8f229607986a109f4baa3d72470c6491b87825e6f0baf86d927bd3fc4209
-  data.tar.gz: 3e3f67a08e881777ea7057d7545253262746d9875f3bef1c2bd7ac21db52f4b7862881223405ca304dc794b369402f4726747a73bd984e2b11c3ac535733ca28
+  metadata.gz: 94d500defcefee3f20a86b8ff7adc7b25379cec0561b0ef675e00b4c1153fc23e00f8e897a425848c2be77bdcb59fa3931fb8ec647a64a6b0d768d231f3161cd
+  data.tar.gz: 00b7582689da125e19e2ec21d9b8543e40ea1d2c19a382e719a0d81a42dfd4069f65bf4ec2cee7da4ad9a8fc635bfb79747f5c6201437f20c3d4a6746348a295

data/lib/read.rb

@@ -199,42 +199,40 @@ def self.read_map(maps_files_paths, output_path, logging, game_type, processing_
                     end
 
                     parameters = item.parameters
-                    parameters.each do |parameter|
-                        if code == 401
-                            next unless parameter.is_a?(String) && !parameter.empty?
 
-                            in_sequence = true
-                            line.push(parameter)
-                        elsif code == 102 && parameter.is_a?(Array)
-
-                            parameter.each do |subparameter|
-                                next unless subparameter.is_a?(String)
-
-                                subparameter = subparameter.strip
-                                next if subparameter.empty?
+                    if code == 401
+                        next unless parameters[0].is_a?(String) && !parameters[0].empty?
 
-                                parsed = parse_parameter(code, subparameter, game_type)
-                                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)
-
-                                maps_lines.add(parsed)
-                            end
-                        elsif code == 356 && parameter.is_a?(String)
-                            parameter = parameter.strip
-                            next if parameter.empty?
+                            subparameter = subparameter.strip
+                            next if subparameter.empty?
 
-                            parsed = parse_parameter(code, parameter, game_type)
+                            parsed = parse_parameter(code, subparameter, game_type)
                             next if parsed.nil?
 
-                            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_lines.add(parsed)
                         end
+                    elsif parameters[0].is_a?(String)
+                        parameter = parameters[0].strip
+                        next if parameter.empty?
+
+                        parsed = parse_parameter(code, parameter, game_type)
+                        next if parsed.nil?
+
+                        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_lines.add(parsed)
                     end
                 end
             end
@@ -366,45 +364,44 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
                         end
 
                         parameters = item.parameters
-                        parameters.each do |parameter|
-                            if [401, 405].include?(code)
-                                next unless parameter.is_a?(String) && !parameter.empty?
 
-                                in_sequence = true
-                                line.push(parameter.gsub(/\r?\n/, '\#'))
-                            else
+                        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
-                                                next if subparameter.empty?
+                                subparameter = subparameter.strip
+                                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_lines.add(subparameter)
+                            end
+                        elsif parameters[0].is_a?(String)
+                            parameter = parameters[0].strip
+                            next if parameter.empty?
 
-                                                other_translation_map.insert_at_index(other_lines.length, subparameter, '') if inner_processing_type == :append &&
-                                                    !other_translation_map.include?(subparameter)
+                            parameter = parameter.gsub(/\r?\n/, '\#')
 
-                                                other_lines.add(subparameter)
-                                            end
-                                        end
-                                    when 356
-                                        next unless parameter.is_a?(String)
+                            other_translation_map.insert_at_index(other_lines.length, parameter, '') if inner_processing_type == :append &&
+                                !other_translation_map.include?(parameter)
 
-                                        parameter = parameter.strip
-                                        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
@@ -483,7 +480,6 @@ 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 &&
@@ -524,7 +520,6 @@ 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 &&
@@ -597,14 +592,19 @@ def self.read_scripts(scripts_file_path, output_path, logging, processing_type)
         # 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?
-            # who the fuck uses the degree symbol from FUCKING WINDOWS-1252 and NOT UTF-8
-            # also, String#encode does NOT FUCKING WORK and for some reason raises on the
-            # fucking degree symbol from windows-1252 when trying to encode
-            code.force_encoding('Windows-1252')
-        end
+            [Encoding::UTF_8, Encoding::WINDOWS_1252, Encoding::SHIFT_JIS].each do |encoding|
+                encoded = code.encode(code.encoding, encoding)
 
-        raise unless code.valid_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
@@ -614,7 +614,7 @@ def self.read_scripts(scripts_file_path, output_path, logging, processing_type)
 
             # 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?(/^[^\p{L}]+$/) ||
                 string.match?(/^\d+$/) ||
                 string.match?(/%.*(\d|\+|\*)d\]?:?$/) ||
                 string.match?(/^\[(ON|OFF)\]$/) ||

data/lib/write.rb

@@ -219,25 +219,7 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
                         in_sequence = true
                         line.push(parameters[0])
                         item_indices.push(it)
-                    elsif code == 356
-                        parameter = parameters[0]
-                        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[0] = translated unless translated.nil? || translated.empty?
-                    elsif code == 402
-                        parameter = parameters[1]
-                        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[1] = translated unless translated.nil? || translated.empty?
-                    elsif code == 102 && parameters[0].is_a?(Array)
+                    elsif parameters[0].is_a?(Array)
                         parameters[0].each_with_index do |subparameter, sp|
                             next unless subparameter.is_a?(String)
 
@@ -247,6 +229,18 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
                             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.parameters = parameters
@@ -268,10 +262,7 @@ 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]
 
     # 401 - dialogue lines
@@ -313,17 +304,18 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                     next if variable.empty?
 
                     variable = variable.gsub(/\r\n/, "\n")
-
                     translated = get_variable_translated(variable, other_translation_map, game_type)
 
-                    if i.zero?
-                        object.name = translated unless translated.nil? || translated.empty?
-                    elsif i == 1
-                        object.nickname = translated unless translated.nil? || translated.empty?
-                    elsif i == 2
-                        object.description = translated unless translated.nil? || translated.empty?
-                    else
-                        object.note = 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
@@ -374,25 +366,7 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                             in_sequence = true
                             line.push(parameters[0])
                             item_indices.push(it)
-                        elsif code == 356
-                            parameter = parameters[0]
-                            next unless parameter.is_a?(String)
-
-                            parameter = parameter.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 code == 402
-                            parameter = parameters[1]
-                            next unless parameter.is_a?(String)
-
-                            parameter = parameter.strip
-                            next if parameter.empty?
-
-                            translated = get_parameter_translated(code, parameter, other_translation_map, game_type)
-                            parameters[1] = translated unless translated.nil? || translated.empty?
-                        elsif code == 102 && parameters[0].is_a?(Array)
+                        elsif parameters[0].is_a?(Array)
                             parameters[0].each_with_index do |subparameter, sp|
                                 next unless subparameter.is_a?(String)
 
@@ -402,6 +376,18 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                                 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.parameters = parameters
@@ -540,13 +526,21 @@ def self.write_scripts(scripts_file_path, other_path, output_path, logging)
 
     # 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?
-            # who the fuck uses the degree symbol from FUCKING WINDOWS-1252 and NOT UTF-8
-            # also, String#encode does NOT FUCKING WORK and for some reason raises on the
-            # fucking degree symbol from windows-1252 when trying to encode
-            code.force_encoding('Windows-1252')
+            [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

data/rvpacker-txt.gemspec

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