rvpacker-txt 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2668e8728bac13732103b447b33f2a3e3b699f408e6e214255abb7a0fa4718c1
-  data.tar.gz: 9214274068189272243df485f52d0d53063316a749590e7f1e708f05613cfeca
+  metadata.gz: fa47130be6188bd6cc7e662a705d3967640b9c20d359d6f1004cd8f87567c6fa
+  data.tar.gz: 73107db4657b4f2790c6b1bbcbec6784c244729218eb9b0a26565a2371b3f985
 SHA512:
-  metadata.gz: 9c646537c1a24ee6341e3d2904c952644bd78054f17d624d21c69627b3972c9741a3989bf8b4ae711f8ebb592ddadfc1d52da3b52faacecd875f031fc1f839f3
-  data.tar.gz: 480402b6423c51245cb431f7fba7324f2895b79f5c3d13ab8f38614a1d3aad026e3f6eabe74b0d2a2992df3f695f81bf91a5f05c93c2566d3f480111a4bdcdf9
+  metadata.gz: 1ca284ed2546b82c36113e324c246af68d3f61f7365ee8a37dd6559dba81ef612027160e957935435e20532c36fe184ad4cb791bc389fb8f6a607f84eb489537
+  data.tar.gz: 578030edf1a599864badba6f4ae5ba889d721aa5644731a7a462c438023fb5f5795543c7ccafd3468e8140243767523eb0dad8fecbfe5eafc42dae3fbaaa5f87

data/lib/read.rb

@@ -26,7 +26,7 @@ def self.extract_quoted_strings(string)
         stripped = line.strip
 
         next if stripped[0] == '#' ||
-            !stripped.match?(/["']/) ||
+            (!in_quotes && !stripped.match?(/["']/)) ||
             stripped.start_with?(/(Win|Lose)|_Fanfare/) ||
             stripped.match?(/eval\(/)
 
@@ -35,8 +35,6 @@ def self.extract_quoted_strings(string)
 
         next if skip_block
 
-        buffer.push('\#') if in_quotes
-
         line.each_char do |char|
             if %w[' "].include?(char)
                 unless quote_type.nil? || char == quote_type
@@ -51,7 +49,16 @@ def self.extract_quoted_strings(string)
                 next
             end
 
-            buffer.push(char) if in_quotes
+            if in_quotes
+                if char == "\r"
+                    next
+                elsif char == "\n"
+                    buffer.push('\#')
+                    next
+                end
+
+                buffer.push(char)
+            end
         end
     end
 
@@ -147,9 +154,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 +282,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 +315,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

@@ -300,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
 
@@ -317,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

data/rvpacker-txt.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
     spec.name = 'rvpacker-txt'
-    spec.version = '1.8.0'
+    spec.version = '1.8.2'
     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.8.0
+  version: 1.8.2
 platform: ruby
 authors:
 - Howard Jeng