From 23c94975a035c3fdcd379e2502e0ca7e1ba27ca5 Mon Sep 17 00:00:00 2001 From: dm94 Date: Sun, 1 Sep 2024 16:05:10 +0200 Subject: [PATCH 01/30] version: Updated the version --- src/main/resources/plugin.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index ddc4acc3..6abfd12e 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.0 beta 6", + "version": "2.3.0", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From 0e5d859caa2729bbd9e99a9744d604690c9393b9 Mon Sep 17 00:00:00 2001 From: dm94 Date: Mon, 2 Sep 2024 21:00:33 +0200 Subject: [PATCH 02/30] fix: Fixed Astral last jump --- src/main/resources/plugin.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 6abfd12e..b41719ea 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.0", + "version": "2.3.1", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", @@ -36,6 +36,6 @@ ], "donation": "https://ko-fi.com/deeme", "discord": "https://discord.gg/GPRTRRZJPw", - "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.0/DmPlugin.jar", + "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.1/DmPlugin.jar", "update": "https://raw.githubusercontent.com/darkbot-reloaded/DmPlugin/master/src/main/resources/plugin.json" } From 6d38ce826dbe2af3e2f18fa7eb5b3ae64f2b6012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Thu, 5 Sep 2024 22:20:41 +0200 Subject: [PATCH 03/30] New translations strings_en.properties (Turkish) (#182) --- src/main/resources/com/deeme/lang/strings_tr.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_tr.properties b/src/main/resources/com/deeme/lang/strings_tr.properties index e77f5e37..65c2572a 100644 --- a/src/main/resources/com/deeme/lang/strings_tr.properties +++ b/src/main/resources/com/deeme/lang/strings_tr.properties @@ -39,8 +39,8 @@ general.always_use_bellow_hp.desc=Can bu miktarın altına düştüğünde her z general.item_condition=Öğe Durumu general.min_time_per_action=Eylemler arasında minimum süre general.min_time_per_action.desc=Eylemler arasında minimum süre (Saniye cinsinden) -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=Seçim yaparken rastgele noktalara tıklamayı etkinleştir +general.enable_random_clicks.desc=Eğer etkinleştirilirse, rastgele bir noktaya tıklayacaktır, bu daha güvenlidir ancak hatalı çalışabilir general.options=Seçenekler general.options.only_prometheus=Prometheus yüklendiğinde kullan @@ -169,7 +169,7 @@ astral.portal_table.priority.desc=Daha düşük sayı \= Daha yüksek öncelik astral.portal_table.ignore_limit=Limiti yok say astral.portal_table.ignore_limit.desc=Bu öğelerden maksimum sayıya sahip olsanız bile portala girecektir. astral.custom_item_priority=Öğeler için özel öncelik -astral.extra_options=Additional options +astral.extra_options=Ek seçenekler ambulance.ship_type=Gemi türü ambulance.ship_type.desc=Plus versiyonlarla da çalışır From a601f69bff3c818cab1b24122ce7d5b77c11d642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Fri, 6 Sep 2024 13:35:53 +0200 Subject: [PATCH 04/30] New translations strings_en.properties (Turkish) (#183) --- .../com/deeme/lang/strings_tr.properties | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_tr.properties b/src/main/resources/com/deeme/lang/strings_tr.properties index 65c2572a..8805574b 100644 --- a/src/main/resources/com/deeme/lang/strings_tr.properties +++ b/src/main/resources/com/deeme/lang/strings_tr.properties @@ -344,8 +344,8 @@ best_rocket_launcher.rockets_to_use_pvp=PVP'de kullanılacak roket türü generic_gate=Genel Kapı generic_gate.min_radius=Yaratıklar için minimum menzil generic_gate.repair=Tamir yöntemi -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=Onarım gerektiğinde onarım yapılandırmasını kullan +generic_gate.repair_config.desc=Sağlık değeri onarım yapılandırmasının altına düştüğünde, onarım yapılandırması kullanılacaktır generic_gate.attack_closest=Her zaman en yakındaki yaratığa saldır generic_gate.attack_closest.desc=Diğer yöntemden daha iyi çalışabilir generic_gate.travel_to_next=Bir sonraki haritaya ışınlan @@ -434,27 +434,27 @@ quest_module.quest_giver.change_profile.desc=Aktif edilmemişse, bot durur quest_module.quest_giver.profile=Değiştirilecek profil quest_module.quest_giver.types=Görev Türleri 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.daily=Günlük +quest_module.quest_giver.types.weekly=Haftalık +quest_module.quest_giver.types.special=Özel quest_module.priority_to_use=Varsayılan olarak atanan öncelik quest_module.priority_to_use.desc=Varsayılan olarak bu öncelik görev için gerekli olan yaratık/kutulara atanır quest_module.priority_to_ignore=Yoksayma önceliği quest_module.priority_to_ignore.desc=Bu önceliğe sahip Yaratıklar/Kutular listede değiştirilmez -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 -urgent_detector.bot_profile.desc=When there is an urgent quest, change the profile to the selected profile \ No newline at end of file +quest_module.seasson_pass=Sezon Bileti Görevleri +quest_module.seasson_pass.types=Sezon Bileti Görev Türleri +quest_module.seasson_pass.types.daily=Günlük +quest_module.seasson_pass.types.weekly=Haftalık +quest_module.seasson_pass.types.seasson=Sezon +quest_module.quest_types=Görev Türleri +quest_module.quest_types.normal=Normal Görevler +quest_module.quest_types.seasson=Sezon Bileti +quest_module.quest_types.urgent=Acil Görevler +quest_module.quest_types_to_do=Yapılacak Görev Türleri +quest_module.quest_types_to_do.desc=Modülün yapması gereken görev türlerini seçin + +urgent_detector=Acil Görev Dedektörü +urgent_detector.take_quest=Görevi Al +urgent_detector.take_quest.desc=Gerekli olduğunda görevi kabul etmek için bir modül etkinleştirilecek +urgent_detector.bot_profile=Değiştirilecek Profil +urgent_detector.bot_profile.desc=Acil bir görev olduğunda, profili seçilen profile değiştir \ No newline at end of file From e374b7dcf371f989331eaa72ec3096becca4f517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Wed, 11 Sep 2024 19:13:01 +0200 Subject: [PATCH 05/30] feat: Astral: Added the option to set the minimum shield percentage to start running away (#184) --- src/main/java/com/deeme/modules/astral/AstralConfig.java | 5 +++++ src/main/java/com/deeme/modules/astral/AstralGate.java | 2 +- src/main/resources/com/deeme/lang/strings_en.properties | 2 ++ src/main/resources/com/deeme/lang/strings_es.properties | 2 ++ src/main/resources/plugin.json | 2 +- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/deeme/modules/astral/AstralConfig.java b/src/main/java/com/deeme/modules/astral/AstralConfig.java index d7377c27..87ed30fd 100644 --- 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 index 28fa083f..6dc882b7 100644 --- 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_en.properties b/src/main/resources/com/deeme/lang/strings_en.properties index 6d699d67..a3322b44 100644 --- 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 index 537c3b85..59efc67c 100644 --- 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/plugin.json b/src/main/resources/plugin.json index b41719ea..8f072954 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.1", + "version": "2.3.2 beta 1", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From 2be372d3b8bc35656f8d0d9c5b0aec446307fee6 Mon Sep 17 00:00:00 2001 From: dm94 Date: Wed, 11 Sep 2024 22:37:24 +0200 Subject: [PATCH 06/30] fix: ProfileChanger: Fixed timer condition --- src/main/java/com/deeme/behaviours/ProfileChanger.java | 3 +-- src/main/resources/plugin.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/deeme/behaviours/ProfileChanger.java b/src/main/java/com/deeme/behaviours/ProfileChanger.java index 694f7fe0..bfbfab87 100644 --- a/src/main/java/com/deeme/behaviours/ProfileChanger.java +++ b/src/main/java/com/deeme/behaviours/ProfileChanger.java @@ -266,8 +266,7 @@ 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; } private boolean isReadyKeyCondition() { diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 8f072954..f43e97e2 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.2 beta 1", + "version": "2.3.2 beta 2", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From 63a5820c92cb98bee6c943b715744343871ef0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Thu, 12 Sep 2024 17:24:40 +0200 Subject: [PATCH 07/30] New Crowdin updates (#185) * New translations strings_en.properties (Turkish) * New translations strings_en.properties (Romanian) * New translations strings_en.properties (French) * New translations strings_en.properties (Bulgarian) * New translations strings_en.properties (Czech) * New translations strings_en.properties (German) * New translations strings_en.properties (Greek) * New translations strings_en.properties (Hungarian) * New translations strings_en.properties (Italian) * New translations strings_en.properties (Lithuanian) * New translations strings_en.properties (Polish) * New translations strings_en.properties (Portuguese) * New translations strings_en.properties (Russian) * New translations strings_en.properties (Swedish) * New translations strings_en.properties (Ukrainian) --- src/main/resources/com/deeme/lang/strings_bg.properties | 2 ++ src/main/resources/com/deeme/lang/strings_cs.properties | 2 ++ src/main/resources/com/deeme/lang/strings_de.properties | 2 ++ src/main/resources/com/deeme/lang/strings_el.properties | 2 ++ src/main/resources/com/deeme/lang/strings_fr.properties | 2 ++ src/main/resources/com/deeme/lang/strings_hu.properties | 2 ++ src/main/resources/com/deeme/lang/strings_it.properties | 2 ++ src/main/resources/com/deeme/lang/strings_lt.properties | 2 ++ src/main/resources/com/deeme/lang/strings_pl.properties | 2 ++ src/main/resources/com/deeme/lang/strings_pt.properties | 2 ++ src/main/resources/com/deeme/lang/strings_ro.properties | 2 ++ src/main/resources/com/deeme/lang/strings_ru.properties | 2 ++ src/main/resources/com/deeme/lang/strings_sv.properties | 2 ++ src/main/resources/com/deeme/lang/strings_tr.properties | 2 ++ src/main/resources/com/deeme/lang/strings_uk.properties | 2 ++ 15 files changed, 30 insertions(+) diff --git a/src/main/resources/com/deeme/lang/strings_bg.properties b/src/main/resources/com/deeme/lang/strings_bg.properties index c4613b7b..875ee8f0 100644 --- 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 index e2ebdd01..aab1867e 100644 --- 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 index d42b054d..4291802f 100644 --- 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 index d1dfd7c1..3c8de73b 100644 --- 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_fr.properties b/src/main/resources/com/deeme/lang/strings_fr.properties index 2fae6232..448508ce 100644 --- 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 index 4c28107a..0d66ea08 100644 --- 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 index bffed036..e4a21880 100644 --- 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 index 8fd33476..8ae74bf7 100644 --- 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 index 520fbb73..cae2c00a 100644 --- a/src/main/resources/com/deeme/lang/strings_pl.properties +++ b/src/main/resources/com/deeme/lang/strings_pl.properties @@ -170,6 +170,8 @@ 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.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=Rodzaj statku ambulance.ship_type.desc=Działa również z wersjami plus diff --git a/src/main/resources/com/deeme/lang/strings_pt.properties b/src/main/resources/com/deeme/lang/strings_pt.properties index a32d1202..42ecb8ea 100644 --- 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 index b7b6f05a..eefa2048 100644 --- 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 index 598b2808..1ebdd70d 100644 --- 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 index 3ac76874..77541a3d 100644 --- 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 diff --git a/src/main/resources/com/deeme/lang/strings_tr.properties b/src/main/resources/com/deeme/lang/strings_tr.properties index 8805574b..ddd9817e 100644 --- a/src/main/resources/com/deeme/lang/strings_tr.properties +++ b/src/main/resources/com/deeme/lang/strings_tr.properties @@ -170,6 +170,8 @@ astral.portal_table.ignore_limit=Limiti yok say astral.portal_table.ignore_limit.desc=Bu öğelerden maksimum sayıya sahip olsanız bile portala girecektir. astral.custom_item_priority=Öğeler için özel öncelik astral.extra_options=Ek seçenekler +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=Gemi türü ambulance.ship_type.desc=Plus versiyonlarla da çalışır diff --git a/src/main/resources/com/deeme/lang/strings_uk.properties b/src/main/resources/com/deeme/lang/strings_uk.properties index 4721c55e..f0a06abc 100644 --- a/src/main/resources/com/deeme/lang/strings_uk.properties +++ b/src/main/resources/com/deeme/lang/strings_uk.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=Також працює з версією плюс From 3617c75192f4e7554a7d9fb9d535c848cb7a3787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Sat, 14 Sep 2024 22:51:13 +0200 Subject: [PATCH 08/30] New translations strings_en.properties (Polish) (#186) --- src/main/resources/com/deeme/lang/strings_pl.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_pl.properties b/src/main/resources/com/deeme/lang/strings_pl.properties index cae2c00a..ceb82a8c 100644 --- a/src/main/resources/com/deeme/lang/strings_pl.properties +++ b/src/main/resources/com/deeme/lang/strings_pl.properties @@ -170,8 +170,8 @@ 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.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 +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 From 57f3eb0299557a484efc6aabe9d658a88508e766 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Mon, 16 Sep 2024 22:59:21 +0200 Subject: [PATCH 09/30] New translations strings_en.properties (Polish) (#187) --- .../com/deeme/lang/strings_pl.properties | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_pl.properties b/src/main/resources/com/deeme/lang/strings_pl.properties index ceb82a8c..3614fe94 100644 --- 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,7 @@ 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 @@ -243,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 @@ -346,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 @@ -381,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 @@ -435,10 +435,10 @@ 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 From dd84733af817f512ddf0c0cb65aa47c46aa81e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Tue, 17 Sep 2024 10:18:59 +0200 Subject: [PATCH 10/30] New translations strings_en.properties (Polish) (#188) --- .../com/deeme/lang/strings_pl.properties | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_pl.properties b/src/main/resources/com/deeme/lang/strings_pl.properties index 3614fe94..65e72111 100644 --- a/src/main/resources/com/deeme/lang/strings_pl.properties +++ b/src/main/resources/com/deeme/lang/strings_pl.properties @@ -443,20 +443,20 @@ 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 \ No newline at end of file From eea8c1ccf571a9db85c00bc8bd7368f746a58770 Mon Sep 17 00:00:00 2001 From: dm94 Date: Tue, 17 Sep 2024 19:47:01 +0200 Subject: [PATCH 11/30] fix: ProfileChanger: Now the time condition only changes if it is in the defined minute or in the next 5 minutes --- .gitignore | 1 + src/main/java/com/deeme/behaviours/ProfileChanger.java | 3 ++- src/main/resources/plugin.json | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 23e2c21e..82d4be2b 100644 --- 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 index bfbfab87..7e1f7d9e 100644 --- a/src/main/java/com/deeme/behaviours/ProfileChanger.java +++ b/src/main/java/com/deeme/behaviours/ProfileChanger.java @@ -266,7 +266,8 @@ private boolean isReadyTimeCondition() { LocalDateTime da = LocalDateTime.now(); - return 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/resources/plugin.json b/src/main/resources/plugin.json index f43e97e2..d4b82135 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.2 beta 2", + "version": "2.3.2 beta 3", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From 6dca03c84d7abc236b457d79dad1925aeef82955 Mon Sep 17 00:00:00 2001 From: dm94 Date: Mon, 23 Sep 2024 22:33:19 +0200 Subject: [PATCH 12/30] feat: Updated the version --- src/main/resources/plugin.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index d4b82135..e3813534 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.2 beta 3", + "version": "2.3.2", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", @@ -36,6 +36,6 @@ ], "donation": "https://ko-fi.com/deeme", "discord": "https://discord.gg/GPRTRRZJPw", - "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.1/DmPlugin.jar", + "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.2/DmPlugin.jar", "update": "https://raw.githubusercontent.com/darkbot-reloaded/DmPlugin/master/src/main/resources/plugin.json" } From efcc13cd0c65e7778444140502129538e8ee11b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Thu, 26 Sep 2024 08:38:33 +0200 Subject: [PATCH 13/30] New translations strings_en.properties (German) (#189) --- src/main/resources/com/deeme/lang/strings_de.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_de.properties b/src/main/resources/com/deeme/lang/strings_de.properties index 4291802f..52d2c897 100644 --- a/src/main/resources/com/deeme/lang/strings_de.properties +++ b/src/main/resources/com/deeme/lang/strings_de.properties @@ -170,8 +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 +astral.min_shield_to_repair=Minimaler Schild zum Starten der Reparatur +astral.min_shield_to_repair.desc=Wenn es unter diesem Schild Prozentsatz liegt, wird es in den Reparaturmodus gewechselt ambulance.ship_type=Schiffstyp ambulance.ship_type.desc=Funktioniert auch mit den Plus-Versionen From 35f2f724cb53331973e2aa8ea0bd830c53391825 Mon Sep 17 00:00:00 2001 From: dm94 Date: Tue, 1 Oct 2024 14:43:46 +0200 Subject: [PATCH 14/30] feat: Added a default profile in the config --- .../deeme/behaviours/profilechanger/ProfileChangerConfig.java | 2 +- .../deeme/behaviours/urgentdetector/UrgentDetectorConfig.java | 2 +- src/main/java/com/deeme/types/config/Profile.java | 2 +- src/main/resources/plugin.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/deeme/behaviours/profilechanger/ProfileChangerConfig.java b/src/main/java/com/deeme/behaviours/profilechanger/ProfileChangerConfig.java index c21e9c6f..68ea2983 100644 --- a/src/main/java/com/deeme/behaviours/profilechanger/ProfileChangerConfig.java +++ b/src/main/java/com/deeme/behaviours/profilechanger/ProfileChangerConfig.java @@ -17,7 +17,7 @@ public class ProfileChangerConfig { @Option("general.bot_profile") @Dropdown(options = ProfileNames.class) - public String BOT_PROFILE = ""; + public String BOT_PROFILE = "config"; @Option("profile_changer.close_bot") public boolean closeBot = false; diff --git a/src/main/java/com/deeme/behaviours/urgentdetector/UrgentDetectorConfig.java b/src/main/java/com/deeme/behaviours/urgentdetector/UrgentDetectorConfig.java index a05f5829..38789ebf 100644 --- a/src/main/java/com/deeme/behaviours/urgentdetector/UrgentDetectorConfig.java +++ b/src/main/java/com/deeme/behaviours/urgentdetector/UrgentDetectorConfig.java @@ -17,5 +17,5 @@ public class UrgentDetectorConfig { @Option("urgent_detector.bot_profile") @Dropdown(options = ProfileNames.class) - public String botProfile = ""; + public String botProfile = "config"; } diff --git a/src/main/java/com/deeme/types/config/Profile.java b/src/main/java/com/deeme/types/config/Profile.java index c8f5cec2..832a4e03 100644 --- a/src/main/java/com/deeme/types/config/Profile.java +++ b/src/main/java/com/deeme/types/config/Profile.java @@ -15,5 +15,5 @@ public class Profile { @Option("general.bot_profile") @Dropdown(options = ProfileNames.class) - public String BOT_PROFILE = ""; + public String BOT_PROFILE = "config"; } \ No newline at end of file diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index e3813534..ea706a5d 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.2", + "version": "2.3.3 beta 1", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From 0c8fd6430c071bd3ce50bc0e6506d66e125d4548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Tue, 1 Oct 2024 15:19:01 +0200 Subject: [PATCH 15/30] New translations strings_en.properties (Turkish) (#190) --- src/main/resources/com/deeme/lang/strings_tr.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_tr.properties b/src/main/resources/com/deeme/lang/strings_tr.properties index ddd9817e..e2ea5e0f 100644 --- a/src/main/resources/com/deeme/lang/strings_tr.properties +++ b/src/main/resources/com/deeme/lang/strings_tr.properties @@ -32,7 +32,7 @@ general.next_check_time_minutes=Kontrol için min. süre general.next_check_time_minutes.desc=Dakika cinsinden minimum kontrol etme süresi general.tick_stopped=Bot ile işaret durduruldu general.tick_stopped.desc=Test için kullanıyor, aktif etmeyin -general.default_laser=Varsayılan lazer +general.default_laser=Varsayılan Lazer general.default_rocket_launcher=Varsayılan Roketatar general.always_use_bellow_hp=Can bu miktarın altına düştüğünde her zaman kullan general.always_use_bellow_hp.desc=Can bu miktarın altına düştüğünde her zaman kullanır. 0 \= Devredışı @@ -170,8 +170,8 @@ astral.portal_table.ignore_limit=Limiti yok say astral.portal_table.ignore_limit.desc=Bu öğelerden maksimum sayıya sahip olsanız bile portala girecektir. astral.custom_item_priority=Öğeler için özel öncelik astral.extra_options=Ek seçenekler -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 +astral.min_shield_to_repair=Tamire başlamak için minimum kalkan\n +astral.min_shield_to_repair.desc=Bu kalkan yüzdesinin altına düştüğünde tamir moduna geçer\n ambulance.ship_type=Gemi türü ambulance.ship_type.desc=Plus versiyonlarla da çalışır From 8507527346fbe5c92167a60c6555586ac3d5ea80 Mon Sep 17 00:00:00 2001 From: dm94 Date: Tue, 1 Oct 2024 15:26:06 +0200 Subject: [PATCH 16/30] feat: Updated some messages --- src/main/java/com/deeme/types/backpage/Utils.java | 6 +++--- src/main/resources/plugin.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/deeme/types/backpage/Utils.java b/src/main/java/com/deeme/types/backpage/Utils.java index 0193e6d6..e975fd28 100644 --- a/src/main/java/com/deeme/types/backpage/Utils.java +++ b/src/main/java/com/deeme/types/backpage/Utils.java @@ -23,7 +23,7 @@ public static synchronized void discordCheck(FeatureInfo featureInfo, String if (!Backpage.isInDiscord(authID)) { String discordTag = Backpage.getDiscordTagExternal(authID); featureInfo - .addFailure("To use this option you need to be on my discord", + .addFailure("To use this option you need to be on the plugin discord", "ID: " + discordTag); } } @@ -32,8 +32,8 @@ public static synchronized void discordDonorCheck(FeatureInfo featureInfo, St if (!Backpage.isDonor(authID, featureInfo.getPluginInfo().getVersion().toString().trim())) { String discordTag = Backpage.getDiscordTagExternal(authID); featureInfo - .addFailure("[PLUS] Only some people can use this feature.", - "ID: " + discordTag); + .addFailure("[PLUS] You need to have a specific role to use this", + "Read the FAQs in discord. ID: " + discordTag); } } diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index ea706a5d..28145ac1 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.3 beta 1", + "version": "2.3.3 beta 2", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From 1e016535541a2f9c6e60fe535c3062746cc0c0f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Fri, 4 Oct 2024 23:05:30 +0200 Subject: [PATCH 17/30] feat: Sentinel module: Added that humanizer also takes effect when searching for the target (#192) --- .../com/deeme/modules/SentinelModule.java | 31 ++++++++++++++----- .../java/com/deeme/types/ShipAttacker.java | 11 ++++--- src/main/resources/plugin.json | 2 +- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/deeme/modules/SentinelModule.java b/src/main/java/com/deeme/modules/SentinelModule.java index 95be5875..27dba9dd 100644 --- a/src/main/java/com/deeme/modules/SentinelModule.java +++ b/src/main/java/com/deeme/modules/SentinelModule.java @@ -48,6 +48,7 @@ import java.util.Arrays; import java.util.Collection; +import java.util.Random; import javax.swing.JComponent; import javax.swing.JLabel; @@ -89,6 +90,8 @@ public class SentinelModule implements Module, Configurable, Ins private int groupLeaderID = 0; private long randomWaitTime = 0; + private Random rnd; + private Entity oldTarget; private Location lastSentinelLocation = null; @@ -162,6 +165,8 @@ public SentinelModule(Main main, PluginAPI api, AuthAPI auth, SafetyFinder safet this.runConfigInCircle = configApi.requireConfig("loot.run_config_in_circle"); this.configRun = configApi.requireConfig("general.run"); this.configRoam = configApi.requireConfig("general.roam"); + this.rnd = new Random(); + this.oldTarget = null; setup(); } @@ -288,6 +293,7 @@ private boolean followByPortals() { if (!sConfig.followByPortals || lastSentinelLocation == null) { return false; } + Portal portal = getNearestPortal(lastSentinelLocation); if (portal != null) { if (group.hasGroup() && masterID != 0) { @@ -322,6 +328,14 @@ private GameMap getWorkingMap() { } private boolean isAttacking() { + if (this.randomWaitTime > System.currentTimeMillis()) { + return this.oldTarget != null; + } + + if (sConfig.humanizer.addRandomTime) { + this.randomWaitTime = System.currentTimeMillis() + (rnd.nextInt(sConfig.humanizer.maxRandomTime) * 1000); + } + Entity target = getSentinelTarget(); if (target == null) { @@ -337,34 +351,37 @@ private boolean isAttacking() { } if (target == null && sConfig.autoAttack.autoAttackEnemies) { - target = shipAttacker.getEnemy(sConfig.autoAttack.rangeForEnemies); + target = this.shipAttacker.getEnemy(sConfig.autoAttack.rangeForEnemies); } if (target == null && sConfig.autoAttack.defendFromNPCs) { target = SharedFunctions.getAttacker(heroapi, npcs, heroapi); } + if (target != null) { setMode(extraConfigChangerLogic.getShipMode()); if (target instanceof Npc) { - isNpc = true; + this.isNpc = true; attacker.setTarget((Npc) target); attacker.tryLockAndAttack(); } else { - isNpc = false; + this.isNpc = false; shipAttacker.setTarget((Ship) target); shipAttacker.tryLockAndAttack(); } } + this.oldTarget = target; + return target != null; } private Entity getSentinelTarget() { - if (randomWaitTime > System.currentTimeMillis()) { - return null; - } - Entity target = null; if (sentinel.getTarget() != null) { + if (this.oldTarget != null && this.oldTarget.getId() == sentinel.getTarget().getId()) { + return this.oldTarget; + } + if (sConfig.autoAttack.helpAttackPlayers || sConfig.autoAttack.helpAttackEnemyPlayers) { target = players.stream() .filter(s -> (sentinel.getTarget().getId() == s.getId()) diff --git a/src/main/java/com/deeme/types/ShipAttacker.java b/src/main/java/com/deeme/types/ShipAttacker.java index c039a2c7..f075a081 100644 --- a/src/main/java/com/deeme/types/ShipAttacker.java +++ b/src/main/java/com/deeme/types/ShipAttacker.java @@ -57,6 +57,7 @@ public class ShipAttacker { private Random rnd; private int lastAttacked; + private static final int MIN_CLICK_DELAY = 250; private boolean firstAttack; private long isAttacking; @@ -110,9 +111,10 @@ private void tryLockTarget() { lastAttacked = target.getId(); firstAttack = true; - clickDelay = System.currentTimeMillis(); if (humanizerConfig.addRandomTime) { clickDelay = System.currentTimeMillis() + (rnd.nextInt(humanizerConfig.maxRandomTime) * 1000); + } else { + clickDelay = System.currentTimeMillis() + MIN_CLICK_DELAY; } } @@ -124,7 +126,7 @@ private void tryLockTarget() { if (System.currentTimeMillis() > clickDelay) { heroapi.setLocalTarget(target); target.trySelect(false); - clickDelay = System.currentTimeMillis(); + clickDelay = System.currentTimeMillis() + MIN_CLICK_DELAY; } } else { movement.moveTo(target.getDestination().orElse(target.getLocationInfo())); @@ -285,11 +287,10 @@ public Ship getEnemy(int maxDistance, List playersToIgnore, boolean ign && (ableToAttack || s.isAttacking()) && !s.hasEffect(290) && !(s instanceof Pet) - && !(ignoreInvisible && s.isInvisible()) - && !inGroup(s.getId()) + && !(ignoreInvisible && s.isInvisible())) + .filter(s -> !inGroup(s.getId()) && movement.canMove(s) && s.getLocationInfo().distanceTo(heroapi) <= maxDistance) - .sorted(Comparator.comparingDouble(s -> s.getLocationInfo().distanceTo(heroapi))).findAny() .orElse(null); } diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 28145ac1..f7c8dc4a 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.3 beta 2", + "version": "2.3.3 beta 4", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From 3a8d9d215f4f0cc0f907ed8ecc09854fc32664d6 Mon Sep 17 00:00:00 2001 From: dm94 Date: Sat, 5 Oct 2024 15:42:59 +0200 Subject: [PATCH 18/30] feat: The old Urgent detector will now give an error if you want to use it --- .../deeme/behaviours/UrgentDetectorDummy.java | 21 ++----------------- src/main/resources/plugin.json | 2 +- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java b/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java index 1845e9bf..100c6ede 100644 --- a/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java +++ b/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java @@ -1,28 +1,11 @@ package com.deeme.behaviours; -import java.util.Arrays; - -import com.deeme.behaviours.urgentdetector.UrgentDetector; -import com.deeme.types.VerifierChecker; -import com.deeme.types.backpage.Utils; - import eu.darkbot.api.PluginAPI; import eu.darkbot.api.extensions.Feature; -import eu.darkbot.api.managers.AuthAPI; -import eu.darkbot.api.managers.ExtensionsAPI; @Feature(name = "Urgent Detector [OLD]", description = "Use the other Urgent Detector") -public class UrgentDetectorDummy extends UrgentDetector { +public class UrgentDetectorDummy { public UrgentDetectorDummy(PluginAPI api) throws SecurityException { - super(api); - - if (!Arrays.equals(VerifierChecker.class.getSigners(), getClass().getSigners())) { - throw new SecurityException(); - } - - AuthAPI auth = api.requireAPI(AuthAPI.class); - VerifierChecker.requireAuthenticity(auth); - ExtensionsAPI extensionsAPI = api.requireAPI(ExtensionsAPI.class); - Utils.discordDonorCheck(extensionsAPI.getFeatureInfo(this.getClass()), auth.getAuthId()); + throw new UnsupportedOperationException("Use the other Urgent Detector, this one will be deleted"); } } diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index f7c8dc4a..1f2356a2 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.3 beta 4", + "version": "2.3.3 beta 5", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From b8fd3e411125a9fdb71b8788e15a282dfd1cfca9 Mon Sep 17 00:00:00 2001 From: dm94 Date: Sun, 6 Oct 2024 11:59:01 +0200 Subject: [PATCH 19/30] updated the version --- src/main/resources/plugin.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 1f2356a2..1f8a7c86 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.3 beta 5", + "version": "2.3.3", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", @@ -36,6 +36,6 @@ ], "donation": "https://ko-fi.com/deeme", "discord": "https://discord.gg/GPRTRRZJPw", - "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.2/DmPlugin.jar", + "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.3/DmPlugin.jar", "update": "https://raw.githubusercontent.com/darkbot-reloaded/DmPlugin/master/src/main/resources/plugin.json" } From 056336e0fc4cd33734ed50a6971088831362236f Mon Sep 17 00:00:00 2001 From: dm94 Date: Fri, 11 Oct 2024 19:33:10 +0200 Subject: [PATCH 20/30] fix: Fixed a translation error --- src/main/resources/com/deeme/lang/strings_en.properties | 2 ++ src/main/resources/plugin.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/com/deeme/lang/strings_en.properties b/src/main/resources/com/deeme/lang/strings_en.properties index a3322b44..700d5649 100644 --- a/src/main/resources/com/deeme/lang/strings_en.properties +++ b/src/main/resources/com/deeme/lang/strings_en.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 1f8a7c86..20dfbc05 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.3", + "version": "2.3.4 beta 3", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From ddedd3ffa94feb3c6fba9e669eab7495f6876e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Fri, 11 Oct 2024 19:51:13 +0200 Subject: [PATCH 21/30] New Crowdin updates (#195) * New translations strings_en.properties (Romanian) * New translations strings_en.properties (French) * New translations strings_en.properties (Spanish) * New translations strings_en.properties (Bulgarian) * New translations strings_en.properties (Czech) * New translations strings_en.properties (German) * New translations strings_en.properties (Turkish) * New translations strings_en.properties (Greek) * New translations strings_en.properties (Hungarian) * New translations strings_en.properties (Italian) * New translations strings_en.properties (Lithuanian) * New translations strings_en.properties (Polish) * New translations strings_en.properties (Portuguese) * New translations strings_en.properties (Russian) * New translations strings_en.properties (Swedish) * New translations strings_en.properties (Ukrainian) --- src/main/resources/com/deeme/lang/strings_bg.properties | 2 ++ src/main/resources/com/deeme/lang/strings_cs.properties | 2 ++ src/main/resources/com/deeme/lang/strings_de.properties | 2 ++ src/main/resources/com/deeme/lang/strings_el.properties | 2 ++ src/main/resources/com/deeme/lang/strings_es.properties | 2 ++ src/main/resources/com/deeme/lang/strings_fr.properties | 2 ++ src/main/resources/com/deeme/lang/strings_hu.properties | 2 ++ src/main/resources/com/deeme/lang/strings_it.properties | 2 ++ src/main/resources/com/deeme/lang/strings_lt.properties | 2 ++ src/main/resources/com/deeme/lang/strings_pl.properties | 2 ++ src/main/resources/com/deeme/lang/strings_pt.properties | 2 ++ src/main/resources/com/deeme/lang/strings_ro.properties | 2 ++ src/main/resources/com/deeme/lang/strings_ru.properties | 2 ++ src/main/resources/com/deeme/lang/strings_sv.properties | 2 ++ src/main/resources/com/deeme/lang/strings_tr.properties | 2 ++ src/main/resources/com/deeme/lang/strings_uk.properties | 2 ++ 16 files changed, 32 insertions(+) diff --git a/src/main/resources/com/deeme/lang/strings_bg.properties b/src/main/resources/com/deeme/lang/strings_bg.properties index 875ee8f0..5b3f7301 100644 --- a/src/main/resources/com/deeme/lang/strings_bg.properties +++ b/src/main/resources/com/deeme/lang/strings_bg.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_cs.properties b/src/main/resources/com/deeme/lang/strings_cs.properties index aab1867e..1f06163f 100644 --- a/src/main/resources/com/deeme/lang/strings_cs.properties +++ b/src/main/resources/com/deeme/lang/strings_cs.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_de.properties b/src/main/resources/com/deeme/lang/strings_de.properties index 52d2c897..91ebc32f 100644 --- a/src/main/resources/com/deeme/lang/strings_de.properties +++ b/src/main/resources/com/deeme/lang/strings_de.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_el.properties b/src/main/resources/com/deeme/lang/strings_el.properties index 3c8de73b..bfa0369a 100644 --- a/src/main/resources/com/deeme/lang/strings_el.properties +++ b/src/main/resources/com/deeme/lang/strings_el.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_es.properties b/src/main/resources/com/deeme/lang/strings_es.properties index 59efc67c..42e2be1e 100644 --- a/src/main/resources/com/deeme/lang/strings_es.properties +++ b/src/main/resources/com/deeme/lang/strings_es.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Cantidad quantity_condition=Condición de cantidad quantity_condition.min_quantity=Comprar si es menor a quantity_condition.min_quantity.desc=Cuando la cantidad es menor de la configurada la condición se activa. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Cantidad de enemigos a considerar como tren diff --git a/src/main/resources/com/deeme/lang/strings_fr.properties b/src/main/resources/com/deeme/lang/strings_fr.properties index 448508ce..e9de2944 100644 --- a/src/main/resources/com/deeme/lang/strings_fr.properties +++ b/src/main/resources/com/deeme/lang/strings_fr.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_hu.properties b/src/main/resources/com/deeme/lang/strings_hu.properties index 0d66ea08..73b9c39d 100644 --- a/src/main/resources/com/deeme/lang/strings_hu.properties +++ b/src/main/resources/com/deeme/lang/strings_hu.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_it.properties b/src/main/resources/com/deeme/lang/strings_it.properties index e4a21880..97d092da 100644 --- a/src/main/resources/com/deeme/lang/strings_it.properties +++ b/src/main/resources/com/deeme/lang/strings_it.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_lt.properties b/src/main/resources/com/deeme/lang/strings_lt.properties index 8ae74bf7..d1af768b 100644 --- a/src/main/resources/com/deeme/lang/strings_lt.properties +++ b/src/main/resources/com/deeme/lang/strings_lt.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_pl.properties b/src/main/resources/com/deeme/lang/strings_pl.properties index 65e72111..a55532d9 100644 --- a/src/main/resources/com/deeme/lang/strings_pl.properties +++ b/src/main/resources/com/deeme/lang/strings_pl.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Ilość quantity_condition=Stan ilości quantity_condition.min_quantity=Kup, jeśli mniej niż quantity_condition.min_quantity.desc=Gdy ilość przedmiotu jest poniżej zaznaczonej ilości, warunek jest aktywowany. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anty pociąg anti_train.max_enemies=Przeciwnicy uważani jako pociąg diff --git a/src/main/resources/com/deeme/lang/strings_pt.properties b/src/main/resources/com/deeme/lang/strings_pt.properties index 42ecb8ea..d9f2cd01 100644 --- a/src/main/resources/com/deeme/lang/strings_pt.properties +++ b/src/main/resources/com/deeme/lang/strings_pt.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantidade quantity_condition=Condição de Quantidade quantity_condition.min_quantity=Compra se menos que quantity_condition.min_quantity.desc=Quando a quantidade do item estiver abaixo da quantidade escolhida, a condição é ativada. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Inimigos para considerar um Train diff --git a/src/main/resources/com/deeme/lang/strings_ro.properties b/src/main/resources/com/deeme/lang/strings_ro.properties index eefa2048..3e99e677 100644 --- a/src/main/resources/com/deeme/lang/strings_ro.properties +++ b/src/main/resources/com/deeme/lang/strings_ro.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_ru.properties b/src/main/resources/com/deeme/lang/strings_ru.properties index 1ebdd70d..01724758 100644 --- a/src/main/resources/com/deeme/lang/strings_ru.properties +++ b/src/main/resources/com/deeme/lang/strings_ru.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Кол-во quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_sv.properties b/src/main/resources/com/deeme/lang/strings_sv.properties index 77541a3d..ef6c386e 100644 --- a/src/main/resources/com/deeme/lang/strings_sv.properties +++ b/src/main/resources/com/deeme/lang/strings_sv.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train diff --git a/src/main/resources/com/deeme/lang/strings_tr.properties b/src/main/resources/com/deeme/lang/strings_tr.properties index e2ea5e0f..ee378fc9 100644 --- a/src/main/resources/com/deeme/lang/strings_tr.properties +++ b/src/main/resources/com/deeme/lang/strings_tr.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Miktar quantity_condition=Miktar koşulu quantity_condition.min_quantity=Daha az ise satın al quantity_condition.min_quantity.desc=İtemin miktarı belirlenen miktarın altındaysa, bu koşul etkinleştirilir. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Tren anti_train.max_enemies=Treni olarak kabul edilecek düşmanlar diff --git a/src/main/resources/com/deeme/lang/strings_uk.properties b/src/main/resources/com/deeme/lang/strings_uk.properties index f0a06abc..d00509b8 100644 --- a/src/main/resources/com/deeme/lang/strings_uk.properties +++ b/src/main/resources/com/deeme/lang/strings_uk.properties @@ -372,6 +372,8 @@ buy_item_conditions.quantity=Quantity quantity_condition=Quantity condition quantity_condition.min_quantity=Buy if less than quantity_condition.min_quantity.desc=When the quantity of the item is below the marked quantity, the condition is activated. +quantity_condition.item_to_control=Item to use to check +quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. anti_train=Anti Train anti_train.max_enemies=Enemies to consider a train From c390ca54cc0bed29f72917b0a9016a90bcbb167b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Sat, 12 Oct 2024 19:48:23 +0200 Subject: [PATCH 22/30] New translations strings_en.properties (Portuguese) (#196) --- src/main/resources/com/deeme/lang/strings_pt.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_pt.properties b/src/main/resources/com/deeme/lang/strings_pt.properties index d9f2cd01..537fa0b5 100644 --- a/src/main/resources/com/deeme/lang/strings_pt.properties +++ b/src/main/resources/com/deeme/lang/strings_pt.properties @@ -372,8 +372,8 @@ buy_item_conditions.quantity=Quantidade quantity_condition=Condição de Quantidade quantity_condition.min_quantity=Compra se menos que quantity_condition.min_quantity.desc=Quando a quantidade do item estiver abaixo da quantidade escolhida, a condição é ativada. -quantity_condition.item_to_control=Item to use to check -quantity_condition.item_to_control.desc=This is the item that the bot will use to check the amount it has and activate the condition if it is below that amount. +quantity_condition.item_to_control=Item a ser usado para verificar +quantity_condition.item_to_control.desc=Este é o item que o bot utilizará para verificar a quantidade que ele tem e ativar a condição se estiver abaixo dessa quantidade. anti_train=Anti Train anti_train.max_enemies=Inimigos para considerar um Train From 936de40b6898d8f2f4152a595755e38e639400f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Sun, 13 Oct 2024 20:15:48 +0200 Subject: [PATCH 23/30] New translations strings_en.properties (Russian) (#197) --- src/main/resources/com/deeme/lang/strings_ru.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_ru.properties b/src/main/resources/com/deeme/lang/strings_ru.properties index 01724758..07eb914b 100644 --- a/src/main/resources/com/deeme/lang/strings_ru.properties +++ b/src/main/resources/com/deeme/lang/strings_ru.properties @@ -414,9 +414,9 @@ quest_module.pvp_quests=PVP Квесты quest_module.pvp_quests.desc=For the use of this option it is mandatory to have a PVP module configured. quest_module.gg_quests=GG Quests quest_module.gg_quests.desc=For the use of this option it is mandatory to have a GG module configured. -quest_module.update_npc_list=Update NPC List +quest_module.update_npc_list=Обновить список NPC quest_module.show_options=Show in status -quest_module.show_options.rewards=Rewards +quest_module.show_options.rewards=Награды quest_module.show_options.conditions=Conditions quest_module.show_options.conditions_completed=Conditions Completed quest_module.condition_config=Condition Config From 5189d6b18cb9e9d73f367ddde41b8cdaf0fd171d Mon Sep 17 00:00:00 2001 From: dm94 Date: Tue, 15 Oct 2024 22:13:25 +0200 Subject: [PATCH 24/30] refactor: Removed the Urgent Detector Dummy --- .../com/deeme/behaviours/UrgentDetectorDummy.java | 11 ----------- src/main/resources/plugin.json | 5 ++--- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java diff --git a/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java b/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java deleted file mode 100644 index 100c6ede..00000000 --- a/src/main/java/com/deeme/behaviours/UrgentDetectorDummy.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.deeme.behaviours; - -import eu.darkbot.api.PluginAPI; -import eu.darkbot.api.extensions.Feature; - -@Feature(name = "Urgent Detector [OLD]", description = "Use the other Urgent Detector") -public class UrgentDetectorDummy { - public UrgentDetectorDummy(PluginAPI api) throws SecurityException { - throw new UnsupportedOperationException("Use the other Urgent Detector, this one will be deleted"); - } -} diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 20dfbc05..171570d7 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.4 beta 3", + "version": "2.3.4 beta 4", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", @@ -31,8 +31,7 @@ "com.deeme.behaviours.bestrocketlauncher.AutoBestRocketLauncherDummy", "com.deeme.behaviours.autocloack.AutoCloack", "com.deeme.behaviours.antitrain.AntiTrain", - "com.deeme.behaviours.urgentdetector.UrgentDetector", - "com.deeme.behaviours.UrgentDetectorDummy" + "com.deeme.behaviours.urgentdetector.UrgentDetector" ], "donation": "https://ko-fi.com/deeme", "discord": "https://discord.gg/GPRTRRZJPw", From 4dbe573b23dafd7db9f3103b78a87d052e5b8a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Thu, 24 Oct 2024 21:37:23 +0200 Subject: [PATCH 25/30] remove: Removed AiTrainer and PVPLog (#198) --- .../behaviours/aitrainer/AiTrainerDummy.java | 43 ------------------- .../deeme/behaviours/pvplog/PVPLogDummy.java | 37 ---------------- src/main/resources/plugin.json | 2 +- 3 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 src/main/java/com/deeme/behaviours/aitrainer/AiTrainerDummy.java delete mode 100644 src/main/java/com/deeme/behaviours/pvplog/PVPLogDummy.java diff --git a/src/main/java/com/deeme/behaviours/aitrainer/AiTrainerDummy.java b/src/main/java/com/deeme/behaviours/aitrainer/AiTrainerDummy.java deleted file mode 100644 index f3095299..00000000 --- a/src/main/java/com/deeme/behaviours/aitrainer/AiTrainerDummy.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.deeme.behaviours.aitrainer; - -import com.deemeplus.behaviours.aitrainer.AiTrainer; - -import eu.darkbot.api.PluginAPI; -import eu.darkbot.api.extensions.Behavior; -import eu.darkbot.api.extensions.Feature; -import eu.darkbot.api.extensions.Task; -import eu.darkbot.api.managers.AuthAPI; -import eu.darkbot.api.managers.HeroAPI; -import eu.darkbot.api.managers.HeroItemsAPI; -import eu.darkbot.api.managers.StatsAPI; -import eu.darkbot.api.utils.Inject; - -@Feature(name = "AI Trainer", description = "Send information about the missiles and lasers used for AI training purposes") -public class AiTrainerDummy implements Behavior, Task { - - private AiTrainer privateBehavior; - - @Inject - public AiTrainerDummy(PluginAPI api, HeroAPI hero, StatsAPI stats, HeroItemsAPI items, AuthAPI auth) { - this.privateBehavior = new AiTrainer(api, hero, stats, items, auth); - } - - @Override - public void onTickTask() { - if (this.privateBehavior == null) { - return; - } - - this.privateBehavior.onTickTask(); - } - - @Override - public void onTickBehavior() { - if (this.privateBehavior == null) { - return; - } - - this.privateBehavior.onTickBehavior(); - } - -} diff --git a/src/main/java/com/deeme/behaviours/pvplog/PVPLogDummy.java b/src/main/java/com/deeme/behaviours/pvplog/PVPLogDummy.java deleted file mode 100644 index 8aa3dd96..00000000 --- a/src/main/java/com/deeme/behaviours/pvplog/PVPLogDummy.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.deeme.behaviours.pvplog; - -import com.deemeplus.behaviours.pvplog.PVPLog; - -import eu.darkbot.api.PluginAPI; -import eu.darkbot.api.extensions.Behavior; -import eu.darkbot.api.extensions.Feature; -import eu.darkbot.api.extensions.Task; - -@Feature(name = "PVPLog", description = "Send a battle log for training purposes") -public class PVPLogDummy implements Behavior, Task { - - private PVPLog privateBehaviour; - - public PVPLogDummy(PluginAPI api) { - this.privateBehaviour = new PVPLog(api); - } - - @Override - public void onTickTask() { - if (this.privateBehaviour == null) { - return; - } - - this.privateBehaviour.onTickTask(); - } - - @Override - public void onTickBehavior() { - if (this.privateBehaviour == null) { - return; - } - - this.privateBehaviour.onTickBehavior(); - } - -} diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 171570d7..5d62e2a7 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.4 beta 4", + "version": "2.3.4 beta 6", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From c4b071bdd924de42359c8f1b8fafc472e2e600b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Tue, 29 Oct 2024 21:05:37 +0100 Subject: [PATCH 26/30] New Crowdin updates (#199) * New translations strings_en.properties (Spanish) * New translations strings_en.properties (Spanish) --- src/main/resources/com/deeme/lang/strings_es.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_es.properties b/src/main/resources/com/deeme/lang/strings_es.properties index 42e2be1e..6fbe8aea 100644 --- a/src/main/resources/com/deeme/lang/strings_es.properties +++ b/src/main/resources/com/deeme/lang/strings_es.properties @@ -9,7 +9,7 @@ general.auto_cloak=Camuflaje automático general.auto_cloak.desc=Usará el camuflaje automáticamente general.next_check_time=Tiempo mínimo por comprobación general.next_check_time.desc=Tiempo mínimo por comprobación en segundos -general.time_per_tick=Min time per tick +general.time_per_tick=Tiempo entre ticks general.time_per_tick.desc=Min time per tick in seconds general.default_ammo=Munición por defecto general.default_rocket=Misil por defecto @@ -346,7 +346,7 @@ best_rocket_launcher.rockets_to_use_pvp=Misiles a usar contra jugadores generic_gate=Generic Gate generic_gate.min_radius=Radio mínimo para NPCs generic_gate.repair=Lógica de reparación -generic_gate.repair_config=Use repair config when need repair +generic_gate.repair_config=Usar configuración de reparación cuando se necesite reparar 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.attack_closest=Atacar siempre al NPC más cercano generic_gate.attack_closest.desc=Puede funcionar mejor que la otra lógica From 725eb8d9dcced37e669e29c33bfea2b9d9c3660f Mon Sep 17 00:00:00 2001 From: dm94 Date: Wed, 30 Oct 2024 21:03:43 +0100 Subject: [PATCH 27/30] fix: WeeklySchedule: Fixed null exception --- src/main/java/com/deeme/tasks/WeeklySchedule.java | 2 +- src/main/resources/plugin.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/deeme/tasks/WeeklySchedule.java b/src/main/java/com/deeme/tasks/WeeklySchedule.java index b07444fb..1c58e0a7 100644 --- a/src/main/java/com/deeme/tasks/WeeklySchedule.java +++ b/src/main/java/com/deeme/tasks/WeeklySchedule.java @@ -239,7 +239,7 @@ private void setProfile() { } private boolean isRunningPalladiumModule() { - return botApi.getModule().getClass() == PalladiumHangar.class; + return botApi.getModule() != null && botApi.getModule().getClass() == PalladiumHangar.class; } private void tryUpdateHangarList() { diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 5d62e2a7..ebecd004 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.4 beta 6", + "version": "2.3.4 beta 7", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", From 4e36aa55989d7434ae5780ecd0b6ece1100131c0 Mon Sep 17 00:00:00 2001 From: dm94 Date: Sun, 3 Nov 2024 10:36:26 +0100 Subject: [PATCH 28/30] version: Updated the version --- src/main/resources/plugin.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index ebecd004..671c9847 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.4 beta 7", + "version": "2.3.4", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", @@ -35,6 +35,6 @@ ], "donation": "https://ko-fi.com/deeme", "discord": "https://discord.gg/GPRTRRZJPw", - "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.3/DmPlugin.jar", + "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.4/DmPlugin.jar", "update": "https://raw.githubusercontent.com/darkbot-reloaded/DmPlugin/master/src/main/resources/plugin.json" } From e0a3832507fccf7ac9ee6e5fa7bbda22195d51cd Mon Sep 17 00:00:00 2001 From: dm94 Date: Thu, 14 Nov 2024 08:58:33 +0100 Subject: [PATCH 29/30] updated the version --- src/main/resources/plugin.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/plugin.json b/src/main/resources/plugin.json index 671c9847..20f889ab 100644 --- a/src/main/resources/plugin.json +++ b/src/main/resources/plugin.json @@ -1,7 +1,7 @@ { "name": "DmPlugin", "author": "Dm94Dani", - "version": "2.3.4", + "version": "2.3.5", "minVersion": "1.131", "supportedVersion": "1.131.2", "basePackage": "com.deeme", @@ -35,6 +35,6 @@ ], "donation": "https://ko-fi.com/deeme", "discord": "https://discord.gg/GPRTRRZJPw", - "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.4/DmPlugin.jar", + "download": "https://github.com/darkbot-reloaded/DmPlugin/releases/download/v2.3.5/DmPlugin.jar", "update": "https://raw.githubusercontent.com/darkbot-reloaded/DmPlugin/master/src/main/resources/plugin.json" } From c3bbc95a5303164bdf112085762419ec75a21a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=ADn?= Date: Fri, 15 Nov 2024 23:57:58 +0100 Subject: [PATCH 30/30] New translations strings_en.properties (Russian) (#200) --- .../com/deeme/lang/strings_ru.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/com/deeme/lang/strings_ru.properties b/src/main/resources/com/deeme/lang/strings_ru.properties index 07eb914b..af202d0c 100644 --- a/src/main/resources/com/deeme/lang/strings_ru.properties +++ b/src/main/resources/com/deeme/lang/strings_ru.properties @@ -412,7 +412,7 @@ quest_module.use_pet_locator=Use Pet Locator quest_module.use_pet_locator.desc=It will activate the pet locator on NPCs it has to kill and deactivate it when it does not have to kill them. quest_module.pvp_quests=PVP Квесты quest_module.pvp_quests.desc=For the use of this option it is mandatory to have a PVP module configured. -quest_module.gg_quests=GG Quests +quest_module.gg_quests=GG квесты quest_module.gg_quests.desc=For the use of this option it is mandatory to have a GG module configured. quest_module.update_npc_list=Обновить список NPC quest_module.show_options=Show in status @@ -423,12 +423,12 @@ quest_module.condition_config=Condition Config quest_module.condition_config.enable_condition_type=Enable this type of quests quest_module.custom_module=Custom module config quest_module.custom_module.enable_custom_module=Enable use of a custom module -quest_module.custom_module.module=Module -quest_module.custom_pet=Custom pet config +quest_module.custom_module.module=Модуль +quest_module.custom_pet=Пользовательские настройки PET quest_module.custom_pet.enable_custom_pet=Enable custom pet config quest_module.custom_pet.enable_pet=Использовать PET quest_module.custom_pet.enable_pet.desc=If disabled, bot will ignore all PET functions -quest_module.custom_pet.pet_module=PET module +quest_module.custom_pet.pet_module=PET модуль quest_module.custom_pet.pet_module.desc=The list will update to your modules if your PET is on quest_module.quest_giver=Quest Giver Logic quest_module.quest_giver.take_more=Take more quests @@ -437,10 +437,10 @@ quest_module.quest_giver.change_profile=Change profile if there are no more ques quest_module.quest_giver.change_profile.desc=If it is not activated, it will stop quest_module.quest_giver.profile=Profile to change to quest_module.quest_giver.types=Quest Types -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=Обычный +quest_module.quest_giver.types.daily=Ежедневный +quest_module.quest_giver.types.weekly=Еженедельный +quest_module.quest_giver.types.special=Специальный quest_module.priority_to_use=Priority assigned by default quest_module.priority_to_use.desc=By default this priority will be assigned to NPCs/Boxes needed for quest quest_module.priority_to_ignore=Priority to ignore