Merge branch 'dm94:master' into master

darkbot-reloaded · Sep 23, 2024 · ac46220 · ac46220
2 parents 525245c + 6dca03c
commit ac46220
Show file tree

Hide file tree

Showing 22 changed files with 97 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ hs_err_pid*
 .idea/*
 .gradle/
 build/
+bin/
 out/*
 DmPlugin.iml
 dmplugin.properties

diff --git a/src/main/java/com/deeme/behaviours/ProfileChanger.java b/src/main/java/com/deeme/behaviours/ProfileChanger.java
@@ -266,8 +266,8 @@ private boolean isReadyTimeCondition() {
 
         LocalDateTime da = LocalDateTime.now();
 
-        return da.getHour() > config.timeCondition.hour
-                || (config.timeCondition.hour == da.getHour() && da.getMinute() >= config.timeCondition.minute);
+        return config.timeCondition.hour == da.getHour()
+                && (da.getMinute() >= config.timeCondition.minute && config.timeCondition.minute <= da.getMinute() + 5);
     }
 
     private boolean isReadyKeyCondition() {

diff --git a/src/main/java/com/deeme/modules/astral/AstralConfig.java b/src/main/java/com/deeme/modules/astral/AstralConfig.java
@@ -13,6 +13,7 @@
 import eu.darkbot.api.config.annotations.Dropdown;
 import eu.darkbot.api.config.annotations.Number;
 import eu.darkbot.api.config.annotations.Option;
+import eu.darkbot.api.config.annotations.Percentage;
 import eu.darkbot.api.config.annotations.Table;
 
 @Configuration("astral")
@@ -36,6 +37,10 @@ public class AstralConfig {
     @Option("astral.attack_closest")
     public boolean alwaysTheClosestNPC = false;
 
+    @Option("astral.min_shield_to_repair")
+    @Percentage
+    public double minShieldToRepair = 0.2;
+
     @Option("astral.best_ammo")
     @Dropdown
     public BestAmmoConfig useBestAmmoLogic = BestAmmoConfig.ONLY_MARKED;

diff --git a/src/main/java/com/deeme/modules/astral/AstralGate.java b/src/main/java/com/deeme/modules/astral/AstralGate.java
@@ -204,7 +204,7 @@ public void onTickModule() {
             if (astralPlus.isValidShip()) {
                 activeAutoRocketCPU();
                 repairShield = repairShield && heroapi.getHealth().shieldPercent() < 0.9
-                        || heroapi.getHealth().shieldPercent() < 0.2;
+                        || heroapi.getHealth().shieldPercent() < astralConfig.minShieldToRepair;
                 if (findTarget()) {
                     waveLogic();
                 } else if (npcs.isEmpty() || !portals.isEmpty()) {

diff --git a/src/main/resources/com/deeme/lang/strings_bg.properties b/src/main/resources/com/deeme/lang/strings_bg.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Type of ship
 ambulance.ship_type.desc=Also works with the plus versions

diff --git a/src/main/resources/com/deeme/lang/strings_cs.properties b/src/main/resources/com/deeme/lang/strings_cs.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Druh lodi
 ambulance.ship_type.desc=Pracuje také s verzemi plus

diff --git a/src/main/resources/com/deeme/lang/strings_de.properties b/src/main/resources/com/deeme/lang/strings_de.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Weitere Optionen
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Schiffstyp
 ambulance.ship_type.desc=Funktioniert auch mit den Plus-Versionen

diff --git a/src/main/resources/com/deeme/lang/strings_el.properties b/src/main/resources/com/deeme/lang/strings_el.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Τύπος πλοίου
 ambulance.ship_type.desc=Επίσης λειτουργεί με τις εκδόσεις συν

diff --git a/src/main/resources/com/deeme/lang/strings_en.properties b/src/main/resources/com/deeme/lang/strings_en.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Type of ship
 ambulance.ship_type.desc=Also works with the plus versions

diff --git a/src/main/resources/com/deeme/lang/strings_es.properties b/src/main/resources/com/deeme/lang/strings_es.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignora límite del Items
 astral.portal_table.ignore_limit.desc=Usará el portal aunque tenga el máximo de ese Item.
 astral.custom_item_priority=Prioridad de ítems
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Escudo minimo para empezar a reparar
+astral.min_shield_to_repair.desc=Cuando esta por debajo de ese porcentaje de escudo se pone en modo de reparación
 
 ambulance.ship_type=Tipo de nave
 ambulance.ship_type.desc=También funciona con las versiones plus

diff --git a/src/main/resources/com/deeme/lang/strings_fr.properties b/src/main/resources/com/deeme/lang/strings_fr.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Type de navire
 ambulance.ship_type.desc=Fonctionne également avec les versions plus

diff --git a/src/main/resources/com/deeme/lang/strings_hu.properties b/src/main/resources/com/deeme/lang/strings_hu.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Hajó típusa
 ambulance.ship_type.desc=A plusz verziókkal is működik

diff --git a/src/main/resources/com/deeme/lang/strings_it.properties b/src/main/resources/com/deeme/lang/strings_it.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Tipo di nave
 ambulance.ship_type.desc=Funziona anche con le versioni plus

diff --git a/src/main/resources/com/deeme/lang/strings_lt.properties b/src/main/resources/com/deeme/lang/strings_lt.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Laivo tipas
 ambulance.ship_type.desc=Taip pat veikia su plus versijomis

diff --git a/src/main/resources/com/deeme/lang/strings_pl.properties b/src/main/resources/com/deeme/lang/strings_pl.properties
@@ -39,8 +39,8 @@ general.always_use_bellow_hp.desc=Zawsze będzie używać, jeśli HP jest poniż
 general.item_condition=Warunek użycia przedmiotu
 general.min_time_per_action=Minimalny czas pomiędzy akcjami
 general.min_time_per_action.desc=Minimalny czas pomiędzy akcjami (w sekundach)
-general.enable_random_clicks=Enable clicking on random points when selecting
-general.enable_random_clicks.desc=If enabled it will click on a random point, it is more secure but can be buggy
+general.enable_random_clicks=Włącz klikanie w losowych miejscach podczas zaznaczania
+general.enable_random_clicks.desc=Jeżeli włączone, wykona kliknięcie w losowym punkcie. Jest to bardziej bezpiecznie lecz może być zawodne
 
 general.options=Opcje
 general.options.only_prometheus=Używaj, gdy prometheus jest załadowany
@@ -169,7 +169,9 @@ astral.portal_table.priority.desc=Niższa wartość \= wyższy priorytet
 astral.portal_table.ignore_limit=Ignoruj limit
 astral.portal_table.ignore_limit.desc=Wejdzie do portalu, nawet jeśli masz maksimum tych elementów.
 astral.custom_item_priority=Niestandardowy priorytet dla przedmiotów
-astral.extra_options=Additional options
+astral.extra_options=Dodatkowe opcje
+astral.min_shield_to_repair=Minimalna tarcza do rozpoczęcia naprawy
+astral.min_shield_to_repair.desc=Kiedy tarcza znajdzie się poniżej tego procentu, przechodzi w tryb naprawy
 
 ambulance.ship_type=Rodzaj statku
 ambulance.ship_type.desc=Działa również z wersjami plus
@@ -241,7 +243,7 @@ profile_changer.time_condition.hour=Godzina
 profile_changer.time_condition.minute=Minuty
 profile_changer.deaths_condition=Stan śmierci
 profile_changer.deaths_condition.max_deaths=Maksymalna liczba śmierci
-profile_changer.key_condition=Booty Key Condition
+profile_changer.key_condition=Warunek Klucza do skrzyń
 profile_changer.key_condition.desc=Jeśli nie ma kluczy, warunek jest aktywowany
 profile_changer.key_condition.key_to_check=Klucz do sprawdzenia
 profile_changer.close_bot=Zamknij bota
@@ -344,8 +346,8 @@ best_rocket_launcher.rockets_to_use_pvp=Rakiety do użycia w PVP
 generic_gate=Ogólna brama
 generic_gate.min_radius=Minimalny zasięg dla NPC
 generic_gate.repair=Logika naprawy
-generic_gate.repair_config=Use repair config when need repair
-generic_gate.repair_config.desc=When the health value of the health drops below the repair configuration, the repair config will be used
+generic_gate.repair_config=Użyj konfiguracji do naprawiania jeśli wymaga naprawy
+generic_gate.repair_config.desc=Gdy wartość życia spadnie poniżej progu Naprawy, zostanie użyta konfiguracja do naprawy
 generic_gate.attack_closest=Zawsze atakuj najbliższego NPC
 generic_gate.attack_closest.desc=Może działać lepiej niż inna logika
 generic_gate.travel_to_next=Podróż do następnej mapy
@@ -379,7 +381,7 @@ anti_train.ignore_distance.desc=Jeśli wróg jest dalej niż ta odległość, zo
 anti_train.run=Uciekaj od pociągów
 anti_train.run.desc=Ucieka do najbliższego bezpiecznego obszaru przy wykryciu pociągu
 anti_train.condition=Dodatkowy warunek aktywacji
-anti_train.condition.desc=If enabled it will only be activated when the condition is also true
+anti_train.condition.desc=Jeżeli włączone, zostanie aktywowane tylko gdy kondycja będzie spełniona
 
 extra_movement_conditions=Warunki przemieszczania się
 movement_conditions=Ruch z Warunkiem
@@ -433,28 +435,28 @@ quest_module.quest_giver.change_profile=Zmień profil, jeśli nie ma już więce
 quest_module.quest_giver.change_profile.desc=Jeśli nie jest aktywny, zatrzyma się.
 quest_module.quest_giver.profile=Profil do zmiany na
 quest_module.quest_giver.types=Typy Misji
-quest_module.quest_giver.types.normal=Normal
-quest_module.quest_giver.types.daily=Daily
-quest_module.quest_giver.types.weekly=Weekly
-quest_module.quest_giver.types.special=Special
+quest_module.quest_giver.types.normal=Normalne
+quest_module.quest_giver.types.daily=Dzienne
+quest_module.quest_giver.types.weekly=Weekendowe
+quest_module.quest_giver.types.special=Specjalne
 quest_module.priority_to_use=Priorytet przydzielony domyślnie
 quest_module.priority_to_use.desc=Domyślnie ten priorytet zostanie przypisany do NPC/Boxów potrzebnych do misji.
 quest_module.priority_to_ignore=Priorytet do zignorowania
 quest_module.priority_to_ignore.desc=NPC/Boxy o tym priorytecie nie będą modyfikowane na listach.
-quest_module.seasson_pass=Season Pass Quests
-quest_module.seasson_pass.types=Seasson Pass Quest types
-quest_module.seasson_pass.types.daily=Daily
-quest_module.seasson_pass.types.weekly=Weekly
-quest_module.seasson_pass.types.seasson=Seasson
-quest_module.quest_types=Quest types
-quest_module.quest_types.normal=Normal Quests
-quest_module.quest_types.seasson=Seasson Pass
-quest_module.quest_types.urgent=Urgent Quests
-quest_module.quest_types_to_do=Type of quests to do
-quest_module.quest_types_to_do.desc=Select the types of quests that the module should do
-
-urgent_detector=Urgent quests detector
-urgent_detector.take_quest=Take the quest
-urgent_detector.take_quest.desc=It will activate a module to accept the quest when necessary
-urgent_detector.bot_profile=Profile to change to
+quest_module.seasson_pass=Zadania Przepustki Sezonowej
+quest_module.seasson_pass.types=Typ zadań Przepustki Sezonowej
+quest_module.seasson_pass.types.daily=Dzienne
+quest_module.seasson_pass.types.weekly=Tygodniowe
+quest_module.seasson_pass.types.seasson=Sezonowe
+quest_module.quest_types=Typy zadań
+quest_module.quest_types.normal=Normalne zadania
+quest_module.quest_types.seasson=Przepustka Sezonowa
+quest_module.quest_types.urgent=Pilne zadania
+quest_module.quest_types_to_do=Typ zadań do wykonania
+quest_module.quest_types_to_do.desc=Wybierz rodzaj zadań jakie moduł powinien wykonać
+
+urgent_detector=Wykrywacz Pilnych Zadań
+urgent_detector.take_quest=Przyjmij zadanie
+urgent_detector.take_quest.desc=Aktywuje moduł by zaakceptować misje gdy konieczne
+urgent_detector.bot_profile=Profil na który zmienić
 urgent_detector.bot_profile.desc=When there is an urgent quest, change the profile to the selected profile
diff --git a/src/main/resources/com/deeme/lang/strings_pt.properties b/src/main/resources/com/deeme/lang/strings_pt.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignorar limite
 astral.portal_table.ignore_limit.desc=Irá entrar no portal mesmo se você tiver o máximo desses itens.
 astral.custom_item_priority=Prioridade personalizada para itens
 astral.extra_options=Opções adicionais
+astral.min_shield_to_repair=Escudo mínimo para ir reparar
+astral.min_shield_to_repair.desc=Quando está abaixo dessa porcentagem de escudo ele vai para longe os reparar
 
 ambulance.ship_type=Tipo de Nave
 ambulance.ship_type.desc=Também funciona com as versões PLUS

diff --git a/src/main/resources/com/deeme/lang/strings_ro.properties b/src/main/resources/com/deeme/lang/strings_ro.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Tipul navei
 ambulance.ship_type.desc=Funcționează și cu versiunile plus

diff --git a/src/main/resources/com/deeme/lang/strings_ru.properties b/src/main/resources/com/deeme/lang/strings_ru.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Тип корабля
 ambulance.ship_type.desc=Также работает с версиями plus

diff --git a/src/main/resources/com/deeme/lang/strings_sv.properties b/src/main/resources/com/deeme/lang/strings_sv.properties
@@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Ignore Limit
 astral.portal_table.ignore_limit.desc=It will enter the portal even if you have the maximum of those items.
 astral.custom_item_priority=Custom priority for items
 astral.extra_options=Additional options
+astral.min_shield_to_repair=Minimum shield to start repairing
+astral.min_shield_to_repair.desc=When it is below that shield percentage it goes into repair mode
 
 ambulance.ship_type=Typ av skepp
 ambulance.ship_type.desc=Fungerar även med de plus versionerna