From fea8b6bb7aef2d69c0641b19abc0f05eb89e789e Mon Sep 17 00:00:00 2001 From: David Gay Date: Thu, 20 May 2021 17:40:20 -0400 Subject: Refactor activity scaling data format --- app/models/character.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'app/models') 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) -- cgit v1.2.3