1.8.6 updates

fribbels · Dec 5, 2022 · 416e8f3 · 416e8f3
1 parent 2b839df
commit 416e8f3
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 21 deletions.
diff --git a/app/js/lib/grids/heroesGrid.js b/app/js/lib/grids/heroesGrid.js
@@ -242,10 +242,10 @@ function buildGrid(localeText) {
                 return params.rowNode.data.name;
             }},
             {headerName: i18next.t('icon'), sortable: false, field: 'name', width: 60, cellRenderer: (params) => renderIcon(params.value)},
-            {headerName: i18next.t('elem'), field: 'attribute', width: 50, filter: 'agTextColumnFilter', cellRenderer: (params) => renderElement(params.value)},
+            {headerName: i18next.t('elem'), field: 'attribute', width: 45, filter: 'agTextColumnFilter', cellRenderer: (params) => renderElement(params.value)},
             {headerName: i18next.t('class'), field: 'role', width: 50, filter: 'agTextColumnFilter', cellRenderer: (params) => renderClass(params.value)},
             //{headerName: i18next.t('name'), field: 'name', width: 0, wrapText: true, cellStyle: {'display':'none'}},
-            {headerName: i18next.t('name'), field: 'label', width: 150, wrapText: true, sortingOrder: ['asc', 'desc', null], cellStyle: {'white-space': 'normal !important', 'line-height': '16px'}, cellRenderer: (params) => renderName(params)},
+            {headerName: i18next.t('name'), field: 'label', width: 155, wrapText: true, sortingOrder: ['asc', 'desc', null], cellStyle: {'white-space': 'normal !important', 'line-height': '16px'}, cellRenderer: (params) => renderName(params)},
             // {headerName: i18next.t('Stars'), field: 'rarity', width: 50},
             // {headerName: i18next.t('Class'), field: 'role', width: 100, cellRenderer: (params) => renderClass(params.value)},
             {headerName: i18next.t('sets'), field: 'equipment', width: 85, cellRenderer: (params) => renderSets(params.value)},

diff --git a/app/js/lib/importer.js b/app/js/lib/importer.js
@@ -123,7 +123,7 @@ module.exports = {
                 if (err) {
                     console.error(err)
                     if (isEpermError(err)) {
-                        Dialog.error("Unable to save file. Please try disabling your antivirus, or add the app as an exception, then restarting the app in admin mode.")
+                        Dialog.error("Unable to save file. Please try disabling your antivirus, or add the app as an exception, then restarting the app in admin mode. Check if your saves folder is under OneDrive on the Settings tab, and if so, change it to somewhere else.")
                     } else {
                         Notifier.error(i18next.t("Unable to write file") + filename + " - " + err);
                     }
@@ -168,7 +168,7 @@ module.exports = {
                 if (err) {
                     console.error(err)
                     if (isEpermError(err)) {
-                        Dialog.error("Unable to save file. Please try disabling your antivirus, or add the app as an exception, then restarting the app in admin mode.")
+                        Dialog.error("Unable to save file. Please try disabling your antivirus, or add the app as an exception, then restarting the app in admin mode. Check if your saves folder is under OneDrive on the Settings tab, and if so, change it to somewhere else.")
                     } else {
                         Notifier.error(i18next.t("Unable to write file") + filename + " - " + err);
                     }

diff --git a/app/js/lib/saves.js b/app/js/lib/saves.js
@@ -37,7 +37,7 @@ module.exports = {
 
             return data;
         } catch (e) {
-            Dialog.error("Unable to save file. Please try disabling your antivirus, or add the app as an exception, then restarting the app in admin mode.")
+            Dialog.error("Unable to save file. Please try disabling your antivirus, or add the app as an exception, then restarting the app in admin mode. Check if your saves folder is under OneDrive on the Settings tab, and if so, change it to somewhere else.")
         }
     },
 

diff --git a/app/js/lib/updater.js b/app/js/lib/updater.js
@@ -1,6 +1,6 @@
 const { ipcRenderer } = require('electron');
 global.ipcRenderer = ipcRenderer;
-const currentVersion = "1.8.5";
+const currentVersion = "1.8.6";
 
 global.TEST = false;
 
@@ -34,12 +34,10 @@ module.exports = {
 
 `
 <h2>
-    New in v1.8.5
+    New in v1.8.6
 </h2>
 <ul class="newFeatures">
-    <li>Added Protection and Torrent sets</li>
-    <li>DmgD optimization rating for Dmg x Defense</li>
-    <li>Multiple substat selections on Gear tab</li>
+    <li>Bug fixes</li>
 </ul>
 <h2>
     New in v1.8.0
@@ -51,14 +49,9 @@ module.exports = {
     <li>Click on the magnifying glass on an item to load analysis</li>
     <li>Customizable dark mode colors for the UI</li>
     <li>Penetration set damage bonus will be added to Dmg/Mcd calculations</li>
-    <li>Double click a hero on the Heroes tab to load them in Optimizer tab</li>
-    <li>Added an item attribute to disable modifications on the item</li>
-    <li>Ehp and Mcd values can be previewed in filters</li>
     <li>Heroes tab now shows 5* hero indicators</li>
     <li>All scores now use reforged values</li>
     <li>Storage items can now be imported - Open storage menu during scan</li>
-    <li>Added "Erase all data" button on Importer tab</li>
-    <li>Added Japanese translation</li>
     <li>Added +0/3/6/9/12/15 gear and above optimizer setting</li>
     <li>Added score evaluation based on each unit's base stats</li>
 </ul>

diff --git a/app/package.json b/app/package.json
@@ -5,7 +5,7 @@
     "name": "Fribbels",
     "url": "https://github.com/fribbels/Fribbels-Epic-7-Optimizer"
   },
-  "version": "1.8.5",
+  "version": "1.8.6",
   "description": "Epic 7 Gear Optimizer",
   "main": "./main.prod.js",
   "scripts": {

diff --git a/backend/out/artifacts/backend_jar/backend.jar b/backend/out/artifacts/backend_jar/backend.jar
diff --git a/backend/src/main/java/com/fribbels/core/StatCalculator.java b/backend/src/main/java/com/fribbels/core/StatCalculator.java
@@ -126,10 +126,6 @@ public HeroStats addAccumulatorArrsToHero(final HeroStats base,
         final float torrentMultiplier = sets[17]/2 > 1 ? sets[17] / 2 * 0.1f + 1 : 1;
         final float spdDiv1000 = (float)spd/1000;
 
-        if (sets[17] > 1) {
-            System.out.println("test");
-        }
-
         final int ehp = (int) (hp * (def/300 + 1));
         final int hpps = (int) (hp*spdDiv1000);
         final int ehpps = (int) ((float)ehp*spdDiv1000);

diff --git a/data/jar/backend.jar b/data/jar/backend.jar
diff --git a/data/py/scanner.py b/data/py/scanner.py
@@ -73,7 +73,7 @@ def thread_sniff(i, index):
 def terminate():
     os._exit(0)
 
-t = threading.Timer(1800.0, terminate)
+t = threading.Timer(3600.0, terminate)
 t.start()
 
 loop = True