wolftrans 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c841512ed31767357a132f115dd9c9d5d4d85ae3
-  data.tar.gz: 13b81d6e79ce6e6e7a3ca202073dd4b8c2a22dd8
+  metadata.gz: 04ff8773a7b8a4af514f481410befe41e922aaf2
+  data.tar.gz: 80e7cb14b2a9337ef34b687df85cbff1e4cf60a6
 SHA512:
-  metadata.gz: 4b63ce1e61df8e456faf61ae7064c8732dfc8626b75262641a9afe76b5f271c5e813daa97042435ea237fedf923e7129b74e363c6fbac6b5322f41a6316a5901
-  data.tar.gz: faea22c7bbf27d5e4171fa3056306014e869e4c57e4ea9c5697c6359a0a84255ae1b0ccf5ea14ee9d474d2fb00b8f4328790a96e93bbff84443b408d687ea7bc
+  metadata.gz: 95a928ce6271aa3bfa37c8f842e92a9fee8c117c06849a52545f49fd2abd33ef64a7277b01342bcd188b1abcb7f36a78213161bd90411c1b42558fab05c0c03a
+  data.tar.gz: 7f3ed861199acd6c26fe2ac173892470ab061886b75332fe89d280e59fcf251df47be4a2eab4903670dcc6af2f869249fab874ae416e5981db19a786ca96ba69

data/README.md

@@ -36,6 +36,8 @@ Currently, Wolf Trans can be invoked with the command line:
 
 If `patch_dir` does not exist, it will be automatically generated with the text contained in the data files of the game in `game_dir`. `out_dir` will contain the patched game.
 
+**WARNING: OUT_DIR WILL BE *DELETED* IF IT EXISTS. USE CAUTION.**
+
 The behavior of the command line arguments will almost certainly be revised in a future version.
 
 ## Todo

data/bin/wolftrans

@@ -5,6 +5,7 @@ require 'wolftrans'
 
 if ARGV.size != 3
   STDERR.puts "usage: wolftrans game_dir patch_dir out_dir"
+  STDERR.puts "WARNING: out_dir will be DELETED. Use caution."
   exit 1
 end
 

data/lib/wolfrpg/command.rb

@@ -413,6 +413,14 @@ module WolfRpg
       dump_terminator(coder)
     end
 
+    def each_filename
+      @string_args.each do |str|
+        str.scan(/^[^ ]*?[\/\\].*?\.[a-zA-Z0-9]+$/).each do |filename|
+          yield filename.gsub('\\', '/')
+        end
+      end
+    end
+
     private
     def initialize(cid, args, string_args, indent)
       @cid = cid

data/lib/wolfrpg/common_events.rb

@@ -27,6 +27,14 @@ module WolfRpg
       end
     end
 
+    def each_filename
+      @events.each do |event|
+        event.each_filename do |fn|
+          yield fn
+        end
+      end
+    end
+
     def grep(needle)
     end
 
@@ -149,6 +157,14 @@ module WolfRpg
         end
       end
 
+      def each_filename
+        @commands.each do |command|
+          command.each_filename do |fn|
+            yield fn
+          end
+        end
+      end
+
       private
       MAGIC_NUMBER = [
         0x0A, 0x00, 0x00, 0x00

data/lib/wolfrpg/database.rb

@@ -33,36 +33,46 @@ module WolfRpg
           STDERR.puts "warning: no C1 terminator at the end of '#{dat_filename}'"
         end
       end
+    end
 
-      def dump(project_filename, dat_filename)
-        FileCoder.open(project_filename, :write) do |coder|
-          coder.write_int(@types.size)
-          @types.each do |type|
-            type.dump_project(coder)
-          end
+    def dump(project_filename, dat_filename)
+      FileCoder.open(project_filename, :write) do |coder|
+        coder.write_int(@types.size)
+        @types.each do |type|
+          type.dump_project(coder)
         end
-        FileCoder.open(dat_filename, :write, DAT_SEED_INDICES, @crypt_header) do |coder|
-          if encrypted?
-            coder.write_byte(@unknown_encrypted_1)
-          else
-            coder.write(DAT_MAGIC_NUMBER)
-          end
-          coder.write_int(@types.size)
-          @types.each do |type|
-            type.dump_dat(coder)
+      end
+      FileCoder.open(dat_filename, :write, DAT_SEED_INDICES, @crypt_header) do |coder|
+        if encrypted?
+          coder.write_byte(@unknown_encrypted_1)
+        else
+          coder.write(DAT_MAGIC_NUMBER)
+        end
+        coder.write_int(@types.size)
+        @types.each do |type|
+          type.dump_dat(coder)
+        end
+        coder.write_byte(0xC1)
+      end
+    end
+
+    def each_filename
+      @types.each do |type|
+        type.data.each do |datum|
+          datum.each_filename do |fn|
+            yield fn
           end
-          coder.write_byte(0xC1)
         end
       end
+    end
 
-      def grep(needle)
-        @types.each_with_index do |type, type_index|
-          type.data.each_with_index do |datum, datum_index|
-            datum.each_translatable do |value, field|
-              next unless value =~ needle
-              puts "DB:[#{type_index}]#{type.name}/[#{datum_index}]#{datum.name}/[#{field.index}]#{field.name}"
-              puts "\t" + value
-            end
+    def grep(needle)
+      @types.each_with_index do |type, type_index|
+        type.data.each_with_index do |datum, datum_index|
+          datum.each_translatable do |value, field|
+            next unless value =~ needle
+            puts "DB:[#{type_index}]#{type.name}/[#{datum_index}]#{datum.name}/[#{field.index}]#{field.name}"
+            puts "\t" + value
           end
         end
       end
@@ -312,6 +322,15 @@ module WolfRpg
           yield [value, field] unless value.empty? || value.include?("\n")
         end
       end
+
+      def each_filename
+        @fields.each do |field|
+          next unless field.string?
+          self[field].scan(/^[^ ]*?[\/\\].*?\.[a-zA-Z0-9]+$/).each do |filename|
+            yield filename.gsub('\\', '/')
+          end
+        end
+      end
     end
 
     DAT_MAGIC_NUMBER = [

data/lib/wolfrpg/game_dat.rb

@@ -80,6 +80,10 @@ module WolfRpg
       end
     end
 
+    def each_filename
+      yield @default_pc_graphic.gsub('\\', '/') unless @default_pc_graphic.empty?
+    end
+
     private
     MAGIC_NUMBER = [
       0x57, 0x00, 0x00, 0x4f, 0x4c, 0x00, 0x46, 0x4d, 0x00

data/lib/wolfrpg/map.rb

@@ -55,6 +55,14 @@ module WolfRpg
       end
     end
 
+    def each_filename
+      @events.each do |event|
+        event.each_filename do |fn|
+          yield fn
+        end
+      end
+    end
+
     #DEBUG method that searches for a string somewhere in the map
     def grep(needle)
       @events.each do |event|
@@ -128,6 +136,14 @@ module WolfRpg
         coder.write_byte(0x70)
       end
 
+      def each_filename
+        @pages.each do |page|
+          page.each_filename do |fn|
+            yield fn
+          end
+        end
+      end
+
       class Page
         attr_accessor :id
         attr_accessor :unknown1
@@ -219,6 +235,15 @@ module WolfRpg
           coder.write_byte(0x7A)
         end
 
+        def each_filename
+          yield @graphic_name.gsub('\\', '/') unless @graphic_name.empty?
+          @commands.each do |command|
+            command.each_filename do |fn|
+              yield fn
+            end
+          end
+        end
+
         COMMANDS_TERMINATOR = [
           0x03, 0x00, 0x00, 0x00,
         ].pack('C*')

data/lib/wolftrans/patch_data.rb

@@ -3,6 +3,7 @@ require 'wolfrpg'
 
 require 'fileutils'
 require 'find'
+require 'set'
 
 #####################
 # Loading Game data #
@@ -15,38 +16,29 @@ module WolfTrans
       end
       @game_data_dir = Util.join_path_nocase(@game_dir, 'data')
       if @game_data_dir == nil
-        raise "could not find data folder in '#{@game_dir}'"
+        raise "could not find Data folder in '#{@game_dir}'"
       end
 
-      @maps = {}
+      # Load databases, Game.dat, and common events
       @databases = {}
-
-      # Find and read all necessary data
-      Dir.entries(@game_data_dir).each do |parent_name|
-        parent_name_downcase = parent_name.downcase
-        next unless ['basicdata', 'mapdata'].include? parent_name_downcase
-        parent_path = "#{@game_data_dir}/#{parent_name}"
-        Dir.entries(parent_path).each do |basename|
-          basename_downcase = basename.downcase
-          extension = File.extname(basename_downcase)
-          basename_noext = File.basename(basename_downcase, '.*')
-          filename = "#{parent_path}/#{basename}"
-          case parent_name_downcase
-          when 'mapdata'
-            load_map(filename) if extension == '.mps'
-          when 'basicdata'
-            if basename_downcase == 'game.dat'
-              @game_dat_filename = 'Data/BasicData/Game.dat'
-              load_game_dat(filename)
-            elsif extension == '.project'
-              next if basename_downcase == 'sysdatabasebasic.project'
-              dat_filename = Util.join_path_nocase(parent_path, "#{basename_noext}.dat")
-              next if dat_filename == nil
-              load_game_database(filename, dat_filename)
-            elsif basename_downcase == 'commonevent.dat'
-              load_common_events(filename)
-            end
-          end
+      basicdata_dir = Util.join_path_nocase(@game_data_dir, 'basicdata')
+      if basicdata_dir == nil
+        raise "could not find BasicData folder in '#{@game_data_dir}'"
+      end
+      Dir.entries(basicdata_dir).each do |entry|
+        entry_downcase = entry.downcase
+        filename = "#{basicdata_dir}/#{entry}"
+        if entry_downcase == 'game.dat'
+          @game_dat_filename = 'Data/BasicData/Game.dat'
+          load_game_dat(filename)
+        elsif entry_downcase.end_with?('.project')
+          next if entry_downcase == 'sysdatabasebasic.project'
+          basename = File.basename(entry_downcase, '.*')
+          dat_filename = Util.join_path_nocase(basicdata_dir, "#{basename}.dat")
+          next if dat_filename == nil
+          load_game_database(filename, dat_filename)
+        elsif entry_downcase == 'commonevent.dat'
+          load_common_events(filename)
         end
       end
 
@@ -60,13 +52,62 @@ module WolfTrans
           end
         end
       end
+
+      # Gather list of asset and map filenames
+      map_names = Set.new
+      @assets = {}
+      @databases.each_value do |db|
+        db.each_filename do |fn|
+          fn_downcase = fn.downcase
+          @assets[fn_downcase] = fn
+          if fn_downcase.end_with?('.mps')
+            map_names.add(File.basename(fn_downcase, '.*'))
+          end
+        end
+      end
+      @game_dat.each_filename do |fn|
+        @assets[fn.downcase] = fn
+      end
+      @common_events.each_filename do |fn|
+        @assets[fn.downcase] = fn
+      end
+
+      # Load maps
+      maps_path = Util.join_path_nocase(@game_data_dir, 'mapdata')
+      if maps_path == nil
+        raise "could not find MapData folder in '#{@game_data_dir}'"
+      end
+      @maps = {}
+      map_names.each do |name|
+        map_path = Util.join_path_nocase(maps_path, name + '.mps')
+        if map_path == nil
+          STDERR.puts "warn: could not find map '#{name}'"
+          next
+        end
+        load_map(map_path)
+      end
+
+      # Gather remaining asset filenames
+      @maps.each_value do |map|
+        map.each_filename do |fn|
+          @assets[fn.downcase] = fn
+        end
+      end
+
+      # Make sure not to treat certain kinds of filenames as assets
+      @assets.reject! { |k, v| k.start_with?('save/') }
+
+      # Rewrite asset filenames
+      extcounts = Hash.new(0)
+      @assets.keys.sort.each do |fn|
+        ext = File.extname(fn)[1..-1]
+        @assets[fn] = '%04d.%s' % [extcounts[ext], ext]
+        extcounts[ext] += 1
+      end
     end
 
     # Apply the patch to the files in the game path and write them to the
     # output directory
-    DATA_FILE_EXTENSIONS = ['png','jpg','jpeg','bmp','ogg',
-                            'mp3','wav','mid','midi',
-                            'dat','project','xxxxx']
     def apply(out_dir)
       out_dir = Util.sanitize_path(out_dir)
       out_data_dir = "#{out_dir}/Data"
@@ -74,21 +115,8 @@ module WolfTrans
       # Clear out directory
       FileUtils.rm_rf(out_dir)
       FileUtils.mkdir_p("#{out_data_dir}/BasicData")
-      FileUtils.mkdir_p("#{out_data_dir}/MapData")
 
-      # Patch all the maps and dump them
-      @maps.each do |map_name, map|
-        map.events.each do |event|
-          next unless event
-          event.pages.each do |page|
-            page.commands.each_with_index do |command, cmd_index|
-              context = Context::MapEvent.from_data(map_name, event, page, cmd_index, command)
-              patch_command(command, context)
-            end
-          end
-        end
-        map.dump("#{out_data_dir}/MapData/#{map_name}.mps")
-      end
+      #TODO create directories for each asset
 
       # Patch the databases
       @databases.each do |db_name, db|
@@ -120,26 +148,33 @@ module WolfTrans
       patch_game_dat
       @game_dat.dump("#{out_dir}/#{@game_dat_filename}")
 
-      # Copy image/sound/music files
-      Dir.entries(@game_data_dir).each do |entry|
-        # Skip dot and dot-dot and non-directories
-        next if entry == '.' || entry == '..'
-        path = "#{@game_data_dir}/#{entry}"
-        next unless FileTest.directory? path
-
-        # Find the corresponding folder in the out dir
-        unless (out_path = Util.join_path_nocase(out_data_dir, entry))
-          out_path = "#{out_data_dir}/#{entry}"
-          FileUtils.mkdir_p(out_path)
+      # Patch all the maps
+      @maps.each do |map_name, map|
+        map.events.each do |event|
+          next unless event
+          event.pages.each do |page|
+            page.commands.each_with_index do |command, cmd_index|
+              context = Context::MapEvent.from_data(map_name, event, page, cmd_index, command)
+              patch_command(command, context)
+            end
+          end
         end
+        # Translate path
+        assetpath = @assets["mapdata/#{map_name.downcase}.mps"]
+        fullpath = "#{out_data_dir}/#{assetpath}"
+        map.dump(fullpath)
+      end
 
-        # Find the corresponding folder in the patch
-        if @patch_data_dir && (asset_entry = Util.join_path_nocase(@patch_data_dir, entry))
-          copy_data_files("#{@patch_data_dir}/#{asset_entry}", DATA_FILE_EXTENSIONS, out_path)
-        end
+      # Copy remaining BasicData files
+      copy_data_files(Util.join_path_nocase(@game_data_dir, 'basicdata'),
+                      ['xxxxx', 'dat', 'project', 'png'],
+                      "#{out_data_dir}/BasicData")
 
-        # Copy the original game files
-        copy_data_files(path, DATA_FILE_EXTENSIONS, out_path)
+      # Copy remaining assets
+      @assets.each_pair do |fn, newfn|
+        filename = get_asset_filename(fn)
+        next unless filename
+        FileUtils.cp(filename, "#{out_data_dir}/#{newfn}")
       end
 
       # Copy fonts
@@ -345,5 +380,24 @@ module WolfTrans
         FileUtils.cp(path, "#{out_dir}/#{entry}")
       end
     end
+
+    # Get a full filename based on a short asset filename
+    def get_asset_filename(fn)
+      # Find the correct filename case
+      dirname, basename = fn.split('/')
+      if @patch_data_dir
+        path = Util.join_path_nocase(@patch_data_dir, dirname)
+        if path
+          path = Util.join_path_nocase(path, basename)
+          return path if path
+        end
+      end
+      path = Util.join_path_nocase(@game_data_dir, dirname)
+      if path
+        path = Util.join_path_nocase(path, basename)
+        return path if path
+      end
+      return nil
+    end
   end
 end

data/lib/wolftrans/version.rb

@@ -1,3 +1,3 @@
 module WolfTrans
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wolftrans
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Mathew Velasquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies: []
 description: A utility to translate Wolf RPG Editor games
 email: mathewvq@gmail.com
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A utility to translate Wolf RPG Editor games