Merge branch 'dev' into flake8_lint

Coffee-fueled-deadlines · Nov 12, 2023 · 08e07ea · 08e07ea
2 parents 0f8ae16 + 3a1b457
commit 08e07ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/OSRSBytes/Hiscores.py b/OSRSBytes/Hiscores.py
@@ -188,7 +188,7 @@ def __parseSkills(self):
 
         self.__skills = [
                 'attack',
-                'defense',
+                'defence',
                 'strength',
                 'hitpoints',
                 'ranged',
@@ -388,7 +388,9 @@ def skill(self, skill, stype: str = 'level'):
 
         """
         try:
-            if stype.lower() not in ['rank','level','experience', 'exp_to_next_level']:
+            # Add support for both British and American spellings of 'defence'
+            if skill == 'defense': skill = 'defence'
+            if stype.lower() not in ['rank', 'level', 'experience', 'exp_to_next_level']:
                 raise SkillError("stype must be 'rank','level', or 'experience'")
             else:
                 return self.stats[self.username][skill.lower()][stype.lower()]

diff --git a/OSRSBytes/tests/hiscores_test.py b/OSRSBytes/tests/hiscores_test.py
@@ -19,8 +19,8 @@ def test(verbose=True):
         except:
             failed_tests.append(skill)
         if (verbose):
-            print("Skill: {}\n\tRank: {}\n\tLevel: {}"
-                .format(skill, boss_user.skill(skill,"rank"), boss_user.skill(skill,"level")))
+            print("Skill: {}\n\tRank: {}\n\tLevel: {}\n\tXP: {}"
+                .format(skill, boss_user.skill(skill,"rank"), boss_user.skill(skill,"level"),boss_user.skill(skill,"experience")))
 
     for activity in pvp_user.getPVPGenerator():
         try: