Merge pull request #30 from Savage-Aim/dsr

Dragonsong Reprise
SavageAim · May 13, 2022 · a1103a4 · a1103a4
2 parents 0fa6962 + 0c05c88
commit a1103a4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/backend/api/management/commands/gear_seed.py b/backend/api/management/commands/gear_seed.py
@@ -28,6 +28,9 @@ class Command(BaseCommand):
         {'has_accessories': False, 'has_armour': True, 'has_weapon': False, 'item_level': 590, 'name': 'Panthean'},
         {'has_accessories': False, 'has_armour': False, 'has_weapon': True, 'item_level': 595, 'name': 'Bluefeather'},
         {'has_accessories': True, 'has_armour': True, 'has_weapon': True, 'item_level': 590, 'name': 'Augmented Classical'},
+
+        # 6.1.1
+        {'has_accessories': False, 'has_armour': False, 'has_weapon': True, 'item_level': 605, 'name': 'Ultimate of the Heavens'},
     ]
 
     def handle(self, *args, **options):

diff --git a/backend/api/tests/test_loot.py b/backend/api/tests/test_loot.py
@@ -48,7 +48,7 @@ def setUp(self):
         )
 
         # Next, create two BIS lists for each character
-        self.raid_weapon = Gear.objects.get(item_level=605)
+        self.raid_weapon = Gear.objects.get(item_level=605, name='Asphodelos')
         self.raid_gear = Gear.objects.get(item_level=600, has_weapon=False)
         self.tome_gear = Gear.objects.get(item_level=600, has_weapon=True)
         self.crafted = Gear.objects.get(name='Classical')

diff --git a/backend/api/tests/test_management.py b/backend/api/tests/test_management.py
@@ -81,7 +81,7 @@ def test_loot_team_link(self):
         )
 
         # Next, create two BIS lists for each character
-        raid_weapon = models.Gear.objects.get(item_level=605)
+        raid_weapon = models.Gear.objects.get(item_level=605, name='Asphodelos')
         raid_gear = models.Gear.objects.get(item_level=600, has_weapon=False)
         tome_gear = models.Gear.objects.get(item_level=600, has_weapon=True)
         crafted = models.Gear.objects.get(name='Classical')

diff --git a/backend/api/tests/test_team_member.py b/backend/api/tests/test_team_member.py
@@ -47,7 +47,7 @@ def setUp(self):
         )
 
         # Next, create two BIS lists for each character
-        raid_weapon = Gear.objects.get(item_level=605)
+        raid_weapon = Gear.objects.get(item_level=605, name='Asphodelos')
         raid_gear = Gear.objects.get(item_level=600, has_weapon=False)
         tome_gear = Gear.objects.get(item_level=600, has_weapon=True)
         crafted = Gear.objects.get(name='Classical')

diff --git a/frontend/src/components/modals/changelog.vue b/frontend/src/components/modals/changelog.vue
@@ -12,8 +12,13 @@
     </div>
     <div class="card-content content">
       <h2 class="has-text-primary subtitle">{{ version }}</h2>
-      <div class="divider"><i class="material-icons icon">expand_more</i> Minor Changes <i class="material-icons icon">expand_more</i></div>
-      <p>Fixed an issue where using Character aliases would break the history counts in the Loot Manager tiles.</p>
+      <div class="divider"><i class="material-icons icon">expand_more</i> FFXIV 6.1.1 <i class="material-icons icon">expand_more</i></div>
+      <p>
+        Added the following Gear for the release of 6.1.1;
+        <ul>
+          <li>Ultimate of the Heavens; Item Level 605 Weapons</li>
+        </ul>
+      </p>
     </div>
   </div>
 </template>