Refactor activity scaling data format

1 files changed, 10 insertions, 4 deletions

diff --git a/app/models/character.rb b/app/models/character.rb
index 9a3569f..507548e 100644
--- a/app/models/character.rb
+++ b/app/models/character.rb
@@ -44,16 +44,22 @@ class Character < ApplicationRecord
     CharacterSkill.find_by(skill: skill).increment!(:xp, amount)
   end
 
-  def skill_level(gid)
-    self.character_skills.find_by(skill: Skill.find_by_gid(gid.to_s)).level
+  def skill_level(skill)
+    skill = Skill.find_by_gid(skill) if skill.is_a? String
+    self.character_skills.find_by(skill: skill).level
   end
 
   def activity_time_remaining
     return nil unless self.activity
     duration_data = self.activity.whatnot[:duration]
     duration = duration_data[:base]
-    duration_data[:scaling]&.each do |skill, scaling_amount|
-      duration -= self.skill_level(skill) * scaling_amount
+    duration_data[:scaling]&.each do |scaling_entry|
+      case scaling_entry[:type]
+      when "skill"
+        duration -= self.skill_level(scaling_entry[:gid]) * scaling_entry[:scale_value]
+      else
+        raise "Invalid scaling type." # TODO: Improve this
+      end
     end
     duration = [duration, duration_data[:minimum] || 10].max
     duration - (Time.now - self.activity_started_at)