Merge branch 'ok-oldking:master' into patch-1

ok-oldking · Jan 12, 2025 · 2c9960d · 2c9960d
2 parents 8e0a178 + aec6d01
commit 2c9960d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/i18n/zh_CN/LC_MESSAGES/ok.mo b/i18n/zh_CN/LC_MESSAGES/ok.mo
diff --git a/i18n/zh_CN/LC_MESSAGES/ok.po b/i18n/zh_CN/LC_MESSAGES/ok.po
@@ -286,6 +286,9 @@ msgstr "半自动肉鸽(深坠异想奇境)"
 msgid "Fallacy of No Return"
 msgstr "无归的谬误"
 
+msgid "Lorelei"
+msgstr "罗莱蕾"
+
 msgid "click f2 to open the book"
 msgstr "点击F2打开书"
 

diff --git a/src/task/FarmWorldBossTask.py b/src/task/FarmWorldBossTask.py
@@ -12,7 +12,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.description = "Click Start in Game World"
         self.name = "Farm World Boss(Must Drop a WayPoint on the Boss First)"
-        self.boss_names = ['N/A','Sentry Construct','Dragon of Dirge','Nightmare: Feilian Beringal',
+        self.boss_names = ['N/A', 'Lorelei', 'Sentry Construct','Dragon of Dirge','Nightmare: Feilian Beringal',
                            'Nightmare: Impermanence Heron','Nightmare: Thundering Mephis',
                            'Nightmare: Tempest Mephis', 'Nightmare: Crownless',
                            'Nightmare: Inferno Rider','Nightmare: Mourning Aix','Bell-Borne Geochelone', 'Crownless', 'Thundering Mephis', 'Tempest Mephis',
@@ -81,6 +81,9 @@ def run(self):
                         elif boss_name == 'Bell-Borne Geochelone':
                             logger.info(f'sleep for the Bell-Borne model to appear')
                             self.sleep(15)
+                        elif boss_name == 'Lorelei':
+                            if count % 6 < 3:                                
+                                self.change_time_to_night()
                         self.middle_click_relative(0.5, 0.5)
                         self.sleep(0.4)
                         self.run_until(self.in_combat, 'w', time_out=10, running=True)
@@ -110,3 +113,18 @@ def run(self):
             if count <= 2:
                 self.log_error('Must choose at least 3 Boss to Farm', notify=True)
                 return
+
+    def change_time_to_night(self):
+        logger.info('change time to night')
+        self.send_key("esc")
+        self.sleep(1)
+        self.click_relative(0.71,0.96) 
+        self.sleep(2)
+        self.click_relative(0.19,0.14)
+        self.sleep(1)
+        self.click_relative(0.52,0.90)
+        self.sleep(6)
+        self.send_key("esc")
+        self.sleep(1)
+        self.send_key("esc")
+        self.sleep(1)