0.13.6

GottFaust · Jun 15, 2020 · e6351eb · e6351eb
1 parent 5f7d774
commit e6351eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/etc/Constants.java b/src/etc/Constants.java
@@ -157,7 +157,7 @@ public class Constants {
 
   /** Frame Title **/
   public static final String APP_TITLE = "Warframe Weapon DPS Calculator";
-  public static final String APP_VERSION = "v0.13.4";
+  public static final String APP_VERSION = "v0.13.6";
 
   /** ToolTips **/
   public static final String NAME_TOOL_TIP = "The weapon's name.";

diff --git a/src/ttk/TTKTarget.java b/src/ttk/TTKTarget.java
@@ -1342,17 +1342,14 @@ public double calculateRandomizedTimeToKill() {
 					statusStacks.get(j).timer -= 1000;
 					if (statusStacks.get(j).timer <= 0 && statusStacks.get(j).duration >= 0) {
 						double mult = statusStacks.get(j).healthMult;
-						if (targetCurrentShields > 0.0) {
-							if (!statusStacks.get(j).tox) {
-								mult = statusStacks.get(j).shieldMult;
-								targetCurrentShields -= statusStacks.get(j).damage * mult * magMult;
-							} else { // tox bypasses shields
-								mult = ((statusStacks.get(j).healthMult * statusStacks.get(j).armorMult) / (1 + ((shatteringImpactMult * corroMult * heatProcMult * targetAdjustedMaxArmor * (2 - statusStacks.get(j).armorMult)) / 300)));
-								targetCurrentHealth -= statusStacks.get(j).damage * mult * viralDamageBuff;
-							}
-						} else if (shatteringImpactMult * corroMult * heatProcMult * targetAdjustedMaxArmor > 0.0) {
+						if (targetCurrentShields > 0.0 && !statusStacks.get(j).tox) { // Shields
+							mult = statusStacks.get(j).shieldMult;
+							targetCurrentShields -= statusStacks.get(j).damage * mult * magMult;
+						} else if (shatteringImpactMult * corroMult * heatProcMult * targetAdjustedMaxArmor > 0.0) { // Armor
 							mult = ((statusStacks.get(j).healthMult * statusStacks.get(j).armorMult) / (1 + ((shatteringImpactMult * corroMult * heatProcMult * targetAdjustedMaxArmor * (2 - statusStacks.get(j).armorMult)) / 300)));
 							targetCurrentHealth -= statusStacks.get(j).damage * (statusStacks.get(j).slash ? 1 : mult) * viralDamageBuff;
+						} else { // No armor
+							targetCurrentHealth -= statusStacks.get(j).damage * (statusStacks.get(j).slash ? 1 : mult) * viralDamageBuff;
 						}
 						statusStacks.get(j).timer = 10000;
 					}
@@ -1481,6 +1478,10 @@ public double calculateRandomizedTimeToKill() {
 			rampMult += nextEvent;
 			shotTimer -= nextEvent;
 			timeToKill += nextEvent;
+
+			if (name.equals("Crewman") && timeToKill > 20000) {
+				int debug = 0;
+			}
 
 		}
 		return timeToKill / 10000.0;