Merge branch 'feature/grant-needed-skills' into dev

2017-05-06 13:09:23 -04:00
parent 2e6066e848 283aba4f85
commit 703d6dbc85
4 changed files with 53 additions and 7 deletions
--- a/service/character.py
+++ b/service/character.py
@@ -372,9 +372,13 @@ class Character(object):
        eos.db.commit()

    @staticmethod
-    def changeLevel(charID, skillID, level, persist=False):
+    def changeLevel(charID, skillID, level, persist=False, ifHigher=False):
        char = eos.db.getCharacter(charID)
        skill = char.getSkill(skillID)
+
+        if ifHigher and level < skill.level:
+            return
+
        if isinstance(level, basestring) or level > 5 or level < 0:
            skill.level = None
        else: