d3_mpq 0.0.7 → 0.0.9

data/lib/bindata_ext/mod_code.rb

@@ -108,7 +108,8 @@ class ModCode < BinData::Record
         when 0x00
           # return the value at the top of the stack
           raise "Return found, but Stack not empty!" if @data[index+1]
-          return @value = pop
+          @value = pop
+          return @value
         when 0x01
           # call the function of the next op-code (just pass here)
         when 0x03
@@ -150,7 +151,7 @@ class ModCode < BinData::Record
 
       formula, min, max = blk.call(a, b)
 
-      push(StackValue.random(min, min || max))
+      push(StackValue.random(min, max || min))
       @trace << formula
     end
 

data/lib/d3_mpq/analyzer.rb

@@ -18,6 +18,8 @@ module D3MPQ
       case parser_name
       when "d3mpq_stringlist"
         write_stringlist
+      when "d3mpq_recipe"
+        write_recipe
       when "d3mpq_attributes"
         write_single_file("analyze")
       when "d3mpq_coredata_actor"
@@ -33,6 +35,13 @@ module D3MPQ
       write_single_file(dir, @files.first.split("/").last)
     end
 
+    # Writing if StringList
+    def write_recipe
+      @field = nil
+      dir = File.join("analyze", "Recipe")
+      write_single_file(dir, @files.first.split("/").last)
+    end
+
     # Writing if GameBalance
     def write_game_balance
       write_single_file("analyze")

data/lib/d3_mpq/commands.rb

@@ -84,7 +84,10 @@ Example: d3_mpq --csv-input extracted_mpqs/StringList/ csv StringList
 * Actor
 * AffixList
 * Items
+* ItemEnhancements
 * ItemTypes
+* Recipes
+* RecipeDetails
 * StringList
 
 MESSAGE

data/lib/d3_mpq/core_data/game_balance/item_enhancements.rb

@@ -9,14 +9,23 @@ module D3MPQ::CoreData::GameBalance
               :read_length  => 0x100,
               :trim_padding => true
 
-#      zeroes
+      uint32  :source
+      uint32  :level
+      uint32  :gold_cost
+      uint32  :slot
 
-      # lot of ints
-      109.times do |i|
-        uint32  "ui#{i}".intern
+      zeroes
+
+      mod_codes :mod_codes, :initial_length => 16
+
+      uint32  :num_mats
+
+      3.times do |i|
+        uint32  "mats#{i}_hash"
+        uint32  "mats#{i}_num"
       end
 
-#      zeroes  :length => 1
+      zeroes
     end
   end
 end

data/lib/d3_mpq/core_data/game_balance/recipes.rb

@@ -0,0 +1,23 @@
+module D3MPQ::CoreData::GameBalance
+  class Recipes < Base
+    self.struct_size = 0x14C
+
+    content do
+      zeroes
+      string  :name, :length => 0x100, :trim_padding => true
+
+      uint32  :rcp_id         # MPQ Id of the corresponding *.rcp file
+      uint32  :type           # recipe type: 0=BS, 1=Jeweler, 2=Mystic
+      uint32  :source         # recipe source: 0=Auto, 1=Plan
+      uint32  :unkown
+      uint32  :gold_cost      # crafting gold cost
+      uint32  :level_internal # crafting level required (internal)
+
+      6.times do |i|
+        uint32  "mats#{i}_hash"
+        uint32  "mats#{i}_num"
+      end
+    end
+  end
+end
+

data/lib/d3_mpq/core_data/game_balance.rb

@@ -16,6 +16,7 @@ module D3MPQ::CoreData
     require "d3_mpq/core_data/game_balance/monster_affixes"
     require "d3_mpq/core_data/game_balance/monster_names"
     require "d3_mpq/core_data/game_balance/power_formula_tables"
+    require "d3_mpq/core_data/game_balance/recipes"
     require "d3_mpq/core_data/game_balance/set_item_bonuses"
     require "d3_mpq/core_data/game_balance/socketed_effects"
   end

data/lib/d3_mpq/csv_generator/affix_list.rb

@@ -10,7 +10,7 @@ module D3MPQ::CSVGenerator
       :param1             => :param1,
       :param2             => :param2,
       :rare_prefix_fileid => :rare_name_prefix_id,
-      :rate_suffix_fileid => :rare_name_suffix_id,
+      :rare_suffix_fileid => :rare_name_suffix_id,
       :parent_hash        => :group_hash,
       :parent_hash2       => :group_hash2,
       :class_id           => :class_id,

data/lib/d3_mpq/csv_generator/item_enhancements.rb

@@ -0,0 +1,34 @@
+module D3MPQ::CSVGenerator
+  class ItemEnhancements < Base
+    MPQ_READER = D3MPQ::CoreData::GameBalance::ItemEnhancements
+
+    map = {
+      :name           => :name,
+      :hash           => Proc.new { |subject| subject.name.to_d3_hash },
+      :source     => :source,
+      :level      => :level,
+      :gold_cost  => :gold_cost,
+      :slot       => :slot,
+      :num_mats   => :num_mats
+    }
+
+    16.times do |i|
+      m = "modcode#{i}"
+      map["#{m}_mod_id".intern]     = Proc.new { |subject| subject.mod_codes[i].mod_code }
+      map["#{m}_param1".intern]     = Proc.new { |subject| subject.mod_codes[i].mod_param1 }
+      map["#{m}_param2".intern]     = Proc.new { |subject| subject.mod_codes[i].mod_param2 }
+      map["#{m}_param3".intern]     = Proc.new { |subject| subject.mod_codes[i].mod_param3 }
+      map["#{m}_opcode".intern]     = Proc.new { |subject| subject.mod_codes[i].trace.join("|") }
+      map["#{m}_value_min".intern]  = Proc.new { |subject| subject.mod_codes[i].min }
+      map["#{m}_value_max".intern]  = Proc.new { |subject| subject.mod_codes[i].max }
+    end
+
+    3.times do |i|
+      map["mats#{i}_hash".intern] = "mats#{i}_hash".intern
+      map["mats#{i}_num".intern]  = "mats#{i}_num".intern
+    end
+
+    map_to_csv(map)
+  end
+end
+

data/lib/d3_mpq/csv_generator/recipe_details.rb

@@ -0,0 +1,23 @@
+module D3MPQ::CSVGenerator
+  class RecipeDetails < Base
+    MPQ_READER = D3MPQ::Recipe
+
+    map_to_csv  :mpq_id   => :mpq_id,
+                :filename => Proc.new { |subject, filename| filename.split("/").last.gsub(".rcp", '') },
+                :base_type_hash     => :base_type_hash,
+                :num_fixed_affixes  => :num_fixed_affixes,
+                :affix_hash_1       => :affix_hash_1,
+                :affix_hash_2       => :affix_hash_2,
+                :affix_hash_3       => :affix_hash_3,
+                :num_rand_affixes   => :num_rand_affixes,
+                :unknown            => :unknown
+
+  # HACK: to map a MPQ that do not respond_to :content
+  def base_to_subjects(base, filename)
+    print "."
+    @lines << subject_to_csv_line(base, filename)
+  end
+
+  end
+end
+

data/lib/d3_mpq/csv_generator/recipes.rb

@@ -0,0 +1,24 @@
+module D3MPQ::CSVGenerator
+  class Recipes < Base
+    MPQ_READER = D3MPQ::CoreData::GameBalance::Recipes
+
+    map = {
+      :name           => :name,
+      :hash           => Proc.new { |subject| subject.name.to_d3_hash },
+      :rcp_id         => :rcp_id,
+      :type           => :type,
+      :source         => :source,
+      :gold_cost      => :gold_cost,
+      :level_internal => :level_internal,
+      :num_mats       => :unkown
+    }
+
+    6.times do |i|
+      map["mats#{i}_hash".intern] = "mats#{i}_hash".intern
+      map["mats#{i}_num".intern]  = "mats#{i}_num".intern
+    end
+
+    map_to_csv(map)
+  end
+end
+

data/lib/d3_mpq/csv_generator.rb

@@ -4,8 +4,11 @@ module D3MPQ
 
     require 'd3_mpq/csv_generator/actor'
     require 'd3_mpq/csv_generator/affix_list'
-    require 'd3_mpq/csv_generator/item_types'
+    require 'd3_mpq/csv_generator/item_enhancements'
     require 'd3_mpq/csv_generator/items'
+    require 'd3_mpq/csv_generator/item_types'
+    require 'd3_mpq/csv_generator/recipe_details'
+    require 'd3_mpq/csv_generator/recipes'
     require 'd3_mpq/csv_generator/string_list'
   end
 end

data/lib/d3_mpq/recipe.rb

@@ -0,0 +1,19 @@
+module D3MPQ
+  class Recipe < MPQ
+    uint32  :mpq_id
+
+    zeroes  :length => 2
+
+    uint32  :base_type_hash     # hash of the item's base type
+    uint32  :num_fixed_affixes  # number of fixed affixes
+    uint32  :affix_hash_1       # affix hash 1
+    uint32  :affix_hash_2       # affix hash 2
+    uint32  :affix_hash_3       # affix hash 3
+    uint32  :num_rand_affixes   # number of random affixes
+    uint32  :unknown
+
+    hide  :rest
+    rest  :rest
+  end
+end
+

data/lib/d3_mpq/version.rb

@@ -1,4 +1,4 @@
 module D3MPQ
-  VERSION = "0.0.7"
+  VERSION = "0.0.9"
 end
 

data/lib/d3_mpq/version.rb~

@@ -1,4 +1,4 @@
 module D3MPQ
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end
 

data/lib/d3_mpq.rb

@@ -14,6 +14,7 @@ module D3MPQ
 
   require 'd3_mpq/core_data'
   require 'd3_mpq/string_list'
+  require 'd3_mpq/recipe'
 
   require 'd3_mpq/version'