v2.8.0

speedBoost, PushBullet fixes, image recognition

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.7.1)
-#pragma compile(FileVersion, 2.7.1)
+#pragma compile(ProductVersion, 2.8.0)
+#pragma compile(FileVersion, 2.8.0)
 
 #include <GUIConstants.au3>
 
-$sBotVersion = "2.7.1"
+$sBotVersion = "2.8.0"
 $sBotTitle = "BrokenBot.org - Break FREE - v" & $sBotVersion
 
 If FileExists (@ScriptDir & "\.developer") Then

BrokenBot.exe

@@ -6,7 +6,7 @@
 Func checkDarkElix()
 	_CaptureRegion()
 	$sendHBitmap = _GDIPlus_BitmapCreateHBITMAPFromBitmap($hBitmap)
-	$res = DllCall(@ScriptDir & "\BrokenBot.org\BrokenBot32.dll", "str", "BrokenBotMatchBuilding", "ptr", $sendHBitmap, "int", 13, "int", 3, "int", 1, "int", 1)
+	$res = DllCall(@ScriptDir & "\BrokenBot.org\BrokenBot32.dll", "str", "BrokenBotMatchBuilding", "ptr", $sendHBitmap, "int", 13, "int", 3, "int", 1, "int", 1, "int", (IsChecked($chkSpeedBoost) ? (1) : (0)))
 	_WinAPI_DeleteObject($sendHBitmap)
 	If IsArray($res) Then
 		If $res[0] = -1 Then

BrokenBot.org/BrokenBot32.dll

@@ -6,7 +6,7 @@
 Func checkTownhall()
 	_CaptureRegion()
 	$sendHBitmap = _GDIPlus_BitmapCreateHBITMAPFromBitmap($hBitmap)
-	$res = DllCall(@ScriptDir & "\BrokenBot.org\BrokenBot32.dll", "str", "BrokenBotMatchBuilding", "ptr", $sendHBitmap, "int", 1, "int", 3, "int", 1, "int", 1)
+	$res = DllCall(@ScriptDir & "\BrokenBot.org\BrokenBot32.dll", "str", "BrokenBotMatchBuilding", "ptr", $sendHBitmap, "int", 1, "int", 3, "int", 1, "int", 1, "int", (IsChecked($chkSpeedBoost) ? (1) : (0)))
 	_WinAPI_DeleteObject($sendHBitmap)
 	If IsArray($res) Then
 		If $res[0] = -1 Then
@@ -37,8 +37,8 @@ Func checkTownhall()
 		EndIf
 	Else
 		SetLog(GetLangText("msgDLLFailure"), $COLOR_RED)
-		$DEx = 0
-		$DEy = 0
+		$THx = 0
+		$THy = 0
 		Return "-" ; return 0
 	EndIf
 EndFunc   ;==>checkTownhall

BrokenBot.org/functions/ImageSearch/checkDarkElix.au3

@@ -26,13 +26,15 @@ Func ChkDisconnection($disconnected = False)
 	If _ImageSearch(@ScriptDir & "\images\Lost.bmp", 1, $dummyX, $dummyY, 50) = 1 Then
 		If $dummyX > 320 and $dummyX < 350 and $dummyY > 330 and $dummyY < 350 Then
 			$disconnected = True
-			$speedBump += 500
-			If $speedBump > 5000 Then
-				$speedBump=5000
-				SetLog("Lost Connection! Already searching slowly, not changing anything.", $COLOR_RED)
-			Else
-				SetLog("Lost Connection! Slowing search speed by 0.5 secs.", $COLOR_RED)
-			EndIf
+			;Looks like lost connection is not related to search speed, test run without bump
+			SetLog("Lost Connection!", $COLOR_RED)
+;~ 			$speedBump += 500
+;~ 			If $speedBump > 5000 Then
+;~ 				$speedBump=5000
+;~ 				SetLog("Lost Connection! Already searching slowly, not changing anything.", $COLOR_RED)
+;~ 			Else
+;~ 				SetLog("Lost Connection! Slowing search speed by 0.5 secs.", $COLOR_RED)
+;~ 			EndIf
 		EndIf
 	EndIf
 

BrokenBot.org/functions/ImageSearch/checkTownhall.au3

@@ -11,7 +11,7 @@ Func collectResources()
 	  Do
 		  _CaptureRegion()
 		  $sendHBitmap = _GDIPlus_BitmapCreateHBITMAPFromBitmap($hBitmap)
-		  $res = DllCall(@ScriptDir & "\BrokenBot.org\BrokenBot32.dll", "str", "BrokenBotMatchBuilding", "ptr", $sendHBitmap, "int", 27, "int", 3, "int", 17, "int", 1)
+		  $res = DllCall(@ScriptDir & "\BrokenBot.org\BrokenBot32.dll", "str", "BrokenBotMatchBuilding", "ptr", $sendHBitmap, "int", 27, "int", 3, "int", 17, "int", 1, "int", (IsChecked($chkSpeedBoost) ? (1) : (0)))
 		  _WinAPI_DeleteObject($sendHBitmap)
 		 If IsArray($res) Then
 		   If $res[0] = -1 and NOT $foundResource Then

BrokenBot.org/functions/Strategies/SharedFunction.au3

@@ -339,6 +339,8 @@ btnCloseBR = "Close"
 heroSkill = "0 = Activate at low HP"
 heroSkill2 = ">0 = Activate after number of seconds"
 lblDisconnected = "Disconnected :"
+chkSpeedBoost = "speedBoost"
+chkSpeedBoostTip = "Uses more CPU, but will find buildings faster"
 msgMissing = "Missing required file!"
 msgMissing1 = "Your system appears to be missing a required file (MSVCP120.DLL) for redline detection to work."
 msgMissing2 = "You may continue but the bot will not work as intended."

BrokenBot.org/functions/Village/collectResources.au3

@@ -449,6 +449,9 @@ $cmbLanguage = GUICtrlCreateCombo("", 30, 130, 347, 20, BitOR($CBS_DROPDOWNLIST,
 PopulateLanguages()
 _GUICtrlComboBox_SetCurSel($cmbLanguage, _GUICtrlComboBox_FindStringExact($cmbLanguage, $StartupLanguage))
 
+$chkSpeedBoost = GUICtrlCreateCheckbox(GetLangText("chkSpeedBoost"), 40, 170, 100, 15)
+GUICtrlSetTip(-1, GetLangText("chkSpeedBoostTip"))
+
 $grpUpdate = GUICtrlCreateGroup(GetLangText("grpUpdate"), 20, 225, 375, 60)
 $chkUpdate = GUICtrlCreateCheckbox(GetLangText("chkUpdate"), 40, 250, 225, 15)
 GUICtrlSetBkColor($chkUpdate, $COLOR_WHITE)

BrokenBot.org/languages/English.ini

@@ -99,8 +99,12 @@ Global $prevTab = 0
 Global $slideOut = 0
 Global $slideIn = 0
 
-;Troop types
-Global Enum $eBarbarian, $eArcher, $eGiant, $eGoblin, $eWallbreaker, $eMinion, $eHog, $eValkyrie, $eKing, $eQueen, $eCastle, $eLSpell
+;Troop types, from 0 ~ 19 so far
+Global Enum $eBarbarian, $eArcher, $eGiant, $eGoblin, $eWallbreaker, _
+			$eBalloon, $eWizard, $eHealer, $eDragon, $ePekka, _
+			$eMinion, $eHog, $eValkyrie, $eGolem, $eWitch, _
+			$eLavaHound, _
+			$eKing, $eQueen, $eCastle, $eLSpell
 
 ;Attack Settings
 ; Shift outer corners 1 pixel for more random drop space