fix setting app (#31)

Co-authored-by: 9-9-9-9 <9-9-9-9>
9-9-9-9 · Sep 5, 2021 · 5a47073 · 5a47073
1 parent d4efc68
commit 5a47073
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>bh.bot</groupId>
     <artifactId>BitHeroes</artifactId>
-    <version>1.5.2</version>
+    <version>1.5.3</version>
 
     <dependencies>
         <dependency>

diff --git a/src/main/java/bh/bot/app/AbstractApplication.java b/src/main/java/bh/bot/app/AbstractApplication.java
@@ -567,9 +567,11 @@ protected void autoReactiveAuto(AtomicBoolean masterSwitch) {
                 }
                 if (ImageUtil.isRedLikeColor(color)) {
                     continousRed++;
-                    if (continousRed >= 2)
-                        info("Detected Auto is not turned on, gonna reactive it soon");
+                    if (continousRed >= 2 && continousRed < maxContinousRed) {
+                        info("Detected Auto is not turned on, gonna reactive it after %d seconds", (maxContinousRed - continousRed) * sleepMs / 1_000);
+                    }
                     if (continousRed >= maxContinousRed) {
+                        info("Detected Auto is not turned on, gonna reactive it soon");
                         moveCursor(point);
                         sleep(100);
                         mouseClick();

diff --git a/src/main/java/bh/bot/app/SettingApp.java b/src/main/java/bh/bot/app/SettingApp.java
@@ -85,12 +85,6 @@ protected void internalRun(String[] args) {
             tmp = readIntInput(sb.toString(), woldBossLevelRange._1, woldBossLevelRange._2);
             worldBossLevel = tmp == null ? worldBossLevel : tmp;
             //
-
-            sb = new StringBuilder();
-            sb.append(String.format("%s=%d\n", UserConfig.raidLevelKey, raidLevel));
-            sb.append(String.format("%s=%d\n", UserConfig.raidModeKey, raidMode));
-            sb.append(String.format("%s=%d\n", UserConfig.worldBossLevelKey, worldBossLevel));
-
             UserConfig newCfg = new UserConfig(profileNumber, (byte) raidLevel, (byte) raidMode, (byte) worldBossLevel);
 
             sb = new StringBuilder("Your setting:\n");
@@ -115,6 +109,10 @@ protected void internalRun(String[] args) {
             });
 
             if (save) {
+                sb = new StringBuilder();
+                sb.append(String.format("%s=%d\n", UserConfig.raidLevelKey, raidLevel));
+                sb.append(String.format("%s=%d\n", UserConfig.raidModeKey, raidMode));
+                sb.append(String.format("%s=%d\n", UserConfig.worldBossLevelKey, worldBossLevel));
                 Files.write(Paths.get(fileName), sb.toString().getBytes());
                 info("Saved successfully");
             } else {