1.6.0 support Invasion on Steam (#36)

* prepare for other Dimentions of Expedition

* update desc of some functions

* support Invasion on Steam

* 1.6.0

Co-authored-by: 9-9-9-9 <9-9-9-9>

README.md

@@ -56,7 +56,7 @@ Tips 2: see help
 - Linux/MacOS: run script `./help.sh`
 
 ##### Optional configuration:
-- [Configure Raid/World Boss](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki/Select-Raid-World-Boss-level,-mode,..-using-%60setting%60-function):
+- [Configure Raid/World Boss/Expedition](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki/Select-Raid-World-Boss-level,-mode,..-using-%60setting%60-function):
   - Windows: run file `setting.bat`
   - Linux/MacOS: run script `./setting.sh`
 - [push notification via Telegram](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki/Configure-Telegram-in-able-to-receive-notification)

README.release.md

@@ -48,7 +48,7 @@ Tips 2: see help
 - Linux/MacOS: run script `./help.sh`
 
 ##### Optional configuration:
-- [Configure Raid/World Boss](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki/Select-Raid-World-Boss-level,-mode,..-using-%60setting%60-function):
+- [Configure Raid/World Boss/Expedition](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki/Select-Raid-World-Boss-level,-mode,..-using-%60setting%60-function):
   - Windows: run file `setting.bat`
   - Linux/MacOS: run script `./setting.sh`
 - [push notification via Telegram](https://github.com/9-9-9-9/Bit-Heroes-bot/wiki/Configure-Telegram-in-able-to-receive-notification)

pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>bh.bot</groupId>
 	<artifactId>99bot</artifactId>
-	<version>1.5.8</version>
+	<version>1.6.0</version>
 
 	<dependencies>
 		<dependency>

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

@@ -1,6 +1,7 @@
 package bh.bot.app;
 
 import bh.bot.Main;
+import bh.bot.app.farming.ExpeditionApp;
 import bh.bot.common.Configuration;
 import bh.bot.common.OS;
 import bh.bot.common.Telegram;
@@ -27,8 +28,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.*;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
@@ -659,30 +659,63 @@ protected void autoExit(int exitAfterXSecs, AtomicBoolean masterSwitch) {
         }
     }
 
+    private final HashMap<BwMatrixMeta, Offset[]> expeditionMap =
+            this instanceof AfkApp || this instanceof ExpeditionApp
+                    ? new HashMap<BwMatrixMeta, Offset[]>() {{
+            	/*
+                put(BwMatrixMeta.Metas.Expedition.Labels.infernoDimension, new Offset[]{
+                        Configuration.screenResolutionProfile.getOffsetEnterInfernoDimensionRaleib(),
+                        Configuration.screenResolutionProfile.getOffsetEnterInfernoDimensionBlemo(),
+                        Configuration.screenResolutionProfile.getOffsetEnterInfernoDimensionGummy(),
+                        Configuration.screenResolutionProfile.getOffsetEnterInfernoDimensionZarlock(),
+                });
+                put(BwMatrixMeta.Metas.Expedition.Labels.hallowedDimension, new Offset[]{
+                        Configuration.screenResolutionProfile.getOffsetEnterHallowedDimensionGooGarum(),
+                        Configuration.screenResolutionProfile.getOffsetEnterHallowedDimensionSvord(),
+                        Configuration.screenResolutionProfile.getOffsetEnterHallowedDimensionTwimbo(),
+                        Configuration.screenResolutionProfile.getOffsetEnterHallowedDimensionX5T34M(),
+                });
+                put(BwMatrixMeta.Metas.Expedition.Labels.jammieDimension, new Offset[]{
+                        Configuration.screenResolutionProfile.getOffsetEnterJammieDimensionZorgo(),
+                        Configuration.screenResolutionProfile.getOffsetEnterJammieDimensionYackerz(),
+                        Configuration.screenResolutionProfile.getOffsetEnterJammieDimensionVionot(),
+                        Configuration.screenResolutionProfile.getOffsetEnterJammieDimensionGrampa(),
+                });
+                */
+                put(BwMatrixMeta.Metas.Expedition.Labels.idolDimension, new Offset[]{
+                        Configuration.screenResolutionProfile.getOffsetEnterIdolDimensionBlubLix(),
+                        Configuration.screenResolutionProfile.getOffsetEnterIdolDimensionMowhi(),
+                        Configuration.screenResolutionProfile.getOffsetEnterIdolDimensionWizBot(),
+                        Configuration.screenResolutionProfile.getOffsetEnterIdolDimensionAstamus(),
+                });
+                /*
+                put(BwMatrixMeta.Metas.Expedition.Labels.battleBards, new Offset[]{
+                        Configuration.screenResolutionProfile.getOffsetEnterBattleBardsHero(),
+                        Configuration.screenResolutionProfile.getOffsetEnterBattleBardsBurning(),
+                        Configuration.screenResolutionProfile.getOffsetEnterBattleBardsMelvapaloozo(),
+                        Configuration.screenResolutionProfile.getOffsetEnterBattleBardsBitstock(),
+                });
+                */
+            }}
+                    : null;
+
     protected boolean tryEnterExpedition(boolean doExpedition, byte place) {
-        if (doExpedition && clickImage(BwMatrixMeta.Metas.Expedition.Labels.idolDimension)) {
-            Point p;
-            switch (place) {
-                case 1:
-                    p = Configuration.screenResolutionProfile.getOffsetEnterIdolDimensionBlubLix().toScreenCoordinate();
-                    break;
-                case 2:
-                    p = Configuration.screenResolutionProfile.getOffsetEnterIdolDimensionMowhi().toScreenCoordinate();
-                    break;
-                case 3:
-                    p = Configuration.screenResolutionProfile.getOffsetEnterIdolDimensionWizBot().toScreenCoordinate();
-                    break;
-                case 4:
-                    p = Configuration.screenResolutionProfile.getOffsetEnterIdolDimensionAstamus().toScreenCoordinate();
-                    break;
-                default:
-                    return false;
+        if (!doExpedition)
+            return false;
+
+        for (Map.Entry<BwMatrixMeta, Offset[]> entry : expeditionMap.entrySet()) {
+            if (entry.getKey() == null)
+                continue;
+
+            if (clickImage(entry.getKey())) {
+                Point p = entry.getValue()[place - 1].toScreenCoordinate();
+                mouseMoveAndClickAndHide(p);
+                sleep(5_000);
+                hideCursor();
+                return true;
             }
-            mouseMoveAndClickAndHide(p);
-            sleep(5_000);
-            hideCursor();
-            return true;
         }
+
         return false;
     }
 
@@ -781,7 +814,6 @@ private Point fromRelativeToAbsoluteBasedOnPreviousResult(BwMatrixMeta sampleImg
     }
 
     protected byte selectExpeditionPlace() {
-        //noinspection StringBufferReplaceableByString
         StringBuilder sb = new StringBuilder("Select a place to do Expedition:\n");
         final Tuple2<Byte, Byte> expeditionPlaceRange = UserConfig.getExpeditionPlaceRange();
         for (int i = expeditionPlaceRange._1; i <= expeditionPlaceRange._2; i++)
@@ -916,8 +948,8 @@ protected String readCfgProfileName(String ask, String desc) {
             final String prefix = "readonly.";
             final String suffix = ".user-config.properties";
             boolean foundAny = false;
-            for (File file : Arrays.stream(new File(".").listFiles())
-                    .filter(x -> x.isFile())
+            for (File file : Arrays.stream(Objects.requireNonNull(new File(".").listFiles()))
+                    .filter(File::isFile)
                     .sorted().collect(Collectors.toList())) {
                 String name = file.getName();
                 if (!name.startsWith(prefix) || !name.endsWith(suffix))

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

@@ -126,10 +126,6 @@ private void doLoop(//
                         boolean doGauntlet //
     ) {
         try {
-
-            if (doInvasion && Configuration.isSteamProfile)
-                throw new NotSupportedException("Invasion has not been supported on Steam mode");
-
             info(ColorizeUtil.formatInfo, "\n\nStarting AFK");
             boolean isUnknownGvgOrInvasionOrExpedition = (doGvg && doInvasion) || (doGvg && doExpedition)
                     || (doInvasion && doExpedition);
@@ -460,7 +456,7 @@ private ArrayList<AttendablePlace> getAttendablePlaces() {
                     MenuItem.from("Trials/Gauntlet", AttendablePlaces.trials, AttendablePlaces.gauntlet),
                     MenuItem.from(AttendablePlaces.pvp, AttendablePlaces.worldBoss, AttendablePlaces.raid),
                     MenuItem.from(AttendablePlaces.pvp, AttendablePlaces.worldBoss, AttendablePlaces.raid,
-                            AttendablePlaces.expedition, AttendablePlaces.trials),
+                            AttendablePlaces.invasion, AttendablePlaces.gauntlet),
                     MenuItem.from("All", allAttendablePlaces.toArray(new AttendablePlace[0]))
             ).collect(Collectors.toList());
 
@@ -521,7 +517,7 @@ protected String getUsage() {
 
     @Override
     protected String getDescription() {
-        return "It helps you AFK by automatically consume PVP/World Boss/GVG/Invasion/Trials/Gauntlet turns";
+        return "AFK automatically consume PVP/World Boss/GVG/Invasion/Trials/Gauntlet turns, thus you can away from keyboard";
     }
 
     @Override

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

@@ -54,7 +54,7 @@ public static List<NextAction> getPredefinedImageActions() {
 
     @Override
     protected String getLimitationExplain() {
-        return "This function does not support select badge cost, so choose it before turn this on";
+        return "Expedition does not support select badge cost, so choose it before turn this on";
     }
 
     @Override

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

@@ -31,6 +31,6 @@ public static List<NextAction> getPredefinedImageActions() {
 
     @Override
     protected String getLimitationExplain() {
-        return "This function does not support select difficulty and token cost, so choose it before turn this on";
+        return "Gauntlet does not support select difficulty and token cost, so choose it before turn this on";
     }
 }

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

@@ -32,6 +32,6 @@ public static List<NextAction> getPredefinedImageActions() {
 
     @Override
     protected String getLimitationExplain() {
-        return "This function does not support select badge cost, so choose it before turn this on";
+        return "GVG does not support select badge cost, so choose it before turn this on";
     }
 }

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

@@ -31,6 +31,6 @@ public static List<NextAction> getPredefinedImageActions() {
 
     @Override
     protected String getLimitationExplain() {
-        return "This function does not support select badge cost, so choose it before turn this on";
+        return "Invasion does not support select badge cost, so choose it before turn this on";
     }
 }

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

@@ -33,6 +33,6 @@ public static List<NextAction> getPredefinedImageActions() {
 
     @Override
     protected String getLimitationExplain() {
-        return "This function only hit first opponent and does not support select PVP ticket cost, so choose it before turn this on";
+        return "PVP only hit first opponent and does not support select PVP ticket cost, so choose it before turn this on";
     }
-}
+}

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

@@ -31,6 +31,6 @@ public static List<NextAction> getPredefinedImageActions() {
 
     @Override
     protected String getLimitationExplain() {
-        return "This function does not support select difficulty and token cost, so choose it before turn this on";
+        return "Trials does not support select difficulty and token cost, so choose it before turn this on";
     }
 }

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

@@ -66,6 +66,6 @@ public static List<NextAction> getPredefinedImageActions() {
 
     @Override
     protected String getLimitationExplain() {
-        return "This function is solo only and does not support select mode of World Boss (Normal/Hard/Heroic), only select by default So which boss do you want to hit? Choose it before turn this on";
+        return "World Boss is solo only and does not support select mode of World Boss (Normal/Hard/Heroic), only select by default So which boss do you want to hit? Choose it before turn this on";
     }
 }

src/main/java/bh/bot/common/Configuration.java

@@ -75,7 +75,7 @@ public static void loadSystemConfig(final ParseArgumentsResult parseArgumentsRes
         if (isBlank(profileName))
             throw new InvalidDataException("profileName");
 
-        warn("You must move the Bit Heroes game's window to top left corner of your screen or provide exactly screen offset into the 'offset.screen.x & y' keys");
+        warn("You must move the Bit Heroes game's window to top left corner of your screen or provide exactly screen offset into the 'offset.screen.x & y' keys. See more: https://github.com/9-9-9-9/Bit-Heroes-bot/wiki/Manually-setting-game-screen-coordinate");
         if (isSteamProfile)
             warn("Your Bit Heroes game window must be 800x480. You can check it by open Settings, see the Windowed option");
 

src/main/java/bh/bot/common/jna/MiniClientLinuxJna.java

@@ -36,9 +36,8 @@ public void internalTryToCloseGameWindow() throws Exception {
                 debug("internalTryToCloseGameWindow: Output of ps command has invalid format: %s", psOutput);
                 continue;
             }
-            int pid = Integer.parseInt(spl[0]);
-            startProcess("kill", "-9", String.valueOf(pid));
 
+            int pid = Integer.parseInt(spl[0]);
             new ProcessBuilder(new String[]{
                     "kill", "-9", String.valueOf(pid)
             }).start().waitFor();