- build.bat error fixing, last minute tweaks.

boludoz · Dec 31, 2019 · 54920ee · 54920ee
1 parent 952162e
commit 54920ee
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/COCBot/GUI/MBR GUI Design Child Village - Misc.au3 b/COCBot/GUI/MBR GUI Design Child Village - Misc.au3
@@ -566,7 +566,7 @@ Func CreateBBDropOrderGUI()
 	Next
 
 	$g_hGUI_BBDropOrder = GUICreate("Army", 428, 451, 240, 124)
-	GUICtrlCreateGroup("Group1", 16, 8, 393, 105)
+	GUICtrlCreateGroup("Army", 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)
@@ -576,11 +576,17 @@ Func CreateBBDropOrderGUI()
 	$g_sIcnTroopBB[5] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnBlank, 352, 32, 41, 41)
 
 	$g_sComboTroopBB[0] = GUICtrlCreateCombo("", 24, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+		GUICtrlSetState(-1, $GUI_DISABLE)
 	$g_sComboTroopBB[1] = GUICtrlCreateCombo("", 88, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+		GUICtrlSetState(-1, $GUI_DISABLE)
 	$g_sComboTroopBB[2] = GUICtrlCreateCombo("", 152, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+		GUICtrlSetState(-1, $GUI_DISABLE)
 	$g_sComboTroopBB[3] = GUICtrlCreateCombo("", 216, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+		GUICtrlSetState(-1, $GUI_DISABLE)
 	$g_sComboTroopBB[4] = GUICtrlCreateCombo("", 280, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+		GUICtrlSetState(-1, $GUI_DISABLE)
 	$g_sComboTroopBB[5] = GUICtrlCreateCombo("", 344, 80, 57, 25, BitOR($CBS_DROPDOWN,$CBS_AUTOHSCROLL))
+		GUICtrlSetState(-1, $GUI_DISABLE)
 	GUICtrlCreateGroup("", -99, -99, 1, 1)
 	GUICtrlCreateGroup("BB Custom dropping order.", 8, 120, 409, 281)
 

diff --git a/COCBot/Team__AiO__MOD++/functions/Mod's/ModFuncs.au3 b/COCBot/Team__AiO__MOD++/functions/Mod's/ModFuncs.au3
@@ -317,12 +317,9 @@ EndFunc
 ; Example .......: IsSlotDead(1)
 ; ===============================================================================================================================
 Func IsSlotDead()
-	Local $Hex = _GetPixelColor(Int($g_avAttackTroops[$g_iSlotNow][4], 638, True, "WAIT--> IsSlotDead")
-	Setlog($Hex, $COLOR_ORANGE) 
-
-	If _Wait4Pixel(Int($g_avAttackTroops[$g_iSlotNow][4]), 633, 0xFFFFFF, 15, 1000, 10) Then 
+	If _Wait4Pixel($g_avAttackTroops[$g_iSlotNow][4], 633, 0xFFFFFF, 15, 250, 10) Then 
 		Return
-	ElseIf _Wait4Pixel(Int($g_avAttackTroops[$g_iSlotNow][4]), 638, 0x656565, 10, 1000, 250) Then
+	ElseIf _Wait4Pixel($g_avAttackTroops[$g_iSlotNow][4], 638, 0x656565, 10, 250, 10) Then
 		SetLog("Troop Dead X: " & $g_iSlotNow, $COLOR_ORANGE)
 		$g_aIsDead[$g_iSlotNow] = 1
 		Else

diff --git a/ModChangelog b/ModChangelog
@@ -8,7 +8,7 @@
 		• CSV: 
 			- Add hero if it doesn't exist in CSV.
 
-	**V3.2.0** (Pre update / dont use this)
+	**V3.2.0**
 		» Added:
 			• CSV: 
 				- By @Eloy