Updates

Fixed another DLL error, fix townhall level reporting in search results,
fix archer color detection

Author: codebroken

BrokenBot.au3

@@ -3,12 +3,12 @@
 #pragma compile(Icon, "BrokenBot.org\images\icons\brokenbot.ico")
 #pragma compile(FileDescription, BrokenBot.org - Clash of Clans Bot)
 #pragma compile(ProductName, BrokenBot.org - Clash of Clans Bot)
-#pragma compile(ProductVersion, 2.5.2)
-#pragma compile(FileVersion, 2.5.2)
+#pragma compile(ProductVersion, 2.5.3)
+#pragma compile(FileVersion, 2.5.3)
 
 #include <GUIConstants.au3>
 
-$sBotVersion = "2.5.2"
+$sBotVersion = "2.5.3"
 $sBotTitle = "BrokenBot.org - Break FREE - v" & $sBotVersion
 
 Global $StartupLanguage = IniRead(@ScriptDir & "\config\default.ini", "config", "language", "English")
@@ -70,8 +70,7 @@ If IsArray($CmdLine) Then
 	EndIf
 EndIf
 
-_CaptureRegion()
-Local $hHBitmap = _GDIPlus_BitmapCreateHBITMAPFromBitmap($hBitmap)
+$hHBitmap = _ScreenCapture_Capture("", 0, 0, 860, 720)
 $ret = DllCall(@ScriptDir & "\BrokenBot.org\BrokenBot32.dll", "str", "BrokenBotRedLineCheck", "ptr", $hHBitmap, "int", 1, "int", 1, "int", 0, "int", 0, "int", 0)
 _WinAPI_DeleteObject($hHBitmap)
 If Not IsArray($ret) Then

BrokenBot.exe

@@ -400,7 +400,7 @@ msgWanted = "Wanted:"
 msgGot = "Got:"
 msgVariance = "Variance:"
 msgNoNextButton = "Cannot locate Next button, Restarting Bot"
-msgMidAttack = "MidAttack ResChk:"
+msgMidAttack = "Mid-attack resource check:"
 msgSearchingMatch = "Searching for match..."
 msgOOSAlreadySlow = "Out of sync! Already searching slowly, not changing anything."
 msgOOSSlowingSearch = "Out of sync! Slowing search speed by 0.5 secs."

BrokenBot.org/languages/English.ini

@@ -334,3 +334,5 @@ Global $SpellLightningY = 461
 Global $SpellRageX = 650
 Global $SpellRageY = 372
 Global $LabPos[2]
+
+Global $FontSize

COCBot/Global Variables.au3

@@ -32,7 +32,7 @@ Global $CampFull[4] = [328, 535, 0xD03840, 20] ;
 Global $DropTrophiesStartPoint = [34, 310]
 Global $TrainBtn[4] = [541, 602, 0x728BB0, 20] ;
 Global $TrainBarbarian[4] = [261, 366, 0x39D8E0, 20] ;
-Global $TrainArcher[4] = [369, 366, 0x39D8E0, 20] ;
+Global $TrainArcher[4] = [369, 366, 0x2DA7B3, 20] ;
 Global $TrainGiant[4] = [475, 366, 0x3DD8E0, 20] ;
 Global $TrainGoblin[4] = [581, 366, 0x39D8E0, 20] ;
 Global $TrainWallbreaker[4] = [688, 366, 0x3AD8E0, 20] ;

COCBot/functions/Config/ScreenCoordinates.au3

@@ -146,4 +146,10 @@ Func readConfig() ;Reads config and sets it to the variables
 	Next
 	$LabPos[0] = IniRead($config, "position", "LabPosX", "")
 	$LabPos[1] = IniRead($config, "position", "LabPosY", "")
+
+	;---------------------------------------------------------------------------------------
+	; Hidden settings ----------------------------------------------------------------------
+	;---------------------------------------------------------------------------------------
+	; These settings can be read in from config but aren't found in the GUI
+	$FontSize = IniRead($config, "hidden", "fontsize", "8.5")
 EndFunc   ;==>readConfig

COCBot/functions/Config/readConfig.au3

@@ -8,6 +8,7 @@ EndFunc   ;==>SetLog
 Func _GUICtrlRichEdit_AppendTextColor($hWnd, $sText, $iColor)
 	Local $iLength = _GUICtrlRichEdit_GetTextLength($hWnd, True, True)
 	Local $iCp = _GUICtrlRichEdit_GetCharPosOfNextWord($hWnd, $iLength)
+	_GUICtrlRichEdit_SetFont($hWnd, $FontSize)
 	_GUICtrlRichEdit_AppendText($hWnd, $sText)
 	_GUICtrlRichEdit_SetSel($hWnd, $iCp - 1, $iLength + StringLen($sText))
 	_GUICtrlRichEdit_SetCharColor($hWnd, $iColor)

COCBot/functions/Other/SetLog.au3

@@ -28,8 +28,8 @@ Func CheckPixel($tab)
 		Return True
 	Else
 		SetLog(GetLangText("msgLocationX") & $tab[0] & " Y:" & $tab[1], $COLOR_RED)
-		SetLog(GetLangText("msgWanted") & _GetPixelColor($tab[0], $tab[1]), $COLOR_RED)
-		SetLog(GetLangText("msgGot") & Hex($tab[2], 6), $COLOR_RED)
+		SetLog(GetLangText("msgGot") & _GetPixelColor($tab[0], $tab[1]), $COLOR_RED)
+		SetLog(GetLangText("msgWanted") & Hex($tab[2], 6), $COLOR_RED)
 		SetLog(GetLangText("msgVariance") & $tab[3], $COLOR_RED)
 		Return False
 	EndIf

COCBot/functions/Pixels/_ColorCheck.au3

@@ -93,7 +93,7 @@ Func Standard_Search()
 						If $conditionlogstr <> "Dead Base (" Then
 							$conditionlogstr = $conditionlogstr & ";"
 						EndIf
-						$conditionlogstr = $conditionlogstr & " Max Townhall: " & $MaxDeadTH
+						$conditionlogstr = $conditionlogstr & " Max Townhall: " & $THText[$MaxDeadTH]
 					EndIf
 					If IsChecked($chkDeadMeetTHO) Then
 						If $conditionlogstr <> "Dead Base (" Then
@@ -129,7 +129,7 @@ Func Standard_Search()
 						If $conditionlogstr <> "Live Base (" Then
 							$conditionlogstr = $conditionlogstr & ";"
 						EndIf
-						$conditionlogstr = $conditionlogstr & " Max Townhall: " & $MaxTH
+						$conditionlogstr = $conditionlogstr & " Max Townhall: " & $THText[$MaxTH]
 					EndIf
 					If IsChecked($chkMeetTHO) Then
 						If $conditionlogstr <> "Live Base (" Then

COCBot/functions/Strategies/Standard/Search.au3

@@ -1,5 +1,5 @@
 # BrokenBot.org - Clash of Clans Bot
-Latest version: 2.5.2
+Latest version: 2.5.3
 
 ## Community
 Forums available for discussion at: http://brokenbot.org/