Release hotfix v6.2.2

Author: monkeyhunter01

CHANGELOG

@@ -1,3 +1,47 @@
+* **V6.2.2**
+ * Add Android support for LeapDroid 1.5.0 - 1.3.0 (http://www.leapdroid.com/)
+ * Fix bot stop working and freezing sometimes (bot buttons did disappear as well)
+ * Fix OCR sometimes not working at all (English language detection...)
+ * Fix ADB connect problems
+ * Fix Android ADB screencap performance issues for some Windows installations
+ * Fix Android ADB screencap protocol error when bot stopped
+ * Fix deactivation of "Bot Tab" controls when bot is running
+ * Fix BlueStacks manual mouse clicks little off when undocked after being docked
+ * Fix BlueStacks2 docking/undocking issues
+ * Fix Android Window search (not using title anymore)
+ * Fix zoom-out for Nox 3.7.0 and 3.7.1
+ * Fix not finding home screen when docked in non background mode
+ * Fix close while training GUI errors
+ * Fix random click not adding window offset and reduce zone size on collectors to remove errors
+ * Fix typo in CSV forced side code that prevent proper operation
+ * Fix saving photo when bot stopped and Android Window moved
+ * Fix Dock Mode when Windows Screen Size changes
+ * Fix Android Window minimize when bot stopped or paused
+ * Fix restarting bot with /restart parameter
+ * Fix Training idle time log off without a shield error due old shield time value
+ * Fix Pause causing bot crashes and unwanted error messages/behavior
+ * Fix BlueStacks memory problems when in halt mode
+ * Fix launching bot with profile command line parameter not creating profile
+ * Fix Random start of attack when army is not full when search start army size filter enabled or zero value
+ * Fix search IF filter to require ALL enabled filter conditions as true to start search, instead of only one.
+ * Fix rare issue of fast re-starting attack immediately after personal break without checking Heroes
+ * Fix share replay feature not working after working for awhile (@Samkie provided)
+ * Adjust Training idle time feature to allow users to disable anti-ban smartwait when shielded
+ * Improve hero activation when more than 11 slots occupied (from @Promac post in forums)
+ * Improve Android Shield support in Window 7
+ * Improve non background mode not stealing focus to bring android to front
+ * Improve train order log message
+ * Add warning message when heroes are found being upgraded and wait for hero is enabled in GUI
+ * Add check of reload CoC messages for banned accounts and stop bot
+ * Remove forced bot repositioning on low screen resolution
+ * Change Android priority order to MEmu, BlueStacks2, BlueStacks, Droid4X, LeapDroid, Nox
+ * Change default zoom-out for BlueStacks/BlueStacks2 to use WinAPI Ctrl-Click when un-docked
+ * Change wait when another device connects from Seconds to Minutes in bot option input box
+ * Change Spell training to automatically pre-train spells for next attack, when army full (@mikemikemikecoc)
+ * Enable Accelerator Key (not global hotkeys!) that work when bot window is active:
+   Pause/Break Key = Pause/Resume bot
+   ESC = Stop bot
+
 * **V6.2.1**
  * Fix GUI display of clone/skeleton spells for TH level where they are not available
  * Fix old training bug (@Promac submitted)
@@ -42,15 +86,15 @@
  * Minor User Interface changes to Bot Options tab: Moved "Village Search Delay" to Search & Attack Options tab, Moved "Train Click Delay" to Train Army Options tab; as they seem better aligned with those tabs.
  * New scroll to waters and zoom-out ADB scripts for slower computer
 
-  * **V6.1.4**
+* **V6.1.4**
  * Improve Freeze, Poison, and Haste spell training detection
  * Improved donaton detection images for Healer, Barbarian, Lava Hound, Wizard, Poison, Earthquake, Haste.
  * Fix manual TH locate warning error creating confusion on proper button to choose
  * Fix variable not declared error in attack planner
  * Reduce (hopefully fixed) resource collection errors with new match images
  * Updated Taiwan language file (from @flowclouds)
 
- * **V6.1.3**
+* **V6.1.3**
  * Improve troop deploy click speed
  * Improve click speed for MEmu, Droid4X and Nox (adb.click.enabled now by default disabled (0) in config.ini, ensure mouse is not over Android Window!)
  * Improve Android Emulator launch by closing Windows WerFault AppCrash Window preventing launch of emulator
@@ -161,7 +205,6 @@
  * Improve healing spell detection during training
 
 * **V5.3.2**
->>>>>>> release/MBR_v.6.1
  * Updated Italian language file (from @davideroma)
  * Improve Troops&Spells Detection army overview
  * Fix Hero Status detection

COCBot/GUI/MBR GUI Control BOT Options.au3

@@ -342,3 +342,63 @@ Func btnTestAttackBar()
 EndFunc
 
 
+Func btnTestClickDrag()
+
+	Local $i
+
+	SetLog("Testing Click drag functionality...", $COLOR_BLUE)
+	For $i = 0 To 4
+		SetLog("Click x1/y1=100/600 and drag to x2/y2=150/600", $COLOR_BLUE)
+		ClickDrag(100, 600, 150, 600)
+	Next
+	SetDebugLog("Waiting 3 Seconds...")
+	_SleepStatus(3000, True, True, False)
+	For $i = 0 To 4
+		SetLog("Click x1/y1=150/600 and drag to x2/y2=100/600", $COLOR_BLUE)
+		ClickDrag(150, 600, 100, 600)
+	Next
+
+EndFunc
+
+Func btnTestImage()
+
+	Local $sImageFile = FileOpenDialog("Select CoC screenshot to test", $dirTemp, "Image (*.png)", $FD_FILEMUSTEXIST, "", $frmBot)
+
+	SetLog("Testing image " & $sImageFile, $COLOR_BLUE)
+
+	Local $currentRunState = $RunState
+	$RunState = True
+
+	; load test image
+	Local $hBMP = _GDIPlus_BitmapCreateFromFile($sImageFile)
+	Local $hHBMP = _GDIPlus_BitmapCreateDIBFromBitmap($hBMP)
+	TestCapture($hHBMP)
+
+	SetLog("Testing image hHBitmap = " & $hHBMP)
+
+	Local $Result
+
+	SetLog("Testing checkObstacles", $COLOR_GREEN)
+	$Result = checkObstacles()
+	SetLog("Testing checkObstacles DONE, $Result=" & $Result, $COLOR_GREEN)
+
+	SetLog("Testing waitMainScreen...", $COLOR_GREEN)
+	$Result = waitMainScreen()
+	SetLog("Testing waitMainScreen DONE, $Result=" & $Result, $COLOR_GREEN)
+
+	SetLog("Testing waitMainScreenMini", $COLOR_GREEN)
+	$Result = waitMainScreenMini()
+	SetLog("Testing waitMainScreenMini DONE, $Result=" & $Result, $COLOR_GREEN)
+
+	;checkObstacles()
+
+    _GDIPlus_BitmapDispose($hBMP)
+	_WinAPI_DeleteObject($hHBMP)
+
+	TestCapture(0)
+
+	SetLog("Testing finished", $COLOR_BLUE)
+
+	$RunState = $currentRunState
+
+EndFunc

COCBot/GUI/MBR GUI Control Bottom.au3

@@ -16,7 +16,6 @@
 Func Initiate()
 	WinGetAndroidHandle()
     If $HWnD <> 0 And ($AndroidBackgroundLaunched = True Or AndroidControlAvailable()) Then
-		;WinActivate($HWnD)
 		SetLog(_PadStringCenter(" " & $sBotTitle & " Powered by MyBot.run ", 50, "~"), $COLOR_PURPLE)
 		SetLog($Compiled & " running on " & @OSVersion & " " & @OSServicePack & " " & @OSArch)
 		If Not $bSearchMode Then
@@ -45,7 +44,7 @@ Func Initiate()
 		;		$RunState = True
 
 		If Not $bSearchMode Then
-			AdlibRegister("SetTime", 1000)
+			;AdlibRegister("SetTime", 1000)
 			If $restarted = 1 Then
 				$restarted = 0
 				IniWrite($config, "general", "Restarted", 0)
@@ -148,10 +147,12 @@ Func btnStart()
 EndFunc   ;==>btnStart
 
 Func btnStop()
-	; always invoked in MyBot.run.au3!
-	EnableControls($frmBotBottom, False, $frmBotBottomCtrlState)
-	$RunState = False ; Exit BotStart()
-	$BotAction = $eBotStop
+	If $RunState Then
+		; always invoked in MyBot.run.au3!
+		EnableControls($frmBotBottom, False, $frmBotBottomCtrlState)
+		$RunState = False ; Exit BotStart()
+		$BotAction = $eBotStop
+	EndIf
 EndFunc   ;==>btnStop
 
 Func btnSearchMode()

COCBot/GUI/MBR GUI Control Child Army.au3

@@ -383,7 +383,7 @@ Func btnCloseWaitStopRandom()
 		GUICtrlSetState($btnCloseWaitStop, BitOR($GUI_DISABLE, $GUI_UNCHECKED))
 	Else
 		$ibtnCloseWaitStopRandom = 0
-		GUICtrlSetState($btnCloseWaitStop, $GUI_ENABLE)
+		If GUICtrlRead($chkCloseWaitEnable) = $GUI_CHECKED Then GUICtrlSetState($btnCloseWaitStop, $GUI_ENABLE)
 	EndIf
 EndFunc   ;==>btnCloseWaitStopRandom
 
@@ -433,6 +433,7 @@ Func chkTroopOrder($bNoiseMode = True)
 			For $i = 0 To UBound($DefaultTroopGroup) - 1
 				$sNewTrainList &= $TroopName[$i] & ", "
 			Next
+			$sNewTrainList = StringLeft($sNewTrainList, StringLen($sNewTrainList)-2)
 			Setlog("Current train order= " & $sNewTrainList, $COLOR_BLUE)
 		EndIf
 	EndIf
@@ -464,6 +465,7 @@ Func chkDarkTroopOrder($bNoiseMode = True)
 			For $i = 0 To UBound($DefaultTroopGroupDark) - 1
 				$sNewTrainList &= $TroopDarkName[$i] & ", "
 			Next
+			$sNewTrainList = StringLeft($sNewTrainList, StringLen($sNewTrainList)-2)
 			Setlog("Current train order= " & $sNewTrainList, $COLOR_BLUE)
 		EndIf
 	EndIf

COCBot/GUI/MBR GUI Control Tab General.au3

@@ -135,6 +135,8 @@ Func MoveDivider()
 	_GUICtrlRichEdit_SetSel($txtLog, - 1, -1) ; select end
 	_GUICtrlRichEdit_SetSel($txtAtkLog, - 1, -1) ; select end
 
+	SetDebugLog("MoveDivider exit", Default, True)
+
 EndFunc   ;==>MoveDivider
 
 

COCBot/GUI/MBR GUI Design Bottom.au3

@@ -24,23 +24,24 @@ Local $y_bottom = 0 ; 515
 Local $x = 15, $y = $y_bottom + 10
 $grpButtons = GUICtrlCreateGroup("https://mybot.run " & GetTranslated(602,0, "- freeware bot -"), $x - 5, $y - 10, 190, 108)
 	$btnStart = GUICtrlCreateButton(GetTranslated(602,1, "Start Bot"), $x, $y + 2 +5, 90, 40-5)
+		$txtTip = GetTranslated(602,30, "Use this to START the bot.")
+		_GUICtrlSetTip(-1, $txtTip)
 		GUICtrlSetOnEvent(-1, "btnStart")
 		IF $btnColor then GUICtrlSetBkColor(-1, 0x5CAD85)
 	    GUICtrlSetState(-1, $GUI_DISABLE)
 	$btnStop = GUICtrlCreateButton(GetTranslated(602,2, "Stop Bot"), -1, -1, 90, 40-5)
-		;GUICtrlSetOnEvent(-1, "btnStop")
+		$txtTip = GetTranslated(602,31, "Use this to STOP the bot (or ESC key).")
+		_GUICtrlSetTip(-1, $txtTip)
 		IF $btnColor then GUICtrlSetBkColor(-1, 0xDB4D4D)
 		GUICtrlSetState(-1, $GUI_HIDE)
  	$btnPause = GUICtrlCreateButton(GetTranslated(602,3, "Pause"), $x + 90, -1, 90, 40-5)
-		$txtTip = GetTranslated(602,4, "Use this to PAUSE all actions of the bot until you Resume.")
+		$txtTip = GetTranslated(602,4, "Use this to PAUSE all actions of the bot until you Resume (or Pause/Break key).")
 		_GUICtrlSetTip(-1, $txtTip)
-		;GUICtrlSetOnEvent(-1, "btnPause")
  		IF $btnColor then GUICtrlSetBkColor(-1,  0xFFA500)
 		GUICtrlSetState(-1, $GUI_HIDE)
 	$btnResume = GUICtrlCreateButton(GetTranslated(602,5, "Resume"), -1, -1, 90, 40-5)
- 		$txtTip = GetTranslated(602,6, "Use this to RESUME a paused Bot.")
+ 		$txtTip = GetTranslated(602,6, "Use this to RESUME a paused Bot (or Pause/Break key).")
 		_GUICtrlSetTip(-1, $txtTip)
-		;GUICtrlSetOnEvent(-1, "btnResume")
 		IF $btnColor then GUICtrlSetBkColor(-1,  0xFFA500)
 		GUICtrlSetState(-1, $GUI_HIDE)
 	$btnSearchMode = GUICtrlCreateButton(GetTranslated(602,7, "Search Mode"), -1, -1, 90, 40-5)
@@ -52,12 +53,10 @@ $grpButtons = GUICtrlCreateGroup("https://mybot.run " & GetTranslated(602,0, "-
 	$btnMakeScreenshot = GUICtrlCreateButton(GetTranslated(602,9, "Photo"), $x , $y + 45, 40, -1)
 		$txtTip = GetTranslated(602,10, "Click here to take a snaphot of your village and save it to a file.")
 		_GUICtrlSetTip(-1, $txtTip)
-		;GUICtrlSetOnEvent(-1, "btnMakeScreenshot")
 		IF $btnColor then GUICtrlSetBkColor(-1, 0x5CAD85)
 	$btnHide = GUICtrlCreateButton(GetTranslated(602,11, "Hide"), $x + 40, $y + 45, 50, -1)
 		$txtTip = GetTranslated(602,12, "Use this to move the Android Window out of sight.") & @CRLF & GetTranslated(602,13, "(Not minimized, but hidden)")
 		_GUICtrlSetTip(-1, $txtTip)
-		;GUICtrlSetOnEvent(-1, "btnHide")
 		IF $btnColor Then GUICtrlSetBkColor(-1, 0x22C4F5)
 		GUICtrlSetState(-1, $GUI_DISABLE)
 	$btnEmbed = GUICtrlCreateButton(GetTranslated(602,27, "Dock"), $x + 90, $y + 45, 90, -1)
@@ -77,31 +76,25 @@ $grpButtons = GUICtrlCreateGroup("https://mybot.run " & GetTranslated(602,0, "-
 		$txtTip = GetTranslated(601,18,"Paypal Donate?")
 		_GUICtrlSetTip(-1, $txtTip)
 	$btnAttackNowDB = GUICtrlCreateButton(GetTranslated(602,18, "DB Attack!"), $x + 190, $y - 4, 60, -1)
-		;GUICtrlSetOnEvent(-1, "btnAttackNowDB")
 		GUICtrlSetState(-1, $GUI_HIDE)
 	$btnAttackNowLB = GUICtrlCreateButton(GetTranslated(602,19, "LB Attack!"), $x + 190, $y + 23, 60, -1)
-		;GUICtrlSetOnEvent(-1, "btnAttackNowLB")
 		GUICtrlSetState(-1, $GUI_HIDE)
 	$btnAttackNowTS = GUICtrlCreateButton(GetTranslated(602,20, "TH Snipe!"), $x + 190, $y + 50, 60, -1)
-		;GUICtrlSetOnEvent(-1, "btnAttackNowTS")
 		GUICtrlSetState(-1, $GUI_HIDE)
 GUICtrlCreateGroup("", -99, -99, 1, 1)
 
 If $AndroidAdbScreencap = True Then chkBackground() ; update background mode GUI
 
 $pic2arrow = GUICtrlCreatePic(@ScriptDir & "\Images\2arrow.jpg", $x + 187, $y + 10, 50, 45)
-;	GUICtrlSetOnEvent(-1, "arrows")
 
 $lblVersion = GUICtrlCreateLabel($sBotVersion, 205, $y + 60, 60, 17, $SS_CENTER)
 	GUICtrlSetColor(-1, $COLOR_MEDGRAY)
 
 $arrowleft = GUICtrlCreatePic(@ScriptDir & "\Images\triangle_left.bmp", $x + 247, $y + 30, 8, 14)
    $txtTip = GetTranslated(602,25, "Switch between village info and stats")
    _GUICtrlSetTip(-1, $txtTip)
-   ;GUICtrlSetOnEvent(-1, "btnVillageStat")
 $arrowright = GUICtrlCreatePic(@ScriptDir & "\Images\triangle_right.bmp", $x + 247 + 198, $y + 30, 8, 14)
    _GUICtrlSetTip(-1, $txtTip)
-   ;GUICtrlSetOnEvent(-1, "btnVillageStat")
 
 ;~ Village
 Local $x = 290, $y = $y_bottom + 20

COCBot/GUI/MBR GUI Design Child Attack - Troops.au3

@@ -639,7 +639,8 @@ $y = $yStart + 45
 			GUICtrlSetOnEvent(-1, "chkTroopOrder2")
 
 	Local $sComboData = ""
-	Local $aTroopOrderList[13] = [ "", $sTxtBarbarians, $sTxtArchers, $sTxtGiants, $sTxtGoblins, $sTxtWallBreakers, $sTxtBalloons, $sTxtWizards, $sTxtHealers, $sTxtDragons, $sTxtPekkas, $sTxtBabyDragons, $sTxtMiners]
+	; Do Not Use translated names here or ChangeTroopTrainOrder() code breaks
+	Local $aTroopOrderList[13] = [ "", "Barbarians", "Archers", "Giants", "Goblins", "Wall Breakers", "Balloons", "Wizards", "Healers", "Dragons", "Pekkas", "Baby Dragons", "Miners"]
 
 	; Create translated list of Troops for combo box
 	For $j = 0 To UBound($aTroopOrderList) - 1
@@ -679,7 +680,8 @@ $y = $yStart + 45
 		GUICtrlSetOnEvent(-1, "chkDarkTroopOrder2")
 
 	Local $sComboData = ""
-	Local $aDarkTroopOrderList[8] = [ "", $sTxtMinions, $sTxtHogRiders, $sTxtValkyries, $sTxtGolems, $sTxtWitches, $sTxtLavaHounds, $sTxtBowlers]
+	; Do Not Use translated names here or ChangeDarkTroopTrainOrder()code breaks
+	Local $aDarkTroopOrderList[8] = [ "", "Minions", "Hog Riders", "Valkyries", "Golems", "Witches", "Lava Hounds", "Bowlers"]
 
 	; Create translated list of Troops for combo box
 	For $j = 0 To UBound($aDarkTroopOrderList) - 1

COCBot/GUI/MBR GUI Design Child Bot - Debug.au3

@@ -50,17 +50,25 @@ $grpDebug = GUICtrlCreateGroup(GetTranslated(636,34, "Debug"), $x - 20, $y - 20,
 		GUICtrlSetState(-1, $GUI_DISABLE)
 		GUICtrlSetState(-1, $GUI_HIDE)
 
-Local $x = 305
+Local $x = 295
 $y = 45
-	$btnTestTrain = GUICtrlCreateButton(GetTranslated(636,88, "Test Train"), $x  , $y , 120, 30)
+	$btnTestTrain = GUICtrlCreateButton(GetTranslated(636,88, "Test Train"), $x  , $y , 140, 30)
 
-	$y += 50
+	$y += 35
 
-	$btnTestDonateCC = GUICtrlCreateButton(GetTranslated(636,89, "Test Donate"), $x  , $y , 120, 30)
+	$btnTestDonateCC = GUICtrlCreateButton(GetTranslated(636,89, "Test Donate"), $x  , $y , 140, 30)
 
-	$y += 50
+	$y += 35
 
-	$btnTestAttackBar = GUICtrlCreateButton(GetTranslated(636,90, "Test Attack Bar"), $x  , $y , 120, 30)
+	$btnTestAttackBar = GUICtrlCreateButton(GetTranslated(636,90, "Test Attack Bar"), $x  , $y , 140, 30)
+
+	$y += 35
+
+	$btnTestClickDrag = GUICtrlCreateButton(GetTranslated(636,102, "Test Click Drag (scrolling)"), $x  , $y , 140, 30)
+
+	$y += 35
+
+	$btnTestImage = GUICtrlCreateButton(GetTranslated(636,103, "Test Image"), $x  , $y , 140, 30)
 
 GUICtrlCreateGroup("", -99, -99, 1, 1)
 

COCBot/GUI/MBR GUI Design Child Bot - Options.au3

@@ -152,12 +152,12 @@ $y +=48
 $grpTimeWakeUp = GUICtrlCreateGroup(GetTranslated(636,85, "Remote Device"), $x - 20, $y - 20 , 225, 42)
 	$y -= 5
 	$lblTimeWakeUp = GUICtrlCreateLabel(GetTranslated(636,86, "When 'Another Device' wait") & ":", $x - 10, $y + 2, -1, -1)
-	$txtTip = GetTranslated(636,87, "Enter the time to wait (in seconds) before the Bot reconnects when another device took control.")
+	$txtTip = GetTranslated(636,87, "Enter the time to wait (in Minutes) before the Bot reconnects when another device took control.")
 		_GUICtrlSetTip(-1, $txtTip)
-	$txtTimeWakeUp = GUICtrlCreateInput("240", $x + 127, $y - 1, 35, 21, BitOR($GUI_SS_DEFAULT_INPUT, $ES_CENTER, $ES_NUMBER))
+	$txtTimeWakeUp = GUICtrlCreateInput("2", $x + 127, $y - 1, 35, 21, BitOR($GUI_SS_DEFAULT_INPUT, $ES_CENTER, $ES_NUMBER))
 		_GUICtrlSetTip(-1, $txtTip)
 		GUICtrlSetLimit(-1, 3)
-	$lblTimeWakeUpSec = GUICtrlCreateLabel(GetTranslated(603,6, "sec."), $x + 165, $y + 2, -1, -1)
+	$lblTimeWakeUpSec = GUICtrlCreateLabel(GetTranslated(603,10, "min."), $x + 165, $y + 2, -1, -1)
 GUICtrlCreateGroup("", -99, -99, 1, 1)
 
 $y+= 51

COCBot/GUI/MBR GUI Design Child Bot - Stats.au3

@@ -20,7 +20,6 @@ Global $LastControlToHide = GUICtrlCreateDummy()
 Global $iPrevState[$LastControlToHide + 1]
 ;~ -------------------------------------------------------------
 
-$hGUI_STATS = GUICreate("", $_GUI_MAIN_WIDTH - 28, $_GUI_MAIN_HEIGHT - 255 - 28, 5, 25, BitOR($WS_CHILD, $WS_TABSTOP), -1, $hGUI_BOT)
 ;GUISetBkColor($COLOR_WHITE, $hGUI_STATS)
 
 GUISwitch($hGUI_STATS)
@@ -206,7 +205,7 @@ $hGUI_STATS_TAB_ITEM1 = GUICtrlCreateTabItem(GetTranslated(600,38,"Gain"))
 			GUICtrlSetState(-1,$GUI_HIDE)
 			$LegendLeague = GUICtrlCreateIcon(@ScriptDir & "\images\League\Legend.ico",-1, $x - 2, $y - 2, 64, 64)
 			GUICtrlSetState(-1,$GUI_HIDE)
-			
+
 			$lblLeague = GUICtrlCreateLabel("", $x + 20, $y + 50, 64, 64, $SS_CENTER)
 			GUICtrlSetFont($lblLeague, 12, $FW_BOLD)
 			GUICtrlSetColor($lblLeague, $COLOR_BLACK)