Merge pull request #129 from Tmktahu/tk-states-and-tweaks

Initial States Handling + Misc Tweaks
Tmktahu · Dec 27, 2023 · fd1404f · fd1404f
2 parents 907e76f + a9bb14a
commit fd1404f
Show file tree

Hide file tree

Showing 7 changed files with 375 additions and 34 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wakfu-wizard",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "private": true,
   "scripts": {
     "serve": "vite",

diff --git a/src/components/AppSidebar.vue b/src/components/AppSidebar.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script setup>
-import { ref, watch, nextTick } from 'vue';
+import { ref, watch, nextTick, computed } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -74,7 +74,7 @@ watch(
 );
 
 const languageMenu = ref(null);
-const languageMenuItems = ref([
+const languageMenuItems = computed(() => [
   {
     label: t('sidebar.language'),
     items: [
@@ -108,7 +108,7 @@ const languageMenuItems = ref([
 
 const themeMenu = ref(null);
 const currentTheme = ref('bonta');
-const themeMenuItems = ref([
+const themeMenuItems = computed(() => [
   {
     label: t('sidebar.colorTheme'),
     items: [

diff --git a/src/components/characterSheet/ItemFilters.vue b/src/components/characterSheet/ItemFilters.vue
@@ -246,6 +246,8 @@ const FILTER_TYPE_IDS = [
   EFFECT_TYPE_DATA.randomElementalMasteries.id,
   EFFECT_TYPE_DATA.randomElementalResistances.id,
   EFFECT_TYPE_DATA.harvestingQuantity.id,
+  EFFECT_TYPE_DATA.armorGiven.id,
+  EFFECT_TYPE_DATA.armorReceived.id,
 ];
 
 const filterTypeOptions = FILTER_TYPE_IDS.map((typeId) => {

diff --git a/src/components/characterSheet/ItemStatList.vue b/src/components/characterSheet/ItemStatList.vue
@@ -239,13 +239,14 @@ const getTotalMastery = (item) => {
     ...EFFECT_TYPE_DATA.meleeMastery.rawIds,
     ...EFFECT_TYPE_DATA.distanceMastery.rawIds,
     ...EFFECT_TYPE_DATA.berserkMastery.rawIds,
-    ...EFFECT_TYPE_DATA.berserkMastery.rawIds,
+    ...EFFECT_TYPE_DATA.criticalMastery.rawIds,
+    ...EFFECT_TYPE_DATA.randomElementalMasteries.rawIds,
   ];
 
   item?.equipEffects?.forEach((effect) => {
-    if (EFFECT_TYPE_DATA.randomElementalMasteries.rawIds.includes(effect.id)) {
-      totalValue += effect.values[0] * effect.values[2];
-    } else if (masteryEffectIds.includes(effect.id)) {
+    // if (EFFECT_TYPE_DATA.randomElementalMasteries.rawIds.includes(effect.id)) {
+    //   totalValue += effect.values[0] * effect.values[2];
+    if (masteryEffectIds.includes(effect.id)) {
       totalValue += effect.values[0];
     }
   });