3 files changed, 30 insertions, 5 deletions
diff --git a/app/models/character.rb b/app/models/character.rb
index d386002..03bd510 100644
--- a/app/models/character.rb
+++ b/app/models/character.rb
@@ -9,6 +9,7 @@ class Character < ApplicationRecord
   has_many :character_items
   has_many :learned_activities
   has_many :items, through: :character_items
+  has_many :item_infixes
   has_many :character_skills
   has_many :conditions, through: :states
   has_many :states
@@ -182,6 +183,11 @@ class Character < ApplicationRecord
     end
   end
 
+  def max_infixes(skill)
+    skill = Skill.find_by_gid(skill) if skill.is_a? String
+    1 + (skill_level(skill) / 20).floor
+  end
+
   def add_skill_xp(skill, amount)
     skill = Skill.find_by_gid(skill) if skill.is_a? String
     Character.transaction do
diff --git a/app/models/character_skill.rb b/app/models/character_skill.rb
index 368cc28..406cade 100644
--- a/app/models/character_skill.rb
+++ b/app/models/character_skill.rb
@@ -39,6 +39,10 @@ class CharacterSkill < ApplicationRecord
     end
   end
 
+  def self.xp_required_for_level(level)
+    level <= 120 ? XP_TOTALS_PER_LEVEL[level - 1] : nil
+  end
+
   def level
     XP_TOTALS_PER_LEVEL.each_with_index do |total, index|
       return index if total > self.xp
@@ -46,7 +50,7 @@ class CharacterSkill < ApplicationRecord
   end
 
   def total_xp_for_next_level
-    xp_required_for_level(level + 1)
+    CharacterSkill.xp_required_for_level(level + 1)
   end
 
   def xp_to_next_level
@@ -57,11 +61,13 @@ class CharacterSkill < ApplicationRecord
     CharacterSkill.top_xp_for(self.skill, limit: nil).map(&:character).map(&:id).index(self.character.id) + 1
   end
 
-  private
-    def xp_required_for_level(level)
-      level <= 120 ? XP_TOTALS_PER_LEVEL[level - 1] : nil
-    end
+  def percentage_of_skill_level_completed
+    xp_gained_this_level = xp - CharacterSkill.xp_required_for_level(level)
+    total_xp_gain_neeeded_for_entire_level = total_xp_for_next_level - CharacterSkill.xp_required_for_level(level)
+    (xp_gained_this_level.to_f / total_xp_gain_neeeded_for_entire_level) * 100
+  end
 
+  private
     def send_chat_message_if_leveled_up
       if CharacterSkill.level_for_xp(self.xp_was) < CharacterSkill.level_for_xp(self.xp)
         chat_message = ChatMessage.new(body: "reached #{self.skill.name} level #{self.level}!",
diff --git a/app/models/item_infix.rb b/app/models/item_infix.rb
new file mode 100644
index 0000000..cc99ee7
--- /dev/null
+++ b/app/models/item_infix.rb
@@ -0,0 +1,13 @@
+class ItemInfix < ApplicationRecord
+  belongs_to :character
+  belongs_to :item
+  belongs_to :skill
+
+  before_create :check_max_infixes
+
+  private
+    def check_max_infixes
+      current_infixes = character.item_infixes.where(skill: skill)
+      raise :abort if current_infixes.count >= character.max_infixes(skill)
+    end
+end