Add Avoid CBS option similar to Avoid Radiation and Mines (#359)

darkbot-reloaded · Jun 20, 2024 · 66ff423 · 66ff423
1 parent 6bc09c5
commit 66ff423
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/src/main/java/com/github/manolo8/darkbot/config/Config.java b/src/main/java/com/github/manolo8/darkbot/config/Config.java
@@ -201,6 +201,7 @@ public static class Miscellaneous {
         public @Option @Visibility(Level.INTERMEDIATE) boolean LOG_CHAT = false;
         public @Option @Visibility(Level.INTERMEDIATE) boolean LOG_DEATHS = false;
         public @Option @Visibility(Level.INTERMEDIATE) boolean AVOID_MINES = true;
+        public @Option @Visibility(Level.INTERMEDIATE) boolean AVOID_CBS = true;
         public @Option @Visibility(Level.INTERMEDIATE) boolean AVOID_RADIATION = true;
         public @Option @Visibility(Level.INTERMEDIATE) boolean USERNAME_ON_TITLE = false;
         public @Option @Visibility(Level.ADVANCED) boolean AUTO_REFINE = false;

diff --git a/src/main/java/com/github/manolo8/darkbot/core/entities/BattleStation.java b/src/main/java/com/github/manolo8/darkbot/core/entities/BattleStation.java
@@ -212,7 +212,7 @@ public void added(Main main) {
         @Override
         public boolean use() {
             boolean allowEnemy = main.hero.invisible && main.config.GENERAL.ROAMING.ENEMY_CBS_INVISIBLE;
-            return !allowEnemy && info.isEnemy() && isDangerousModule();
+            return !allowEnemy && info.isEnemy() && isDangerousModule() && main.config.MISCELLANEOUS.AVOID_CBS;
         }
 
         private boolean isDangerousModule() {

diff --git a/src/main/resources/lang/strings_de.properties b/src/main/resources/lang/strings_de.properties
@@ -202,6 +202,10 @@ config.miscellaneous.log_chat=Schreib die Chat Nachrichten in einen Log
 config.miscellaneous.log_deaths=Schreibe die Tode in einen Log
 config.miscellaneous.avoid_mines=Minen vermeiden
 config.miscellaneous.avoid_mines.desc=Wenn der Bot Minen vermeiden soll
+config.miscellaneous.avoid_cbs=CBS vermeiden
+config.miscellaneous.avoid_cbs.desc=Bot vermeidet CBS (Clan Battle Stations)
+config.miscellaneous.avoid_radiation=Strahlenzone meiden
+config.miscellaneous.avoid_radiation.desc=Bot vermeidet die Strahlenzone
 config.miscellaneous.username_on_title=Benutzername zum Anwendungstitel hinzufügen
 config.miscellaneous.username_on_title.desc=Fügt deinen in-game Namen dem Anwendungstitel hinzu, z.B. Sichtbarkeit im Task-Manager
 config.miscellaneous.auto_refine=Automatische Veredelung (API-spezifisch)

diff --git a/src/main/resources/lang/strings_en.properties b/src/main/resources/lang/strings_en.properties
@@ -215,6 +215,8 @@ config.miscellaneous.log_chat=Write chat messages to log file
 config.miscellaneous.log_deaths=Write death infos to log file
 config.miscellaneous.avoid_mines=Avoid mines
 config.miscellaneous.avoid_mines.desc=If the bot should avoid mines
+config.miscellaneous.avoid_cbs=Avoid CBS
+config.miscellaneous.avoid_cbs.desc=Bot will avoid flying over CBS
 config.miscellaneous.avoid_radiation=Avoid radiation
 config.miscellaneous.avoid_radiation.desc=Bot will avoid entering the radiation zone. Disable only if you are well aware of what you are doing
 config.miscellaneous.username_on_title=Add username to application title