From a585eb41180583881b2ac457b44e57152b485834 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 10 Jun 2023 19:52:43 +0200 Subject: [PATCH] Stop fishing and hunting --- .github/workflows/release-main.yml | 4 ++-- .github/workflows/release-twink1-farmer.yml | 2 +- ...lease-twink2-fisher.yml => release-twink2-farmer.yml} | 9 ++++----- .github/workflows/release-twink3-fisher.yml | 2 +- .github/workflows/release-twink4-fisher.yml | 2 +- .github/workflows/release-twink5-fisher.yml | 2 +- .github/workflows/release-twink6-hunter.yml | 2 +- .github/workflows/release-twink7-hunter.yml | 2 +- .github/workflows/release-twink8-hunter.yml | 2 +- .github/workflows/release-twink9-fisher.yml | 2 +- README.md | 5 ----- 11 files changed, 14 insertions(+), 20 deletions(-) rename .github/workflows/{release-twink2-fisher.yml => release-twink2-farmer.yml} (85%) diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml index acd2b4d..5c5a062 100644 --- a/.github/workflows/release-main.yml +++ b/.github/workflows/release-main.yml @@ -46,8 +46,8 @@ jobs: echo 'stop_if_equip_broken=false' >> .env echo 'notifications_enabled=false' >> .env echo 'select_combo_strategy=tuned' >> .env - echo 'repair_locations_path="Троглодитов"' >> .env + echo 'repair_locations_path="Оазис"' >> .env supervisorctl stop main:main-grinder supervisorctl stop main:main-fisher - supervisorctl restart main:main-farmer + supervisorctl stop main:main-farmer diff --git a/.github/workflows/release-twink1-farmer.yml b/.github/workflows/release-twink1-farmer.yml index 2e3ed49..b290181 100644 --- a/.github/workflows/release-twink1-farmer.yml +++ b/.github/workflows/release-twink1-farmer.yml @@ -50,4 +50,4 @@ jobs: supervisorctl stop twink1:twink1-grinder supervisorctl stop twink1:twink1-fisher - supervisorctl restart twink1:twink1-farmer + supervisorctl stop twink1:twink1-farmer diff --git a/.github/workflows/release-twink2-fisher.yml b/.github/workflows/release-twink2-farmer.yml similarity index 85% rename from .github/workflows/release-twink2-fisher.yml rename to .github/workflows/release-twink2-farmer.yml index 07b7edb..25215e0 100644 --- a/.github/workflows/release-twink2-fisher.yml +++ b/.github/workflows/release-twink2-farmer.yml @@ -42,13 +42,12 @@ jobs: echo 'telegram_api_id=${{ secrets.TELEGRAM_API_ID_TWINK2 }}' > .env echo 'telegram_api_hash=${{ secrets.TELEGRAM_API_HASH_TWINK2 }}' >> .env echo 'anti_captcha_com_apikey=${{ secrets.ANTI_CAPTCHA_APIKEY }}' >> .env - echo 'minimum_hp_level_for_grinding=85' >> .env + echo 'minimum_hp_level_for_grinding=95' >> .env echo 'stop_if_equip_broken=false' >> .env echo 'notifications_enabled=false' >> .env - echo 'slow_mode=true' >> .env - echo 'select_random_combo=false' >> .env - echo 'message_log_limit=300' >> .env + echo 'select_combo_strategy=tuned' >> .env + echo 'repair_locations_path="грейт,Цирта"' >> .env supervisorctl stop twink2:twink2-grinder - supervisorctl restart twink2:twink2-fisher + supervisorctl stop twink2:twink2-fisher supervisorctl stop twink2:twink2-farmer diff --git a/.github/workflows/release-twink3-fisher.yml b/.github/workflows/release-twink3-fisher.yml index 050e962..6320095 100644 --- a/.github/workflows/release-twink3-fisher.yml +++ b/.github/workflows/release-twink3-fisher.yml @@ -50,5 +50,5 @@ jobs: echo 'message_log_limit=300' >> .env supervisorctl stop twink3:twink3-grinder - supervisorctl restart twink3:twink3-fisher + supervisorctl stop twink3:twink3-fisher supervisorctl stop twink3:twink3-farmer diff --git a/.github/workflows/release-twink4-fisher.yml b/.github/workflows/release-twink4-fisher.yml index a126a44..a8d4091 100644 --- a/.github/workflows/release-twink4-fisher.yml +++ b/.github/workflows/release-twink4-fisher.yml @@ -50,5 +50,5 @@ jobs: echo 'message_log_limit=300' >> .env supervisorctl stop twink4:twink4-grinder - supervisorctl restart twink4:twink4-fisher + supervisorctl stop twink4:twink4-fisher supervisorctl stop twink4:twink4-farmer diff --git a/.github/workflows/release-twink5-fisher.yml b/.github/workflows/release-twink5-fisher.yml index 6d8d0bd..e4df0c2 100644 --- a/.github/workflows/release-twink5-fisher.yml +++ b/.github/workflows/release-twink5-fisher.yml @@ -50,5 +50,5 @@ jobs: echo 'message_log_limit=300' >> .env supervisorctl stop twink5:twink5-grinder - supervisorctl restart twink5:twink5-fisher + supervisorctl stop twink5:twink5-fisher supervisorctl stop twink5:twink5-farmer diff --git a/.github/workflows/release-twink6-hunter.yml b/.github/workflows/release-twink6-hunter.yml index 1027ad9..a827932 100644 --- a/.github/workflows/release-twink6-hunter.yml +++ b/.github/workflows/release-twink6-hunter.yml @@ -53,4 +53,4 @@ jobs: supervisorctl stop twink6:twink6-grinder supervisorctl stop twink6:twink6-fisher supervisorctl stop twink6:twink6-farmer - supervisorctl restart twink6:twink6-hunter + supervisorctl stop twink6:twink6-hunter diff --git a/.github/workflows/release-twink7-hunter.yml b/.github/workflows/release-twink7-hunter.yml index 1a740cb..59a9e85 100644 --- a/.github/workflows/release-twink7-hunter.yml +++ b/.github/workflows/release-twink7-hunter.yml @@ -53,4 +53,4 @@ jobs: supervisorctl stop twink7:twink7-grinder supervisorctl stop twink7:twink7-fisher supervisorctl stop twink7:twink7-farmer - supervisorctl restart twink7:twink7-hunter + supervisorctl stop twink7:twink7-hunter diff --git a/.github/workflows/release-twink8-hunter.yml b/.github/workflows/release-twink8-hunter.yml index 6fd449d..c190635 100644 --- a/.github/workflows/release-twink8-hunter.yml +++ b/.github/workflows/release-twink8-hunter.yml @@ -49,5 +49,5 @@ jobs: echo 'repair_locations_path="цирта"' >> .env echo 'skip_random_vendor_stop_words=""' >> .env - supervisorctl restart twink8:twink8-farmer + supervisorctl stop twink8:twink8-farmer supervisorctl stop twink8:twink8-hunter diff --git a/.github/workflows/release-twink9-fisher.yml b/.github/workflows/release-twink9-fisher.yml index fd17617..065c2cd 100644 --- a/.github/workflows/release-twink9-fisher.yml +++ b/.github/workflows/release-twink9-fisher.yml @@ -50,4 +50,4 @@ jobs: echo 'skip_random_vendor_stop_words=""' >> .env supervisorctl stop twink9:twink9-farmer - supervisorctl restart twink9:twink9-fisher + supervisorctl stop twink9:twink9-fisher diff --git a/README.md b/README.md index 240cf84..7d17e73 100644 --- a/README.md +++ b/README.md @@ -199,11 +199,6 @@ In this mode, the tool will only help you solve the captcha automatically and no ## Roadmap -- setup twink 7 - hunter -- setup twink 8 - leveling -- setup twink 8 - hunter -- setup twink 9 - leveling -- setup twink 9 - hunter - make GIFs for readme - readme on teletype page and change link in settings/readme.md - contacts for support to readme.md