Merge pull request #31 from codebroken/beta

Update master

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

BrokenBot.exe

@@ -40,8 +40,8 @@ Func ChkDisconnection($disconnected = False)
 		;increase disconnect counts
 		GUICtrlSetData($lblresultsearchdisconnected, GUICtrlRead($lblresultsearchdisconnected) + 1)
 		If $DebugMode = 1 Then _GDIPlus_ImageSaveToFile($hBitmap, $dirDebug & "DisConnt-" & @HOUR & @MIN & @SEC & ".png")
-		If $PushBulletEnabled = 1 Then
 
+		If $PushBulletEnabled = 1 and IsChecked($lbldisconnect) Then
 			Local $iCount = _FileCountLines($sLogPath)
 			Local $myLines = ""
 			Local $i

BrokenBot.org/functions/Strategies/SharedFunction.au3

@@ -63,7 +63,7 @@ AtkSpeed = "Deploy Speed"
 lblUnitDelay = "Unit Delay:"
 lblWaveDelay = "Wave Delay:"
 Randomspeedatk = "Random Speeds"
-lblAttackdelay = "Delays of troops deployment speed, 1 (fast) = like a Bot, 10 (slow) = Like a Human. Random will make bot more varied and closer to a person."
+lblAttackdelay = "Delays of troops deployment speed, 1 (fast) = like a crazy bot, 10 (slow) = Like a slow human. Speeds always randomized to look less bot-like."
 pageDonateSettings = "Donate/Request"
 Barbarians = "Troop 1"
 chkDonateAll = "Donate to All"
@@ -118,19 +118,21 @@ lblpushbulletremoteTip = "Enables pushbullet remote function"
 lblpushbulletdelete = "Delete Msg on Start"
 lblpushbulletdeleteTip = "Will delete your messages on start button click"
 lblpushmessage = "Push Messages As Text"
-lblvillagereport = "Village Report"
+lblvillagereport = "Hourly Village Report"
 lblmatchfound = "Match Found"
 lbllastraid = "Last Raid"
 lblfreebuilder = "Free Builder"
+lbldisconnect = "Disconnection"
 lblpushbulletloot = "As JPG"
+lblpushuser = "Enter user name here to get user specific info and multi-bot control"
 UseJPG = "Last Raid"
 UseJPGTip = "Attach the loot jpg file in push message"
 UseAttackJPG = "Attack"
 UseAttackJPGTip = "Attach the attack jpg file in push message"
-lblpushbullet2 = "PushBullet Remote"
+lblpushbullet2 = "PushBullet Multi-user"
 pushbullettoken2 = "You can remotely control your bot using the following command format"
 pushbullettoken3 = "Enter the command in the title of the message"
-pushbullettoken4 = "Bot <command> where <command> is:"
+pushbullettoken4 = "Bot <command> <user>    Where <command> is:"
 pushbullettoken5 = "Pause - pause the bot"
 pushbullettoken6 = "Resume - resume the bot"
 pushbullettoken7 = "Stats - send bot current statistics"
@@ -696,4 +698,5 @@ pushFBf = " available!"
 pushVR = "Village Report"
 pushLR = "Last Raid Report:"
 pushLRb = "Gain: \n["
-pushBS = "Base Searched:"
+pushBS = "Base Searched:"
+pushLootA = "Loot Available:"

BrokenBot.org/languages/English.ini

@@ -40,8 +40,6 @@ Func GUIControl($hWind, $iMsg, $wParam, $lParam)
 						chkRequest()
 					Case $tabMain
 						tabMain()
-					Case $Randomspeedatk
-						Randomspeedatk()
 					Case $chkNoAttack
 						If IsChecked($chkNoAttack) Then
 							If IsChecked($lblpushbulletenabled) Then
@@ -159,6 +157,8 @@ Func btnStart()
 		EndIf
 		GUICtrlSetState($pageGeneral, $GUI_SHOW)
 		$FirstAttack = True
+		; Set hourly village report timer
+		$PushBulletvillagereportTimer = TimerInit()
 
 		CreateLogFile()
 
@@ -468,18 +468,6 @@ Func chkRequest()
 	EndIf
 EndFunc   ;==>chkRequest
 
-Func Randomspeedatk()
-	If IsChecked($Randomspeedatk) Then
-		$iRandomspeedatk = 1
-		GUICtrlSetState($cmbUnitDelay, $GUI_DISABLE)
-		GUICtrlSetState($cmbWaveDelay, $GUI_DISABLE)
-	Else
-		$iRandomspeedatk = 0
-		GUICtrlSetState($cmbUnitDelay, $GUI_ENABLE)
-		GUICtrlSetState($cmbWaveDelay, $GUI_ENABLE)
-	EndIf
-EndFunc   ;==>Randomspeedatk
-
 Func tabMain()
 	If _GUICtrlTab_GetCurSel($tabMain) = 0 Then
 		ControlShow("", "", $txtLog)
@@ -607,6 +595,8 @@ Func lblpushbulletenabled()
 		GUICtrlSetState($lblpushbulletdelete, $GUI_ENABLE)
 		GUICtrlSetState($lblvillagereport, $GUI_ENABLE)
 		GUICtrlSetState($lblmatchfound, $GUI_ENABLE)
+		GUICtrlSetState($lblfreebuilder, $GUI_ENABLE)
+		GUICtrlSetState($lbldisconnect, $GUI_ENABLE)
 		GUICtrlSetState($lbllastraid, $GUI_ENABLE)
 		GUICtrlSetState($UseJPG, $GUI_ENABLE)
 	Else
@@ -616,6 +606,8 @@ Func lblpushbulletenabled()
 		GUICtrlSetState($lblpushbulletdelete, $GUI_DISABLE)
 		GUICtrlSetState($lblvillagereport, $GUI_DISABLE)
 		GUICtrlSetState($lblmatchfound, $GUI_DISABLE)
+		GUICtrlSetState($lblfreebuilder, $GUI_DISABLE)
+		GUICtrlSetState($lbldisconnect, $GUI_DISABLE)
 		GUICtrlSetState($lbllastraid, $GUI_DISABLE)
 		GUICtrlSetState($UseJPG, $GUI_DISABLE)
 	EndIf
@@ -633,8 +625,7 @@ Func btnBugRep()
 		EndIf
 	Next
 
-	GUICtrlSetData($inpSettings, "")
-	$firstLine = True
+	GUICtrlSetData($inpSettings, "Global Settings:")
 	If FileExists($config) Then
 		$hConfig = FileOpen($config)
 		While True
@@ -643,15 +634,26 @@ Func btnBugRep()
 			If StringInStr($strNextLine, "accounttoken=") Then
 				$strNextLine = "accounttoken=REDACTED"
 			EndIf
-			If Not $firstLine Then
-				GUICtrlSetData($inpSettings, GUICtrlRead($inpSettings) & @CRLF & $strNextLine)
-			Else
-				$firstLine = False
-				GUICtrlSetData($inpSettings, $strNextLine)
+			If StringInStr($strNextLine, "user=") Then
+				$strNextLine = "user=REDACTED"
 			EndIf
+			GUICtrlSetData($inpSettings, GUICtrlRead($inpSettings) & @CRLF & $strNextLine)
+		WEnd
+		FileClose($hConfig)
+	Else
+		GUICtrlSetData($inpSettings, GUICtrlRead($inpSettings) & @CRLF & "No settings file found")
+	EndIf
+	GUICtrlSetData($inpSettings, GUICtrlRead($inpSettings) & @CRLF & @CRLF & "Strategy settings:")
+	If FileExists($dirStrat & GUICtrlRead($lstStrategies) & ".ini") Then
+		$hConfig = FileOpen($dirStrat & GUICtrlRead($lstStrategies) & ".ini")
+		While True
+			$strNextLine = FileReadLine($hConfig)
+			If @error Then ExitLoop
+			GUICtrlSetData($inpSettings, GUICtrlRead($inpSettings) & @CRLF & $strNextLine)
 		WEnd
+		FileClose($hConfig)
 	Else
-		GUICtrlSetData($inpSettings, "No log file found")
+		GUICtrlSetData($inpSettings, GUICtrlRead($inpSettings) & @CRLF & "No strategy settings file found")
 	EndIf
 
 	GUISetState(@SW_DISABLE, $frmBot)

COCBot/GUI Control.au3

@@ -81,8 +81,6 @@ GUICtrlSetData(-1, "1|2|3|4|5|6|7|8|9|10", "5")
 $lblWaveDelay = GUICtrlCreateLabel(GetLangText("lblWaveDelay"), 155, 292, 75, 17)
 $cmbWaveDelay = GUICtrlCreateCombo("", 225, 289, 50, 17, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
 GUICtrlSetData(-1, "1|2|3|4|5|6|7|8|9|10", "5")
-$Randomspeedatk = GUICtrlCreateCheckbox(GetLangText("Randomspeedatk"), 295, 292, 100, 17)
-GUICtrlSetOnEvent(-1, "Randomspeedatk")
 $lblAttackdelay = GUICtrlCreateLabel(GetLangText("lblAttackdelay"), 35, 315, 350, 67, $SS_CENTER)
 GUICtrlCreateGroup("", -99, -99, 1, 1)
 
@@ -222,24 +220,26 @@ GUICtrlSetTip(-1, GetLangText("lblpushbulletenabledTip"))
 $lblpushbulletdebug = GUICtrlCreateCheckbox(GetLangText("lblpushbulletdebug"), 100, 65, 60, 17)
 GUICtrlSetTip(-1, GetLangText("lblpushbulletdebugTip"))
 $lblpushbulletremote = GUICtrlCreateCheckbox(GetLangText("lblpushbulletremote"), 170, 65, 60, 17)
-GUICtrlSetTip(-1, GetLangText("lblpushbulletremoteTip"))
+GUICtrlSetTip(-1, GetLangText("pushbullettoken2") & @CRLF & GetLangText("pushbullettoken3") & @CRLF & GetLangText("pushbullettoken4") & @CRLF & @CRLF & GetLangText("pushbullettoken5") & @CRLF & GetLangText("pushbullettoken6") & @CRLF & GetLangText("pushbullettoken7") & @CRLF & GetLangText("pushbullettoken8") & @CRLF & GetLangText("pushbullettoken9"))
 $lblpushbulletdelete = GUICtrlCreateCheckbox(GetLangText("lblpushbulletdelete"), 240, 65, 120, 17)
 GUICtrlSetTip(-1, GetLangText("lblpushbulletdeleteTip"))
 
-$lblpushmessage = GUICtrlCreateGroup(GetLangText("lblpushmessage"), 30, 115, 200, 80)
-$lblvillagereport = GUICtrlCreateCheckbox(GetLangText("lblvillagereport"), 40, 140, 95, 17)
+$lblpushmessage = GUICtrlCreateGroup(GetLangText("lblpushmessage"), 30, 115, 200, 88)
+$lbldisconnect = GUICtrlCreateCheckbox(GetLangText("lbldisconnect"), 40, 140, 95, 17)
 $lblmatchfound = GUICtrlCreateCheckbox(GetLangText("lblmatchfound"), 40, 160, 95, 17)
 $lbllastraid = GUICtrlCreateCheckbox(GetLangText("lbllastraid"), 140, 140, 80, 17)
 $lblfreebuilder = GUICtrlCreateCheckbox(GetLangText("lblfreebuilder"), 140, 160, 80, 17)
+$lblvillagereport = GUICtrlCreateCheckbox(GetLangText("lblvillagereport"), 40, 180, 150, 17)
 
-$lblpushbulletloot = GUICtrlCreateGroup(GetLangText("lblpushbulletloot"), 240, 115, 140, 80)
+$lblpushbulletloot = GUICtrlCreateGroup(GetLangText("lblpushbulletloot"), 240, 115, 140, 88)
 $UseJPG = GUICtrlCreateCheckbox(GetLangText("UseJPG"), 260, 135, 60, 17)
 GUICtrlSetTip(-1, GetLangText("UseJPGTip"))
 $UseAttackJPG = GUICtrlCreateCheckbox(GetLangText("UseAttackJPG"), 260, 155, 60, 17)
 GUICtrlSetTip(-1, GetLangText("UseAttackJPGTip"))
 
-$lblpushbullet2 = GUICtrlCreateGroup(GetLangText("lblpushbullet2"), 20, 210, 370, 140)
-$pushbullettoken2 = GUICtrlCreateLabel(GetLangText("pushbullettoken2") & @CRLF & GetLangText("pushbullettoken3") & @CRLF & GetLangText("pushbullettoken4") & @CRLF & @CRLF & GetLangText("pushbullettoken5") & @CRLF & GetLangText("pushbullettoken6") & @CRLF & GetLangText("pushbullettoken7") & @CRLF & GetLangText("pushbullettoken8") & @CRLF & GetLangText("pushbullettoken9"), 25, 230, 340, 350, $SS_LEFT)
+$lblpushbullet2 = GUICtrlCreateGroup(GetLangText("lblpushbullet2"), 20, 210, 370, 70)
+$lblpushUser = GUICtrlCreateLabel(GetLangText("lblpushuser"), 30, 230, 350, 20)
+$inppushUser = GUICtrlCreateInput("", 30, 250, 150, 20)
 
 ; ---------------------------------------------------------------------------------------------------------------------
 ; Misc ----------------------------------------------------------------------------------------------------------------

COCBot/GUI Design.au3

@@ -282,13 +282,16 @@ Global $PushBullettype = 0
 Global $PushBulletattacktype = 0
 Global $FileName = ""
 Global $PushBulletvillagereport = 0
+Global $PushBulletvillagereportTimer
+Global $PushBulletvillagereportInterval = 3600000 ; an hour
 Global $PushBulletmatchfound = 0
 Global $PushBulletlastraid = 0
 Global $PushBullettotalgain = 0
 Global $PushBulletdebug = 0
 Global $PushBulletremote = 0
 Global $PushBulletdelete = 0
 Global $PushBulletfreebuilder = 0
+Global $PushBulletdisconnection = 0
 Global $sLogFileName
 Global $Raid = 0
 Global $buildernotified = False
@@ -300,12 +303,14 @@ Global $SearchCost = 0
 Global $sTimerRC
 Global $PauseBot = False
 
+;Match found
+Global $MatchFoundText =""
+
 ;Last Raid
 Global $LastRaidGold = 0
 Global $LastRaidElixir = 0
 Global $LastRaidDarkElixir = 0
 Global $LastRaidTrophy = 0
-
 ;UpTroops
 Global $ichkLab
 Global $icmbLaboratory

COCBot/Global Variables.au3

@@ -84,13 +84,6 @@ Func applyConfig() ;Applies the data from config to the controls in GUI
 	_GUICtrlComboBox_SetCurSel($cmbUnitDelay, $icmbUnitDelay)
 	_GUICtrlComboBox_SetCurSel($cmbWaveDelay, $icmbWaveDelay)
 
-	If $iRandomspeedatk = 1 Then
-		GUICtrlSetState($Randomspeedatk, $GUI_CHECKED)
-	Else
-		GUICtrlSetState($Randomspeedatk, $GUI_UNCHECKED)
-	EndIf
-	Randomspeedatk()
-
 ;Lab
     If $ichkLab = 1 Then
         GUICtrlSetState($chkLab, $GUI_CHECKED)
@@ -217,6 +210,12 @@ Func applyConfig() ;Applies the data from config to the controls in GUI
 		GUICtrlSetState($lblfreebuilder, $GUI_UNCHECKED)
 	EndIf
 
+	If $PushBulletdisconnection = 1 Then
+		GUICtrlSetState($lbldisconnect, $GUI_CHECKED)
+	Else
+		GUICtrlSetState($lbldisconnect, $GUI_UNCHECKED)
+	EndIf
+
 	If $PushBullettype = 1 Then
 		GUICtrlSetState($UseJPG, $GUI_CHECKED)
 	Else

COCBot/functions/Config/applyConfig.au3

@@ -17,7 +17,6 @@ Func readConfig() ;Reads config and sets it to the variables
 	;---------------------------------------------------------------------------------------
 	$icmbUnitDelay = IniRead($config, "attack", "UnitD", "0")
 	$icmbWaveDelay = IniRead($config, "attack", "WaveD", "0")
-	$iRandomspeedatk = IniRead($config, "attack", "randomatk", "0")
 
 	;---------------------------------------------------------------------------------------
 	; Donate settings ----------------------------------------------------------------------
@@ -62,6 +61,8 @@ Func readConfig() ;Reads config and sets it to the variables
 	$PushBulletremote = IniRead($config, "notification", "remote", "0")
 	$PushBulletdelete = IniRead($config, "notification", "delete", "0")
 	$PushBulletfreebuilder = IniRead($config, "notification", "freebuilder", "0")
+	$PushBulletdisconnection = IniRead($config, "notification", "disconnection", "0")
+	GUICtrlSetData($inppushuser, IniRead($config, "notification", "user", ""))
 
 	;---------------------------------------------------------------------------------------
 	; Misc settings ------------------------------------------------------------------------

COCBot/functions/Config/readConfig.au3

@@ -28,7 +28,6 @@ Func saveConfig() ;Saves the controls settings to the config
 	;---------------------------------------------------------------------------------------
 	IniWrite($config, "attack", "UnitD", _GUICtrlComboBox_GetCurSel($cmbUnitDelay))
 	IniWrite($config, "attack", "WaveD", _GUICtrlComboBox_GetCurSel($cmbWaveDelay))
-	IniWrite($config, "attack", "randomatk", GUICtrlRead($Randomspeedatk))
 	;---------------------------------------------------------------------------------------
 	; Donate settings ----------------------------------------------------------------------
 	;---------------------------------------------------------------------------------------
@@ -185,6 +184,11 @@ Func saveConfig() ;Saves the controls settings to the config
 	Else
 		IniWrite($config, "notification", "freebuilder", 0)
 	EndIf
+	If IsChecked($lbldisconnect) Then
+		IniWrite($config, "notification", "disconnection", 1)
+	Else
+		IniWrite($config, "notification", "disconnection", 0)
+	EndIf
 	If IsChecked($lblpushbulletdebug) Then
 		IniWrite($config, "notification", "debug", 1)
 	Else
@@ -211,6 +215,7 @@ Func saveConfig() ;Saves the controls settings to the config
 	Else
 		IniWrite($config, "notification", "attackimage", 0)
 	EndIf
+	IniWrite($config, "notification", "user", GUICtrlRead($inppushuser))
 
 	;---------------------------------------------------------------------------------------
 	; Misc settings ------------------------------------------------------------------------