diff --git a/TwosideKeeper.jar b/TwosideKeeper.jar index 5433181..6f34d22 100644 Binary files a/TwosideKeeper.jar and b/TwosideKeeper.jar differ diff --git a/src/sig/plugin/TwosideKeeper/HelperStructures/ItemSet.java b/src/sig/plugin/TwosideKeeper/HelperStructures/ItemSet.java index 37bbfe3..7956d06 100644 --- a/src/sig/plugin/TwosideKeeper/HelperStructures/ItemSet.java +++ b/src/sig/plugin/TwosideKeeper/HelperStructures/ItemSet.java @@ -25,7 +25,7 @@ public enum ItemSet { ALIKAHN(3,1, 15,6, 30,10, 1,1), LORASAADI(4,1, 4,2, 8,6, 8,3), MOONSHADOW(4,2, 1,1, 8,8, 15,7), - GLADOMAIN(1,1, 12,10, 8,8, 1,1), + GLADOMAIN(1,1, 12,4, 8,4, 1,1), WOLFSBANE(2,1, 15,10, 10,5, 15,10), ALUSTINE(3,2, 300,-30, 50,-5, 6,2), DASHER(5,5, 3,3, 5,5, 0,0), diff --git a/src/sig/plugin/TwosideKeeper/Logging/Average.java b/src/sig/plugin/TwosideKeeper/Logging/Average.java index 56eb5ec..470a16d 100644 --- a/src/sig/plugin/TwosideKeeper/Logging/Average.java +++ b/src/sig/plugin/TwosideKeeper/Logging/Average.java @@ -7,6 +7,8 @@ public class Average { int low; int trend; int last; + int lasthigh; + int lastlow; public Average() { this.avg=0; this.count=0; @@ -17,11 +19,15 @@ public class Average { } public void add(int value) { + if (lasthigh>60) {high=0;lasthigh=0;} + if (lastlow>60) {low=Integer.MAX_VALUE;lastlow=0;} if (value>high) { high=value; + lasthigh=0; } else if (value60) {trend=60;} if (trend<-60) {trend=-60;} + lasthigh++; + lastlow++; count++; } } diff --git a/src/sig/plugin/TwosideKeeper/runServerHeartbeat.java b/src/sig/plugin/TwosideKeeper/runServerHeartbeat.java index 6e73ae8..e94f9a4 100644 --- a/src/sig/plugin/TwosideKeeper/runServerHeartbeat.java +++ b/src/sig/plugin/TwosideKeeper/runServerHeartbeat.java @@ -559,9 +559,9 @@ final class runServerHeartbeat implements Runnable { double regenamt = GenericFunctions.getAbilityValue(ArtifactAbility.HEALTH_REGEN, equip); bonusregen += regenamt; TwosideKeeper.log("Bonus regen increased by "+regenamt,5); - if (ArtifactAbility.containsEnchantment(ArtifactAbility.GREED, equip)) { - totalregen /= ArtifactAbility.containsEnchantment(ArtifactAbility.GREED, equip)?2:1; - } + if (ArtifactAbility.containsEnchantment(ArtifactAbility.GREED, equip)) { + totalregen /= ArtifactAbility.containsEnchantment(ArtifactAbility.GREED, equip)?2:1; + } } } if (ArtifactAbility.containsEnchantment(ArtifactAbility.GREED, p.getEquipment().getItemInMainHand())) {