rmxp_extractor 1.8 → 1.9

data/lib/rmxp_extractor/classnames.rb

@@ -1,245 +1,227 @@
-def const_from_string(str)
-  str.split("::").inject(Object) do |mod, class_name|
-    mod.const_get(class_name)
-  end
-end
-
-def create_from_rmxp_serialize(obj)
-  if obj.is_a?(Hash)
-    ret = {}
-    # Hashes have no map method. Why? I dunno!
-    obj.each do |key, value|
-      if key.is_a?(String) && key.start_with?("class ")
-        const = const_from_string(key.delete_prefix("class "))
-        ret = const.new.from_rmxp_serialize(value)
-      else
-        if key.is_a?(String) && key =~ /\A[0-9]+\z/ # Key is an integer
-          key = key.to_i
-        end
-        ret[key] = create_from_rmxp_serialize(value)
-      end
-    end
-    return ret
-  end
-  if obj.is_a?(Array)
-    obj.map! do |value|
-      create_from_rmxp_serialize(value)
-    end
-  end
-  ret = obj
-end
-
-class Object
-  def rmxp_serialize
-    hash = {}
-    self.instance_variables.each { |var| hash[var.to_s.delete("@")] = self.instance_variable_get(var).rmxp_serialize }
-    { "class #{self.class.name}" => hash }
-  end
-
-  def from_rmxp_serialize(hash)
-    hash.each { |key, value| self.instance_variable_set("@#{key}", create_from_rmxp_serialize(value)) }
-    self
-  end
-end
-
-class Numeric
-  def rmxp_serialize
-    self
-  end
-end
-
-class String
-  def rmxp_serialize
-    self
-  end
-end
-
-class Array
-  def rmxp_serialize
-    arr = []
-    self.each { |e| arr << e.rmxp_serialize }
-    arr
-  end
-end
-
-class Hash
-  def rmxp_serialize
-    hash = {}
-    self.each { |key, value| hash[key] = value.rmxp_serialize }
-    hash
-  end
-end
-
-class TrueClass
-  def rmxp_serialize
-    self
-  end
-end
-
-class FalseClass
-  def rmxp_serialize
-    self
-  end
-end
-
-class NilClass
-  def rmxp_serialize
-    self
-  end
-end
-
-class Color
-  attr_accessor :red, :green, :blue, :alpha
-
-  def _dump(limit)
-    [@red, @green, @blue, @alpha].pack("EEEE")
-  end
-
-  def self._load(obj)
-    red, green, blue, alpha = *obj.unpack("EEEE")
-    obj = Color.new
-    obj.red = red; obj.green = green; obj.blue = blue; obj.alpha = alpha
-    obj
-  end
-end
-
-class Table
-  attr_accessor :num_of_dimensions, :xsize, :ysize, :zsize, :num_of_elements, :elements
-
-  def _dump(limit)
-    [@num_of_dimensions, @xsize, @ysize, @zsize, @num_of_elements, *@elements.flatten].pack("VVVVVv*")
-  end
-
-  def self._load(obj)
-    data = obj.unpack("VVVVVv*")
-    obj = self.new
-    num_of_dimensions, xsize, ysize, zsize, num_of_elements, *elements = *data
-    if num_of_dimensions > 1
-      if xsize > 1
-        elements = elements.each_slice(xsize).to_a
-      else
-        elements = elements.map { |element| [element] }
-      end
-    end
-    if num_of_dimensions > 2
-      if ysize > 1
-        elements = elements.each_slice(ysize).to_a
-      else
-        elements = elements.map { |element| [element] }
-      end
-    end
-    obj.num_of_dimensions = num_of_dimensions; obj.xsize = xsize; obj.ysize = ysize; obj.zsize = zsize; obj.elements = elements
-    obj
-  end
-end
-
-class Tone
-  attr_accessor :red, :green, :blue, :gray
-
-  def _dump(limit)
-    [@red, @green, @blue, @gray].pack("EEEE")
-  end
-
-  def self._load(obj)
-    red, green, blue, gray = *obj.unpack("EEEE")
-    obj = Tone.new
-    obj.red = red; obj.green = green; obj.blue = blue; obj.gray = gray
-    obj
-  end
-end
-
-module RPG
-  class Event
-    class Page
-      class Condition
-      end
-
-      class Graphic
-      end
-    end
-  end
-
-  class EventCommand
-  end
-
-  class MoveRoute
-  end
-
-  class MoveCommand
-  end
-
-  class Map
-  end
-
-  class MapInfo
-  end
-
-  class AudioFile
-  end
-
-  class System
-    class Words
-    end
-
-    class TestBattler
-    end
-  end
-
-  class CommonEvent
-  end
-
-  class Tileset
-  end
-
-  class State
-  end
-
-  class Animation
-    class Frame
-    end
-
-    class Timing
-    end
-  end
-
-  class Class
-    class Learning
-    end
-  end
-
-  class Actor
-  end
-
-  class Skill
-  end
-
-  class Item
-  end
-
-  class Weapon
-  end
-
-  class Armor
-  end
-
-  class Enemy
-    class Action
-    end
-  end
-
-  class Troop
-    class Member
-    end
-
-    class Page
-      class Condition
-      end
-    end
-  end
-end
-
-class Script
-  attr_accessor :id
-  attr_accessor :name
-  attr_accessor :data
-end
+def const_from_string(str)
+  str.split("::").inject(Object) do |mod, class_name|
+    mod.const_get(class_name)
+  end
+end
+
+def create_from_rmxp_serialize(obj)
+  if obj.is_a?(Hash)
+    ret = {}
+    # Hashes have no map method. Why? I dunno!
+    obj.each do |key, value|
+      if key.is_a?(String) && key.start_with?("class ")
+        const = const_from_string(key.delete_prefix("class "))
+        ret = const.new.from_rmxp_serialize(value)
+      else
+        if key.is_a?(String) && key =~ /\A[0-9]+\z/ # Key is an integer
+          key = key.to_i
+        end
+        ret[key] = create_from_rmxp_serialize(value)
+      end
+    end
+    return ret
+  end
+  if obj.is_a?(Array)
+    obj.map! do |value|
+      create_from_rmxp_serialize(value)
+    end
+  end
+  ret = obj
+end
+
+class Object
+  def rmxp_serialize
+    hash = {}
+    self.instance_variables.sort.each { |var| hash[var.to_s.delete("@")] = self.instance_variable_get(var).rmxp_serialize }
+    { "class #{self.class.name}" => hash }
+  end
+
+  def from_rmxp_serialize(hash)
+    hash.each { |key, value| self.instance_variable_set("@#{key}", create_from_rmxp_serialize(value)) }
+    self
+  end
+end
+
+class Numeric
+  def rmxp_serialize
+    self
+  end
+end
+
+class String
+  def rmxp_serialize
+    self
+  end
+end
+
+class Array
+  def rmxp_serialize
+    arr = []
+    self.each { |e| arr << e.rmxp_serialize }
+    arr
+  end
+end
+
+class Hash
+  def rmxp_serialize
+    hash = {}
+    self.sort.each { |key, value| hash[key] = value.rmxp_serialize }
+    hash
+  end
+end
+
+class TrueClass
+  def rmxp_serialize
+    self
+  end
+end
+
+class FalseClass
+  def rmxp_serialize
+    self
+  end
+end
+
+class NilClass
+  def rmxp_serialize
+    self
+  end
+end
+
+class Color
+  attr_accessor :red, :green, :blue, :alpha
+
+  def _dump(limit)
+    [@red, @green, @blue, @alpha].pack("d4")
+  end
+
+  def self._load(data)
+    obj = Color.new
+    obj.red, obj.green, obj.blue, obj.alpha = *data.unpack("d4")
+    obj
+  end
+end
+
+class Table
+  attr_accessor :num_of_dimensions, :xsize, :ysize, :zsize, :num_of_elements, :elements
+
+  def _dump(limit)
+    [@num_of_dimensions, @xsize, @ysize, @zsize, @num_of_elements, @elements].flatten.pack("VVVVVv*")
+  end
+
+  def self._load(data)
+    obj = self.new
+    obj.num_of_dimensions, obj.xsize, obj.ysize, obj.zsize, obj.num_of_elements, *obj.elements = *data.unpack("VVVVVv*")
+    obj
+  end
+end
+
+class Tone
+  attr_accessor :red, :green, :blue, :gray
+
+  def _dump(limit)
+    [@red, @green, @blue, @gray].pack("d4")
+  end
+
+  def self._load(data)
+    obj = Tone.new
+    obj.red, obj.green, obj.blue, obj.gray = *data.unpack("d4")
+    obj
+  end
+end
+
+module RPG
+  class Event
+    class Page
+      class Condition
+      end
+
+      class Graphic
+      end
+    end
+  end
+
+  class EventCommand
+  end
+
+  class MoveRoute
+  end
+
+  class MoveCommand
+  end
+
+  class Map
+  end
+
+  class MapInfo
+  end
+
+  class AudioFile
+  end
+
+  class System
+    class Words
+    end
+
+    class TestBattler
+    end
+  end
+
+  class CommonEvent
+  end
+
+  class Tileset
+  end
+
+  class State
+  end
+
+  class Animation
+    class Frame
+    end
+
+    class Timing
+    end
+  end
+
+  class Class
+    class Learning
+    end
+  end
+
+  class Actor
+  end
+
+  class Skill
+  end
+
+  class Item
+  end
+
+  class Weapon
+  end
+
+  class Armor
+  end
+
+  class Enemy
+    class Action
+    end
+  end
+
+  class Troop
+    class Member
+    end
+
+    class Page
+      class Condition
+      end
+    end
+  end
+end
+
+class Script
+  attr_accessor :id
+  attr_accessor :name
+  attr_accessor :data
+end

data/lib/rmxp_extractor/data_export.rb

@@ -1,82 +1,80 @@
-module RMXPExtractor
-  def self.export(format)
-    format ||= "json"
-    STDERR.puts "No Data Directory!" unless Dir.exists? "./Data"
-    exit 1 unless Dir.exists? "./Data"
-
-    require "json"
-    require "yaml"
-    require "amazing_print"
-    require "ruby-progressbar"
-    require "fileutils"
-    require "pathname"
-    require "readline"
-    require_relative "classnames"
-    require_relative "script_handler"
-
-    if format == "ron"
-      require_relative "ron"
-    end
-
-    window_size = 120
-    progress_format = "%a /%e |%B| %p%% %c/%C %r files/sec %t, currently processing: "
-    progress = ProgressBar.create(
-      format: progress_format,
-      starting_at: 0,
-      total: nil,
-      output: $stderr,
-      length: window_size,
-      title: "exported",
-      remainder_mark: "\e[0;30m█\e[0m",
-      progress_mark: "█",
-      unknown_progress_animation_steps: ["==>", ">==", "=>="],
-    )
-    Dir.mkdir "./Data_#{format.upcase}" unless Dir.exists? "./Data_#{format.upcase}"
-    paths = Pathname.glob(("./Data/" + ("*" + ".rxdata")))
-    count = paths.size
-    progress.total = count
-    paths.each_with_index do |path, i|
-      content = Hash.new
-
-      name = path.basename(".rxdata")
-      begin
-        rxdata = Marshal.load(path.read(mode: "rb"))
-      rescue TypeError => e # Failed to load
-        puts "Failed to load file #{path}.\n"
-        next
-      end
-
-      progress.format = progress_format + name.to_s
-      case name.to_s
-      when "xScripts", "Scripts"
-        RMXPExtractor.rpgscript("./", "./Scripts", "#{name.to_s}.rxdata", true)
-        content["data"] = rxdata.map do |a| 
-          s = Script.new
-          s.id, s.name, s.data = a
-          s.data = s.data.bytes
-          s
-        end.rmxp_serialize
-        content["version"] = VERSION
-      else
-        content["data"] = rxdata.rmxp_serialize
-        content["version"] = VERSION
-      end
-
-      file = File.open("./Data_#{format.upcase}/" + name.sub_ext(".#{format}").to_s, "wb")
-      file.puts case format
-                when "yaml"
-                  content.to_yaml
-                when "json"
-                  JSON.pretty_generate(content)
-                when "toml"
-                  TomlRB.dump(content)
-                when "rb"
-                  content.ai(index: false, indent: 2, plain: true)
-                when "ron"
-                  content["data"]
-                end
-
-      progress.increment
-    end
-  end
-end
+module RMXPExtractor
+  def self.export(format)
+    format ||= "json"
+    STDERR.puts "No Data Directory!" unless Dir.exists? "./Data"
+    exit 1 unless Dir.exists? "./Data"
+
+    require "json"
+    require "yaml"
+    require "amazing_print"
+    require "ruby-progressbar"
+    require "fileutils"
+    require "pathname"
+    require "readline"
+    require_relative "classnames"
+    require_relative "script_handler"
+
+    if format == "ron"
+      require_relative "ron"
+    end
+
+    window_size = 120
+    progress_format = "%a /%e |%B| %p%% %c/%C %r files/sec %t, currently processing: "
+    progress = ProgressBar.create(
+      format: progress_format,
+      starting_at: 0,
+      total: nil,
+      output: $stderr,
+      length: window_size,
+      title: "exported",
+      remainder_mark: "\e[0;30m█\e[0m",
+      progress_mark: "█",
+      unknown_progress_animation_steps: ["==>", ">==", "=>="],
+    )
+    Dir.mkdir "./Data_#{format.upcase}" unless Dir.exists? "./Data_#{format.upcase}"
+    paths = Pathname.glob(("./Data/" + ("*" + ".rxdata")))
+    count = paths.size
+    progress.total = count
+    paths.each_with_index do |path, i|
+      content = Hash.new
+
+      name = path.basename(".rxdata")
+      begin
+        rxdata = Marshal.load(path.read(mode: "rb"))
+      rescue TypeError => e # Failed to load
+        puts "Failed to load file #{path}.\n"
+        next
+      end
+
+      progress.format = progress_format + name.to_s
+      case name.to_s
+      when "xScripts", "Scripts"
+        RMXPExtractor.rpgscript("./", "./Scripts", "#{name.to_s}.rxdata", true)
+        content["data"] = rxdata.map do |a|
+          s = Script.new
+          s.id, s.name, s.data = a
+          s.data = s.data.bytes
+          s
+        end.rmxp_serialize
+        content["version"] = VERSION
+      else
+        content["data"] = rxdata.rmxp_serialize
+        content["version"] = VERSION
+      end
+
+      file = File.open("./Data_#{format.upcase}/" + name.sub_ext(".#{format}").to_s, "wb")
+      file.puts case format
+                when "yaml"
+                  content.to_yaml
+                when "json"
+                  JSON.pretty_generate(content)
+                when "rb"
+                  content.ai(index: false, indent: 2, plain: true)
+                when "ron"
+                  content["data"]
+                end
+
+      progress.increment
+    end
+  end
+end