Fix: exiting combat status properly using MAP_GOTO_GLOBE_STORY

LmeSzinc · Dec 11, 2024 · 8d42b3c · 8d42b3c
1 parent bfdf6e4
commit 8d42b3c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/assets/cn/os/MAP_GOTO_GLOBE_STORY.png b/assets/cn/os/MAP_GOTO_GLOBE_STORY.png
diff --git a/module/os/assets.py b/module/os/assets.py
@@ -15,6 +15,7 @@
 MAP_EXIT = Button(area={'cn': (1147, 637, 1280, 699), 'en': (1148, 641, 1280, 699), 'jp': (1147, 637, 1280, 699), 'tw': (1147, 639, 1280, 703)}, color={'cn': (47, 35, 42), 'en': (32, 20, 20), 'jp': (58, 34, 34), 'tw': (55, 46, 43)}, button={'cn': (1147, 637, 1280, 699), 'en': (1148, 641, 1280, 699), 'jp': (1147, 637, 1280, 699), 'tw': (1147, 639, 1280, 703)}, file={'cn': './assets/cn/os/MAP_EXIT.png', 'en': './assets/en/os/MAP_EXIT.png', 'jp': './assets/jp/os/MAP_EXIT.png', 'tw': './assets/tw/os/MAP_EXIT.png'})
 MAP_GOTO_GLOBE = Button(area={'cn': (1069, 641, 1260, 695), 'en': (1069, 641, 1260, 691), 'jp': (1064, 636, 1265, 699), 'tw': (1069, 641, 1260, 694)}, color={'cn': (212, 140, 140), 'en': (212, 140, 140), 'jp': (207, 132, 132), 'tw': (213, 143, 143)}, button={'cn': (1069, 641, 1260, 695), 'en': (1069, 641, 1260, 691), 'jp': (1064, 636, 1265, 699), 'tw': (1069, 641, 1260, 694)}, file={'cn': './assets/cn/os/MAP_GOTO_GLOBE.png', 'en': './assets/en/os/MAP_GOTO_GLOBE.png', 'jp': './assets/jp/os/MAP_GOTO_GLOBE.png', 'tw': './assets/tw/os/MAP_GOTO_GLOBE.png'})
 MAP_GOTO_GLOBE_FOG = Button(area={'cn': (1074, 644, 1114, 691), 'en': (1074, 644, 1114, 691), 'jp': (1074, 644, 1114, 691), 'tw': (1074, 644, 1114, 691)}, color={'cn': (50, 34, 32), 'en': (50, 34, 32), 'jp': (50, 34, 32), 'tw': (50, 34, 32)}, button={'cn': (1074, 644, 1114, 691), 'en': (1074, 644, 1114, 691), 'jp': (1074, 644, 1114, 691), 'tw': (1074, 644, 1114, 691)}, file={'cn': './assets/cn/os/MAP_GOTO_GLOBE_FOG.png', 'en': './assets/en/os/MAP_GOTO_GLOBE_FOG.png', 'jp': './assets/jp/os/MAP_GOTO_GLOBE_FOG.png', 'tw': './assets/tw/os/MAP_GOTO_GLOBE_FOG.png'})
+MAP_GOTO_GLOBE_STORY = Button(area={'cn': (918, 647, 959, 689), 'en': (918, 647, 959, 689), 'jp': (918, 647, 959, 689), 'tw': (918, 647, 959, 689)}, color={'cn': (46, 53, 77), 'en': (46, 53, 77), 'jp': (46, 53, 77), 'tw': (46, 53, 77)}, button={'cn': (918, 647, 959, 689), 'en': (918, 647, 959, 689), 'jp': (918, 647, 959, 689), 'tw': (918, 647, 959, 689)}, file={'cn': './assets/cn/os/MAP_GOTO_GLOBE_STORY.png', 'en': './assets/cn/os/MAP_GOTO_GLOBE_STORY.png', 'jp': './assets/cn/os/MAP_GOTO_GLOBE_STORY.png', 'tw': './assets/cn/os/MAP_GOTO_GLOBE_STORY.png'})
 MAP_NAME = Button(area={'cn': (120, 9, 400, 41), 'en': (116, 6, 549, 39), 'jp': (115, 14, 421, 41), 'tw': (120, 9, 400, 41)}, color={'cn': (60, 66, 77), 'en': (43, 50, 60), 'jp': (94, 104, 120), 'tw': (60, 66, 77)}, button={'cn': (120, 9, 400, 41), 'en': (116, 6, 549, 39), 'jp': (115, 14, 421, 41), 'tw': (120, 9, 400, 41)}, file={'cn': './assets/cn/os/MAP_NAME.png', 'en': './assets/en/os/MAP_NAME.png', 'jp': './assets/jp/os/MAP_NAME.png', 'tw': './assets/tw/os/MAP_NAME.png'})
 MEOWFFICER_SEARCHING = Button(area={'cn': (172, 606, 220, 619), 'en': (172, 607, 221, 616), 'jp': (173, 606, 220, 619), 'tw': (173, 605, 221, 619)}, color={'cn': (67, 131, 149), 'en': (75, 132, 150), 'jp': (76, 138, 158), 'tw': (78, 152, 173)}, button={'cn': (172, 606, 220, 619), 'en': (172, 607, 221, 616), 'jp': (173, 606, 220, 619), 'tw': (173, 605, 221, 619)}, file={'cn': './assets/cn/os/MEOWFFICER_SEARCHING.png', 'en': './assets/en/os/MEOWFFICER_SEARCHING.png', 'jp': './assets/jp/os/MEOWFFICER_SEARCHING.png', 'tw': './assets/tw/os/MEOWFFICER_SEARCHING.png'})
 MEOWFFICER_SEARCHING_PERCENTAGE = Button(area={'cn': (144, 621, 223, 623), 'en': (144, 621, 223, 623), 'jp': (144, 621, 223, 623), 'tw': (144, 621, 223, 623)}, color={'cn': (52, 167, 190), 'en': (52, 167, 190), 'jp': (52, 167, 190), 'tw': (52, 167, 190)}, button={'cn': (144, 621, 223, 623), 'en': (144, 621, 223, 623), 'jp': (144, 621, 223, 623), 'tw': (144, 621, 223, 623)}, file={'cn': './assets/cn/os/MEOWFFICER_SEARCHING_PERCENTAGE.png', 'en': './assets/en/os/MEOWFFICER_SEARCHING_PERCENTAGE.png', 'jp': './assets/jp/os/MEOWFFICER_SEARCHING_PERCENTAGE.png', 'tw': './assets/tw/os/MEOWFFICER_SEARCHING_PERCENTAGE.png'})

diff --git a/module/os_handler/enemy_searching.py b/module/os_handler/enemy_searching.py
@@ -2,7 +2,7 @@
 from module.handler.enemy_searching import \
     EnemySearchingHandler as EnemySearchingHandler_
 from module.logger import logger
-from module.os.assets import MAP_GOTO_GLOBE_FOG
+from module.os.assets import MAP_GOTO_GLOBE_FOG, MAP_GOTO_GLOBE_STORY
 from module.os_handler.assets import AUTO_SEARCH_REWARD, IN_MAP, ORDER_ENTER
 
 
@@ -12,6 +12,8 @@ def is_in_map(self):
             return True
         if self.match_template_color(MAP_GOTO_GLOBE_FOG, offset=(5, 5)):
             return True
+        if self.match_template_color(MAP_GOTO_GLOBE_STORY, offset=(200, 5)):
+            return True
 
         return False