Skip to content

Commit

Permalink
* **V7.6.1**
Browse files Browse the repository at this point in the history
* Fixed Queen activation at scripted Attacks
* Fixed Train Sieges on Quick Train , by @ChacalGyn
* Fixed Train Sieges after donate all current sieges and camp is 0
* Improved MEmu/Nox OpenGL and DirectX Render detection for Win10 Build 17134
* Improved Heroes Upgrade, don't check a hero, which is already upgrading
* Improved Heroes Upgrade, reserve builders for upgrading
* Improved Wall Upgrade, allow upgrade by elixir, when Warden is already upgrading
* Removed the Scheduler Notify Tab
  • Loading branch information
promac2k committed Aug 11, 2018
1 parent 28c5206 commit d1cd478
Show file tree
Hide file tree
Showing 47 changed files with 3,945 additions and 14,006 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
* **V7.6.1**
* Fixed Queen activation at scripted Attacks
* Fixed Train Sieges on Quick Train , by @ChacalGyn
* Fixed Train Sieges after donate all current sieges and camp is 0
* Improved MEmu/Nox OpenGL and DirectX Render detection for Win10 Build 17134
* Improved Heroes Upgrade, don't check a hero, which is already upgrading
* Improved Heroes Upgrade, reserve builders for upgrading
* Improved Wall Upgrade, allow upgrade by elixier, when Warden is already upgrading
* Removed the Scheduler Notify Tab

* **V7.6**
* Added New Logo/banner by @Hecki
* Added Double Train Army by @Demen
Expand Down
5 changes: 3 additions & 2 deletions COCBot/GUI/MBR GUI Control Child Army.au3
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Func chkUseQTrain()
_GUI_Value_STATE("ENABLE", $grpCookSpell)
lblTotalCountTroop1()
TotalSpellCountClick()
lblTotalCountSiege()
EndIf
lblTotalCountSiege()
EndFunc ;==>chkUseQTrain

Func chkQuickTrainCombo()
Expand Down Expand Up @@ -190,7 +190,8 @@ Func lblTotalCountSiege()
GUICtrlSetBkColor($g_hLblCountTotalSiege, $g_iTotalTrainSpaceSiege <= 2 ? $COLOR_MONEYGREEN : $COLOR_RED)

CalCostSiege()
If $g_iTownHallLevel <> 12 and $g_iTownHallLevel > 0 then
; prepared for some new TH level !!
If $g_iTownHallLevel > 0 And $g_iTownHallLevel < 12 then
$g_iTotalTrainSpaceSiege = 0
GUICtrlSetBkColor($g_hLblCountTotalSiege,$COLOR_RED)
_GUICtrlSetTip($g_hLblCountTotalSiege, GetTranslatedFileIni("MBR GUI Design Child Attack - Troops", "LblCountTotal_Info_03", "Workshop Level 1 Required!"))
Expand Down
27 changes: 24 additions & 3 deletions COCBot/GUI/MBR GUI Control Child Upgrade.au3
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ Func ResetLabUpgradeTime()
EndFunc ;==>ResetLabUpgradeTime

Func chkUpgradeKing()
If $g_iTownHallLevel > 6 Or $g_iTownHallLevel = 0 Then ; Must be TH7 or above to have King
If $g_iTownHallLevel > 6 Then ; Must be TH7 or above to have King
GUICtrlSetState($g_hChkUpgradeKing, $GUI_ENABLE)
If GUICtrlRead($g_hChkUpgradeKing) = $GUI_CHECKED Then
$g_bUpgradeKingEnable = True
Expand Down Expand Up @@ -203,7 +203,7 @@ Func chkUpgradeKing()
EndFunc ;==>chkUpgradeKing

Func chkUpgradeQueen()
If $g_iTownHallLevel > 8 Or $g_iTownHallLevel = 0 Then ; Must be TH9 or above to have Queen
If $g_iTownHallLevel > 8 Then ; Must be TH9 or above to have Queen
GUICtrlSetState($g_hChkUpgradeQueen, $GUI_ENABLE)
If GUICtrlRead($g_hChkUpgradeQueen) = $GUI_CHECKED Then
$g_bUpgradeQueenEnable = True
Expand Down Expand Up @@ -232,7 +232,7 @@ Func chkUpgradeQueen()
EndFunc ;==>chkUpgradeQueen

Func chkUpgradeWarden()
If $g_iTownHallLevel > 10 Or $g_iTownHallLevel = 0 Then ; Must be TH11 to have warden
If $g_iTownHallLevel > 10 Then ; Must be TH11 to have warden
GUICtrlSetState($g_hChkUpgradeWarden, $GUI_ENABLE)
If GUICtrlRead($g_hChkUpgradeWarden) = $GUI_CHECKED Then
$g_bUpgradeWardenEnable = True
Expand Down Expand Up @@ -260,6 +260,27 @@ Func chkUpgradeWarden()
EndIf
EndFunc ;==>chkUpgradeWarden

Func cmbHeroReservedBuilder()
$g_iHeroReservedBuilder = _GUICtrlComboBox_GetCurSel($g_hCmbHeroReservedBuilder)
If $g_iTownHallLevel > 6 Then ; Must be TH7 or above to have Heroes
If $g_iTownHallLevel > 10 Then ; For TH11 enable up to 3 reserved builders
GUICtrlSetData($g_hCmbHeroReservedBuilder, "|0|1|2|3", "0")
ElseIf $g_iTownHallLevel > 8 Then ; For TH9 enable up to 2 reserved builders
GUICtrlSetData($g_hCmbHeroReservedBuilder, "|0|1|2", "0")
Else ; For TH7 enable up to 1 reserved builder
GUICtrlSetData($g_hCmbHeroReservedBuilder, "|0|1", "0")
EndIf
GUICtrlSetState($g_hCmbHeroReservedBuilder, $GUI_ENABLE)
GUICtrlSetState($g_hLblHeroReservedBuilderTop, $GUI_ENABLE)
GUICtrlSetState($g_hLblHeroReservedBuilderBottom, $GUI_ENABLE)
Else
GUICtrlSetState($g_hCmbHeroReservedBuilder, $GUI_DISABLE)
GUICtrlSetState($g_hLblHeroReservedBuilderTop, $GUI_DISABLE)
GUICtrlSetState($g_hLblHeroReservedBuilderBottom, $GUI_DISABLE)
EndIf
_GUICtrlComboBox_SetCurSel($g_hCmbHeroReservedBuilder, $g_iHeroReservedBuilder)
EndFunc ;==>cmbHeroReservedBuilder

Func chkWalls()
If GUICtrlRead($g_hChkWalls) = $GUI_CHECKED Then
$g_bAutoUpgradeWallsEnable = True
Expand Down
8 changes: 0 additions & 8 deletions COCBot/GUI/MBR GUI Control Notify.au3
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,6 @@ Func chkPBTGenabled()
EndIf
EndFunc ;==>chkPBTGenabled

Func NotifyHelp()
If FileExists(@ScriptDir & "\Help\NotifyHelp_" & $g_sLanguage & ".mht") Then
ShellExecute(@ScriptDir & "\Help\NotifyHelp_" & $g_sLanguage & ".mht")
ElseIf FileExists(@ScriptDir & "\Help\NotifyHelp_English.mht") Then
ShellExecute(@ScriptDir & "\Help\NotifyHelp_English.mht")
EndIf
EndFunc ;==>NotifyHelp

Func chkNotifyHours()
Local $b = GUICtrlRead($g_hChkNotifyOnlyHours) = $GUI_CHECKED
For $i = 0 To 23
Expand Down
14 changes: 13 additions & 1 deletion COCBot/GUI/MBR GUI Design About.au3
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,25 @@ EndFunc ;==>CreateAboutTab

Func ShowCommandLineHelp()

SetDebugLog ("Help File called from CrtlID: " & @GUI_CtrlId)

Local $PathHelp = "CommandLineParameter"

; This can be use for several Help Files
Switch @GUI_CtrlId
Case 2620 to 2670 ; Bot/Android/Help Handle
$PathHelp = "CommandLineParameter"
Case 1100 to 1150
$PathHelp = "NotifyHelp"
EndSwitch

UpdateBotTitle()
$g_hGUI_CommandLineHelp = GUICreate($g_sBotTitle & " - Command Line Help", 650, 700, -1, -1, BitOR($WS_CAPTION, $WS_POPUPWINDOW, $DS_MODALFRAME))
GUISetIcon($g_sLibIconPath, $eIcnGUI, $g_hGUI_CommandLineHelp)

; add controls
Local $hRichEdit = _GUICtrlRichEdit_Create($g_hGUI_CommandLineHelp, "", 2, 0, 646, 667, $WS_VSCROLL + $ES_MULTILINE)
Local $sHelpFile = @ScriptDir & "\Help\CommandLineParameter"
Local $sHelpFile = @ScriptDir & "\Help\" & $PathHelp
If $g_sLanguage <> $g_sDefaultLanguage Then
If FileExists($sHelpFile & "_" & $g_sLanguage & ".rtf") Then
$sHelpFile &= "_" & $g_sLanguage
Expand Down
9 changes: 9 additions & 0 deletions COCBot/GUI/MBR GUI Design Child VIllage - Upgrade.au3
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Global $g_hChkAutoLabUpgrades = 0, $g_hCmbLaboratory = 0, $g_hLblNextUpgrade = 0

; Heroes
Global $g_hChkUpgradeKing = 0, $g_hChkUpgradeQueen = 0, $g_hChkUpgradeWarden = 0, $g_hPicChkKingSleepWait = 0, $g_hPicChkQueenSleepWait = 0, $g_hPicChkWardenSleepWait = 0
Global $g_hCmbHeroReservedBuilder = 0, $g_hLblHeroReservedBuilderTop = 0, $g_hLblHeroReservedBuilderBottom = 0

; Buildings
Global $g_hChkUpgrade[$g_iUpgradeSlots] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
Expand Down Expand Up @@ -188,6 +189,14 @@ Func CreateHeroesSubTab()
$g_hPicChkWardenSleepWait = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnSleepingWarden, $x + 18, $y, 64, 64)
_GUICtrlSetTip(-1, $sTxtTip)
GUICtrlSetState(-1,$GUI_HIDE)

$x += 95
$g_hLblHeroReservedBuilderTop = GUICtrlCreateLabel(GetTranslatedFileIni("MBR GUI Design Child Village - Upgrade_Heroes", "LblHeroReservedBuilderTop", "Reserve ") , $x, $y + 15, -1, -1)
$g_hCmbHeroReservedBuilder = GUICtrlCreateCombo("", $x + 50, $y + 11, 30, 21, $CBS_DROPDOWNLIST, $WS_EX_RIGHT)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Upgrade_Heroes", "CmbHeroReservedBuilder", "At least this many builders have to upgrade heroes, or wait for it."))
GUICtrlSetData(-1, "|0|1|2|3", "0")
GUICtrlSetOnEvent(-1, "cmbHeroReservedBuilder")
$g_hLblHeroReservedBuilderBottom = GUICtrlCreateLabel(GetTranslatedFileIni("MBR GUI Design Child Village - Upgrade_Heroes", "LblHeroReservedBuilderBottom", "builder/s for hero upgrade"), $x, $y + 35, -1, -1)
GUICtrlCreateGroup("", -99, -99, 1, 1)

EndFunc ;==>CreateHeroesSubTab
Expand Down
139 changes: 32 additions & 107 deletions COCBot/GUI/MBR GUI Design Child Village - Notify.au3
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
; Example .......: No
; ===============================================================================================================================
#include-once
Global $g_hGUI_NOTIFY = 0, $g_hGUI_NOTIFY_TAB = 0, $g_hGUI_NOTIFY_TAB_ITEM2 = 0, $g_hGUI_NOTIFY_TAB_ITEM6 = 0
Global $g_hGUI_NOTIFY = 0, $g_hGUI_NOTIFY_TAB = 0, $g_hGUI_NOTIFY_TAB_ITEM2 = 0

Global $g_hGrpNotify = 0
; Global $g_hChkNotifyPBEnable = 0, $g_hTxtNotifyPBToken = 0
Expand All @@ -40,8 +40,6 @@ Func CreateVillageNotify()
$g_hGUI_NOTIFY_TAB = GUICtrlCreateTab(0, 0, $g_iSizeWGrpTab2, $g_iSizeHGrpTab2, BitOR($TCS_MULTILINE, $TCS_RIGHTJUSTIFY))
$g_hGUI_NOTIFY_TAB_ITEM2 = GUICtrlCreateTabItem(GetTranslatedFileIni("MBR Main GUI", "Tab_02_STab_05_STab_01", "Telegram"))
CreatePushBulletTelegramSubTab()
$g_hGUI_NOTIFY_TAB_ITEM6 = GUICtrlCreateTabItem(GetTranslatedFileIni("MBR Main GUI", "Tab_02_STab_05_STab_02", "Notify Schedule"))
CreateNotifyScheduleSubTab()
GUICtrlCreateTabItem("")

EndFunc ;==>CreateVillageNotify
Expand All @@ -63,7 +61,7 @@ Func CreatePushBulletTelegramSubTab()
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Notify", "LblNotifyTGToken_Info_01", "You need a Token to use Telegram notifications. Get a token from Telegram.com"))
GUICtrlSetState(-1, $GUI_DISABLE)

$y += 30
$y += 25
$g_hChkNotifyRemote = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Notify", "ChkNotifyRemote", "Remote Control"), $x + 10, $y)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Notify", "ChkNotifyRemote_Info_01", "Enables Telegram Remote function"))
GUICtrlSetState(-1, $GUI_DISABLE)
Expand Down Expand Up @@ -129,120 +127,49 @@ Func CreatePushBulletTelegramSubTab()
$g_hChkNotifyBOTUpdate = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Notify", "ChkNotifyBOTUpdate", "BOT Update"), $x + 210, $y, -1, -1)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Notify", "ChkNotifyBOTUpdate_Info_01", "Send an Alert when there is a new version of the bot."))
GUICtrlSetState(-1, $GUI_DISABLE)
$y += 70
GUICtrlCreateLabel(GetTranslatedFileIni("MBR GUI Design Child Village - Notify", "LblNotifyHelp", "Help ?"), $x + 197, $y + 93, 220, 24, $SS_RIGHT)
GUICtrlSetOnEvent(-1, "NotifyHelp")
GUICtrlSetCursor(-1, 0)
GUICtrlSetFont(-1, 8.5, $FW_BOLD)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Notify", "LblNotifyHelp_Info_01", "Click here to get Help about Notify Remote commands to Telegram"))
GUICtrlSetColor(-1, $COLOR_NAVY)
GUICtrlCreateGroup("", -99, -99, 1, 1)

EndFunc ;==>CreatePushBulletTelegramSubTab

Func CreateNotifyScheduleSubTab()
Local $x = 25
Local $y = 150 - 105
Local $sTxtTip = ""
$y += 20
; TODO

GUICtrlCreateGroup(GetTranslatedFileIni("MBR Main GUI", "Tab_02_STab_05_STab_02", -1), $x - 20, $y - 20, $g_iSizeWGrpTab3, $g_iSizeHGrpTab3)
$x += 10
$y += 10
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnTelegram, $x - 5, $y, 64, 64, $BS_ICON)
$g_hChkNotifyOnlyHours = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR Global GUI Design", "Only_during_hours", "Only during these hours of each day"), $x + 70, $y - 6)
$y += 30
$g_hChkNotifyOnlyHours = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR Global GUI Design", "Only_during_hours", "Only during these hours of each day"), $x + 70, $y )
GUICtrlSetOnEvent(-1, "chkNotifyHours")

$x += 59
$y += 85
$y += 25
$g_hLblNotifyhour = GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design", "Hour", "Hour") & ":", $x, $y, -1, 15)
$sTxtTip = GetTranslatedFileIni("MBR Global GUI Design", "Only_during_hours", -1)
_GUICtrlSetTip(-1, $sTxtTip)
$g_hLblNotifyhours[0] = GUICtrlCreateLabel(" 0", $x + 30, $y)
$g_hLblNotifyhours[1] = GUICtrlCreateLabel(" 1", $x + 45, $y)
$g_hLblNotifyhours[2] = GUICtrlCreateLabel(" 2", $x + 60, $y)
$g_hLblNotifyhours[3] = GUICtrlCreateLabel(" 3", $x + 75, $y)
$g_hLblNotifyhours[4] = GUICtrlCreateLabel(" 4", $x + 90, $y)
$g_hLblNotifyhours[5] = GUICtrlCreateLabel(" 5", $x + 105, $y)
$g_hLblNotifyhours[6] = GUICtrlCreateLabel(" 6", $x + 120, $y)
$g_hLblNotifyhours[7] = GUICtrlCreateLabel(" 7", $x + 135, $y)
$g_hLblNotifyhours[8] = GUICtrlCreateLabel(" 8", $x + 150, $y)
$g_hLblNotifyhours[9] = GUICtrlCreateLabel(" 9", $x + 165, $y)
$g_hLblNotifyhours[10] = GUICtrlCreateLabel("10", $x + 180, $y)
$g_hLblNotifyhours[11] = GUICtrlCreateLabel("11", $x + 195, $y)
For $i = 0 to 11
$g_hLblNotifyhours[$i] = GUICtrlCreateLabel(StringFormat("%2s", String($i)), $x + 30 + ( 15 * $i), $y)
Next
$g_ahLblNotifyhoursE = GUICtrlCreateLabel("X", $x + 214, $y + 1, 11, 11)

$y += 15
$g_hChkNotifyhours[0] = GUICtrlCreateCheckbox("", $x + 30, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[1] = GUICtrlCreateCheckbox("", $x + 45, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[2] = GUICtrlCreateCheckbox("", $x + 60, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[3] = GUICtrlCreateCheckbox("", $x + 75, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[4] = GUICtrlCreateCheckbox("", $x + 90, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[5] = GUICtrlCreateCheckbox("", $x + 105, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[6] = GUICtrlCreateCheckbox("", $x + 120, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[7] = GUICtrlCreateCheckbox("", $x + 135, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[8] = GUICtrlCreateCheckbox("", $x + 150, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[9] = GUICtrlCreateCheckbox("", $x + 165, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[10] = GUICtrlCreateCheckbox("", $x + 180, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[11] = GUICtrlCreateCheckbox("", $x + 195, $y, 15, 15)
For $i = 0 to 11
$g_hChkNotifyhours[$i] = GUICtrlCreateCheckbox("", $x + 30 + (15 * $i), $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
Next
$g_hChkNotifyhoursE1 = GUICtrlCreateCheckbox("", $x + 211, $y + 1, 13, 13, BitOR($BS_PUSHLIKE, $BS_ICON))
_GUICtrlSetImage(-1, $g_sLibIconPath, $eIcnGoldStar, 0)
GUICtrlSetState(-1, $GUI_UNCHECKED + $GUI_DISABLE)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR Global GUI Design", "Clear_set_row_of_boxes", -1))
GUICtrlSetOnEvent(-1, "chkNotifyhoursE1")
$g_hLblNotifyhoursAM = GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design", "AM", -1), $x + 10, $y)

$y += 15
$g_hChkNotifyhours[12] = GUICtrlCreateCheckbox("", $x + 30, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[13] = GUICtrlCreateCheckbox("", $x + 45, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[14] = GUICtrlCreateCheckbox("", $x + 60, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[15] = GUICtrlCreateCheckbox("", $x + 75, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[16] = GUICtrlCreateCheckbox("", $x + 90, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[17] = GUICtrlCreateCheckbox("", $x + 105, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[18] = GUICtrlCreateCheckbox("", $x + 120, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[19] = GUICtrlCreateCheckbox("", $x + 135, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[20] = GUICtrlCreateCheckbox("", $x + 150, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[21] = GUICtrlCreateCheckbox("", $x + 165, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[22] = GUICtrlCreateCheckbox("", $x + 180, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyhours[23] = GUICtrlCreateCheckbox("", $x + 195, $y, 15, 15)
For $i = 12 to 23
$g_hChkNotifyhours[$i] = GUICtrlCreateCheckbox("", $x + 30 + (15 * ($i - 12)), $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
Next
$g_hChkNotifyhoursE2 = GUICtrlCreateCheckbox("", $x + 211, $y + 1, 13, 13, BitOR($BS_PUSHLIKE, $BS_ICON))
_GUICtrlSetImage(-1, $g_sLibIconPath, $eIcnGoldStar, 0)
GUICtrlSetState(-1, $GUI_UNCHECKED + $GUI_DISABLE)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR Global GUI Design", "Clear_set_row_of_boxes", -1))
GUICtrlSetOnEvent(-1, "chkNotifyhoursE2")
$g_hLblNotifyhoursPM = GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design", "PM", -1), $x + 10, $y)

$x = 35
$y = 220
$g_hChkNotifyOnlyWeekDays = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR Global GUI Design", "Only_during_day", "Only during these day of week"), $x + 70, $y - 6)
$y += 20
$g_hChkNotifyOnlyWeekDays = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR Global GUI Design", "Only_during_day", "Only during these day of week"), $x + 11, $y )
GUICtrlSetOnEvent(-1, "chkNotifyWeekDays")
GUICtrlSetState(-1, $GUI_DISABLE)

$x += 59
$y += 19
$y += 25
GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design", "Day", "Day") & ":", $x, $y, -1, 15)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR Global GUI Design", "Only_during_day", -1))
$g_hLblNotifyWeekdays[0] = GUICtrlCreateLabel(GetTranslatedFileIni("MBR Global GUI Design", "Su", "Su"), $x + 30, $y)
Expand All @@ -261,28 +188,26 @@ Func CreateNotifyScheduleSubTab()
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR Global GUI Design", "Saturday", "Saturday"))
$g_ahLblNotifyWeekdaysE = GUICtrlCreateLabel("X", $x + 155, $y + 1, -1, 15)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR Global GUI Design", "Clear_set_row_of_boxes", -1))

$y += 13
$g_hChkNotifyWeekdays[0] = GUICtrlCreateCheckbox("", $x + 30, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyWeekdays[1] = GUICtrlCreateCheckbox("", $x + 47, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyWeekdays[2] = GUICtrlCreateCheckbox("", $x + 64, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyWeekdays[3] = GUICtrlCreateCheckbox("", $x + 81, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyWeekdays[4] = GUICtrlCreateCheckbox("", $x + 99, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyWeekdays[5] = GUICtrlCreateCheckbox("", $x + 117, $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
$g_hChkNotifyWeekdays[6] = GUICtrlCreateCheckbox("", $x + 133, $y, 15, 15)
For $i = 0 to 6
$g_hChkNotifyWeekdays[$i] = GUICtrlCreateCheckbox("", $x + 30 + (17 * $i), $y, 15, 15)
GUICtrlSetState(-1, $GUI_CHECKED + $GUI_DISABLE)
Next
$g_ahChkNotifyWeekdaysE = GUICtrlCreateCheckbox("", $x + 151, $y + 1, 13, 13, BitOR($BS_PUSHLIKE, $BS_ICON))
_GUICtrlSetImage(-1, $g_sLibIconPath, $eIcnGoldStar, 0)
GUICtrlSetState(-1, $GUI_UNCHECKED)
GUICtrlSetState(-1, $GUI_DISABLE)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR Global GUI Design", "Clear_set_row_of_boxes", -1))
GUICtrlSetOnEvent(-1, "ChkNotifyWeekdaysE")
$y += 15
$x = 15
GUICtrlCreateLabel(GetTranslatedFileIni("MBR GUI Design Child Village - Notify", "LblNotifyHelp", "Help ?"), $x + 310, $y , 100, 24, $SS_RIGHT)
GUICtrlSetOnEvent(-1, "ShowCommandLineHelp")
GUICtrlSetCursor(-1, 0)
GUICtrlSetFont(-1, 8.5, $FW_BOLD)
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Notify", "LblNotifyHelp_Info_01", "Click here to get Help about Notify Remote commands to Telegram"))
GUICtrlSetColor(-1, $COLOR_NAVY)
GUICtrlCreateGroup("", -99, -99, 1, 1)

EndFunc ;==>CreateNotifyScheduleSubTab
EndFunc ;==>CreatePushBulletTelegramSubTab

2 changes: 1 addition & 1 deletion COCBot/MBR GUI Control Variables.au3
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ Func InitializeControlVariables()
Dim $aTabControlsMisc = [$g_hGUI_MISC_TAB, $g_hGUI_MISC_TAB_ITEM1, $g_hGUI_MISC_TAB_ITEM2]
Dim $aTabControlsDonate = [$g_hGUI_DONATE_TAB, $g_hGUI_DONATE_TAB_ITEM1, $g_hGUI_DONATE_TAB_ITEM2, $g_hGUI_DONATE_TAB_ITEM3]
Dim $aTabControlsUpgrade = [$g_hGUI_UPGRADE_TAB, $g_hGUI_UPGRADE_TAB_ITEM1, $g_hGUI_UPGRADE_TAB_ITEM2, $g_hGUI_UPGRADE_TAB_ITEM3, $g_hGUI_UPGRADE_TAB_ITEM4, $g_hGUI_UPGRADE_TAB_ITEM5]
Dim $aTabControlsNotify = [$g_hGUI_NOTIFY_TAB, $g_hGUI_NOTIFY_TAB_ITEM2, $g_hGUI_NOTIFY_TAB_ITEM6]
Dim $aTabControlsNotify = [$g_hGUI_NOTIFY_TAB, $g_hGUI_NOTIFY_TAB_ITEM2]
Dim $aTabControlsAttack = [$g_hGUI_ATTACK_TAB, $g_hGUI_ATTACK_TAB_ITEM1, $g_hGUI_ATTACK_TAB_ITEM2, $g_hGUI_ATTACK_TAB_ITEM3]

Dim $aTabControlsArmy = [$g_hGUI_TRAINARMY_TAB, $g_hGUI_TRAINARMY_TAB_ITEM1, $g_hGUI_TRAINARMY_TAB_ITEM2, $g_hGUI_TRAINARMY_TAB_ITEM3, $g_hGUI_TRAINARMY_TAB_ITEM4]
Expand Down
Loading

0 comments on commit d1cd478

Please sign in to comment.