Skip to content

Commit

Permalink
Merge pull request #37 from dm94/master
Browse files Browse the repository at this point in the history
v1.7.27
  • Loading branch information
dm94 authored Apr 16, 2023
2 parents 06933dd + 1f7f740 commit 290910a
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 333 deletions.
5 changes: 0 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@
</repositories>

<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.9</version>
</dependency>
<dependency>
<groupId>eu.darkbot</groupId>
<artifactId>DarkBot</artifactId>
Expand Down
319 changes: 0 additions & 319 deletions src/main/java/com/deeme/behaviours/PVPLog.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,6 @@ private Ability getBestAbility() {
return Ability.GOLIATH_X_FROZEN_CLAW;
} else if (isAvailable(Ability.VENOM)) {
return Ability.VENOM;
} else if (isAvailable(Ability.SOLARIS_INC)) {
return Ability.SOLARIS_INC;
} else if (isAvailable(Ability.SOLARIS_PLUS_INCINERATE_PLUS)) {
return Ability.SOLARIS_PLUS_INCINERATE_PLUS;
} else if (isAvailable(Ability.TARTARUS_RAPID_FIRE)) {
return Ability.TARTARUS_RAPID_FIRE;
} else if (isAvailable(Ability.DISRUPTOR_SHIELD_DISARRAY)) {
Expand All @@ -214,6 +210,12 @@ private Ability getBestAbility() {
return Ability.ZEPHYR_TBR;
} else if (isAvailable(Ability.HOLO_ENEMY_REVERSAL)) {
return Ability.HOLO_ENEMY_REVERSAL;
} else if (isInRange()) {
if (isAvailable(Ability.SOLARIS_INC)) {
return Ability.SOLARIS_INC;
} else if (isAvailable(Ability.SOLARIS_PLUS_INCINERATE_PLUS)) {
return Ability.SOLARIS_PLUS_INCINERATE_PLUS;
}
}
}

Expand All @@ -226,6 +228,11 @@ private boolean shoulFocusDamage() {
&& target.getHealth().getHp() >= this.config.minHealthToUseDamage);
}

private boolean isInRange() {
Lockable target = heroapi.getLocalTarget();
return (target != null && target.isValid() && heroapi.distanceTo(target) < 650);
}

private boolean shoulFocusSpeed() {
if (safety.state() == Escaping.ENEMY) {
return true;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/deeme/tasks/Discord.java
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private void sendStatistics() {
best += "{" +
" \"name\": \"Group size\",";
if (main.guiManager.group.hasGroup()) {
best += " \"value\": \"" + main.guiManager.group.group.size + "\",";
best += " \"value\": \"" + main.guiManager.group.getMembers().size() + "\",";
} else {
best += " \"value\": \" No Group \",";
}
Expand Down
Loading

0 comments on commit 290910a

Please sign in to comment.