Merge branch 'dev'

Added mitigated columns, hotkeys, and fixed bugs
- Added mitigated & total mitigated columns
- Added hotkeys
- Added version to window title
- Clear log now also resets
- Fixed tracker not working when reset clicked and new match loaded
- Fixed backstab damage not being detected
- Fixed not being able to read DIT\_ log format

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'antD'
-version '2.1'
+version '2.2'
 
 repositories {
     mavenCentral()
@@ -26,6 +26,17 @@ jar {
 
 mainClassName = 'sdps.MainKt'
 
+task createProperties() {
+    doLast {
+        mkdir("$buildDir/resources/main")
+        new File("$buildDir/resources/main/version.txt").write("${project.version}")
+    }
+}
+
+classes {
+    dependsOn createProperties
+}
+
 runtime {
     options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages']
     modules = ['java.base', 'java.desktop']
@@ -49,9 +60,8 @@ task createBundledExe() {
         }
         copy {
             from "$buildDir/launch4j/$project.name-${project.version}.exe",
-                 "$projectDir/legal/release-license.txt"
+                 "$projectDir/bundle"
             into bundledExeDir
-            rename 'release-license.txt', 'license.txt'
         }
     }
 }

bundle/readme.txt

@@ -0,0 +1,35 @@
+ ---------- SDPS v2.2 ----------
+
+SDPS is a handy tool for the game Smite (https://smitegame.com/) that lets you track your in-game
+damage in real time. By jumping into a jungle practice match, SDPS makes it easy to compare the
+damage of different builds. SDPS uses the in-game combat log, so it will work seamlessly with future
+updates containing balance changes, new gods, and new items.
+
+Release: https://github.com/antD97/SmiteDPS/releases/tag/v2.2
+For a more detailed readme: https://github.com/antD97/SDPS/tree/v2.2
+
+ --- Usage ---
+
+1. Extract the zip file and run `SDPS.exe` to start the tool. Windows will likely display a message
+   stating "Windows protected your PC", because the file is not recognized. Click "More info" and
+   then "Run anyway" to launch the tool.
+
+2. In the Smite chat, enter `/combatlog toggle piped` to let SDPS see your combat log. This command
+   has to be typed in once per game launch.
+
+3. Enter your Smite in-game name and SDPS will begin tracking your damage in your match. Your first
+   tick of damage will start the timer used to calculate DPS, and your DPS will continuously be
+   reported every time you do more damage. DPS is calculated from your first tick of damage to the
+   most recent.
+
+4. If you click "Reset", your next tick of damage will reset the DPS timer. Alternatively, if you
+   click "Clear Table", the table will both be cleared and the timer reset.
+
+5. Whenever you want to record DPS or total damage, be sure to click "Reset" and then do another
+   tick of damage to reveal any damage ticks that may have been hidden. Read the last bullet in the
+   detailed readme's notes section for an explanation.
+
+ --- Copyright and License ---
+
+Copyright © 2021 antD97  
+Licensed under the MIT License https://antD.mit-license.org/

readme.md

@@ -1,13 +1,13 @@
 # SDPS
 
-[![GitHub release](https://img.shields.io/github/downloads/antD97/SDPS/v2.1/total)](https://github.com/antD97/SmiteDPS/releases/tag/v2.1)
+[![GitHub release](https://img.shields.io/github/downloads/antD97/SDPS/v2.2/total)](https://github.com/antD97/SmiteDPS/releases/tag/v2.2)
 
 SDPS is a handy tool for the game [Smite](https://smitegame.com/) that lets you track your in-game
 damage in real time. By jumping into a jungle practice match, SDPS makes it easy to compare the
 damage of different builds. SDPS uses the in-game combat log, so it will work seamlessly with future
 updates containing balance changes, new gods, and new items.
 
-You can find the download [here](https://github.com/antD97/SmiteDPS/releases/tag/v2.1).
+You can find the download [here](https://github.com/antD97/SmiteDPS/releases/tag/v2.2).
 
 ## Usage
 
@@ -20,51 +20,63 @@ You can find the download [here](https://github.com/antD97/SmiteDPS/releases/tag
    tick of damage will start the timer used to calculate DPS, and your DPS will continuously be
    reported every time you do more damage. DPS is calculated from your first tick of damage to the
    most recent.
-4. If you click "Reset", your next tick of damage will reset the DPS timer.
+4. If you click "Reset", your next tick of damage will reset the DPS timer. Alternatively, if you
+   click "Clear Table", the table will both be cleared and the timer reset.
+5. Whenever you want to record DPS or total damage, be sure to click "Reset" and then do another
+   tick of damage to reveal any damage ticks that may have been hidden. Read the last bullet in the
+   notes section for an explanation.
 
 ## Notes
 
 - If you have "Window always on top" enabled and your Smite "Screen Type" setting set to "Borderless
   Window" or "Window", you can have the tool window display on top of the game which makes testing
   considerably easier.
-
+  
 - SDPS can be used for more than just comparing DPS. If you want compare burst damage pay attention
   to the "Σ Damage" column which displays the total damage since reset has been clicked.
 
+- If you hover over each of the buttons and checkboxes in the window, you can reveal its shortcut.
+  By only displaying columns that are relevant to you and clicking the button in the top left
+  corner to hide the sidebar, you can resize the window and use the shortcuts so that the tool is
+  as out of your way as possible.
+
+- In the "Odin bots" section of jungle practice, there are three Odin bots to the immediate left.
+  These bots are handy for DPS calculations. The first one matches your character's level, the
+  second one is level one, and the third one is level twenty. There are also buttons to the right
+  that let you change the amount of protections they have.
+
+- If you are in a match, and the DPS log says "End", try typing the command
+  `/combatlog toggle piped` into Smite chat again. You may have accidentally entered it twice which
+  prevents SDPS from monitoring your combat log.
+
 - **This one is fairly important** depending on the type of scenario you are trying to measure, in
-  particular burst DPS. If there are multiple combat ticks that occur at the same time (e.g. Qin's
-  Sais), Smite's combat log annoyingly won't be updated until the next combat update. The late
-  timing won't mess up the DPS calculation, but this issue can make the DPS output misleading. The
-  following screenshots show an example of two ticks of damage arriving late to the DPS log.
+  particular burst damage. If there are multiple damage ticks that occur at the same time (e.g.
+  Qin's Sais), Smite's combat log annoyingly won't be updated until the next combat update. The late
+  timing won't mess up the DPS calculation, but this issue can make the table's output misleading.
+  The following screenshots show an example of two ticks of damage arriving late to the DPS log.
 
   ![Screenshot 4](pics/screenshot3.png)
 
   There are two missing rows of damage from Qin's Sais and Shifter of Seasons that occurred at the
   same time as the last shown basic attack. These rows are not added until the combat log is
-  updated.
+  updated with another basic attack.
 
   ![Screenshot 4](pics/screenshot4.png)
 
   Some other examples of this are Polynomicon and Bacchus' ult which counts as two combat ticks,
-  once for drunk effect and once for damage. Damage from these sources will appear in the log on the
-  next combat tick. It's difficult to tell which gods and items have this behavior so: **whenever**
-  **you want to record DPS or total damage, click "Reset" and then do another tick of damage to**
-  **reveal any damage ticks that may have been hidden.**
-
-- In the "Odin bots" section of jungle practice, there are three Odin bots to the immediate left.
-  These bots are handy for DPS calculations. The first one matches your character's level, the
-  second one is level one, and the third one is level twenty. There are also buttons to the right
-  that let you control the amount of protections they have.
-
-- If you are in a match, and the DPS log says "End", try typing the command
-  `/combatlog toggle piped` into Smite chat again. You may have accidentally entered it twice which
-  prevents SDPS from monitoring your combat log.
+  once for drunk effect and once for damage. Damage from these sources will appear in the table on
+  the next combat tick. It's difficult to tell which gods and items have this behavior so:
+  **whenever you want to record DPS or total damage, be sure to click "Reset" and then do another**
+  **tick of damage to reveal any damage ticks that may have been hidden.**
 
 ## Building
 
 1. Download and install OpenJDK [here](https://openjdk.java.net/install).
 2. Run `./gradlew createBundledExe`. The output is located in `build/bundledExe`.
 
+If you would like to verify my release, I'm using OpenJDK 15.0.2. If you use the same version, the
+builds' checksums should match.
+
 ## Screenshots
 
 [![Screenshot 1](pics/screenshot1.png)](pics/screenshot1.png)