Merge pull request #1411 from LmeSzinc/bug_fix

Bug fix

module/commission/commission.py

@@ -12,8 +12,8 @@ from module.exception import GameStuckError
 from module.handler.info_handler import InfoHandler
 from module.logger import logger
 from module.map.map_grids import SelectedGrids
-from module.ui.assets import COMMISSION_CHECK, REWARD_GOTO_COMMISSION
-from module.ui.page import page_reward
+from module.ui.assets import COMMISSION_CHECK, REWARD_GOTO_COMMISSION, MAIN_GOTO_REWARD
+from module.ui.page import page_reward, MAIN_CHECK
 from module.ui.scroll import Scroll
 from module.ui.switch import Switch
 from module.ui.ui import UI
@@ -467,6 +467,10 @@ class RewardCommission(UI, InfoHandler):
                 if click_timer.reached() and self.ui_additional():
                     click_timer.reset()
                     continue
+                if self.appear(MAIN_CHECK, offset=(30, 30), interval=5):
+                    self.device.click(MAIN_GOTO_REWARD)
+                    click_timer.reset()
+                    continue
 
                 # End
                 if self.appear(COMMISSION_CHECK, offset=(20, 20)):

module/research/project.py

@@ -408,6 +408,8 @@ class ResearchProject:
         if len(parts) == 3:
             prefix, number, suffix = parts
             number = number.replace('D', '0').replace('O', '0').replace('S', '5')
+            if prefix == 'I1':
+                prefix = 'D'
             prefix = prefix.strip('I1')
             # S3 D-022-MI (S3-Drake-0.5) detected as 'D-022-ML', because of Drake's white cloth.
             suffix = suffix.replace('ML', 'MI').replace('MIL', 'MI')

module/webui/app.py

@@ -452,7 +452,7 @@ class AlasGUI(Frame):
         try:
             valid = []
             invalid = []
-            config = State.config_updater.read_file(self.alas_name)
+            config = State.config_updater.read_file(config_name)
             for k, v in modified.copy().items():
                 valuetype = deep_get(self.ALAS_ARGS, k + ".valuetype")
                 v = parse_pin_value(v, valuetype)