d3_mpq 0.0.6 → 0.0.7

data/lib/bindata_ext/mod_code.rb

@@ -68,11 +68,11 @@ class ModCode < BinData::Record
     end
 
     def min
-      @value.min
+      @value ? @value.min : nil
     end
 
     def max
-      @value.max
+      @value ? @value.max : nil
     end
 
     def push(item)
@@ -98,6 +98,7 @@ class ModCode < BinData::Record
     # Lets go
     def parse
       return @value if @value
+      return nil if @data.empty?
 
       next_op = true
       @data.each_with_index do |dword, index|

data/lib/core_ext/min_max.rb

@@ -23,6 +23,8 @@ class MinMax
 
   # HACK: use a more clever solution
   def /(oth)
+    raise "We can not divide by a range of: #{oth.min} to #{oth.max}" if (oth.min * oth.max) < 0
+
     v = possible_values(self, oth){ |a, b| a / b }
     MinMax.new(v.min, v.max)
   end

data/lib/d3_mpq/commands.rb

@@ -82,6 +82,8 @@ You need to provide the GeneratorClass:
 Example: d3_mpq --csv-input extracted_mpqs/StringList/ csv StringList
 
 * Actor
+* AffixList
+* Items
 * ItemTypes
 * StringList
 

data/lib/d3_mpq/core_data/actor.rb

@@ -1,20 +1,18 @@
 module D3MPQ::CoreData
   class Actor < D3MPQ::MPQ
-    uint32  :actor_id#0x014	DWord appMpqId;	// The MPQ Id of the corresponding Appearance file
+    uint32  :actor_id
 
-    unknown :length => 21#0x018	DWord unknown2[16];	// ???
+    unknown :length => 21
 
     hide    :var_data_offset, :var_data_length
     uint32  :var_data_offset, :check_value => 864
     uint32  :var_data_length
-    unknown :length => 13#0x060	DWord unknown3[13];	// ???
+    unknown :length => 13
 
-    string  :name, :length => 64, :trim_padding => true#0x094	char string[64];	// string
+    string  :name, :length => 64, :trim_padding => true
 
-    unknown :length => 133#0x0D4	DWord unknown4[143];	// ???
+    unknown :length => 143
 
-#    zeroes
-    uint32  :image_hash_before
     uint32  :image_hash_dh_male
     uint32  :image_hash_dh_female
     uint32  :image_hash_barb_male
@@ -25,23 +23,11 @@ module D3MPQ::CoreData
     uint32  :image_hash_wd_female
     uint32  :image_hash_monk_male
     uint32  :image_hash_monk_female
-    uint32  :image_hash_after
 
-    unknown :length => 17# 0x338	DWord unknown4[10];	// could be related to class/gender?
-
-#    array :var_data,
-#          :initial_length => lambda { var_data_length / 4 },
-#          :adjust_offset  => lambda { var_data_offset + 16 }  do
-#      uint32
-#    end
-
-#    hide   :var_data
-#    string :var_data, :length => lambda { var_data_length / 4 },
-#                      :adjust_offset  => lambda { var_data_offset + 16 }
+    unknown :length => 10
 
     hide  :rest
     rest  :rest
-
   end
 end
 

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

@@ -18,13 +18,13 @@ module D3MPQ::CoreData::GameBalance
       uint32  :u03
       uint32  :u04
       uint32  :u05
-      uint32  :p01
-      uint32  :p02
+      uint32  :param1
+      uint32  :param2
       uint32  :rare_name_prefix_id
       uint32  :rare_name_suffix_id
       uint32  :group_hash
       uint32  :group_hash2
-      uint32  :ressource_or_class
+      uint32  :class_id
       uint32  :resource_type_hash
       uint32  :u06
 

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

@@ -41,7 +41,7 @@ module D3MPQ::CoreData::GameBalance
       uint32  :durability_min
       uint32  :durability_delta
       uint32  :base_item_hash
-      uint32  :set_item_bonusses
+      uint32  :setitem_bonus
       uint32  :salvage_common
       uint32  :salvage_magic
       uint32  :salvage_rare
@@ -59,15 +59,15 @@ module D3MPQ::CoreData::GameBalance
       zeroes  :length => 0x15
 
       # Armor
-      float   :armor_minimum
-      float   :armor_variable
+      float   :armor_min
+      float   :armor_delta
       zeroes  :length => 0x2A
 
       # Speed
       float   :attacks_per_second
       zeroes  :length => 21
-      float   :min_damage_mod
-      float   :max_damage_mod
+      float   :damage_mod_min
+      float   :damage_mod_delta
       zeroes  :length => 26
 
       # Unknown
@@ -94,22 +94,24 @@ module D3MPQ::CoreData::GameBalance
       end
 
       ffs     :length => 3
-      uint32  :enchants
+      uint32  :enhancement
 
       # Legendary Affixes
+      uint32  :affix0_id
       uint32  :affix1_id
       uint32  :affix2_id
       uint32  :affix3_id
       uint32  :affix4_id
       uint32  :affix5_id
-      ffs
+      uint32  :affix0_level
       uint32  :affix1_level
       uint32  :affix2_level
       uint32  :affix3_level
       uint32  :affix4_level
       uint32  :affix5_level
 
-      zeroes  :length => 7
+
+      zeroes  :length => 6
 
       uint32  :gem_type
       uint32  :crafting_mat_tier

data/lib/d3_mpq/csv_generator.rb

@@ -3,7 +3,9 @@ module D3MPQ
     require 'd3_mpq/csv_generator/base'
 
     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/items'
     require 'd3_mpq/csv_generator/string_list'
   end
 end

data/lib/d3_mpq/csv_generator/affix_list.rb

@@ -0,0 +1,41 @@
+module D3MPQ::CSVGenerator
+  class AffixList < Base
+    MPQ_READER = D3MPQ::CoreData::GameBalance::AffixList
+
+    map = {
+      :name               => :name,
+      :hash               => Proc.new { |subject| subject.name.to_d3_hash },
+      :lvl                => :alvl,
+      :supmask            => :sup_mask,
+      :param1             => :param1,
+      :param2             => :param2,
+      :rare_prefix_fileid => :rare_name_prefix_id,
+      :rate_suffix_fileid => :rare_name_suffix_id,
+      :parent_hash        => :group_hash,
+      :parent_hash2       => :group_hash2,
+      :class_id           => :class_id,
+      :resource_hash      => :resource_type_hash,
+      :quality_mask       => :quality_mask,
+      :socket_mask        => :socket_mask,
+      :primary_group_hash => :primary_group_hash
+    }
+
+    32.times do |i|
+      map["itemgroup_hash#{i}".intern] = "igh#{i}".intern
+    end
+
+    4.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
+
+    map_to_csv(map)
+  end
+end
+

data/lib/d3_mpq/csv_generator/items.rb

@@ -0,0 +1,64 @@
+module D3MPQ::CSVGenerator
+  class Items < Base
+    MPQ_READER = D3MPQ::CoreData::GameBalance::Items
+
+    map = {
+      :name               => :name,
+      :hash               => Proc.new { |subject| subject.name.to_d3_hash },
+      :actor_id           => :actor_id,
+      :item_type_hash     => :item_type_hash,
+      :lvl                => :item_level,
+      :lvl2               => :ilvl2,
+      :random_affixes     => :num_random_affixes,
+      :max_sockets        => :num_sockets,
+      :max_stacksize      => :stack_size,
+      :gold_price         => :gold_value,
+      :clvl               => :required_level,
+      :durability_min     => :durability_min,
+      :durability_delta   => :durability_delta,
+      :baseitem_hash      => :base_item_hash,
+      :setitem_bonus      => :setitem_bonus,
+      :salvage_common     => :salvage_common,
+      :salvage_magic      => :salvage_magic,
+      :salvage_rare       => :salvage_rare,
+      :rare_prefix_fileid => :rare_group_prefix_id,
+      :rare_suffix_fileid => :rare_group_suffix_id,
+      :damage_min         => :weapong_damage_min,
+      :damage_delta       => :weapong_damage_delta,
+      :armor_min          => :armor_min,
+      :armor_delta        => :armor_delta,
+      :weapon_speed       => :attacks_per_second,
+      :damagemod_min      => :damage_mod_min,
+      :damagemod_delta    => :damage_mod_delta,
+      :item_quality       => :item_quality,
+      :enhancement        => :enhancement,
+      :gem_type           => :gem_type,
+      :craftmat_tier      => :crafting_mat_tier,
+      :craftmat_rarity    => :crafting_mat_rarity
+    }
+
+    7.times do |i|
+      t = "teaches#{i}".intern
+      map[t] = t
+    end
+
+    6.times do |i|
+      map["affixgroup#{i}".intern] = "affix#{i}_id".intern
+      map["affixlevel#{i}".intern] = "affix#{i}_level".intern
+    end
+
+    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
+
+    map_to_csv(map)
+  end
+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/version.rb~

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

data/spec/core_ext/min_max_spec.rb

@@ -57,6 +57,13 @@ describe MinMax do
   describe "#/" do
     specify { (a / b).min.should == 1.to_f/4 }
     specify { (a / b).max.should == 2.to_f/3 }
+
+    context "dividing by possible zero value" do
+      let(:a) { MinMax.new(1.0, 3.0) }
+      let(:b) { MinMax.new(-4.0, 4.0) }
+
+      specify { expect { a / b }.to raise_error }
+    end
     pending "Add TestCases for edges"
   end
 end

data/spec/integration/actor_spec.rb

@@ -17,7 +17,18 @@ describe D3MPQ::CoreData::Actor, :integration => true do
 #  dir.entries.sort.each do |f|
 #    next if f == "." || f == ".."
 
-
+  actors.delete_if do |a|
+    temp_file = File.new(a)
+    size = temp_file.size
+    temp_file.close
+
+    if size == 0
+      warn "[SKIP] #{a}"
+      true
+    else
+      false
+    end
+  end
 #    file = File.join(dir, f)
 
 #    temp_file = File.new(file)

data/spec/unit/core_data/actor_spec.rb

@@ -1,22 +1,22 @@
-#require 'spec_helper'
+require 'spec_helper'
 
-#describe D3MPQ::CoreData::Actor do
-#  let(:io) { File.open("spec/fixtures/CoreData/Actor/DH_elementalArrow_iceProjectile.acr") }
-##  let(:io) { File.open("spec/fixtures/CoreData/GameBalance/Items_Quests_Beta.gam") }
+describe D3MPQ::CoreData::Actor, :broken => true do
+  let(:io) { File.open("spec/fixtures/CoreData/Actor/DH_elementalArrow_iceProjectile.acr") }
+#  let(:io) { File.open("spec/fixtures/CoreData/GameBalance/Items_Quests_Beta.gam") }
 
-##  before(:all) do
-##    subject.read(io)
-###    BinData::trace_reading { subject.read(io) }
-##  end
-
-#  specify do
-#    BinData::trace_reading { subject.read(io) }
-##    subject.var_data_length.should == 0
-#    subject.rest.length.should == 0
-#    true.should be_false
+#  before(:all) do
+#    subject.read(io)
+##    BinData::trace_reading { subject.read(io) }
 #  end
 
-##  its(:variable_content) { subject.size.should_not == 0 }
-##  its(:rest) { should == "" }
-#end
+  specify do
+    BinData::trace_reading { subject.read(io) }
+#    subject.var_data_length.should == 0
+    subject.rest.length.should == 0
+    true.should be_false
+  end
+
+#  its(:variable_content) { subject.size.should_not == 0 }
+#  its(:rest) { should == "" }
+end
 

data/spec/unit/csv_generator/affix_list_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe D3MPQ::CSVGenerator::AffixList do
+  let(:dir) { "spec/fixtures/CoreData/GameBalance/AffixList.gam" }
+
+  specify "#write" do
+    subject.files = dir
+    subject.write
+  end
+end
+

data/spec/unit/csv_generator/item_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe D3MPQ::CSVGenerator::Items do
+  describe "#write" do
+    [
+      "Items_Armor.gam",
+      "Items_Weapons.gam",
+      "Items_Other.gam",
+      "Items_Quests_Beta.gam"
+    ].each do |file_name|
+      context "when called with: Items_Armor.gam" do
+        let(:input) { "spec/fixtures/CoreData/GameBalance/#{file_name}" }
+        specify { subject.files = input; subject.write }
+      end
+    end
+  end
+end
+

data/spec/unit/csv_generator/item_types_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe D3MPQ::CSVGenerator::ItemTypes do
+  let(:dir) { "spec/fixtures/CoreData/GameBalance/ItemTypes.gam" }
+
+  specify "#write" do
+    subject.files = dir
+    subject.write
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: d3_mpq
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
-  requirement: &68997680 !ruby/object:Gem::Requirement
+  requirement: &70636020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68997680
+  version_requirements: *70636020
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &68952190 !ruby/object:Gem::Requirement
+  requirement: &70635710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *68952190
+  version_requirements: *70635710
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &68951920 !ruby/object:Gem::Requirement
+  requirement: &70635330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68951920
+  version_requirements: *70635330
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &68951540 !ruby/object:Gem::Requirement
+  requirement: &70635050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68951540
+  version_requirements: *70635050
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &68951070 !ruby/object:Gem::Requirement
+  requirement: &70634640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68951070
+  version_requirements: *70634640
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &68950820 !ruby/object:Gem::Requirement
+  requirement: &70634350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *68950820
+  version_requirements: *70634350
 description: Parsing data out of Diablo 3.
 email:
 - deradon87@gmail.com
@@ -118,7 +118,9 @@ files:
 - lib/d3_mpq/csv_generator/item_types.rb
 - lib/d3_mpq/csv_generator/string_list.rb
 - lib/d3_mpq/csv_generator/base.rb
+- lib/d3_mpq/csv_generator/affix_list.rb
 - lib/d3_mpq/csv_generator/actor.rb
+- lib/d3_mpq/csv_generator/items.rb
 - lib/d3_mpq/version.rb~
 - lib/bindata_ext/dsl.rb
 - lib/bindata_ext/mod_codes.rb
@@ -6463,6 +6465,9 @@ files:
 - spec/unit/core_data/game_balance/item_enhancements_spec.rb
 - spec/unit/bindata_ext/mod_code_spec.rb
 - spec/unit/string_list_spec.rb
+- spec/unit/csv_generator/affix_list_spec.rb
+- spec/unit/csv_generator/item_types_spec.rb
+- spec/unit/csv_generator/item_spec.rb
 - spec/unit/csv_generator/csv_generator_spec.rb
 - spec/unit/analyzer_spec.rb
 - spec/unit/attributes_spec.rb
@@ -12827,6 +12832,9 @@ test_files:
 - spec/unit/core_data/game_balance/item_enhancements_spec.rb
 - spec/unit/bindata_ext/mod_code_spec.rb
 - spec/unit/string_list_spec.rb
+- spec/unit/csv_generator/affix_list_spec.rb
+- spec/unit/csv_generator/item_types_spec.rb
+- spec/unit/csv_generator/item_spec.rb
 - spec/unit/csv_generator/csv_generator_spec.rb
 - spec/unit/analyzer_spec.rb
 - spec/unit/attributes_spec.rb