Skip to content

Commit

Permalink
* **V7.5.4**
Browse files Browse the repository at this point in the history
* Added Electro Dragon in to Clan Games
* Added Only request donation, when specific Clan Castle type is missing by @demen
* Added Restart search to pick healed heroes up by @demen
* Fixed Issue on waiting for heroes and exist Barbarian King upgrading
* Fixed When the Heroes are not prepared and log doesn't say nothing
* Fixed The url issue on Support Development label, reported by @Hecki
* Fixed Correct profile log when is switch account
* Fixed Train Skip counter issue, idle loop until reaching train time , fix by @demen
* Fixed Rare situations when exist a double Castle Spells but with different levels by @demen
* Fixed Tencent CoC Version in Infinite Start Loop , reported by @PoH98
* Fixed Embedded user clicks for Nox 6.2.0.0
* Fixed Remove clan castle spell slots - June 2018
* Fixed Donate window with 7 slots per row
* Fixed Correct path for ImageDetection, reported by @alepitta
* Fixed Hogs donation, reported by @dharyadi
* Fixed New coordinates for full army check - June 2018 Update
* Fixed Switch accounts and PBT + Disable accounts check
* Fixed Switch accounts + Halt Attack + Smart Switch issue, reported by @rbrt
* Fixed Rearm/Reload button problems when there are more then 7 buttons, reported by @HarchH
* Fixed Lab Debug Icon Save
* Fixed Lab icon coordinates
* Fixed Lab resource OCR
* Fixed Lab "Max Level" detection
* Fixed Lab "Lab Upgrade Required" detection
* Fixed Wall upgrade resource check
* Fixed Wall upgrade priority check
* Fixed Hero upgrade priority check
* Fixed Lab add sieges
* Fixed Lab "Not Unlocked" detection
* Fixed Lab not unlocked treated as read error
* Fixed Lab 2nd page click drag
* Fixed Lab window random coordinates
* Fixed Lab OCR won't read again (wrong flag) after read error
* Fixed Lab apply read flag wrongly on "lab upgrade required" and "not unlocked"
* Fixed Lab OCR read flag won't reset when bot starts, except bot shut down completely
* Fixed Lab OCR white 3 5 6 8, thx ProMac
* Fixed Building upgrade repeat checks Array error for TH12
* Fixed Building upgrade Error finding button for TH12
* Fixed Android hold back ADB click causing infinite Android reboots because clicks never released
* Improved Test click drag
* Improved The Lab check , reported by @demen
* Updated Chinese Simplified Translations by @PoH98
* Updated Android information file
  • Loading branch information
promac2k committed Jul 26, 2018
1 parent b135b3c commit 6be34ae
Show file tree
Hide file tree
Showing 82 changed files with 1,611 additions and 1,033 deletions.
55 changes: 50 additions & 5 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,15 +1,60 @@
* **V7.5.3**
* **V7.5.4**
* Added Electro Dragon in to Clan Games
* Added Only request donation, when specific Clan Castle type is missing by @Demen
* Added Restart search to pick healed heroes up by @Demen
* Fixed Issue on waiting for heroes and exist Barbarian King upgrading
* Fixed When the Heroes are not prepared and log doesn't say nothing
* Fixed The url issue on Support Development label, reported by @Hecki
* Fixed Correct profile log when is switch account
* Fixed Train Skip counter issue, idle loop until reaching train time , fix by @Demen
* Fixed Rare situations when exist a double Castle Spells but with different levels by @Demen
* Fixed Tencent CoC Version in Infinite Start Loop , reported by @PoH98
* Fixed Embedded user clicks for Nox 6.2.0.0
* Fixed Remove clan castle spell slots - June 2018
* Fixed Donate window with 7 slots per row
* Fixed Correct path for ImageDetection, reported by @alepitta
* Fixed Hogs donation, reported by @dharyadi
* Fixed New coordinates for full army check - June 2018 Update
* Fixed Switch accounts and PBT + Disable accounts check
* Fixed Switch accounts + Halt Attack + Smart Switch issue, reported by @rbrt
* Fixed Rearm/Reload button problems when there are more then 7 buttons, reported by @HarchH
* Fixed Lab Debug Icon Save
* Fixed Lab icon coordinates
* Fixed Lab resource OCR
* Fixed Lab "Max Level" detection
* Fixed Lab "Lab Upgrade Required" detection
* Fixed Wall upgrade resource check
* Fixed Wall upgrade priority check
* Fixed Hero upgrade priority check
* Fixed Lab add sieges
* Fixed Lab "Not Unlocked" detection
* Fixed Lab not unlocked treated as read error
* Fixed Lab 2nd page click drag
* Fixed Lab window random coordinates
* Fixed Lab OCR won't read again (wrong flag) after read error
* Fixed Lab apply read flag wrongly on "lab upgrade required" and "not unlocked"
* Fixed Lab OCR read flag won't reset when bot starts, except bot shut down completely
* Fixed Lab OCR white 3 5 6 8, thx ProMac
* Fixed Building upgrade repeat checks Array error for TH12
* Fixed Building upgrade Error finding button for TH12
* Fixed Android hold back ADB click causing infinite Android reboots because clicks never released
* Improved Test click drag
* Improved The Lab check , reported by @Demen
* Updated Chinese Simplified Translations by @PoH98
* Updated Android information file

* **V7.5.3**
* Fixed Miner XP Value , reported by @Spartan
* Fixed Wizard detection on attack bar reported by @liam0603
* Fixed Smartwait4Train when Barracks are boosted , reported by @sleepnmojo
* Fixed Attack Now buttons and New status icons issue , reported by @vLab97
* Fixed Boost button detection on Heroes , reported by @Mantaka
* Fixed Attack Now buttons and New status icons issue , reported by @vLab97
* Fixed Boost button detection on Heroes , reported by @Mantaka
* Fixed Rearm on TH12 when exist 7 button , reported by @HArchH
* Fixed Input Train digit limits to Minions and Electro Dragon , reported by @jwodonto
* Fixed Laboratory Troops and Spells Upgrades - June 2018
* Improved the setlog on Prerequisites
* Improved the Check Laboratory status
* Updated Russian translate by @vLab97
* Updated Russian Translations by @VLab97

* **V7.5.2**
* Added Electro Dragon Support
Expand All @@ -19,7 +64,7 @@
* Added TH12 CSV settings support. Refer "Barch four fingers.csv" for sample commands
* Added Verification the display resolution and taskbar on Prerequisites
* Added TH12 Giga Tesla upgrade support (both auto and manual)
* Added Attack Now Button (Useful for CSV Testing) in Debug mode
* Added Attack Now Button (Useful for CSV Testing) in Debug mode
* Added Heroes and Laboratory status to bot UI
* Fixed Remaining time for CC request - June Update
* Fixed Donations - June Update
Expand Down
11 changes: 8 additions & 3 deletions COCBot/GUI/MBR GUI Control BOT Options.au3
Original file line number Diff line number Diff line change
Expand Up @@ -209,11 +209,16 @@ Func chkSwitchAcc()
For $i = $g_hCmbTotalAccount To $g_ahChkDonate[7]
GUICtrlSetState($i, $GUI_ENABLE)
Next
GUICtrlSetState($g_hChkOnlySCIDAccounts, $GUI_UNCHECKED)
GUICtrlSetState($g_hChkOnlySCIDAccounts, $GUI_DISABLE)
OnlySCIDAccounts()
Else
releaseSwitchAccountMutex()
For $i = $g_hCmbTotalAccount To $g_ahChkDonate[7]
GUICtrlSetState($i, $GUI_DISABLE)
Next
GUICtrlSetState($g_hChkOnlySCIDAccounts, $GUI_ENABLE)
OnlySCIDAccounts()
EndIf
EndFunc ;==>chkSwitchAcc

Expand Down Expand Up @@ -521,7 +526,7 @@ Func btnTestDonateCC()
SetLog("Detecting Troops...")
DetectSlotTroop($eBowl)
SetLog("Detecting Spells...")
DetectSlotTroop($eSkSpell)
DetectSlotSpell($eSkSpell)
SetLog(_PadStringCenter(" Test DonateCC end ", 54, "="), $COLOR_INFO)
ShellExecute($g_sProfileTempDebugPath & "donateCC_")

Expand Down Expand Up @@ -601,7 +606,7 @@ EndFunc ;==>btnTestAttackBar


Func btnTestClickDrag()
Local $sUserInputCoor = InputBox("Coordinators", "x1,y1,x2,y2", "650,473,323,473")
Local $sUserInputCoor = InputBox("Coordinators", "x1,y1,x2,y2", "650,469,290,469")
Local $asCoor = StringSplit($sUserInputCoor, ",")

If @error Or $asCoor[0] <> 4 Then
Expand All @@ -618,7 +623,7 @@ Func btnTestClickDrag()
_Sleep(3000, True, False)

SetLog("Save the image...", $COLOR_DEBUG)
DebugImageSave("TestClickDrag")
DebugImageSave("TestClickDrag", Default, Default, Default, "_" & $asCoor[1] & "x." & $asCoor[2] & "y." & $asCoor[3] & "x." & $asCoor[4] & "y_")

SetLog("Sleep 1 seconds...", $COLOR_DEBUG)
_Sleep(1000, True, False)
Expand Down
1 change: 1 addition & 0 deletions COCBot/GUI/MBR GUI Control Bottom.au3
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Func Initiate()

$g_bFirstStart = True
$g_bInitiateSwitchAcc = True
$g_iFirstTimeLab = 0

If $g_bNotifyDeleteAllPushesOnStart Then _DeletePush()

Expand Down
17 changes: 17 additions & 0 deletions COCBot/GUI/MBR GUI Control Child Misc.au3
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,23 @@ Func btnPushSharedPrefs()
PushSharedPrefs()
EndFunc

Func OnlySCIDAccounts()
; $g_hChkOnlySCIDAccounts
If GUICtrlRead($g_hChkOnlySCIDAccounts) = $GUI_CHECKED Then
GUICtrlSetState($g_hCmbWhatSCIDAccount2Use, $GUI_ENABLE)
WhatSCIDAccount2Use()
$g_bOnlySCIDAccounts = True
Else
GUICtrlSetState($g_hCmbWhatSCIDAccount2Use, $GUI_DISABLE)
$g_bOnlySCIDAccounts = False
EndIf
EndFunc

Func WhatSCIDAccount2Use()
; $g_hCmbWhatSCIDAccount2Use
$g_iWhatSCIDAccount2Use = _GUICtrlComboBox_GetCurSel($g_hCmbWhatSCIDAccount2Use)
EndFunc

Func cmbBotCond()
If _GUICtrlComboBox_GetCurSel($g_hCmbBotCond) = 15 Then
If _GUICtrlComboBox_GetCurSel($g_hCmbHoursStop) = 0 Then _GUICtrlComboBox_SetCurSel($g_hCmbHoursStop, 1)
Expand Down
26 changes: 24 additions & 2 deletions COCBot/GUI/MBR GUI Control Tab Village.au3
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,41 @@ Func chkRequestCCHours()

If GUICtrlRead($g_hChkRequestTroopsEnable) = $GUI_CHECKED Then
GUICtrlSetState($g_hTxtRequestCC, $GUI_SHOW + $GUI_ENABLE)
For $i = $g_hLblRequestCChour To $g_hLblRequestCCHoursPM
For $i = $g_hLblRequestType To $g_hLblRequestCCHoursPM
GUICtrlSetState($i, $GUI_ENABLE)
Next
If GUICtrlRead($g_hChkRequestType_Troops) = $GUI_CHECKED Then
GUICtrlSetState($g_hTxtRequestCountCCTroop, $GUI_ENABLE)
Else
GUICtrlSetState($g_hTxtRequestCountCCTroop, $GUI_DISABLE)
EndIf
If GUICtrlRead($g_hChkRequestType_Spells) = $GUI_CHECKED Then
GUICtrlSetState($g_hTxtRequestCountCCSpell, $GUI_ENABLE)
Else
GUICtrlSetState($g_hTxtRequestCountCCSpell, $GUI_DISABLE)
EndIf
Else
GUICtrlSetState($g_hTxtRequestCC, $GUI_SHOW + $GUI_DISABLE)
For $i = $g_hLblRequestCChour To $g_hLblRequestCCHoursPM
For $i = $g_hLblRequestType To $g_hLblRequestCCHoursPM
GUICtrlSetState($i, $GUI_DISABLE)
Next
EndIf

SetRedrawBotWindowControls($bWasRedraw, $g_hGrpRequestCC, "chkRequestCCHours")
EndFunc ;==>chkRequestCCHours

Func chkRequestCountCC()
If GUICtrlRead($g_hChkRequestType_Troops) = $GUI_CHECKED Then
GUICtrlSetState($g_hTxtRequestCountCCTroop, $GUI_ENABLE)
Else
GUICtrlSetState($g_hTxtRequestCountCCTroop, $GUI_DISABLE)
EndIf
If GUICtrlRead($g_hChkRequestType_Spells) = $GUI_CHECKED Then
GUICtrlSetState($g_hTxtRequestCountCCSpell, $GUI_ENABLE)
Else
GUICtrlSetState($g_hTxtRequestCountCCSpell, $GUI_DISABLE)
EndIf
EndFunc ;==>chkRequestCountCC

Func chkRequestCCHoursE1()
If GUICtrlRead($g_hChkRequestCCHoursE1) = $GUI_CHECKED And GUICtrlRead($g_ahChkRequestCCHours[0]) = $GUI_CHECKED Then
Expand Down
12 changes: 6 additions & 6 deletions COCBot/GUI/MBR GUI Design Bottom.au3
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Func CreateBottomPanel()
GUICtrlSetState(-1, $GUI_HIDE)
$g_hBtnAttackNowTS = GUICtrlCreateButton(GetTranslatedFileIni("MBR GUI Design Bottom", "BtnAttackNowTS", "TH Snipe!"), $x + 190, $y + 50, 60, -1)
GUICtrlSetState(-1, $GUI_HIDE)
$g_hLblDonate = GUICtrlCreateLabel(GetTranslatedFileIni("MBR GUI Design Bottom", "LblDonate", "Support the development"), $x + 270, $y + 80, 165, 24, $SS_RIGHT)
$g_hLblDonate = GUICtrlCreateLabel(GetTranslatedFileIni("MBR GUI Design Bottom", "LblDonate", "Support the Development"), $x + 293, $y + 80, 142, 24, $SS_RIGHT)
GUICtrlSetCursor(-1, 0) ; https://www.autoitscript.com/autoit3/docs/functions/MouseGetCursor.htm
GUICtrlSetFont(-1, 8.5, $FW_BOLD) ;, $GUI_FONTITALIC + $GUI_FONTUNDER)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Bottom", "LblDonate_Info_01", "Paypal Donate?"))
Expand Down Expand Up @@ -126,7 +126,7 @@ Func CreateBottomPanel()
;New section for royal and lab status
Local $x = 202, $y = $y_bottom + 5
$sTxtTip = GetTranslatedFileIni("MBR GUI Design Bottom","GrpStatus_Info_01", "Gray - Not Read, Green - Ready to Use, Blue - Healing, Red - Upgrading")
$g_hlblKing = GUICtrlCreateLabel("King", $x, $y, 50, 16, $SS_LEFT)
$g_hlblKing = GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design Names Troops", "King", "King"), $x, $y, 50, 16, $SS_LEFT)
;GUICtrlSetBkColor(-1, 0xE1E1E1)
_GUICtrlSetTip(-1, $sTxtTip)
$g_hPicKingGray = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnGrayShield, $x + 53, $y, 16, 16)
Expand All @@ -142,7 +142,7 @@ Func CreateBottomPanel()
GUICtrlSetState(-1, $GUI_HIDE)

$y += 25
$g_hlblQueen = GUICtrlCreateLabel("Queen", $x, $y, 50, 16, $SS_LEFT)
$g_hlblQueen = GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design Names Troops", "Queen", "Queen"), $x, $y, 50, 16, $SS_LEFT)
_GUICtrlSetTip(-1, $sTxtTip)
;GUICtrlSetBkColor(-1, 0xE1E1E1)
$g_hPicQueenGray = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnGrayShield, $x + 53, $y, 16, 16 )
Expand All @@ -159,7 +159,7 @@ Func CreateBottomPanel()


$y += 25
$g_hlblWarden = GUICtrlCreateLabel("Warden", $x, $y, 50, 16, $SS_LEFT)
$g_hlblWarden = GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design Names Troops", "Warden", "Warden"), $x, $y, 50, 16, $SS_LEFT)
_GUICtrlSetTip(-1, $sTxtTip)
;GUICtrlSetBkColor(-1, 0xE1E1E1)
$g_hPicWardenGray = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnGrayShield, $x + 53 , $y, 16, 16 )
Expand All @@ -176,7 +176,7 @@ Func CreateBottomPanel()

$y += 25
$sTxtTip = GetTranslatedFileIni("MBR GUI Design Bottom","GrpStatus_Info_02", "Green - Lab is Running, Red - Lab Has Stopped")
$g_hlblLab = GUICtrlCreateLabel("Lab", $x, $y, 50, 16, $SS_LEFT)
$g_hlblLab = GUICtrlCreateLabel(GetTranslatedFileIni("MBR GUI Design Bottom", "Lab", "Lab"), $x, $y, 50, 16, $SS_LEFT)
_GUICtrlSetTip(-1, $sTxtTip)
;GUICtrlSetBkColor(-1, 0xE1E1E1)
$g_hPicLabGray = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnGrayShield, $x + 53 , $y, 16, 16 )
Expand Down Expand Up @@ -206,7 +206,7 @@ Func CreateBottomPanel()
$g_hPicResultElixirTemp = GUICtrlCreateIcon ($g_sLibIconPath, $eIcnElixir, $x + 15, $y + 20, 16, 16)

$g_hLblResultDENow = GUICtrlCreateLabel("", $x + 10, $y + 42, 60, 15, $SS_RIGHT)
$g_hLblResultDEHourNow = GUICtrlCreateLabel("", $x, $y + 42, 60, 15, $SS_RIGHT)
$g_hLblResultDEHourNow = GUICtrlCreateLabel("", $x + 10, $y + 42, 60, 15, $SS_RIGHT)
GUICtrlSetState(-1, $GUI_HIDE)
$g_hPicResultDENow = GUICtrlCreateIcon ($g_sLibIconPath, $eIcnDark, $x + 71, $y + 40, 16, 16)
GUICtrlSetState(-1, $GUI_HIDE)
Expand Down
5 changes: 5 additions & 0 deletions COCBot/GUI/MBR GUI Design Child Attack - Options-Search.au3
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Global $g_hSldVSDelay = 0, $g_hSldMaxVSDelay = 0
Global $g_hChkAttackNow = 0, $g_hCmbAttackNowDelay = 0, $g_hChkRestartSearchLimit = 0, $g_hTxtRestartSearchlimit = 0, $g_hChkAlertSearch = 0

Global $g_hLblVSDelay = 0, $g_hLblTextVSDelay = 0, $g_hLblMaxVSDelay = 0, $g_hLblTextMaxVSDelay = 0, $g_hLblAttackNow = 0, $g_hLblAttackNowSec = 0
Global $g_hChkRestartSearchPickupHero = 0

Func CreateAttackSearchOptionsSearch()

Expand Down Expand Up @@ -170,6 +171,10 @@ Func CreateAttackSearchOptionsSearch()
GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design", "search(es).", -1), $x + 47, $y + 17, -1, -1)

$y += 45
$g_hChkRestartSearchPickupHero = GUICtrlCreateCheckbox("Restart to pickup healed hero", $x - 5, $y, -1, -1)
_GUICtrlSetTip(-1, "Return to base when a hero is healed and ready to join the attack")

$y += 25
$g_hChkAlertSearch = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Attack - Options-Search", "ChkAlertSearch", "Alert me when Village found"), $x - 5, $y, -1, -1)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Attack - Options-Search", "ChkAlertSearch_Info_01", "Check this if you want an Audio alarm & a Balloon Tip when a Base to attack is found."))
GUICtrlSetState(-1, $GUI_CHECKED)
Expand Down
10 changes: 9 additions & 1 deletion COCBot/GUI/MBR GUI Design Child Bot - Profiles.au3
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
; ===============================================================================================================================
#include-once

Global $g_hCmbProfile = 0, $g_hTxtVillageName = 0, $g_hBtnAddProfile = 0, $g_hBtnConfirmAddProfile = 0, $g_hBtnConfirmRenameProfile = 0, _
Global $g_hCmbProfile = 0, $g_hTxtVillageName = 0, $g_hBtnAddProfile = 0, $g_hBtnConfirmAddProfile = 0, $g_hBtnConfirmRenameProfile = 0, $g_hChkOnlySCIDAccounts = 0, $g_hCmbWhatSCIDAccount2Use = 0 , _
$g_hBtnDeleteProfile = 0, $g_hBtnCancelProfileChange = 0, $g_hBtnRenameProfile = 0, $g_hBtnPullSharedPrefs = 0, $g_hBtnPushSharedPrefs = 0

Global $g_hChkSwitchAcc = 0, $g_hCmbSwitchAcc = 0, $g_hChkSharedPrefs = 0, $g_hCmbTotalAccount = 0, $g_hChkSmartSwitch = 0, $g_hCmbTrainTimeToSkip = 0, $g_hChkDonateLikeCrazy = 0, _
Expand Down Expand Up @@ -114,6 +114,14 @@ Func CreateBotProfiles()
_GUICtrlButton_SetImageList($g_hBtnPushSharedPrefs, $bIconPush, 4)
GUICtrlSetOnEvent(-1, "btnPushSharedPrefs")
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Bot - Profiles", "BtnPushSharedPrefs_Info_01", "Push CoC shared_prefs folder"))

$g_hChkOnlySCIDAccounts = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Bot - Profiles", "ChkOnlySCIDAccounts", "SC_ID"), $x + 285, $y, -1, -1)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Bot - Profiles", "ChkOnlySCIDAccounts_Info_01", "Are you using SC_ID?"))
GUICtrlSetOnEvent(-1, "OnlySCIDAccounts")
$g_hCmbWhatSCIDAccount2Use = GUICtrlCreateCombo("", $x + 290 + 47, $y , 83, -1, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
GUICtrlSetData(-1, "Account nº1|Account nº2|Account nº3|Account nº4|Account nº5", "Account nº1")
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Bot - Profiles", "WhatSCIDAccount2Use_Info_01", "Select the correct account from Login Window!"))
GUICtrlSetOnEvent(-1, "WhatSCIDAccount2Use")
GUICtrlCreateGroup("", -99, -99, 1, 1)

Local $x = 25, $y = 105
Expand Down
6 changes: 4 additions & 2 deletions COCBot/GUI/MBR GUI Design Child VIllage - Upgrade.au3
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@ Func CreateLaboratorySubTab()
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtGolems", "Golems") & "|" & _
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtWitches", "Witches") & "|" & _
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtLavaHounds", "Lava Hounds") & "|" & _
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtBowlers", "Bowlers")
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtBowlers", "Bowlers") & "|" & _
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtWallWreckers", "Wall Wreckers") & "|" & _
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtBattleBlimps", "Battle Blimps")

Local $x = 25, $y = 45
GUICtrlCreateGroup(GetTranslatedFileIni("MBR GUI Design Child VIllage - Upgrade_Laboratory", "Group_01", "Laboratory"), $x - 20, $y - 20, $g_iSizeWGrpTab3, $g_iSizeHGrpTab3)
Expand All @@ -113,7 +115,7 @@ Func CreateLaboratorySubTab()
GUICtrlSetOnEvent(-1, "chkLab")
$g_hLblNextUpgrade = GUICtrlCreateLabel(GetTranslatedFileIni("MBR GUI Design Child VIllage - Upgrade_Laboratory", "LblNextUpgrade", "Next one") & ":", $x + 80, $y + 38, 50, -1)
GUICtrlSetState(-1, $GUI_DISABLE)
$g_hCmbLaboratory = GUICtrlCreateCombo("", $x + 135, $y + 35, 140, 25, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
$g_hCmbLaboratory = GUICtrlCreateCombo("", $x + 135, $y + 35, 140, 25, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL, $WS_VSCROLL))
GUICtrlSetData(-1, $sTxtNames, GetTranslatedFileIni("MBR Global GUI Design", "None", "None"))
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child VIllage - Upgrade_Laboratory", "CmbLaboratory_Info_01", "Select the troop type to upgrade with this pull down menu") & @CRLF & _
GetTranslatedFileIni("MBR GUI Design Child VIllage - Upgrade_Laboratory", "CmbLaboratory_Info_02", "The troop icon will appear on the right.") & @CRLF & _
Expand Down
39 changes: 38 additions & 1 deletion COCBot/GUI/MBR GUI Design Child Village - Donate.au3
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ Global $g_hChkRequestTroopsEnable = 0, $g_hTxtRequestCC = 0, $g_ahChkRequestCCHo
Global $g_hChkRequestCCHoursE1 = 0, $g_hChkRequestCCHoursE2 = 0
Global $g_hGrpRequestCC = 0, $g_hLblRequestCCHoursAM = 0, $g_hLblRequestCCHoursPM = 0
Global $g_hLblRequestCChour = 0, $g_ahLblRequestCChoursE = 0
GLobal $g_hLblRequestCChours[12] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
Global $g_hLblRequestCChours[12] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
Global $g_hLblRequestType, $g_hChkRequestType_Troops, $g_hChkRequestType_Spells, $g_hChkRequestType_Siege
Global $g_hTxtRequestCountCCTroop, $g_hTxtRequestCountCCSpell

; Donate
Global $g_hChkExtraAlphabets = 0, $g_hChkExtraChinese = 0, $g_hChkExtraKorean = 0, $g_hChkExtraPersian = 0
Expand Down Expand Up @@ -111,6 +113,41 @@ Func CreateRequestSubTab()
GUICtrlSetState(-1, $GUI_DISABLE)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Donate-CC", "TxtRequestCC_Info_01", "This text is used on your request for troops in the Clan chat."))

; Request Type (Demen)
$y += 25
$g_hLblRequestType = GUICtrlCreateLabel("when lacking ", $x + 70, $y + 23)
_GUICtrlSetTip(-1, "Not send request when all the checked items are full")
$g_hChkRequestType_Troops = GUICtrlCreateCheckbox("Troops", $x + 140, $y + 20)
_GUICtrlSetTip(-1, "Send request when CC Troop is not full")
GUICtrlSetState(-1, $GUI_CHECKED)
GUICtrlSetOnEvent(-1, "chkRequestCountCC")
$g_hChkRequestType_Spells = GUICtrlCreateCheckbox("Spells", $x + 195, $y + 20)
_GUICtrlSetTip(-1, "Send request when CC Spell is not full")
GUICtrlSetState(-1, $GUI_CHECKED)
GUICtrlSetOnEvent(-1, "chkRequestCountCC")
$g_hChkRequestType_Siege = GUICtrlCreateCheckbox("Siege Machine", $x + 250, $y + 20)
_GUICtrlSetTip(-1, "Send request when CC Siege Machine is not received")
GUICtrlSetState(-1, $GUI_UNCHECKED)

$y += 25
GUICtrlCreateLabel("if less than ", $x + 70, $y + 23)
$g_hTxtRequestCountCCTroop = GUICtrlCreateInput("0", $x + 140, $y + 20, 25, 16, BitOR($SS_RIGHT, $ES_NUMBER))
GUICtrlSetLimit(-1, 2)
_GUICtrlSetTip(-1, "Do not request when already received that many CC Troops" & @CRLF & "Set to either ""0"" or ""40+"" when full CC Troop wanted")
If GUICtrlRead($g_hChkRequestType_Troops) = $GUI_CHECKED Then
GUICtrlSetState(-1, $GUI_ENABLE)
Else
GUICtrlSetState(-1, $GUI_DISABLE)
EndIf
$g_hTxtRequestCountCCSpell = GUICtrlCreateInput("0", $x + 195, $y + 20, 25, 16, BitOR($SS_RIGHT, $ES_NUMBER))
GUICtrlSetLimit(-1, 1)
_GUICtrlSetTip(-1, "Do not request when already received that many CC Spells" & @CRLF & "Set to either ""0"" or ""2+"" when full CC Spell wanted")
If GUICtrlRead($g_hChkRequestType_Spells) = $GUI_CHECKED Then
GUICtrlSetState(-1, $GUI_ENABLE)
Else
GUICtrlSetState(-1, $GUI_DISABLE)
EndIf

$x += 29 + 30
$y += 60
GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design", "Only_during_hours", "Only during these hours of each day"), $x + 30, $y, 300, 20, $BS_MULTILINE)
Expand Down
2 changes: 1 addition & 1 deletion COCBot/MBR Functions.au3
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "functions\Attack\Unbreakable.au3"

#include "functions\Attack\Attack Algorithms\algorithm_AllTroops.au3"
#include "functions\Attack\Attack Algorithms\algorithm_Barch.au3"
;#include "functions\Attack\Attack Algorithms\algorithm_Barch.au3"
#include "functions\Attack\Attack Algorithms\algorithmTH.au3"
#include "functions\Attack\Attack Algorithms\THAttackTypes.au3"
#include "functions\Attack\Attack Algorithms\AttackFromCSV.au3"
Expand Down
Loading

0 comments on commit 6be34ae

Please sign in to comment.