**V3.2.0** (Pre update / dont use this)

boludoz · Dec 31, 2019 · e67c8a8 · e67c8a8
1 parent 60d9f13
commit e67c8a8
Show file tree

Hide file tree

Showing 28 changed files with 3,004 additions and 492 deletions.
diff --git a/.gitignore b/.gitignore
@@ -188,5 +188,7 @@ build_compile_only.bat
 build_delete_compile.bat
 build_retry.bat
 build_zip_only.bat
-*.kxf
-Nueva carpeta/
+#*.kxf
+MyBot.run/
+Features/
+lib/MBRBot_original.dll
diff --git a/COCBot/GUI/MBR GUI Control Child Misc.au3 b/COCBot/GUI/MBR GUI Control Child Misc.au3
@@ -727,16 +727,20 @@ Func chkBBDropOrder()
 EndFunc   ;==>chkBBDropOrder
 
 Func GUIBBDropOrder()
+#Region - Custom BB Army - Team AIO Mod++
 	Local $iGUI_CtrlId = @GUI_CtrlId
 	Local $iDropIndex = _GUICtrlComboBox_GetCurSel($iGUI_CtrlId)
-
+	
 	For $i=0 To $g_iBBTroopCount - 1
-		If $iGUI_CtrlId = $g_ahCmbBBDropOrder[$i] Then ContinueLoop
-		If $iDropIndex = _GUICtrlComboBox_GetCurSel($g_ahCmbBBDropOrder[$i]) Then
+		If $iGUI_CtrlId = $g_ahCmbBBDropOrder[$i] Then 
+			_GUICtrlSetImage($g_sIcnBBOrder[$i], $g_sLibIconPath, $g_avStarLabTroops[$iDropIndex+1][4])
+		ElseIf $iDropIndex = _GUICtrlComboBox_GetCurSel($g_ahCmbBBDropOrder[$i]) Then
 			_GUICtrlComboBox_SetCurSel($g_ahCmbBBDropOrder[$i], -1)
+			_GUICtrlSetImage($g_sIcnBBOrder[$i], $g_sLibIconPath, $g_avStarLabTroops[0][4])
 			GUISetState()
 		EndIf
 	Next
+#EndRegion - Custom BB Army - Team AIO Mod++
 EndFunc   ;==>GUIBBDropOrder
 
 Func BtnBBDropOrderSet()
@@ -768,6 +772,7 @@ Func BtnBBDropOrderSet()
 		EndIf
 		$g_sBBDropOrder &= (GUICtrlRead($g_ahCmbBBDropOrder[$i]) & "|")
 		SetDebugLog("DropOrder: " & $g_sBBDropOrder)
+		_GUICtrlSetImage($g_sIcnBBOrder[$i], $g_sLibIconPath, $g_avStarLabTroops[_GUICtrlComboBox_GetCurSel($g_ahCmbBBDropOrder[$i])+1][4])
 	Next
 	$g_sBBDropOrder = StringTrimRight($g_sBBDropOrder, 1) ; Remove last '|'
 	GUICtrlSetBkColor($g_hBtnBBDropOrder, $COLOR_GREEN)
@@ -776,6 +781,7 @@ EndFunc   ;==>BtnBBDropOrderSet
 
 Func BtnBBRemoveDropOrder()
 	For $i=0 To $g_iBBTroopCount-1
+			_GUICtrlSetImage($g_sIcnBBOrder[$i], $g_sLibIconPath, $g_avStarLabTroops[0][4]) ; Custom BB Army - Team AIO Mod++
 			_GUICtrlComboBox_SetCurSel($g_ahCmbBBDropOrder[$i], -1)
 			GUICtrlSetState($g_ahCmbBBDropOrder[$i], $GUI_ENABLE)
 	Next

diff --git a/COCBot/GUI/MBR GUI Design Child Attack - Deadbase-Collectors.au3 b/COCBot/GUI/MBR GUI Design Child Attack - Deadbase-Collectors.au3
@@ -161,7 +161,7 @@ Func CreateAttackSearchDeadBaseCollectors()
 		$g_hLblSkipCollectorCheckTH = GUICtrlCreateLabel(GetTranslatedFileIni("MBR GUI Design Child Attack - Deadbase-Collectors", "LblSkipCollectorCheckTH", "Target Townhall Level"), $x + 10, $y, -1, -1)
 		GUICtrlCreateLabel(ChrW(8804), $x + 120, $y, -1, -1)
 		$g_hCmbSkipCollectorCheckTH = GUICtrlCreateCombo("", $x + 130, $y - 2, 36, 18, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
-			GUICtrlSetData(-1, "7|8|9|10|11|12", "8")
+			GUICtrlSetData(-1, "7|8|9|10|11|12|13", "8")
 	GUICtrlCreateGroup("", -99, -99, 1, 1)
 
 EndFunc   ;==>CreateAttackSearchDeadBaseCollectors
diff --git a/COCBot/GUI/MBR GUI Design Child Attack - Deadbase-Search.au3 b/COCBot/GUI/MBR GUI Design Child Attack - Deadbase-Search.au3
@@ -366,10 +366,10 @@ Local $sMinUmbralTip = GetTranslatedFileIni("MBR GUI Design Child Attack - Searc
 
 	$y += 24
 		$g_ahChkMaxScatter[$DB] = GUICtrlCreateCheckbox("", $x, $y, 17, 17)
-		_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Attack - Search", "ChkMaxScatter", -1))
+		_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Attack - Search", "ChkMaxScatter", "Search for a base that has Scattershot below this level"))
 			GUICtrlSetOnEvent(-1, "chkDBWeakBase")
 		$g_ahCmbWeakScatter[$DB] = GUICtrlCreateCombo("", $x + 19, $y, 53, -1, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
-			$sTxtTip = GetTranslatedFileIni("MBR GUI Design Child Attack - Search", "CmbMaxScatter_Info_01", -1)
+			$sTxtTip = GetTranslatedFileIni("MBR GUI Design Child Attack - Search", "CmbMaxScatter_Info_01", "Set the Max. level of the Scattershot to search for on a village to attack.")
 			_GUICtrlSetTip(-1, $sTxtTip)
 			GUICtrlSetData(-1, "-|Lvl 1|Lvl 2", "Lvl 1")
 			GUICtrlSetState(-1, $GUI_DISABLE)
@@ -408,7 +408,7 @@ Local $sMinUmbralTip = GetTranslatedFileIni("MBR GUI Design Child Attack - Searc
 		$g_ahCmbWeakEagle[$DB] = GUICtrlCreateCombo("", $x + 19, $y, 50, -1, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
 			$sTxtTip = GetTranslatedFileIni("MBR GUI Design Child Attack - Search", "CmbMaxEagle_Info_01", "Set the Max. level of the Eagle Artillery to search for on a village to attack.")
 			_GUICtrlSetTip(-1, $sTxtTip)
-            GUICtrlSetData(-1, "-|Lvl 1|Lvl 2|Lvl 3|Lvl 4", "Lvl 1")
+			GUICtrlSetData(-1, "-|Lvl 1|Lvl 2|Lvl 3|Lvl 4", "Lvl 1")
 			GUICtrlSetState(-1, $GUI_DISABLE)
 		$g_ahPicWeakEagle[$DB] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnEagleArt, $x + 75, $y - 2, 24, 24)
 			_GUICtrlSetTip(-1, $sTxtTip)

diff --git a/COCBot/GUI/MBR GUI Design Child Village - Misc.au3 b/COCBot/GUI/MBR GUI Design Child Village - Misc.au3
@@ -559,55 +559,137 @@ EndFunc   ;==>CreateMiscClanGamesV3SubTab
 
 ; Builder base drop order gui
 Func CreateBBDropOrderGUI()
-	$g_hGUI_BBDropOrder = _GUICreate(GetTranslatedFileIni("GUI Design Child Village - Misc", "GUI_BBDropOrder", "BB Custom Drop Order"), 322, 313, -1, -1, $WS_BORDER, $WS_EX_CONTROLPARENT)
-
-
-	Local $x = 25, $y = 25
-	GUICtrlCreateGroup(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BBDropOrderGroup", "BB Custom Dropping Order"), $x - 20, $y - 20, 308, 250)
-		$x += 10
-		$y += 20
-
-		$g_hChkBBCustomDropOrderEnable = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BBChkCustomDropOrderEnable", "Enable Custom Dropping Order"), $x - 13, $y - 22, -1, -1)
-			GUICtrlSetState(-1, $GUI_UNCHECKED)
-			_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BBChkCustomDropOrderEnable_Info_01", "Enable to select a custom troops dropping order"))
-			GUICtrlSetOnEvent(-1, "chkBBDropOrder")
-
-		$y+=5
-		For $i=0 To $g_iBBTroopCount-1
-			If $i < 6 Then
-				GUICtrlCreateLabel($i + 1 & ":", $x - 19, $y + 3 + 25*$i, -1, 18)
-				$g_ahCmbBBDropOrder[$i] = GUICtrlCreateCombo("", $x, $y + 25*$i, 94, 18, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
+	#Region - Custom BB Army - Team AIO Mod++
+	For $i = 1 To UBound($g_asAttackBarBB) -1
+		Local $iS = $g_avStarLabTroops[$i][3]
+		$g_sBBDropOrderDefault &= (UBound($g_asAttackBarBB) -1 = $i) ? ($iS) : ($iS & "|") 
+	Next
+
+	$g_hGUI_BBDropOrder = GUICreate("Army", 428, 451, 240, 124)
+	GUICtrlCreateGroup("Group1", 16, 8, 393, 105)
+
+	$g_sIcnTroopBB[0] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 32, 32, 41, 41)
+	$g_sIcnTroopBB[1] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 96, 32, 41, 41)
+	$g_sIcnTroopBB[2] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 160, 32, 41, 41)
+	$g_sIcnTroopBB[3] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 224, 32, 41, 41)
+	$g_sIcnTroopBB[4] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 288, 32, 41, 41)
+	$g_sIcnTroopBB[5] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 352, 32, 41, 41)
+
+	$g_sComboTroopBB[0] = GUICtrlCreateCombo("", 24, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+	$g_sComboTroopBB[1] = GUICtrlCreateCombo("", 88, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+	$g_sComboTroopBB[2] = GUICtrlCreateCombo("", 152, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+	$g_sComboTroopBB[3] = GUICtrlCreateCombo("", 216, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+	$g_sComboTroopBB[4] = GUICtrlCreateCombo("", 280, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+	$g_sComboTroopBB[5] = GUICtrlCreateCombo("", 344, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+	GUICtrlCreateGroup("", -99, -99, 1, 1)
+	GUICtrlCreateGroup("BB Custom dropping order.", 8, 120, 409, 281)
+
+	$g_hChkBBCustomDropOrderEnable = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BBChkCustomDropOrderEnable", "Enable Custom Dropping Order"), 16, 136, 57, 17)
+		GUICtrlSetState(-1, $GUI_UNCHECKED)
+		_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BBChkCustomDropOrderEnable_Info_01", "Enable to select a custom troops dropping order"))
+		GUICtrlSetOnEvent(-1, "chkBBDropOrder")
+
+	$g_sIcnBBOrder[0] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 48, 160, 33, 33)
+	$g_sIcnBBOrder[1] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 128, 160, 32, 32)
+	$g_sIcnBBOrder[2] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 208, 160, 32, 32)
+	$g_sIcnBBOrder[3] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 288, 160, 32, 32)
+	$g_sIcnBBOrder[4] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 368, 160, 32, 32)
+	$g_sIcnBBOrder[5] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 48, 224, 32, 32)
+	$g_sIcnBBOrder[6] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 128, 224, 32, 32)
+	$g_sIcnBBOrder[7] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 208, 224, 32, 32)
+	$g_sIcnBBOrder[8] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 288, 224, 32, 32)
+	$g_sIcnBBOrder[9] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 368, 224, 32, 32)
+	$g_sIcnBBOrder[10] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 208, 288, 32, 32)
+
+	GUICtrlCreateLabel("1:", 24, 200, 13, 17)
+	$g_ahCmbBBDropOrder[0] = GUICtrlCreateCombo("", 40, 200, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+		GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
+		GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
+		_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 0 + 1))
+		GUICtrlSetState(-1, $GUI_DISABLE)
+
+	GUICtrlCreateLabel("2:", 104, 200, 13, 17)
+	$g_ahCmbBBDropOrder[1] = GUICtrlCreateCombo("", 120, 200, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
 					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
 					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
-					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & $i + 1))
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 1 + 1))
 					GUICtrlSetState(-1, $GUI_DISABLE)
-			Else
-				GUICtrlCreateLabel($i + 1 & ":", $x + 150 - 19, $y + 3 + 25*($i-6), -1, 18)
-				$g_ahCmbBBDropOrder[$i] = GUICtrlCreateCombo("", $x+150, $y + 25*($i-6), 94, 18, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
+
+	GUICtrlCreateLabel("3:", 184, 200, 13, 17)
+	$g_ahCmbBBDropOrder[2] = GUICtrlCreateCombo("", 200, 200, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
 					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
 					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
-					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & $i + 1))
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 2 + 1))
 					GUICtrlSetState(-1, $GUI_DISABLE)
-			EndIf
-		Next
-
-		$x = 25
-		$y = 225
-		; Create push button to set training order once completed
-		$g_hBtnBBDropOrderSet = GUICtrlCreateButton(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBDropOrderSet", "Apply New Order"), $x, $y, 100, 25)
-			GUICtrlSetState(-1, BitOR($GUI_UNCHECKED, $GUI_DISABLE))
-			_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBDropOrderSet_Info_01", "Push button when finished selecting custom troops dropping order") & @CRLF & _
-							   GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBDropOrderSet_Info_02", "When not all troop slots are filled, will use default order."))
-			GUICtrlSetOnEvent(-1, "BtnBBDropOrderSet")
-
-		$x += 150
-		$g_hBtnBBRemoveDropOrder = GUICtrlCreateButton(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBRemoveDropOrder", "Empty Drop List"), $x, $y, 118, 25)
-			GUICtrlSetState(-1, BitOR($GUI_UNCHECKED, $GUI_DISABLE))
-			_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBRemoveDropOrder_Info_01", "Push button to remove all troops from list and start over"))
-			GUICtrlSetOnEvent(-1, "BtnBBRemoveDropOrder")
-
-		$g_hBtnBBClose = GUICtrlCreateButton(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBDropOrderClose", "Close"), 229, 258, 85, 25)
-			GUICtrlSetOnEvent(-1, "CloseCustomBBDropOrder")
-	GUICtrlCreateGroup("", -99, -99, 1, 1)
-
+
+	GUICtrlCreateLabel("4:", 264, 200, 13, 17)
+	$g_ahCmbBBDropOrder[3] =  GUICtrlCreateCombo("", 280, 200, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
+					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 3 + 1))
+					GUICtrlSetState(-1, $GUI_DISABLE)
+
+	GUICtrlCreateLabel("5:", 344, 200, 13, 17)
+	$g_ahCmbBBDropOrder[4] =  GUICtrlCreateCombo("", 360, 200, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
+					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 4 + 1))
+					GUICtrlSetState(-1, $GUI_DISABLE)
+
+	GUICtrlCreateLabel("6:", 24, 264, 13, 17)
+	$g_ahCmbBBDropOrder[5] = GUICtrlCreateCombo("", 40, 264, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
+					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 5 + 1))
+					GUICtrlSetState(-1, $GUI_DISABLE)
+
+	GUICtrlCreateLabel("7:", 104, 264, 13, 17)
+	$g_ahCmbBBDropOrder[6] = GUICtrlCreateCombo("", 120, 264, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
+					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 6 + 1))
+					GUICtrlSetState(-1, $GUI_DISABLE)
+
+	GUICtrlCreateLabel("8:", 184, 264, 13, 17)
+	$g_ahCmbBBDropOrder[7] = GUICtrlCreateCombo("", 200, 264, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
+					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 7 + 1))
+					GUICtrlSetState(-1, $GUI_DISABLE)
+
+	GUICtrlCreateLabel("9:", 264, 264, 13, 17)
+	$g_ahCmbBBDropOrder[8] = GUICtrlCreateCombo("", 280, 264, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
+					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 8 + 1))
+					GUICtrlSetState(-1, $GUI_DISABLE)
+
+	GUICtrlCreateLabel("10:", 336, 264, 19, 17)
+	$g_ahCmbBBDropOrder[9] = GUICtrlCreateCombo("", 360, 264, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
+					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 9 + 1))
+					GUICtrlSetState(-1, $GUI_DISABLE)
+
+	GUICtrlCreateLabel("11:", 176, 328, 19, 17)
+	$g_ahCmbBBDropOrder[10] = GUICtrlCreateCombo("", 200, 328, 49, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+					GUICtrlSetOnEvent(-1, "GUIBBDropOrder")
+					GUICtrlSetData(-1,  $g_sBBDropOrderDefault)
+					_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "TxtBBDropOrder", "Enter sequence order for drop of troop #" & 10 + 1))
+					GUICtrlSetState(-1, $GUI_DISABLE)
+
+	; Create push button to set training order once completed
+	$g_hBtnBBDropOrderSet = GUICtrlCreateButton(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBDropOrderSet", "Apply New Order"), 72, 360, 129, 25)
+		GUICtrlSetState(-1, BitOR($GUI_UNCHECKED, $GUI_DISABLE))
+		_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBDropOrderSet_Info_01", "Push button when finished selecting custom troops dropping order") & @CRLF & _
+		GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBDropOrderSet_Info_02", "When not all troop slots are filled, will use default order."))
+		GUICtrlSetOnEvent(-1, "BtnBBDropOrderSet")
+	$g_hBtnBBRemoveDropOrder = GUICtrlCreateButton(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBRemoveDropOrder", "Empty Drop List"), 224, 360, 129, 25)
+		GUICtrlSetState(-1, BitOR($GUI_UNCHECKED, $GUI_DISABLE))
+		_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBRemoveDropOrder_Info_01", "Push button to remove all troops from list and start over"))
+		GUICtrlSetOnEvent(-1, "BtnBBRemoveDropOrder")
+		GUICtrlCreateGroup("", -99, -99, 1, 1)
+	$g_hBtnBBClose = GUICtrlCreateButton(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "BtnBBDropOrderClose", "Close"), 344, 416, 65, 25)
+	GUICtrlSetOnEvent(-1, "CloseCustomBBDropOrder")
+	#EndRegion - Custom BB Army - Team AIO Mod++
 EndFunc ;==>CreateBBDropOrderGUI
diff --git a/COCBot/MBR Global Variables.au3 b/COCBot/MBR Global Variables.au3
@@ -881,6 +881,7 @@ Global $g_hCmbBBNextTroopDelay = 0, $g_hCmbBBSameTroopDelay = 0
 Global $g_apTL[10][2] = [ [22, 374], [59, 348], [102, 319], [137, 288], [176, 259], [209, 232], [239, 212], [270, 188], [307, 164], [347, 139] ]
 Global $g_apTR[10][2] = [ [831, 368], [791, 334], [747, 306], [714, 277], [684, 252], [647, 227], [615, 203], [577, 177], [539, 149], [506, 123] ]
 
+#cs - Custom army - Team AIO Mod++
 ; BB Drop Order
 Global $g_hBtnBBDropOrder = 0
 Global $g_hGUI_BBDropOrder = 0
@@ -891,6 +892,7 @@ Global Const $g_iBBTroopCount = 11
 Global Const $g_sBBDropOrderDefault = "BoxerGiant|HogGlider|SuperPekka|DropShip|Witch|BabyDrag|WallBreaker|Barbarian|CannonCart|Archer|Minion"
 Global $g_sBBDropOrder = $g_sBBDropOrderDefault
 Global $g_ahCmbBBDropOrder[$g_iBBTroopCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+#ce
 
 ; <><><><> Village / Donate - Request <><><><>
 Global $g_bRequestTroopsEnable = False
@@ -1836,5 +1838,5 @@ Func _ArrayIndexValid(Const ByRef $a, Const $idx)
 	Return $idx >= 0 And $idx < UBound($a)
 EndFunc   ;==>_ArrayIndexValid
 
-; Team AiO MOD++ (2018)
+; Team AiO MOD++ (2019)
 #include "Team__AiO__MOD++\Globals_Team__AiO__MOD++.au3"