refactor

ReRun.web.bat

@@ -3,5 +3,5 @@
 :: Consider adding `--profile=YourProfileName` so you no longer needed to select profile manually
 :: You can remove flag `--ear` to keep game online all day (but still gone if you got Disconnected)
 :: With steam version of BH, refer to AFK.steam.bat file
-call web.bot.bat quest --debug --img --profile=dare
+call web.bot.bat afk Q --profile=dare
 :: Move this file to bot's folder in order to use (this file was distributed within `sample-script` folder so it unable to run)

src/main/java/bh/bot/app/AbstractApplication.java

@@ -1357,7 +1357,7 @@ protected boolean tryEnterQuest(boolean doQuest, UserConfig userConfig, Supplier
  Point emptyStarCoords = game.findByScanScreen(BwMatrixMeta.Metas.Dungeons.Buttons.emptyStar, 63, 96, 36, 115);
  if (emptyStarCoords == null) {
  debug("Looking for next level");
- Point nextLevelCoords = game.findQuest(BwMatrixMeta.Metas.Dungeons.Buttons.questLevel);
+ Point nextLevelCoords = game.findByScanScreen(BwMatrixMeta.Metas.Dungeons.Buttons.questLevel, 63, 96, 36, 115);
  if (nextLevelCoords == null) {
  } else {
  levelCoords = nextLevelCoords;

src/main/java/bh/bot/app/farming/QuestApp.java

@@ -77,10 +77,4 @@ protected String getLimitationExplain() {
  protected int getDefaultMainLoopInterval() {
  return 1_000;
  }
-
- @SuppressWarnings("unused")
- private Point findQuest(BwMatrixMeta levelIm) {
- return this.gameScreenInteractor.findQuest(levelIm);
- }
-
 }

src/main/java/bh/bot/common/types/AttendablePlace.java

@@ -18,32 +18,32 @@ public AttendablePlace(String name, int id, String imgName, boolean left) throws
  this(name, id, imgName, left, (short) 30);
  }
 
- public AttendablePlace(String name, int id, String imgCode, boolean left, int procedureTicketMinutes) throws IOException {
+ public AttendablePlace(String name, int id, String imgCode, boolean left, int procedureTicketMinutes)
+ throws IOException {
  this.name = name;
  this.id = id;
- 
+
  String imgFile;
- switch(imgCode) {
-   case "pvp":
-   case "world-boss":
-   case "raid":
-   case "invasion":
-   case "trials":
-   case "gvg":
+ switch (imgCode) {
+  case "pvp":
+  case "world-boss":
+  case "raid":
+  case "invasion":
+  case "trials":
+  case "gvg":
  case "quest":
-   case "gauntlet":
-   case "expedition":
-   imgFile = imgCode + "3";
-   break;
-   default:
-   imgFile = imgCode;
-   break;
+  case "gauntlet":
+  case "expedition":
+  imgFile = imgCode + "3";
+  break;
+  default:
+  imgFile = imgCode;
+  break;
  }
  this.img = BwMatrixMeta.from(
  String.format("labels/attendable-places/%s?", imgFile),
  new Offset(0, 0),
- 0xFFFFFF
- );
+ 0xFFFFFF);
  this.left = left;
  this.procedureTicketMinutes = (short) procedureTicketMinutes;
  }

src/main/java/bh/bot/common/types/AttendablePlaces.java

@@ -14,7 +14,7 @@ public static class Ids {
  public static final int Pvp = 0b00100000;
  public static final int WorldBoss = 0b01000000;
  public static final int Raid = 0b10000000;
- public static final int Quest = 0b11000000;
+ public static final int Quest = 0b00000011;
  }
 
  public static AttendablePlace invasion = null;

src/main/java/bh/bot/common/types/ScreenResolutionProfile.java

@@ -44,11 +44,6 @@ public abstract class ScreenResolutionProfile {
  // forward,
  // max x
 
- public abstract Tuple4<Integer, Integer, Integer, Integer> getBackwardScanQuests(); // min x, max
- // y, step
- // backward,
- // max x
-
  public abstract Offset getOffsetButtonSummonOnListingPartiesWorldBoss();
 
  public abstract Offset getOffsetLabelWorldBossInSummonDialog();
@@ -339,11 +334,6 @@ public Tuple4<Integer, Integer, Integer, Integer> getBackwardScanLeftSideAttenda
  return new Tuple4<>(14, 0, 96, 59);
  }
 
- @Override
- public Tuple4<Integer, Integer, Integer, Integer> getBackwardScanQuests() {
- return new Tuple4<>(63, 108, 96, 737);
- }
-
  @Override
  public Offset getOffsetButtonSummonOnListingPartiesWorldBoss() {
  return new Offset(452, 451);

src/main/java/bh/bot/common/utils/InteractionUtil.java

@@ -242,23 +242,6 @@ public Point findAttendablePlace(AttendablePlace event) {
  return null;
  }
 
- public Point findQuest(BwMatrixMeta levelIm) {
- int minX, maxX, stepY, firstY;
- Tuple4<Integer, Integer, Integer, Integer> backwardsScan = Configuration
- .screenResolutionProfile
- .getBackwardScanQuests();
- minX = backwardsScan._1;
- firstY = backwardsScan._2;
- stepY = backwardsScan._3;
- maxX = backwardsScan._4;
-
- minX += Configuration.gameScreenOffset.X.get();
- maxX += Configuration.gameScreenOffset.X.get();
- firstY += Configuration.gameScreenOffset.Y.get();
-
- return findByScanColumn(levelIm, minX, maxX, stepY, firstY, 5);
- }
-
  public Point findByScanScreen(BwMatrixMeta im, int minX, int maxX, int stepY, int firstY) {
  int maxScreen = 800;
  Point located = null;