esther changes & fix

package.json

@@ -1,6 +1,6 @@
 {
   "name": "loa-details",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "Damage meter for Lost Ark",
   "productName": "LOA Details",
   "author": "Herysia, Mathicha, Eren Kara <[email protected]>",

src-electron/util/app-settings.ts

@@ -93,6 +93,7 @@ export type Settings = {
       resetAfterPhaseTransition: boolean;
       displayEsther: boolean;
       estherColor: string;
+      estherIncludeInTotal: boolean;
       autoMinimize: boolean;
       autoMinimizeTimer: number;
       minimizeToTaskbar: boolean;
@@ -181,6 +182,7 @@ const defaultSettings: Settings = {
       resetAfterPhaseTransition: true,
       displayEsther: true,
       estherColor: "#c2fc03",
+      estherIncludeInTotal: true,
       autoMinimize: false,
       autoMinimizeTimer: 60,
       minimizeToTaskbar: false,

src/components/DamageMeter/DamageMeterTable.vue

@@ -881,14 +881,14 @@ function sortEntities() {
   const totalDamageOverride = settingsStore.settings.damageMeter.functionality
     .displayEsther
     ? res.reduce((sum, e) => sum + e.damageDealt, 0)
-    : 0;
+    : undefined;
   const topDamageOverride = settingsStore.settings.damageMeter.functionality
     .displayEsther
     ? res.reduce(
         (prev, curr) => (prev > curr.damageDealt ? prev : curr.damageDealt),
         0
       )
-    : 0;
+    : undefined;
   for (const entity of res) {
     entity.damagePercentageTotal = getPercentage(
       entity,

src/components/LogView.vue

@@ -8,16 +8,13 @@
         </span>
         <span style="margin-right: 12px">
           Total DMG
-          {{ numberFormat(logData.damageStatistics.totalDamageDealt) }}
+          {{ numberFormat(totalDamageDealt) }}
         </span>
         <span style="margin-right: 12px">
           Total DPS
           {{
             numberFormat(
-              (
-                logData.damageStatistics.totalDamageDealt /
-                (logData.duration / 1000)
-              ).toFixed(0)
+              (totalDamageDealt / (logData.duration / 1000)).toFixed(0)
             )
           }}
         </span>
@@ -126,7 +123,7 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { ref, computed } from "vue";
 import {
   numberFormat,
   millisToMinutesAndSeconds,
@@ -154,6 +151,20 @@ const damageType = ref("dmg");
 
 const isTakingScreenshot = ref(false);
 const hideNamesOnScreenshot = ref(false);
+
+const totalDamageDealt = computed(() => {
+  let totalDamageDealt = props.logData.damageStatistics.totalDamageDealt;
+  if (
+    settingsStore.settings.damageMeter.functionality.displayEsther &&
+    settingsStore.settings.damageMeter.functionality.estherIncludeInTotal
+  ) {
+    props.logData.entities.forEach((e) => {
+      if (e.isEsther) totalDamageDealt += e.damageDealt;
+    });
+  }
+  return totalDamageDealt;
+});
+
 async function takeScreenshot(hideNames = true) {
   hideNamesOnScreenshot.value = hideNames;
   isTakingScreenshot.value = true;

src/components/SettingsPage/DamageMeterPage.vue

@@ -134,6 +134,25 @@
       </q-item-section>
     </q-item>
 
+    <q-item
+      tag="label"
+      v-if="settingsStore.settings.damageMeter.functionality.displayEsther"
+    >
+      <q-item-section side top>
+        <q-checkbox
+          v-model="
+            settingsStore.settings.damageMeter.functionality
+              .estherIncludeInTotal
+          "
+        />
+      </q-item-section>
+      <q-item-section>
+        <q-item-label>Inlude Esther in Total damage</q-item-label>
+        <q-item-label caption>
+          Include Esther damage in total damage (table header)
+        </q-item-label>
+      </q-item-section>
+    </q-item>
     <q-item tag="label">
       <q-item-section>
         <q-item-label>

src/layouts/DamageMeter.vue

@@ -68,7 +68,7 @@
             style="margin-right: 12px"
           >
             Total DMG
-            {{ numberFormat(sessionState.damageStatistics.totalDamageDealt) }}
+            {{ numberFormat(totalDamageDealt) }}
           </span>
           <span
             v-if="settingsStore.settings.damageMeter.header.dps.enabled"
@@ -396,6 +396,7 @@ const sessionState: ShallowRef<GameState | Record<string, never>> = shallowRef(
   {}
 );
 let sessionDPS = 0;
+let totalDamageDealt = 0;
 const windowWidth: Ref<number> = ref(0);
 
 onMounted(() => {
@@ -423,19 +424,30 @@ onMounted(() => {
   window.messageApi.send("window-to-main", { message: "get-settings" });
 
   window.messageApi.receive("pcap-on-state-change", (value: GameState) => {
-    if (value.damageStatistics?.totalDamageDealt && fightDuration.value > 0) {
+    totalDamageDealt = value.damageStatistics.totalDamageDealt;
+    if (
+      settingsStore.settings.damageMeter.functionality.displayEsther &&
+      settingsStore.settings.damageMeter.functionality.estherIncludeInTotal
+    ) {
+      value.entities.forEach((e) => {
+        if (e.isEsther) totalDamageDealt += e.damageDealt;
+      });
+    }
+    if (totalDamageDealt && fightDuration.value > 0) {
       sessionDPS = toFixedNumber(
-        value.damageStatistics.totalDamageDealt / (fightDuration.value / 1000),
+        totalDamageDealt / (fightDuration.value / 1000),
         0
       );
     }
+
     sessionState.value = value;
   });
 
   window.messageApi.receive("pcap-on-reset-state", (value) => {
     fightPausedOn = 0;
     fightPausedForMs = 0;
     sessionDPS = 0;
+    totalDamageDealt = 0;
     damageType.value = "dmg";
     isFightPaused.value = false;
   });

src/pages/IndexPage.vue

@@ -60,6 +60,15 @@
       </p>
 
       <h5>Changelog</h5>
+      <h6 id="1-2-7">1.2.7</h6>
+      <ul>
+        <li>Fix previous commit that broke more than it fixed (yh i'm dumb)</li>
+        <li>
+          Esther is now counted in Total Damage and Total DPS (can be disabled
+          in settings->include esther in total damage (only show when display
+          esther is enabled))
+        </li>
+      </ul>
       <h6 id="1-2-6">1.2.6</h6>
       <ul>
         <li>Add basic wiki that includes how to read data</li>

src/pages/LogsPage.vue

@@ -281,10 +281,6 @@ async function changeLogViewerStoreState(newState) {
       );
     }
     //apply all horizontal scroll
-    console.log(
-      horizontalScrollAreas.value.length,
-      horizontalScrollOffsets.length
-    );
     if (
       horizontalScrollAreas.value &&
       horizontalScrollAreas.value.length === horizontalScrollOffsets.length

src/stores/settings.ts

@@ -58,6 +58,7 @@ export const useSettingsStore = defineStore("settings", {
           resetAfterPhaseTransition: true,
           displayEsther: true,
           estherColor: "#c2fc03",
+          estherIncludeInTotal: true,
           autoMinimize: false,
           autoMinimizeTimer: 60,
           minimizeToTaskbar: false,