wayfinder 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e79fa064d4cb9ac71b713c26f5861b4708c1de8b
-  data.tar.gz: 8ceb7131687cb6eb167435d3060842b4d72005f1
+  metadata.gz: 7f4ae19a061f6b7caa1502c21c1a03bc914116ef
+  data.tar.gz: c68e89030487cecd9cd16f8be4ebe8c8c9bb2521
 SHA512:
-  metadata.gz: 56a97597af28f2efb5f0c904b4226552193fbb13f379e985604cb37d328dcb61c46739dd075acb60a2a8af13aa5ceaa11bbcbd73e43cc07b25dbc86ff57e7367
-  data.tar.gz: 5efb1eef1ad3fb85a1165ba287b27e77f7e06197168e12e671bc047d1beb8e8629488ecbd3267d41f194938ac898032efd467c5b2f338f35aa13e3f9ce2dab98
+  metadata.gz: 0b372f56c23fb34e78019eb2d63d3e1188a1f32aaf139eb06c0c03cafb066aa12ea31610948d24c6d8730e0ada426357d8c12f0038fc94ebf024a2c8f7329883
+  data.tar.gz: e0166635e52514241f0b11643ea1e930e0d26d243a7232de248d055e55476ce698aac11e7875a5419a10f1d28dffaad379deb66e9b85738a78d11ab0e1223e96

data/lib/wayfinder.rb

@@ -44,7 +44,6 @@ module Wayfinder
       end
     end
 
-
     ## Returns an array of items in the modifier stack marked with 'active: true'
     def active_stack
       self.modifier_stack.map(&:values).flatten.keep_if { |item| item['active'] }
@@ -52,14 +51,29 @@ module Wayfinder
 
     ## Returns an array of object who affect the specified attribute
     def stack_for(attribute)
-      self.active_stack.each do |item|
+      # Bonuses of the same type do not stack, we need to pick the biggest one and use that one.
+      applicable_stack = []
+
+      self.active_stack.keep_if { |item|
+        # We care about the attributes each modifier affects.
         item.fetch('modifiers', {}).keys.include?(attribute)
+      }.group_by { |mod| mod['type'] }.each do |type, mods|
+        if type
+          # We take the highest modifier of each type
+          applicable_stack << mods.sort_by { |mod| mod.fetch('modifiers', {}).fetch(attribute, 0) }.reverse.first
+        else
+          # Modifiers without a type are simply added to the stack.
+          applicable_stack += mods
+        end
       end
+
+      applicable_stack
     end
 
     ## Outputs the final modifier for the specified attribute.
     def modifier_for(attribute)
       modifier = 0
+
       stack_for(attribute).each do |mod|
         modifier += mod.fetch('modifiers', {}).fetch(attribute, 0)
       end
@@ -159,7 +173,7 @@ module Wayfinder
 
     def skill(skill_name)
       skill = self.source[:skills].fetch(skill_name, {})
-      computed_score = skill.fetch('ranks', 0) + self.send("#{ skill['stat'] }_modifier") + modifier_for(skill_name)
+      computed_score = skill.fetch('ranks', 0) + self.send("#{ skill['stat'] }_modifier") + modifier_for(skill_name) + modifier_for('all_skills')
 
       if skill['class']
         computed_score += 3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wayfinder
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - PoTe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: box