Fixed flat health prediction

Author: fribbels

.gitignore

@@ -51,4 +51,5 @@ npm-debug.log.*
 
 data/saves/autosave.json
 # backend/lib
-backend/.idea/workspace.xml
+backend/.idea/workspace.xml
+backend/target/classes

README.md

@@ -276,7 +276,7 @@ Please read these instructions carefully!
 **Importing gear screenshots:**
 
 1. Open the Gear Management screen in Epic 7 and sort by Max Enhance<br><br>
-2. Click each of the gears that you want to import, and screenshot it. Every screenshot should be 1600x900 and look EXACTLY like this:
+2. Click each of the gears that you want to import, and screenshot it. Every screenshot should be 1600x900 and look EXACTLY like this: https://i.imgur.com/68A8Uf0.jpg
 
 ![https://i.imgur.com/ny7uaa8.jpg](https://i.imgur.com/ny7uaa8.jpg)
 
@@ -356,6 +356,10 @@ Hopefully this is useful for anyone looking for an easier way to gear their unit
  - Update permutations on 4 piece set
  - Dark mode
  - Use main stat gear for priority filter
+ - Clickable lock icon
+ - Alphabetizing
+ - Save filter preferences
+ - Invalid dpi error
 
  **Low priority:**
  - Add can reforge, can enhance columns
@@ -381,7 +385,7 @@ Hopefully this is useful for anyone looking for an easier way to gear their unit
 
 ## Troubleshooting
 
-- Restart your computer and retry first (there might be an child process still kicking around)
+- Restart your computer and retry first (there might be a child process still kicking around)
 - Try killing any java.exe processes in Task Manager that came from this app
 - Error message: 'java is not recognized as an internal or external command' upon opening the app. Install Java 8 64-bit version to fix.
 - After selecting a screenshot folder and pressing submit, nothing happens or gets stuck. Check if there are any invalid screenshots in your folder. They should all look like exactly like https://i.imgur.com/ny7uaa8.jpg in 1600x900 resolution

app/app.html

@@ -508,18 +508,14 @@
                 </div>
 
                 <div class="optimizerActionButtonsRow">
-                  <input type="submit" class="gearPreviewButton" value="Equip Items" id="gearPreviewEquip">
-                  <input type="submit" class="gearPreviewButton" value="Unequip Items" id="gearPreviewUnequip">
-                </div>
-                <div id="buttonSpace"></div>
-                <div class="optimizerActionButtonsRow">
-                  <input type="submit" class="gearPreviewButton" value="Lock Items" id="gearPreviewLock">
-                  <input type="submit" class="gearPreviewButton" value="Unlock Items" id="gearPreviewUnlock">
-                </div>
+                  <input type="submit" class="gearActionButton" value="Equip" id="gearPreviewEquip">
+                  <input type="submit" class="gearActionButton" value="Lock" id="gearPreviewLock">
+                  <input type="submit" class="gearActionButton" value="Select All" id="gearPreviewSelectAll">                </div>
                 <div id="buttonSpace"></div>
                 <div class="optimizerActionButtonsRow">
-                  <input type="submit" class="gearPreviewButton" value="Select All" id="gearPreviewSelectAll">
-                  <input type="submit" class="gearPreviewButton" value="Deselect All" id="gearPreviewDeselectAll">
+                  <input type="submit" class="gearActionButton" value="Unequip" id="gearPreviewUnequip">
+                  <input type="submit" class="gearActionButton" value="Unlock" id="gearPreviewUnlock">
+                  <input type="submit" class="gearActionButton" value="Deselect All" id="gearPreviewDeselectAll">
                 </div>
               </div>
             </div>

app/css/style.css

@@ -98,7 +98,7 @@ body {
 
 .optimization-results-panel {
   flex-grow: 2;
-  min-height: 250px;
+  min-height: 300px;
   height: 100%;
   display: flex;
 }
@@ -633,7 +633,7 @@ input[type=number]::-webkit-outer-spin-button {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
-    line-height: 22px;
+    line-height: 20px;
 }
 .leftRightTextContent {
     font-family: Segoe UI,Frutiger,Frutiger Linotype,Dejavu Sans,Helvetica Neue,Arial,sans-serif;
@@ -667,4 +667,9 @@ input[type=number]::-webkit-outer-spin-button {
 }
 .optimizer-checkbox {
   cursor: pointer;
+}
+.gearActionButton {
+  width: 100px;
+  cursor: pointer;
+  margin-right: 5px;
 }

app/js/lib/notifier.js

@@ -6,7 +6,7 @@ var globalOptions = {
     },
     durations: {
         alert: 20000,
-        warning: 10000
+        warning: 5000
     },
     position: 'top-right'
 }

app/js/lib/reforge.js

@@ -145,7 +145,7 @@ function calculateReforgeValues(substat) {
         substat.reforgedValue = substat.value + 9 * substat.rolls;
     }
     if (substat.type == "Health") {
-        substat.reforgedValue = substat.value + 54 * substat.rolls;
+        substat.reforgedValue = substat.value + 56 * substat.rolls;
     }
     if (substat.type == "Speed") {
         substat.reforgedValue = substat.value + speedRollsToValue[substat.rolls];

backend/.idea/workspace.xml

@@ -11,7 +11,6 @@
 import com.fribbels.handler.SystemRequestHandler;
 import com.sun.net.httpserver.HttpServer;
 
-import java.io.IOException;
 import java.net.BindException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.ExecutorService;

backend/out/artifacts/backend_jar/backend.jar

@@ -45,6 +45,7 @@ private void initialize() throws Exception {
         tessBaseAPI.SetVariable("load_system_dawg", "false");
         tessBaseAPI.SetVariable("load_freq_dawg", "false");
         tessBaseAPI.SetVariable("classify_enable_learning", "0");
+        tessBaseAPI.SetVariable("user_defined_dpi", "70");
     }
 
     @Override