rvpacker-txt 1.7.1 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74aada023c293bbfcc7d1f6ae5938daadaf3fd0b021df0828d9ac6cd7b6c2ff5
-  data.tar.gz: 609a0d4ebb873b9162f3999d3620419757c60724a316c6716311b3f6268fe32e
+  metadata.gz: d199295537aa63985fd91781ab16f369f2143e7dc31a60647800896ea554d499
+  data.tar.gz: 1e9875616671881fad934714622fe57f4a9f9a0c9fa8719e29b33e7e82cb9b94
 SHA512:
-  metadata.gz: 94d500defcefee3f20a86b8ff7adc7b25379cec0561b0ef675e00b4c1153fc23e00f8e897a425848c2be77bdcb59fa3931fb8ec647a64a6b0d768d231f3161cd
-  data.tar.gz: 00b7582689da125e19e2ec21d9b8543e40ea1d2c19a382e719a0d81a42dfd4069f65bf4ec2cee7da4ad9a8fc635bfb79747f5c6201437f20c3d4a6746348a295
+  metadata.gz: d5d3dcb0546223e2934632d15e0e3afb1c551ef68179a92a23d607ac2d575119948cd4e0dfff61f44f12b2dc7d0974e5ea9805c90a09a3192ca0a2e253d1e439
+  data.tar.gz: 971573cb4d854c8b4ca31825c86ed948a8577b73a21ccf30c8f9257c9d2e86eb44a01c2e3b51089941a0c357c94af0bd758c41309f708b2f7cfd5c6850374fd0

data/lib/classes.rb

@@ -134,31 +134,31 @@ module RPG
     end
 
     class Armor
-        attr_accessor :name, :nickname, :description, :note
+        attr_accessor :name, :description, :note
     end
 
     class Class
-        attr_accessor :name, :nickname, :description, :note
+        attr_accessor :name, :description, :note
     end
 
     class Enemy
-        attr_accessor :name, :nickname, :description, :note
+        attr_accessor :name, :description, :note
     end
 
     class Item
-        attr_accessor :name, :nickname, :description, :note
+        attr_accessor :name, :description, :note
     end
 
     class Skill
-        attr_accessor :name, :nickname, :description, :note
+        attr_accessor :name, :description, :note
     end
 
     class State
-        attr_accessor :name, :nickname, :description, :note
+        attr_accessor :name, :description, :note
     end
 
     class Weapon
-        attr_accessor :name, :nickname, :description, :note
+        attr_accessor :name, :description, :note
     end
 
     class CommonEvent

data/lib/read.rb

@@ -13,7 +13,7 @@ class Hash
 end
 
 # @param [String] string A parsed scripts code string, containing raw Ruby code
-# @return [IndexSet<String>] Hash of parsed from code strings and their start indices
+# @return [IndexSet<String>] Set of extracted strings
 def self.extract_quoted_strings(string)
     result = IndexSet.new
 
@@ -147,9 +147,8 @@ def self.read_map(maps_files_paths, output_path, logging, game_type, processing_
 
     # 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
+    allowed_codes = [401, 102, 356].freeze
 
     maps_object_map.each do |filename, object|
         display_name = object.display_name
@@ -276,9 +275,8 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
     # 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
+    allowed_codes = [401, 405, 102, 356].freeze
 
     other_object_array_map.each do |filename, other_object_array|
         processed_filename = File.basename(filename, '.*').downcase
@@ -310,7 +308,7 @@ def self.read_other(other_files_paths, output_path, logging, game_type, processi
                 next if object.nil?
 
                 name = object.name
-                nickname = object.nickname
+                nickname = object.nickname if object.is_a?(RPG::Actor)
                 description = object.description
                 note = object.note
 

data/lib/write.rb

@@ -5,7 +5,6 @@ require 'zlib'
 # @param [String] string A parsed scripts code string, containing raw Ruby code
 # @return [[Array<String>, Array<Integer>]] Hash of parsed from code strings and their start indices
 def self.extract_quoted_strings(string)
-    # Hash of string-index key-value pairs
     strings_array = []
     indices_array = []
 
@@ -140,7 +139,7 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
         line.gsub('\#', "\n").strip
     end.freeze
 
-    maps_translated_text = File.readlines(File.join(maps_path, 'maps.txt'), encoding: 'UTF-8', chomp: true).map do |line|
+    maps_translated_text = File.readlines(File.join(maps_path, 'maps_trans.txt'), encoding: 'UTF-8', chomp: true).map do |line|
         line.gsub('\#', "\n").strip
     end
 
@@ -175,11 +174,11 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
         events = object.events
         next if events.nil?
 
-        events.each_value do |event|
+        events.each do |ev, event|
             pages = event.pages
             next if pages.nil?
 
-            pages.each do |page|
+            pages.each_with_index do |page, pg|
                 list = page.list
                 next if list.nil?
 
@@ -244,13 +243,21 @@ def self.write_map(original_files_paths, maps_path, output_path, shuffle_level,
                     end
 
                     item.parameters = parameters
+                    list[it] = item
                 end
+
+                page.list = list
+                pages[pg] = page
             end
+
+            event.pages = pages
+            events[ev] = event
         end
 
-        puts "Written #{filename}" if logging
+        object.events = events
 
         File.binwrite(File.join(output_path, filename), Marshal.dump(object))
+        puts "Written #{filename}" if logging
     end
 end
 
@@ -293,7 +300,7 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                 next if object.nil?
 
                 name = object.name
-                nickname = object.nickname
+                nickname = object.nickname if object.is_a?(RPG::Actor)
                 description = object.description
                 note = object.note
 
@@ -310,7 +317,7 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                         if i.zero?
                             object.name = translated
                         elsif i == 1
-                            object.nickname = translated
+                            object.nickname = translated if object.is_a?(RPG::Actor)
                         elsif i == 2
                             object.description = translated
                         else
@@ -320,7 +327,7 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                 end
             end
         else
-            other_object_array.each do |object|
+            other_object_array.each_with_index do |object, obj|
                 next if object.nil?
 
                 pages = object.pages
@@ -391,14 +398,23 @@ def self.write_other(original_files_paths, other_path, output_path, shuffle_leve
                         end
 
                         item.parameters = parameters
+                        list[it] = item
+                    end
+
+                    if pages.nil?
+                        object.list = list
+                    else
+                        pages[pg].instance_variable_set(:@list, list)
+                        object.pages = pages
                     end
                 end
+
+                other_object_array[obj] = object
             end
         end
 
-        puts "Written #{filename}" if logging
-
         File.binwrite(File.join(output_path, filename), Marshal.dump(other_object_array))
+        puts "Written #{filename}" if logging
     end
 end
 
@@ -445,15 +461,15 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
     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|
+    [elements, skill_types, weapon_types, armor_types].each_with_index do |array, i|
         next unless array.is_a?(Array)
 
-        array.map! do |string|
-            stripped = string.strip
-            return string if stripped.empty?
+        array.each_with_index do |string, i|
+            string = string.strip
+            next if string.empty?
 
-            translated = system_translation_map[stripped]
-            !translated.nil? && !translated.empty? ? translated : stripped
+            translated = system_translation_map[string]
+            array[i] = translated unless translated.nil? || translated.empty?
         end
 
         if i.zero?
@@ -479,14 +495,14 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
             next if value.empty?
 
             translated = system_translation_map[stripped]
-            value = !translated.nil? && !translated.empty? ? translated : value
+            value = translated unless translated.nil? || translated.empty?
         elsif value.is_a?(Array)
-            value.map! do |string|
-                stripped = string.strip
-                return string if stripped.empty?
+            value.each_with_index do |string, i|
+                string = string.strip
+                next if string.empty?
 
-                translated = system_translation_map[stripped]
-                value = !translated.nil? && !translated.empty? ? translated : value
+                translated = system_translation_map[string]
+                value[i] = translated unless translated.nil? || translated.empty?
             end
         end
 
@@ -498,8 +514,11 @@ def self.write_system(system_file_path, ini_file_path, other_path, output_path,
         system_object.terms = terms
 
     game_title_translated = system_translated_text[-1]
-    system_object.game_title = game_title_translated
-    write_ini_title(ini_file_path, game_title_translated)
+
+    unless game_title_translated.nil? || game_title_translated.empty?
+        system_object.game_title = game_title_translated
+        write_ini_title(ini_file_path, game_title_translated)
+    end
 
     puts "Written #{system_basename}" if logging
 
@@ -558,8 +577,7 @@ def self.write_scripts(scripts_file_path, other_path, output_path, logging)
         script[2] = Zlib::Deflate.deflate(code, Zlib::BEST_COMPRESSION)
     end
 
-    puts "Written #{scripts_basename}" if logging
-
     # 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.7.1'
+    spec.version = '1.8.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.1
+  version: 1.8.1
 platform: ruby
 authors:
 - Howard Jeng
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies: []
 description:
 email: