Skip to content

Commit

Permalink
7.1 Updates (#86)
Browse files Browse the repository at this point in the history
* pre-populating the 7.1 gear file with placeholder names

* minor openapi schema fixes

* fix style of buttons, only have them appear when necessary

* update changelog

* added names of gear added in 7.1

* bump version
  • Loading branch information
freyamade authored Nov 12, 2024
1 parent 0eb0b8d commit 73bee5e
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 13 deletions.
15 changes: 15 additions & 0 deletions backend/api/management/commands/seed_data/gear/7-dt/7.1.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
- has_accessories: False
has_armour: True
has_weapon: False
item_level: 720
name: "Ark Angel's"
- has_accessories: False
has_armour: False
has_weapon: True
item_level: 725
name: 'Eternal'
- has_accessories: True
has_armour: True
has_weapon: True
item_level: 720
name: 'Augmented Archeo Kingdom'
1 change: 1 addition & 0 deletions backend/api/serializers/character.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def get_proxy(self, char: Character) -> bool:
inline_serializer(
'CharacterCollectionBISListSummary',
{'id': serializers.IntegerField(), 'name': serializers.CharField()},
many=True,
),
)
def get_bis_lists(self, char: Character) -> List[Dict[str, Union[str, int]]]:
Expand Down
9 changes: 6 additions & 3 deletions backend/api/views/loot_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -523,23 +523,26 @@ def _get_fourth_floor_data(self, history: QuerySet[Loot], team_size: int, non_lo
'first_floor': inline_serializer(
'LootSolverFirstFloorResponse',
{
slot: serializers.ListField(child=serializers.IntegerField())
slot: serializers.IntegerField()
for slot in FIRST_FLOOR_SLOTS
},
many=True,
),
'second_floor': inline_serializer(
'LootSolverSecondFloorResponse',
{
slot: serializers.ListField(child=serializers.IntegerField())
slot: serializers.IntegerField()
for slot in SECOND_FLOOR_SLOTS
},
many=True,
),
'third_floor': inline_serializer(
'LootSolverThirdFloorResponse',
{
slot: serializers.ListField(child=serializers.IntegerField())
slot: serializers.IntegerField()
for slot in THIRD_FLOOR_SLOTS
},
many=True,
),
'fourth_floor': inline_serializer(
'LootSolverFourthFloorResponse',
Expand Down
2 changes: 1 addition & 1 deletion backend/backend/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

from .celery import app as celery_app

VERSION = '20241022'
VERSION = '20241112'
2 changes: 1 addition & 1 deletion frontend/.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VUE_APP_VERSION="20241022"
VUE_APP_VERSION="20241112"
4 changes: 2 additions & 2 deletions frontend/src/components/gear_dropdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="field-label is-normal">
<label class="label">{{ name }}</label>
</div>
<template v-if="bisValue">
<template v-if="bisValue && bisValue !== value">
<div class="field-body">
<div class="field is-expanded">
<div class="field has-addons">
Expand All @@ -16,7 +16,7 @@
</div>
</div>
<div class="control">
<button class="button is-link" @click="setToCopyValue" data-microtip-position="top" role="tooltip" aria-label="Paste BIS Value">
<button class="button has-text-link" @click="setToCopyValue" data-microtip-position="top" role="tooltip" aria-label="Paste BIS Value">
<i class="material-icons">content_paste_go</i>
</button>
</div>
Expand Down
27 changes: 22 additions & 5 deletions frontend/src/components/modals/changelog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,25 @@
</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> FFXIV 7.1 Update <i class="material-icons icon">expand_more</i></div>
<p>
Added the following new types of Gear released in 7.1;
<ul>
<li>Augmented Archeo Kingdom Weapons, Armour, and Accessories - Item Level 720</li>
<li>Ark Angel's Armour - Item Level 720</li>
<li>New EX Trial Weapons - Item Level 725</li>
</ul>
</p>

<div class="divider"><i class="material-icons icon">expand_more</i> Quick-Set to BIS <i class="material-icons icon">expand_more</i></div>
<p>Thank you Rak for the feature request!</p>
<p>
Now, whenever the Current Gear for a slot does not match the slot's BIS Gear, a button will appear to the right of the dropdown to allow you to instantly set the Current value to the BIS value.
<ul>
<li>This is in the hopes of making life a little easier for those times where you buy your BIS item, for example!</li>
</ul>
</p>

<div class="divider"><i class="material-icons icon">expand_more</i> Bugfixes <i class="material-icons icon">expand_more</i></div>
<p>
Fixed a timezone-based bug when creating manual Loot Entries.
Expand All @@ -21,12 +40,10 @@
</ul>
</p>
<p>Fixed an issue where the mobile version of the Loot Solver would show incorrect numbers for some fields.</p>
<p>Improved the Viper and Pictomancer icons finally!</p>

<div class="divider"><i class="material-icons icon">expand_more</i> Quick-Set to BIS <i class="material-icons icon">expand_more</i></div>
<p>Thank you Rak for the feature request!</p>
<p>All of the Current Gear dropdowns on the Edit BIS pages now have a button you can click to instantly set the Current value to your set BIS value for that slot!</p>
<p>This just brings a little bit of QoL to anyone updating their BIS Lists manually, after purchasing items for example!</p>
<div class="divider"><i class="material-icons icon">expand_more</i> Minor Updates <i class="material-icons icon">expand_more</i></div>
<p>Improved the Viper and Pictomancer icons finally!</p>
<p>Fixed some issues in the OpenAPI schema!</p>
</div>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Sentry.init({
Vue,
dsn: 'https://[email protected]/6180221',
logErrors: true,
release: 'savageaim@20241022',
release: 'savageaim@20241112',
integrations: [
new Sentry.BrowserTracing({
routingInstrumentation: Sentry.vueRouterInstrumentation(router),
Expand Down

0 comments on commit 73bee5e

Please sign in to comment.