* **V7.7.4**

* April Update Fixed loot cart
* April Update Fixed building info positions
* April Update Fixed building icon positions
* April Update Fixed auto upgrade upgrade button position
* April Update Fixed Okay click
* April Update Fixed star bonus
* April Update Fixed wall upgrade
* April Update Fixed Builder Base Upgrade
* April Update Added auto upgrade wall exclude
* Fixed main screen detection
* Fixed zoomout / village measuring in rare cases
* Fixed siege not dropping in CSV attack
* Fixed zoom out mode setting not saved
* Fixed BlueStacks v4 not showing the alternative launcher like nova launcher when started
* Fixed shared folder sometimes not being initialized
* Fixed pull/push of shared_prefs when profile contain special characters
* Fixed KOPLAYER 2.0 additional instance support and screen resolution detection
* Fixed Rage detected as Skeleton spell
* Fixed train cost by @DUC4TI
* Fixed Nox v6.2.8 nox_adb.exe crash by replacing it with MyBot.run.adb.dmmy.exe
* Improved shared folder detection
* Imporved zoomout behaviour when "Update shared_prefs" is enabled and selected in zoomout-mode to restart CoC rather than zooming out
* Improved Builder Base zoomout when Bot/Android "Update shared_prefs" is enabled
* Improved undocked Android Emulator windows to be grouped in taskbar
* Updated adb version to 28.0.2 (March 2019)
* Removed Rearm as it is not needed anymore (April 2019)

CHANGELOG

@@ -1,4 +1,32 @@
-* **V7.7.3**
+* **V7.7.4**
+* April Update Fixed loot cart
+* April Update Fixed building info positions
+* April Update Fixed building icon positions
+* April Update Fixed auto upgrade upgrade button position
+* April Update Fixed Okay click
+* April Update Fixed star bonus
+* April Update Fixed wall upgrade
+* April Update Fixed Builder Base Upgrade
+* April Update Added auto upgrade wall exclude
+* Fixed main screen detection
+* Fixed zoomout / village measuring in rare cases
+* Fixed siege not dropping in CSV attack
+* Fixed zoom out mode setting not saved
+* Fixed BlueStacks v4 not showing the alternative launcher like nova launcher when started
+* Fixed shared folder sometimes not being initialized
+* Fixed pull/push of shared_prefs when profile contain special characters
+* Fixed KOPLAYER 2.0 additional instance support and screen resolution detection
+* Fixed Rage detected as Skeleton spell
+* Fixed train cost by @DUC4TI
+* Fixed Nox v6.2.8 nox_adb.exe crash by replacing it with MyBot.run.adb.dmmy.exe
+* Improved shared folder detection
+* Imporved zoomout behaviour when "Update shared_prefs" is enabled and selected in zoomout-mode to restart CoC rather than zooming out
+* Improved Builder Base zoomout when Bot/Android "Update shared_prefs" is enabled
+* Improved undocked Android Emulator windows to be grouped in taskbar
+* Updated adb version to 28.0.2 (March 2019)
+* Removed Rearm as it is not needed anymore (April 2019)
+
+* **V7.7.3**
 * Added Telegram notification when the lab is idle by @mitzu2250
 * Added Google Play Services button under Bot/Android Play Store to manually install/update Google Play Services
 * Added conditions "TH", "SIEGE" and "TH+SIEGE" to csv WAIT command, to break the wait early thx @Fahid.Mahmood for the inspiration

COCBot/GUI/MBR GUI Control BOT Options.au3

@@ -650,6 +650,7 @@ Func btnTestVillageSize()
 	BeginImageTest()
 	Local $currentRunState = $g_bRunState
 	$g_bRunState = True
+	$g_bRestart = False
 
 	_CaptureRegion()
 	_CaptureRegion2Sync()

COCBot/GUI/MBR GUI Control Child Upgrade.au3

@@ -440,7 +440,7 @@ Func chkResourcesToIgnore()
 EndFunc   ;==>chkResourcesToIgnore
 
 Func chkUpgradesToIgnore()
-	For $i = 0 To 12
+	For $i = 0 To 13
 		$g_iChkUpgradesToIgnore[$i] = GUICtrlRead($g_hChkUpgradesToIgnore[$i]) = $GUI_CHECKED ? 1 : 0
 	Next
 EndFunc   ;==>chkUpgradesToIgnore

COCBot/GUI/MBR GUI Control Tab Village.au3

@@ -14,20 +14,6 @@
 ; ===============================================================================================================================
 #include-once
 
-; Func chkTrap()
-	; If GUICtrlRead($g_hChkTrap) = $GUI_CHECKED Then
-		; $g_bChkTrap = True
-		; ;GUICtrlSetState($btnLocateTownHall, $GUI_SHOW)
-	; Else
-		; $g_bChkTrap = False
-		; ;GUICtrlSetState($btnLocateTownHall, $GUI_HIDE)
-	; EndIf
-; EndFunc   ;==>chkTrap
-
-; Func ChkCollect()
-	; $g_bChkCollect = (GUICtrlRead($g_hChkCollect) = $GUI_CHECKED)
-; EndFunc   ;==>ChkCollect
-
 Func chkRequestCCHours()
 	Local $bWasRedraw = SetRedrawBotWindow(False, Default, Default, Default, "chkRequestCCHours")
 

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

@@ -42,10 +42,9 @@ Func CreateBotAndroid()
 	$y += 25
 		GUICtrlCreateLabel(GetTranslatedFileIni("Android", "LblZoomoutMode", "Zoomout Mode"), $x - 8, $y + 5, 180, 22, $SS_RIGHT)
 		$g_hCmbAndroidZoomoutMode = GUICtrlCreateCombo("", $x - 8 + 180 + 5, $y, 200, -1, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
-			GUICtrlSetData(-1, GetTranslatedFileIni("Android", "CmbZoomoutMode", "Default|Use Minitouch script|Use dd script|WinAPI"))
+			GUICtrlSetData(-1, GetTranslatedFileIni("Android", "CmbZoomoutMode", "Default|Use Minitouch script|Use dd script|WinAPI|Update shared_prefs"))
 			_GUICtrlSetTip(-1, GetTranslatedFileIni("Android", "CmbZoomoutMode_Info", 'Control how the zoomout is done. Default chooses usually Minitouch script, which is most stable.'))
 			_GUICtrlComboBox_SetCurSel(-1, $g_iAndroidZoomoutMode)
-			GUICtrlSetOnEvent(-1, "cmbAndroidBackgroundMode")
 	$y += 25
 		$g_hChkAndroidAdbClick = GUICtrlCreateCheckbox(GetTranslatedFileIni("Android", "ChkAdbClick", "Use minitouch for Click"), $x, $y, -1, -1)
 			_GUICtrlSetTip(-1, GetTranslatedFileIni("Android", "ChkAdbClick_Info", "Use minitouch for Android clicks.\r\nIf unchecked use WinAPI control messages."))

COCBot/GUI/MBR GUI Design Child VIllage - Upgrade.au3

@@ -48,7 +48,7 @@ Global $g_ahPicWallsLevel[14] = [-1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ;
 Global $g_hChkAutoUpgrade = 0, $g_hLblAutoUpgrade = 0, $g_hTxtAutoUpgradeLog = 0
 Global $g_hTxtSmartMinGold = 0, $g_hTxtSmartMinElixir = 0, $g_hTxtSmartMinDark = 0
 Global $g_hChkResourcesToIgnore[3] = [0, 0, 0]
-Global $g_hChkUpgradesToIgnore[13] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Global $g_hChkUpgradesToIgnore[14] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 
 Func CreateVillageUpgrade()
 
@@ -514,40 +514,44 @@ Func CreateAutoUpgradeSubTab()
 		$g_hChkUpgradesToIgnore[3] = GUICtrlCreateCheckbox("", $x + 200 - $xOff, $y + $yRow1 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 
-		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnCC, $x + 275, $y + $yRow1, $iIconSize, $iIconSize)
-		$g_hChkUpgradesToIgnore[4] = GUICtrlCreateCheckbox("", $x + 290 - $xOff, $y + $yRow1 + $yChkOff, 17, 17)
+		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnCC, $x + 245, $y + $yRow1, $iIconSize, $iIconSize)
+		$g_hChkUpgradesToIgnore[4] = GUICtrlCreateCheckbox("", $x + 260 - $xOff, $y + $yRow1 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 
-		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnLaboratory, $x + 365, $y + $yRow1, $iIconSize, $iIconSize)
-		$g_hChkUpgradesToIgnore[5] = GUICtrlCreateCheckbox("", $x + 380 - $xOff, $y + $yRow1 + $yChkOff, 17, 17)
+		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnLaboratory, $x + 305, $y + $yRow1, $iIconSize, $iIconSize)
+		$g_hChkUpgradesToIgnore[5] = GUICtrlCreateCheckbox("", $x + 320 - $xOff, $y + $yRow1 + $yChkOff, 17, 17)
+			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
+
+		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnWall, $x + 365, $y + $yRow1, $iIconSize, $iIconSize)
+		$g_hChkUpgradesToIgnore[6] = GUICtrlCreateCheckbox("", $x + 380 - $xOff, $y + $yRow1 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnBarrack, $x + 5, $y + $yRow2, $iIconSize, $iIconSize)
-		$g_hChkUpgradesToIgnore[6] = GUICtrlCreateCheckbox("", $x + 20 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
+		$g_hChkUpgradesToIgnore[7] = GUICtrlCreateCheckbox("", $x + 20 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnDarkBarrack, $x + 50, $y + $yRow2, $iIconSize, $iIconSize)
-		$g_hChkUpgradesToIgnore[7] = GUICtrlCreateCheckbox("", $x + 65 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
+		$g_hChkUpgradesToIgnore[8] = GUICtrlCreateCheckbox("", $x + 65 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnSpellFactory, $x + 140, $y + $yRow2, $iIconSize, $iIconSize)
-		$g_hChkUpgradesToIgnore[8] = GUICtrlCreateCheckbox("", $x + 155 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
+		$g_hChkUpgradesToIgnore[9] = GUICtrlCreateCheckbox("", $x + 155 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnDarkSpellFactory, $x + 185, $y + $yRow2, $iIconSize, $iIconSize)
-		$g_hChkUpgradesToIgnore[9] = GUICtrlCreateCheckbox("", $x + 200 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
+		$g_hChkUpgradesToIgnore[10] = GUICtrlCreateCheckbox("", $x + 200 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnMine, $x + 275, $y + $yRow2, $iIconSize, $iIconSize)
-		$g_hChkUpgradesToIgnore[10] = GUICtrlCreateCheckbox("", $x + 290 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
+		$g_hChkUpgradesToIgnore[11] = GUICtrlCreateCheckbox("", $x + 290 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnCollector, $x + 320, $y + $yRow2, $iIconSize, $iIconSize)
-		$g_hChkUpgradesToIgnore[11] = GUICtrlCreateCheckbox("", $x + 335 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
+		$g_hChkUpgradesToIgnore[12] = GUICtrlCreateCheckbox("", $x + 335 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnDrill, $x + 365, $y + $yRow2, $iIconSize, $iIconSize)
-		$g_hChkUpgradesToIgnore[12] = GUICtrlCreateCheckbox("", $x + 380 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
+		$g_hChkUpgradesToIgnore[13] = GUICtrlCreateCheckbox("", $x + 380 - $xOff, $y + $yRow2 + $yChkOff, 17, 17)
 			GUICtrlSetOnEvent(-1, "chkUpgradesToIgnore")
 	GUICtrlCreateGroup("", -99, -99, 1, 1)
 

COCBot/GUI/MBR GUI Design Child Village - Misc.au3

@@ -138,15 +138,7 @@ Func CreateMiscNormalVillageSubTab()
 	GUICtrlCreateGroup("", -99, -99, 1, 1)
 
 	Local $x = 15, $y = 145
-	GUICtrlCreateGroup(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "Group_02", "Rearm, Collect, Clear"), $x -10, $y - 20, $g_iSizeWGrpTab3, 217)
-		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnTrap, $x + 7, $y, 24, 24)
-		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnXbow, $x + 32, $y, 24, 24)
-		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnInferno, $x + 57, $y, 24, 24)
-		$g_hChkTrap = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkTrap", "Rearm Traps && Reload Xbows and Infernos"), $x + 100, $y + 4, -1, -1)
-			_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkTrap_Info_01", "Check this to automatically Rearm Traps, Reload Xbows and Infernos (if any) in your Village."))
-			GUICtrlSetState(-1, $GUI_CHECKED)
-
-	$y += 35
+	GUICtrlCreateGroup(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "Group_02", "Collect, Clear"), $x -10, $y - 20, $g_iSizeWGrpTab3, 217)
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnMine, $x - 5, $y, 24, 24)
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnCollector, $x + 20, $y, 24, 24)
 		_GUICtrlCreateIcon($g_sLibIconPath, $eIcnDrill, $x + 45, $y, 24, 24)
@@ -343,7 +335,7 @@ Func CreateMiscBuilderBaseSubTab()
 			_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCollectBuildersBase_Info_01", "Check this to collect Ressources on the Builder Base"))
 		$g_hChkCleanBBYard = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCleanBBYard", "Remove Obstacles"), $x + 260, $y + 4, -1, -1)
 			_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCleanBBYard_Info_01", "Check this to automatically clear Yard from Trees, Trunks, etc."))
-			GUICtrlSetState (-1, $GUI_ENABLE)	
+			GUICtrlSetState (-1, $GUI_ENABLE)
 
 	$y += 32
 		GUICtrlCreateIcon($g_sLibIconPath, $eIcnClockTower, $x + 32, $y, 24, 24)

COCBot/MBR Functions.au3

@@ -266,7 +266,6 @@
 #include "functions\Village\LocateTownHall.au3"
 #include "functions\Village\LocateHeroesAltar.au3"
 #include "functions\Village\ProfileReport.au3"
-#include "functions\Village\ReArm.au3"
 #include "functions\Village\RequestCC.au3"
 #include "functions\Village\VillageReport.au3"
 #include "functions\Village\UpgradeBuilding.au3"

COCBot/MBR GUI Action.au3

@@ -41,6 +41,8 @@ Func BotStart($bAutostartDelay = 0)
 	$g_bSkipFirstZoomout = False
 	$g_bIsSearchLimit = False
 	$g_bIsClientSyncError = False
+	$g_bZoomoutFailureNotRestartingAnything = False
+	$g_bRestart = False
 
 	EnableControls($g_hFrmBotBottom, False, $g_aFrmBotBottomCtrlState)
 	;$g_iFirstAttack = 0
@@ -148,6 +150,7 @@ Func BotStop()
 	$g_bRunState = False
 	$g_bBotPaused = False
 	$g_bTogglePauseAllowed = True
+	$g_bRestart = False
 
 	;WinSetState($g_hFrmBotBottom, "", @SW_DISABLE)
 	Local $aCtrlState
@@ -192,7 +195,7 @@ Func BotStop()
 		If Not $g_bBotPaused Then $g_iTimePassed += Int(__TimerDiff($g_hTimerSinceStarted))
 		If ProfileSwitchAccountEnabled() And Not $g_bBotPaused Then $g_aiRunTime[$g_iCurAccount] += Int(__TimerDiff($g_ahTimerSinceSwitched[$g_iCurAccount]))
 		;AdlibUnRegister("SetTime")
-		$g_bRestart = True
+		;$g_bRestart = True
 
 	   If $g_hLogFile <> 0 Then
 		  FileClose($g_hLogFile)

COCBot/MBR Global Variables.au3

@@ -116,7 +116,8 @@ Global $g_bDebugOCRdonate = False ; Creates OCR/image data and simulate, but do
 Global $g_bDebugDisableZoomout = False
 Global $g_bVillageSearchAlwaysMeasure = False ; If enabled, every village is measured, even if not attacked
 Global $g_bDebugDisableVillageCentering = False
-Global $g_iAndroidZoomoutMode = 0 ; 0 = Default, 1 = ADB minitouch script, 2 = ADB dd script, 3 = WinAPI
+Global $g_iAndroidZoomoutMode = 0 ; 0 = Default, 1 = ADB minitouch script, 2 = ADB dd script, 3 = WinAPI, 4 = Update shared_prefs
+Global $g_bZoomoutFailureNotRestartingAnything = False
 ; <><><><> Only used to debug GDI memory leaks! <><><><>
 Global $g_iDebugGDICount = 0 ; monitor bot GDI Handle count, 0 = Disabled, <> 0 = Enabled
 ; <><><><> Only used to debug language translations! <><><><>
@@ -319,6 +320,7 @@ Global $g_iAndroidWindowWidth ; Expected Width of android window
 Global $g_iAndroidWindowHeight ; Expected height of android window
 Global $g_bAndroidAdbUseMyBot = True ; Use MyBot provided adb.exe and not the one from emulator
 Global $g_bAndroidAdbReplaceEmulatorVersion = True ; If True and MyBot.run adb.exe is available, Android provided adb.exe will be replaced to ensure MyBot.run adb.exe version is used
+Global $g_bAndroidAdbReplaceEmulatorVersionWithDummy = False ; If try (only used by never Nox) emulator adb is replaced with a dummy exe that does nothing
 Global $g_sAndroidAdbPath ; Path to executable HD-Adb.exe or adb.exe
 Global $g_sAndroidAdbGlobalOptions ; Additional adb global options like -P 5037 for port
 Global $g_sAndroidAdbDevice ; full device name ADB connects to
@@ -344,7 +346,7 @@ Global $g_iAndroidControlClickWindow = 0 ; 0 = Click the Android Control, 1 = Cl
 Global $g_iAndroidControlClickMode = 0 ; 0 = Use AutoIt ControlClick, 1 = Use _SendMessage
 Global $g_bAndroidCloseWithBot = False ; Close Android when bot closes
 Global $g_bAndroidInitialized = False
-Global $g_bUpdateSharedPrefs = False ; Update shared_prefs/storage_new.xml before pushing
+Global $g_bUpdateSharedPrefs = True ; Update shared_prefs/storage_new.xml before pushing
 
 Global $g_iAndroidProcessAffinityMask = 0
 
@@ -567,7 +569,7 @@ Global $g_iBotAction = $eBotNoAction
 Global $g_bBotMoveRequested = False ; should the bot be moved
 Global $g_bBotShrinkExpandToggleRequested = False ; should the bot be slided
 Global $g_bBotGuiModeToggleRequested = False ; GUI is changing
-Global $g_bRestart = False
+Global $g_bRestart = False ; CoC or Android got restarted
 Global $g_bRunState = False
 Global $g_bIdleState = False ; bot is in Idle() routine waiting for things to finish
 Global $g_bBtnAttackNowPressed = False ; Set to true if any of the 3 attack now buttons are pressed
@@ -646,23 +648,23 @@ Global Const $g_aiTroopCostPerLevel[$eTroopCount][10] = [ _
 		[8, 50, 80, 120, 200, 300, 400, 500, 600], _ 			        ; Archer
 		[9, 250, 750, 1250, 1750, 2250, 3000, 3500, 4000, 4500], _ 	    ; Giant
 		[7, 25, 40, 60, 80, 100, 150, 200], _ 				 	        ; Goblin
-		[8, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750], _          ; WallBreaker
-		[8, 2000, 2500, 3000, 3500, 4000, 4500, 5000, 5500], _ 	        ; Balloon
-		[9, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000, 5500], _    ; Wizard
-		[5, 5000, 6000, 8000, 10000, 15000], _					        ; Healer
-		[7, 18000, 20000, 22000, 24000, 26000, 28000, 30000], _         ; Dragon
-		[8, 21000, 24000, 27000, 30000, 33000, 35000, 37000, 39000], _  ; Pekka
-		[6, 10000, 11000, 12000, 13000, 14000, 15000], _ 			    ; BabyDragon
+		[8, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000], _          ; WallBreaker
+		[8, 1750, 2250, 2750, 3500, 4000, 4500, 5000, 5500], _ 	        ; Balloon
+		[9, 1000, 1400, 1800, 2200, 2600, 3000, 3400, 3800, 4200], _    ; Wizard
+		[5, 5000, 6000, 8000, 10000, 14000], _					        ; Healer
+		[7, 10000, 12000, 14000, 16000, 18000, 20000, 22000], _         ; Dragon
+		[8, 14000, 16000, 18000, 20000, 22500, 25000, 27500, 30000], _  ; Pekka
+		[6, 5000, 6000, 7000, 8000, 9000, 10000], _ 			    ; BabyDragon
 		[6, 4200, 4800, 5200, 5600, 6000, 6400], _  			        ; Miner
-		[3, 36000, 40000, 44000], _  		                 	        ; ElectroDragon
-		[8, 6, 7, 8, 9, 10, 11, 12, 13], _ 							    ; Minion
-		[8, 40, 45, 52, 58, 65, 90, 115, 140], _					    ; HogRider
-		[7, 70, 100, 130, 160, 190, 220, 250], _ 				 	    ; Valkyrie
-		[8, 300, 375, 450, 525, 600, 675, 750, 825], _ 				    ; Golem
-		[4, 175, 225, 275, 325], _ 								 	    ; Witch
+		[3, 28000, 32000, 36000], _  		                 	        ; ElectroDragon
+		[8, 4, 5, 6, 7, 8, 9, 10, 11], _ 							    ; Minion
+		[9, 30, 34, 38, 42, 48, 60, 80, 100, 120], _					    ; HogRider
+		[7, 50, 65, 80, 100, 130, 160, 190], _ 				 	    ; Valkyrie
+		[8, 200, 250, 300, 350, 425, 500, 600, 700], _ 				    ; Golem
+		[5, 125, 150, 175, 225, 275], _ 								 	    ; Witch
 		[5, 390, 450, 510, 570, 630], _  							    ; Lavahound
-		[4, 110, 130, 150, 170], _ 									    ; Bowler
-		[4, 220, 240, 260, 280]] 									    ; IceGolem
+		[4, 70, 95, 115, 140], _ 									    ; Bowler
+		[5, 220, 240, 260, 280, 300]] 									    ; IceGolem
 Global Const $g_aiTroopDonateXP[$eTroopCount] = [1, 1, 5, 1, 2, 5, 4, 14, 20, 25, 10, 6, 30, 2, 5, 8, 30, 12, 30, 6, 15]
 
 ; Spells
@@ -676,9 +678,9 @@ Global Const $g_aiSpellTrainTime[$eSpellCount] = [360, 360, 360, 360, 360, 720,
 Global Const $g_aiSpellCostPerLevel[$eSpellCount][8] = [ _
 		[7, 15000, 16500, 18000, 20000, 22000, 24000, 26000], _  ;LightningSpell
 		[7, 15000, 16500, 18000, 19000, 21000, 23000, 25000], _  ;HealSpell
-		[5, 23000, 25000, 27000, 30000, 33000], _     			 ;RageSpell
+		[5, 20000, 22000, 24000, 26000, 28000], _     			 ;RageSpell
 		[3, 23000, 27000, 31000], _        						 ;JumpSpell
-		[7, 12000, 13000, 14000, 15000, 16000, 17000, 18000], _  ;FreezeSpell
+		[7, 6000, 7000, 8000, 9000, 10000, 11000, 12000], _  ;FreezeSpell
 		[5, 38000, 39000, 41000, 43000, 45000], _				 ;CloneSpell
 		[5, 95, 110, 125, 140, 155], _         					 ;PoisonSpell
 		[4, 125, 140, 160, 180], _    							 ;EarthquakeSpell
@@ -822,7 +824,7 @@ Global $g_bChkBotStop = False, $g_iCmbBotCommand = 0, $g_iCmbBotCond = 0, $g_iCm
 Global $g_iTxtRestartGold = 10000
 Global $g_iTxtRestartElixir = 25000
 Global $g_iTxtRestartDark = 500
-Global $g_bChkTrap = True, $g_bChkCollect = True, $g_bChkTombstones = True, $g_bChkCleanYard = False, $g_bChkGemsBox = False
+Global $g_bChkCollect = True, $g_bChkTombstones = True, $g_bChkCleanYard = False, $g_bChkGemsBox = False
 Global $g_bChkCollectCartFirst = False, $g_iTxtCollectGold = 0, $g_iTxtCollectElixir = 0, $g_iTxtCollectDark = 0
 Global $g_bChkTreasuryCollect = False
 Global $g_iTxtTreasuryGold = 0
@@ -915,7 +917,7 @@ Global $g_iChkIgnoreTH = 0, $g_iChkIgnoreKing = 0, $g_iChkIgnoreQueen = 0, $g_iC
 Global $g_iChkIgnoreBarrack = 0, $g_iChkIgnoreDBarrack = 0, $g_iChkIgnoreFactory = 0, $g_iChkIgnoreDFactory = 0
 Global $g_iChkIgnoreGColl = 0, $g_iChkIgnoreEColl = 0, $g_iChkIgnoreDColl = 0
 Global $g_iTxtSmartMinGold = 150000, $g_iTxtSmartMinElixir = 150000, $g_iTxtSmartMinDark = 1500
-Global $g_iChkUpgradesToIgnore[13] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+Global $g_iChkUpgradesToIgnore[14] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
 Global $g_iChkResourcesToIgnore[3] = [0, 0, 0]
 Global $g_iCurrentLineOffset = 0, $g_iNextLineOffset = 0
 Global $g_aUpgradeNameLevel ; [Nb of elements in Array, Name, Level]
@@ -930,6 +932,7 @@ Global $g_sUpgradeDuration
 ; Builder Base
 Global $g_iChkBBSuggestedUpgrades = 0, $g_iChkBBSuggestedUpgradesIgnoreGold = 0, $g_iChkBBSuggestedUpgradesIgnoreElixir = 0, $g_iChkBBSuggestedUpgradesIgnoreHall = 0
 Global $g_iChkPlacingNewBuildings = 0
+Global $g_bOnBuilderBase = False ; set to True in MyBot.run.au3 _RunFunction when on builder base
 
 Global $g_iQuickMISX = 0, $g_iQuickMISY = 0