rvpacker-txt 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b17d69aea817f8b41bc154daf4a4f6c6f4c2a0200427cefefadf593c8fae715
-  data.tar.gz: 79a5a1f73df2a44a7571df5fb47bb76c234ecf774946cbdeb51d6a23265a7e13
+  metadata.gz: be60b9ca7d30b5ba65f22b5c71b2051cddc357d0793e5040bddddb4b940f7aec
+  data.tar.gz: a62fc90e814c94a9eeb0d56299c6a9211311263589d6d55b0ef5367a74a281ae
 SHA512:
-  metadata.gz: 5ef9f467c491d122c582f0af55ded8757de79e1bc41eb92b9fdb40617a83b8b06d0cb57dae3d8ae7fc5e397004977b308d303b4489446654022b19ba79279d91
-  data.tar.gz: 00fa12e46f27a7c225bf76179431f4e680d9e4da2c85c48ff0e2355b257254eab80c31d5e07e9be1681982c450d4bfbb3d8d48d41e9e1ab2343af9e7872bcb20
+  metadata.gz: 58e86a866916217af89835096794ecdcaef8803eadc695f24347790179e5e3fda42510d5ce968a904e6d86e84c88602cbbd7fdf7411d2294b253c2a4d225b63b
+  data.tar.gz: 4a6b9e66cc383defab76c9d6216afdfcc45f16de09530ebec498b2401faf4fac16dd3d1aa1843ecc6992585116f22f750f123a9df4d76dd1e1cacbede6ca2705

data/bin/rvpacker-txt

@@ -5,6 +5,7 @@ require 'optparse'
 $logging = false
 $shuffle = 0
 $no = [false, false, false, false] # 0 is whether to NOT process maps, 1 is other, 2 is system, 3 is scripts
+$disable_custom_parsing = false
 
 options = {}
 OptionParser.new do |command|
@@ -43,6 +44,9 @@ OptionParser.new do |command|
                '--shuffle NUMBER',
                'At value 1: Shuffles all lines in strings, at value 2: shuffles all lines and words in strings.') { |number| $shuffle = number }
 
+    command.on('--disable-custom-parsing',
+               'Disables built-in custom parsing for some games, which may improperly parse/write some games.')
+
     command.on('-l',
                '--log',
                'Log information while processing.') { $logging = true }
@@ -53,7 +57,7 @@ OptionParser.new do |command|
 end.parse!(ARGV)
 
 if ARGV.empty?
-    puts 'COMMAND argument is required.'
+    puts 'COMMAND argument is required. Use rvpacker-txt -h for help.'
     exit
 end
 
@@ -66,6 +70,7 @@ end
 
 directory = options[:input_dir]
 raise "#{directory} not found" unless File.exist?(directory)
+directory = File.realpath(directory)
 
 original_directory = Dir.foreach(directory).find { |dirname| dirname.downcase == 'original' || dirname.downcase == 'data' }
 raise '"Data" or "original" directory not found within input directory.' if original_directory.nil?

data/lib/classes.rb

@@ -84,17 +84,14 @@ end
 module RGSS
     # creates an empty class in a potentially nested scope
     def self.process(root, name, *args)
-        if !args.empty?
-            process(root.const_get(name), *args)
+        if args.empty?
+            root.const_set(name, Class.new) unless root.const_defined?(name, false)
         else
-            unless root.const_defined?(name, false)
-                root.const_set(name, Class.new)
-            end
+            process(root.const_get(name), *args)
         end
     end
 
-    # other classes that don't need definitions
-    [
+    classes_nested_array = [
         # RGSS data structures
         %i[RPG Actor],
         %i[RPG Animation],
@@ -143,7 +140,11 @@ module RGSS
         %i[RPG UsableItem Damage],
         %i[RPG UsableItem Effect],
         %i[RPG Weapon]
-    ].each { |symbol_array| process(Object, *symbol_array) }
+    ].freeze
+
+    classes_nested_array.each do |symbol_array|
+        process(Object, *symbol_array)
+    end
 end
 
 require 'serialize'

data/lib/serialize.rb

@@ -18,41 +18,40 @@
 
 require 'zlib'
 
+# Fuck using an array with set, that's just straight dumb and not efficient
 class IndexedSet
     def initialize
-        @set = Set.new
-        @index = []
+        @hash = Hash.new
     end
 
     def add(item)
-        return if @set.include?(item)
-
-        @set.add(item)
-        @index << item
+        return if @hash.include?(item)
+        @hash[item] = hash.size
+        @hash
     end
 
     def include?(item)
-        @set.include?(item)
+        @hash.include?(item)
     end
 
     def each(&block)
-        @index.each(&block)
+        @hash.each_key(&block)
     end
 
     def to_a
-        @index.dup
+        @hash.dup
     end
 
     def join(delimiter = '')
-        @index.join(delimiter)
+        @hash.keys.join(delimiter)
     end
 
     def length
-        @index.length
+        @hash.size
     end
 
     def empty?
-        @index.empty?
+        @hash.empty?
     end
 end
 
@@ -61,7 +60,7 @@ module RGSS
         object = Marshal.load(File.read(system_file_path, mode: 'rb'))
         game_title = object.instance_variable_get(:@game_title)
 
-        return nil if !game_title.is_a?(String) || game_title.empty?
+        return nil if $disable_custom_parsing || (!game_title.is_a?(String) || game_title.empty?)
 
         game_title.downcase!
 
@@ -99,7 +98,7 @@ module RGSS
 
             case $game_type
                 when 'lisa'
-                    unless variable.split('\#').all? { |line| line.match?(/^<.*>\.?$/) || line.length.nil? }
+                    unless variable.split('\#').all? { |line| line.match?(/^<.*>\.?$/) || line.empty? }
                         return nil
                     end
                 else
@@ -277,10 +276,10 @@ module RGSS
 
         [elements, skill_types, weapon_types, armor_types].each do |array|
             next if array.nil?
-            array.each { |string| lines.add(string) unless string.is_a?(String) && string.empty? }
+            array.each { |string| lines.add(string) if string.is_a?(String) && !string.empty? }
         end
 
-        lines.add(currency_unit) unless currency_unit.is_a?(String) && currency_unit.empty?
+        lines.add(currency_unit) if currency_unit.is_a?(String) && !currency_unit.empty?
 
         terms.instance_variables.each do |variable|
             value = terms.instance_variable_get(variable)
@@ -290,10 +289,10 @@ module RGSS
                 next
             end
 
-            value.each { |string| lines.add(string) unless string.is_a?(String) && string.empty? }
+            value.each { |string| lines.add(string) if string.is_a?(String) && !string.empty? }
         end
 
-        lines.add(game_title) unless game_title.is_a?(String) && game_title.empty?
+        lines.add(game_title) if game_title.is_a?(String) && !game_title.empty?
 
         puts "Parsed #{filename}" if $logging
 
@@ -306,10 +305,10 @@ module RGSS
         array.map do |string|
             re = /\S+/
             words = string.scan(re)
-            words.shuffle
+            shuffled = words.shuffle
 
             (0..(words.length)).each do |i|
-                string.sub!(string[i], words[i])
+                string.sub!(words[i], shuffled[i])
             end
 
             string
@@ -370,7 +369,7 @@ module RGSS
             extract_quoted_strings(code).each do |string|
                 string.strip!
 
-                next if string.empty? || string.delete('　　').empty?
+                next if string.empty? || string.gsub('　', '').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)\/)/) ||
@@ -395,7 +394,25 @@ module RGSS
                     string.match?(/\+?=?=/) ||
                     string.match?(/[}{_<>]/) ||
                     string.match?(/r[vx]data/) ||
-                    string.match?(/No such file or directory|level \*\*|Courier New|Comic Sans|Lucida|Verdana|Tahoma|Arial|Player start location|Common event call has exceeded|se-|Start Pos|An error has occurred|Define it first|Process Skill|Wpn Only|Don't Wait|Clear image|Can Collapse/)
+                    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?(/Player start location/) ||
+                    string.match?(/Common event call has exceeded/) ||
+                    string.match?(/se-/) ||
+                    string.match?(/Start Pos/) ||
+                    string.match?(/An error has occurred/) ||
+                    string.match?(/Define it first/) ||
+                    string.match?(/Process Skill/) ||
+                    string.match?(/Wpn Only/) ||
+                    string.match?(/Don't Wait/) ||
+                    string.match?(/Clear image/) ||
+                    string.match?(/Can Collapse/)
 
                 strings.add(string)
             end
@@ -792,6 +809,8 @@ module RGSS
             code = Zlib::Inflate.inflate(script[2]).force_encoding('UTF-8')
 
             scripts_original_text.zip(scripts_translated_text).each do |original, translated|
+                # That may possibly break something, but until it does, who cares
+                # Honestly, it needs to be changed to find quoted strings like in `extract_quoted_strings` method
                 code.gsub!(original, translated) unless translated.nil?
             end
 
@@ -804,14 +823,12 @@ module RGSS
     def self.serialize(engine, action, directory, original_directory)
         start_time = Time.now
 
-        absolute_path = File.realpath(directory).freeze
-
         paths = {
-            original_path: File.join(absolute_path, original_directory),
-            translation_path: File.join(absolute_path, 'translation'),
-            maps_path: File.join(absolute_path, 'translation/maps'),
-            other_path: File.join(absolute_path, 'translation/other'),
-            output_path: File.join(absolute_path, 'output')
+            original_path: File.join(directory, original_directory),
+            translation_path: File.join(directory, 'translation'),
+            maps_path: File.join(directory, 'translation/maps'),
+            other_path: File.join(directory, 'translation/other'),
+            output_path: File.join(directory, 'output')
         }
 
         paths.each_value { |path| FileUtils.mkdir_p(path) }

data/rvpacker-txt.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
     spec.name = 'rvpacker-txt'
-    spec.version = '1.3.0'
+    spec.version = '1.3.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'
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
     spec.metadata = { 'homepage_uri' => 'https://github.com/savannstm/rvpacker-txt' }
 
     spec.files = `git ls-files -z`.split("\x0")
-    spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+    spec.executables = ['rvpacker-txt']
     spec.require_paths = ['lib']
 
     spec.add_development_dependency 'bundler', '~> 2.5'

data/sig/global_variables.rbs

@@ -1,4 +1,5 @@
 $logging: bool
 $shuffle: Integer
 $no: Array[bool]
-$game_type: String | nil
+$game_type: String | nil
+$disable_custom_parsing: bool

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rvpacker-txt
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Howard Jeng
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-05 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler