Have equipment stats affect combat stats

2 files changed, 26 insertions, 9 deletions

diff --git a/app/controllers/bazaar_controller.rb b/app/controllers/bazaar_controller.rb
index b31e8fb..b699d28 100644
--- a/app/controllers/bazaar_controller.rb
+++ b/app/controllers/bazaar_controller.rb
@@ -38,7 +38,7 @@ class BazaarController < ApplicationController
         current_char.shift_item(@bazaar_order.item, -quantity)
         current_char.shift_item("vestige", profit)
         @bazaar_order.character.shift_item(@bazaar_order.item, quantity)
-        @bazaar_order.decrement!(:quantity, quantity)
+        @bazaar_order.decrement(:quantity, quantity)
         @bazaar_order.save!
         flash[:notice] = "You sold #{quantity} #{@bazaar_order.item.name} and got #{profit} vg."
       end
@@ -49,7 +49,7 @@ class BazaarController < ApplicationController
         current_char.shift_item("vestige", -cost)
         current_char.shift_item(@bazaar_order.item, quantity)
         @bazaar_order.character.shift_item("vestige", cost)
-        @bazaar_order.decrement!(:quantity, quantity)
+        @bazaar_order.decrement(:quantity, quantity)
         @bazaar_order.save!
         flash[:notice] = "You bought #{quantity} #{@bazaar_order.item.name} for #{cost} vg."
       end
diff --git a/app/models/character.rb b/app/models/character.rb
index 003f8af..fd0f540 100644
--- a/app/models/character.rb
+++ b/app/models/character.rb
@@ -45,7 +45,7 @@ class Character < ApplicationRecord
     item = Item.find_by_gid(item) if item.is_a? String
     CharacterItem.transaction do
       ci = self.character_items.find_or_initialize_by(item: item)
-      ci.increment!(:quantity, amount)
+      ci.increment(:quantity, amount)
       ci.save!
     end
   end
@@ -138,32 +138,49 @@ class Character < ApplicationRecord
     self.update(activity: activity, activity_started_at: Time.now) if self.can_do_activity?(activity)
   end
 
+  def equipment_stats
+    stats = {}
+    self.equipment.each do |eq|
+      eq.item.whatnot[:effects]&.each do |effect|
+        if effect[:type] == "stat"
+          stats[effect[:gid]] ||= 0
+          stats[effect[:gid]] += effect[:modifier]
+        end
+      end
+    end
+    stats
+  end
+
   def can_fight?
     self.wounds < 1
   end
 
   def max_hp
-    10 + self.beastslay_level
+    10 + self.beastslay_level + (equipment_stats["max_hp"] || 0)
   end
 
   def speed
-    self.beastslay_level
+    self.beastslay_level + (equipment_stats["speed"] || 0)
   end
 
   def accuracy
-    self.beastslay_level
+    self.beastslay_level + (equipment_stats["accuracy"] || 0)
   end
 
   def power
-    self.beastslay_level
+    self.beastslay_level + (equipment_stats["power"] || 0)
   end
 
   def evasion
-    self.beastslay_level
+    self.beastslay_level + (equipment_stats["evasion"] || 0)
   end
 
   def block
-    self.beastslay_level
+    self.beastslay_level + (equipment_stats["block"] || 0)
+  end
+
+  def block_value
+    equipment_stats["block_value"] || 0
   end
 
   private