Merge pull request #65 from whoamikyo/master

GUI: [EN] added better tips in GUI

.gitignore

@@ -241,3 +241,4 @@ $RECYCLE.BIN/
 adb_port.txt
 adb_port.ini
 *.exe
+*.zip

config/template.ini

@@ -97,7 +97,7 @@ serial = 127.0.0.1:62001
 package_name = com.bilibili.azurlane
 enable_error_log_and_screenshot_save = yes
 enable_perspective_error_image_save = no
-device_screenshot_method = aScreenCap
+device_screenshot_method = ADB
 device_control_method = uiautomator2
 combat_screenshot_interval = 1.
 enable_update_check = yes

dev_tools.bat

@@ -89,13 +89,14 @@ CALL %ADB% connect %ADB_PORT%
 	echo Opening dev_tools.emulator_test...
 	call %PYTHON% -m dev_tools.emulator_test
 	pause > NUL
+	goto dev_menu
 	) else (
 		echo :: it was not possible to open dev_tools.emulator_test, make sure you have a folder python-3.7.6.amd64
 		echo :: inside AzurLaneAutoScript folder.
 		echo.
         pause > NUL
+        goto dev_menu
 	)
-goto dev_menu
 :: -----------------------------------------------------------------------------
 :button_extract
 	call %PYTHON% --version >nul
@@ -104,13 +105,14 @@ goto dev_menu
 	echo Opening dev_tools.button_extract...
 	call %PYTHON% -m dev_tools.button_extract
 	pause > NUL
+	goto dev_menu
 	) else (
 		echo :: it was not possible to open dev_tools.button_extract, make sure you have a folder python-3.7.6.amd64
 		echo :: inside AzurLaneAutoScript folder.
 		echo.
         pause > NUL
+        goto dev_menu
 	)
-goto dev_menu
 :: -----------------------------------------------------------------------------
 :grids_debug
 	call %PYTHON% --version >nul
@@ -119,13 +121,14 @@ goto dev_menu
 	echo Opening dev_tools.button_extract...
 	call %PYTHON% -m dev_tools.grids_debug
 	pause > NUL
+	goto dev_menu
 	) else (
 		echo :: it was not possible to open dev_tools.grids_debug, make sure you have a folder python-3.7.6.amd64
 		echo :: inside AzurLaneAutoScript folder.
 		echo.
         pause > NUL
+        goto dev_menu
 	)
-goto dev_menu
 :: -----------------------------------------------------------------------------
 :item_stastistics
 	call %PYTHON% --version >nul
@@ -134,13 +137,14 @@ goto dev_menu
 	echo Opening dev_tools.button_extract...
 	call %PYTHON% -m dev_tools.item_stastistics
 	pause > NUL
+	goto dev_menu
 	) else (
 		echo :: it was not possible to open dev_tools.item_stastistics, make sure you have a folder python-3.7.6.amd64
 		echo :: inside AzurLaneAutoScript folder.
 		echo.
         pause > NUL
+        goto dev_menu
 	)
-goto dev_menu
 :: -----------------------------------------------------------------------------
 :relative_crop
 	call %PYTHON% --version >nul
@@ -149,14 +153,14 @@ goto dev_menu
 	echo Opening dev_tools.button_extract...
 	call %PYTHON% -m dev_tools.relative_crop
 	pause > NUL
+	goto dev_menu
 	) else (
 		echo :: it was not possible to open dev_tools.relative_crop, make sure you have a folder python-3.7.6.amd64
 		echo :: inside AzurLaneAutoScript folder.
 		echo.
         pause > NUL
+        goto dev_menu
 	)
-
-goto dev_menu
 :: -----------------------------------------------------------------------------
 :map_extractor
 	call %PYTHON% --version >nul
@@ -165,13 +169,14 @@ goto dev_menu
 	echo Opening dev_tools.button_extract...
 	call %PYTHON% -m dev_tools.map_extractor
 	pause > NUL
+	goto dev_menu
 	) else (
 		echo :: it was not possible to open dev_tools.map_extractor, make sure you have a folder python-3.7.6.amd64
 		echo :: inside AzurLaneAutoScript folder.
 		echo.
         pause > NUL
+        goto dev_menu
 	)
-goto dev_menu
 :: -----------------------------------------------------------------------------
 :word_template_extractor
 	call %PYTHON% --version >nul
@@ -180,13 +185,14 @@ goto dev_menu
 	echo Opening dev_tools.button_extract...
 	call %PYTHON% -m dev_tools.word_template_extractor
 	pause > NUL
+	goto dev_menu
 	) else (
 		echo :: it was not possible to open dev_tools.word_template_extractor, make sure you have a folder python-3.7.6.amd64
 		echo :: inside AzurLaneAutoScript folder.
 		echo.
         pause > NUL
+        goto dev_menu
 	)
-goto dev_menu
 :: -----------------------------------------------------------------------------
 :adbss
 echo Enter any text/letter instead of the file name, do not enter spaces, enter exit to exit

module/config/argparser_en.py

@@ -85,15 +85,15 @@ def main(ini_name=''):
 
     # 选择关卡
     stage = setting_parser.add_argument_group('Level settings', 'Need to Press start to save your settings.')
-    stage.add_argument('--enable_stop_condition', default=default('--enable_stop_condition'), choices=['yes', 'no'])
+    stage.add_argument('--enable_stop_condition', default=default('--enable_stop_condition'), choices=['yes', 'no'], help='If enabled will start reward loop when triggered any filter below')
     stage.add_argument('--enable_exception', default=default('--enable_exception'), choices=['yes', 'no'], help='Enable or disable some exceptions, ALAS will withdraw from the map when it occurs instead of stopping')
     stage.add_argument('--enable_fast_forward', default=default('--enable_fast_forward'), choices=['yes', 'no'], help='Enable or disable clearing mode')
 
-    stop = stage.add_argument_group('Stop condition', 'After triggering, it will not stop immediately. It will complete the current attack first, and fill in 0 if it is not needed.')
+    stop = stage.add_argument_group('Stop condition', 'After triggering, it will not stop immediately. It will complete the current attack first, Set 0 to disable')
-    stop.add_argument('--if_count_greater_than', default=default('--if_count_greater_than'), help='The previous setting will be used, and the number\n of deductions will be deducted after completion of the attack until it is cleared.')
+    stop.add_argument('--if_count_greater_than', default=default('--if_count_greater_than'), help='How many map completions\n until ALAS enter in Reward loop.')
-    stop.add_argument('--if_time_reach', default=default('--if_time_reach'), help='Use the time within the next 24 hours, the previous setting will be used, and it will be cleared\n after the trigger. It is recommended to advance about\n 10 minutes to complete the current attack. Format 14:59')
+    stop.add_argument('--if_time_reach', default=default('--if_time_reach'), help='How many time in minutes run ALAS until stop\n. It is recommended about\n 10 minutes to complete the current attack. Format 14:59')
-    stop.add_argument('--if_oil_lower_than', default=default('--if_oil_lower_than'))
+    stop.add_argument('--if_oil_lower_than', default=default('--if_oil_lower_than'), help='Will enter in reward loop when\ntriggered Oil limit')
-    stop.add_argument('--if_trigger_emotion_control', default=default('--if_trigger_emotion_control'), choices=['yes', 'no'], help='If yes, wait for reply, complete this time, stop \nIf no, wait for reply, complete this time, continue')
+    stop.add_argument('--if_trigger_emotion_control', default=default('--if_trigger_emotion_control'), choices=['yes', 'no'], help='Will enter in reward loop when\ntriggered Mood limit')
     # stop.add_argument('--if_dock_full', default=default('--if_dock_full'), choices=['yes', 'no'])
 
     # 出击舰队