From e30f71c8910219c3b1ce0aaae16fd14883770944 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Thu, 24 Mar 2022 19:03:15 +0800 Subject: [PATCH] Opt: Faster map preparation - Faster retry after retirement - Faster get_map_clear_percentage() --- module/map/map_operation.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/module/map/map_operation.py b/module/map/map_operation.py index 061217cca..bf8c78a35 100644 --- a/module/map/map_operation.py +++ b/module/map/map_operation.py @@ -169,9 +169,6 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand # Retire if self.handle_retirement(): - campaign_timer.reset() - map_timer.reset() - fleet_timer.reset() continue # Use Data Key @@ -240,11 +237,15 @@ class MapOperation(MysteryHandler, FleetPreparation, Retirement, FastForwardHand return False percent = self.get_map_clear_percentage() - if abs(percent - self.map_clear_percentage_prev) < 0.02: + if percent > 0.95: + # map clear percentage 100%, exit directly + return True + elif abs(percent - self.map_clear_percentage_prev) < 0.02: self.map_clear_percentage_prev = percent if self.map_clear_percentage_timer.reached(): return True - + else: + return False else: self.map_clear_percentage_prev = percent self.map_clear_percentage_timer.reset()