Skip to content

Commit ed9ccc4

Browse files
NytolNytol
committed
* **V7.8.5**
* Fix Clangames air troop challenge typo. Reported and found by @MyBotIvan * Add scroll bar to profiles combobox * Fix Troops Array! * Add scroll bar to profiles combobox * Correct auto switch wall level * Add additional check for missing images * Update lightening image * Add function 'Collect Achievement Rewards' * Update mine level 14, collector level 14 and drill level 8 * Siege machine hidden on train tab - reported by @ydoyoudothis * Add Automatic Town Hall level update to FirstCheck
1 parent 9549470 commit ed9ccc4

86 files changed

Lines changed: 545 additions & 135 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎COCBot/GUI/MBR GUI Control Child Army.au3‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@ Func lblTotalCountSiege()
251251
GUICtrlSetData($g_hLblCountTotalSiege, $g_iTotalTrainSpaceSiege)
252252
GUICtrlSetData($g_hLblTotalTimeSiege, " 0s")
253253
_GUI_Value_STATE("HIDE", $groupListSieges)
254+
Else
255+
GUICtrlSetBkColor($g_hLblCountTotalSiege, $COLOR_MONEYGREEN) ;lime, moneygreen
256+
_GUICtrlSetTip($g_hLblCountTotalSiege, GetTranslatedFileIni("MBR GUI Design Child Attack - Troops", "LblCountTotal_Info_02", "The total units of Siege Machines"))
257+
_GUI_Value_STATE("SHOW", $groupListSieges)
254258
EndIf
255259
EndFunc ;==>lblTotalCountSiege
256260

‎COCBot/GUI/MBR GUI Control Child Misc.au3‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,11 @@ Func chkActivateClangames()
652652
;V3
653653
GUICtrlSetState($g_hChkClanGamesLoot, $GUI_ENABLE)
654654
GUICtrlSetState($g_hChkClanGamesBattle, $GUI_ENABLE)
655+
GUICtrlSetState($g_hChkClanGamesSuperTroop, $GUI_ENABLE)
656+
657+
GUICtrlSetState($g_hChkClanGamesSpell, $GUI_ENABLE)
655658
GUICtrlSetState($g_hChkClanGamesDestruction, $GUI_ENABLE)
659+
656660
GUICtrlSetState($g_hChkClanGamesAirTroop, $GUI_ENABLE)
657661
GUICtrlSetState($g_hChkClanGamesGroundTroop, $GUI_ENABLE)
658662
GUICtrlSetState($g_hChkClanGamesMiscellaneous, $GUI_ENABLE)
@@ -670,6 +674,10 @@ Func chkActivateClangames()
670674
;V3
671675
GUICtrlSetState($g_hChkClanGamesLoot, $GUI_DISABLE)
672676
GUICtrlSetState($g_hChkClanGamesBattle, $GUI_DISABLE)
677+
678+
GUICtrlSetState($g_hChkClanGamesSuperTroop, $GUI_DISABLE)
679+
GUICtrlSetState($g_hChkClanGamesSpell, $GUI_DISABLE)
680+
673681
GUICtrlSetState($g_hChkClanGamesDestruction, $GUI_DISABLE)
674682
GUICtrlSetState($g_hChkClanGamesAirTroop, $GUI_DISABLE)
675683
GUICtrlSetState($g_hChkClanGamesGroundTroop, $GUI_DISABLE)

‎COCBot/GUI/MBR GUI Control Child Upgrade.au3‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ Func btnWalls()
541541
$g_bRunState = True
542542
Zoomout()
543543
$g_iCmbUpgradeWallsLevel = _GUICtrlComboBox_GetCurSel($g_hCmbWalls)
544-
If imglocCheckWall() Then SetLog("Hei Chef! We found the Wall!")
544+
If imglocCheckWall() Then SetLog("Hey Chef! We found the Wall!")
545545
$g_bRunState = $wasRunState
546546
AndroidShield("btnWalls") ; Update shield status due to manual $g_bRunState
547547
EndFunc ;==>btnWalls

‎COCBot/GUI/MBR GUI Control Collectors.au3‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
Func checkCollectors($log = False, $showLabel = True)
1818
Local $anyCollectorsEnabled = 0
19-
For $i = 6 To 13
19+
For $i = 6 To 14
2020
If $g_abCollectorLevelEnabled[$i] Then
2121
$anyCollectorsEnabled = 1
2222
ExitLoop
@@ -38,7 +38,7 @@ Func checkCollectors($log = False, $showLabel = True)
3838
EndFunc ;==>checkCollectors
3939

4040
Func chkDBCollector()
41-
For $i = 6 To 13
41+
For $i = 6 To 14
4242
If $g_ahChkDBCollectorLevel[$i] = @GUI_CtrlId Then
4343
If $i = 6 Then
4444
$g_abCollectorLevelEnabled[6] = False
@@ -54,7 +54,7 @@ Func chkDBCollector()
5454
EndFunc ;==>chkDBCollector
5555

5656
Func cmbDBCollector()
57-
For $i = 6 To 13
57+
For $i = 6 To 14
5858
If $g_ahCmbDBCollectorLevel[$i] = @GUI_CtrlId Then
5959
$g_aiCollectorLevelFill[$i] = _GUICtrlComboBox_GetCurSel($g_ahCmbDBCollectorLevel[$i])
6060
ExitLoop

‎COCBot/GUI/MBR GUI Design Child Attack - Deadbase-Collectors.au3‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#include-once
1616

1717
Global $g_hChkDBDisableCollectorsFilter = 0
18-
Global $g_ahChkDBCollectorLevel[14] = [-1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0] ; elements 0 thru 5 are never referenced
19-
Global $g_ahCmbDBCollectorLevel[14] = [-1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0] ; elements 0 thru 5 are never referenced
18+
Global $g_ahChkDBCollectorLevel[15] = [-1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0] ; elements 0 thru 5 are never referenced
19+
Global $g_ahCmbDBCollectorLevel[15] = [-1, -1, -1, -1, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0] ; elements 0 thru 5 are never referenced
2020
Global $g_hCmbMinCollectorMatches = 0, $g_hSldCollectorTolerance = 0, $g_hLblCollectorWarning = 0
2121

2222
Func CreateAttackSearchDeadBaseCollectors()
@@ -32,7 +32,7 @@ Func CreateAttackSearchDeadBaseCollectors()
3232
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Attack - Deadbase-Collectors", "ChkDisableCollectorsFilter_Info_01", "Disable Collector Filter CHANGES DeadBase into another ActiveBase search"))
3333

3434
$y += 15
35-
For $i = 6 To 13
35+
For $i = 6 To 14
3636
$y += 25
3737
$g_ahChkDBCollectorLevel[$i] = GUICtrlCreateCheckbox("", $x, $y, 18, 18)
3838
$sTxtTip = $s_TxtTip1 & @CRLF & GetTranslatedFileIni("MBR GUI Design Child Attack - Deadbase-Collectors", "ChkCollectorLevel" & $i & "_Info_01", "for level " & $i & " elixir collectors during dead base detection.")

‎COCBot/GUI/MBR GUI Design Child Bot - Profiles.au3‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Func CreateBotProfiles()
2626
Local $x = 25, $y = 45
2727
GUICtrlCreateGroup(GetTranslatedFileIni("MBR GUI Design Child Bot - Profiles", "Group_01", "Switch Profiles"), $x - 20, $y - 20, $g_iSizeWGrpTab2, 55)
2828
$x -= 5
29-
$g_hCmbProfile = GUICtrlCreateCombo("", $x - 3, $y + 1, 115, 18, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
29+
$g_hCmbProfile = GUICtrlCreateCombo("", $x - 3, $y + 1, 115, 18, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL, $WS_VSCROLL))
3030
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Bot - Profiles", "CmbProfile_Info_01", "Use this to switch to a different profile")& @CRLF & _
3131
GetTranslatedFileIni("MBR GUI Design Child Bot - Profiles", "CmbProfile_Info_02", "Your profiles can be found in") & ": " & @CRLF & $g_sProfilePath)
3232
setupProfileComboBox()

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

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Global $g_hChkTrap = 1, $g_hChkCollect = 1, $g_hChkTombstones = 1, $g_hChkCleanY
2323
Global $g_hChkCollectCartFirst = 0, $g_hTxtCollectGold = 0, $g_hTxtCollectElixir = 0, $g_hTxtCollectDark = 0
2424
Global $g_hBtnLocateSpellfactory = 0, $g_hBtnLocateDarkSpellFactory = 0
2525
Global $g_hBtnLocateKingAltar = 0, $g_hBtnLocateQueenAltar = 0, $g_hBtnLocateWardenAltar = 0, $g_hBtnLocateChampionAltar = 0, $g_hBtnLocateLaboratory = 0, $g_hBtnResetBuilding = 0
26-
Global $g_hChkTreasuryCollect = 0, $g_hTxtTreasuryGold = 0, $g_hTxtTreasuryElixir = 0, $g_hTxtTreasuryDark = 0 , $g_hChkFreeMagicItems = 0, $g_hChkCollectRewards = 0, $g_hChkSellRewards = 0
26+
Global $g_hChkTreasuryCollect = 0, $g_hTxtTreasuryGold = 0, $g_hTxtTreasuryElixir = 0, $g_hTxtTreasuryDark = 0 , $g_hChkCollectAchievements = 0, $g_hChkFreeMagicItems = 0, $g_hChkCollectRewards = 0, $g_hChkSellRewards = 0
2727

2828
Global $g_alblBldBaseStats[4] = ["", "", ""]
2929
Global $g_hChkCollectBuilderBase = 0, $g_hChkStartClockTowerBoost = 0, $g_hChkCTBoostBlderBz = 0, $g_hChkCleanBBYard = 0
@@ -34,6 +34,8 @@ Global $g_hChkPlacingNewBuildings = 0, $g_hChkBBSuggestedUpgradesIgnoreWall = 0
3434
Global $g_hChkClanGamesAir = 0, $g_hChkClanGamesGround = 0, $g_hChkClanGamesMisc = 0
3535
Global $g_hChkClanGamesEnabled = 0 , $g_hChkClanGames60 = 0
3636
Global $g_hChkClanGamesLoot = 0 , $g_hChkClanGamesBattle =0 , $g_hChkClanGamesDestruction = 0 , $g_hChkClanGamesAirTroop = 0 , $g_hChkClanGamesGroundTroop = 0 , $g_hChkClanGamesMiscellaneous = 0
37+
global $g_hChkClanGamesSpell = 0
38+
global $g_hChkClanGamesSuperTroop = 0
3739
Global $g_hChkClanGamesPurge = 0 , $g_hcmbPurgeLimit = 0 , $g_hChkClanGamesStopBeforeReachAndPurge = 0
3840
Global $g_hTxtClanGamesLog = 0
3941
Global $g_hChkClanGamesDebug = 0
@@ -280,34 +282,39 @@ Func CreateMiscNormalVillageSubTab()
280282
GUICtrlSetLimit(-1, 6)
281283

282284
$x = 15
283-
$y += 22
285+
$y += 21
284286
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnTombstone, $x + 32 , $y, 24, 24)
285287
$g_hChkTombstones = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkTombstones", "Clear Tombstones"), $x + 100, $y + 4, -1, -1)
286288
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkTombstones_Info_01", "Check this to automatically clear tombstones after enemy attack."))
287289
GUICtrlSetState(-1, $GUI_CHECKED)
288290

289-
$y += 28
290-
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnTree, $x + 20, $y, 24, 24)
291-
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnBark, $x + 45, $y, 24, 24)
292-
$g_hChkCleanYard = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCleanYard", "Remove Obstacles"), $x + 100, $y + 4, -1, -1)
291+
;_GUICtrlCreateIcon($g_sLibIconPath, $eIcnTree, $x + 230, $y, 24, 24)
292+
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnBark, $x + 230, $y, 24, 24)
293+
$g_hChkCleanYard = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCleanYard", "Remove Obstacles"), $x + 265, $y + 4, -1, -1)
293294
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCleanYard_Info_01", "Check this to automatically clear Yard from Trees, Trunks, etc."))
294295
GUICtrlSetState(-1, $GUI_UNCHECKED)
295296

296-
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnPowerPotion, $x + 230, $y + 1 , 24, 24)
297+
$y += 21
298+
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnGembox, $x + 32, $y, 24, 24)
299+
$g_hChkGemsBox = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkGemsBox", "Remove GemBox"), $x + 100, $y + 4, -1, -1)
300+
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkGemsBox_Info_01", "Check this to automatically clear GemBox."))
301+
GUICtrlSetState(-1, $GUI_UNCHECKED)
302+
303+
$y += 21
304+
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnCollectAchievements, $x + 22, $y - 8 , 48, 48)
305+
$g_hChkCollectAchievements = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCollectAchievements", "Collect Achievements"), $x + 100, $y + 4, -1, -1)
306+
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCollectAchievements_Info", "Check this to automatically collect achievement rewards."))
307+
308+
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnPowerPotion, $x + 230, $y + 1 , 24, 24)
297309
$g_hChkFreeMagicItems = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkFreeMagicItems", "Collect Free Magic Items"), $x + 265, $y + 4, -1, -1)
298310
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkFreeMagicItems_Info", "Check this to automatically collect free magic items.\r\nMust be at least Th8."))
299311
GUICtrlSetOnEvent(-1, "ChkFreeMagicItems")
300312
GUICtrlSetColor ( -1, $COLOR_ERROR )
301313

302-
$y += 28
303-
_GUICtrlCreateIcon($g_sLibIconPath, $eIcnGembox, $x + 32, $y, 24, 24)
304-
$g_hChkGemsBox = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkGemsBox", "Remove GemBox"), $x + 100, $y + 4, -1, -1)
305-
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkGemsBox_Info_01", "Check this to automatically clear GemBox."))
306-
GUICtrlSetState(-1, $GUI_UNCHECKED)
314+
$y += 21
315+
$g_hChkCollectRewards = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCollectRewards", "Collect Challenge Rewards"), $x + 100, $y + 4, -1, -1)
307316

308-
$g_hChkCollectRewards = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkCollectRewards", "Collect Challenge Rewards"), $x + 204, $y + 4, -1, -1)
309-
310-
$g_hChkSellRewards = GUICtrlCreateCheckBox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkSellRewards", "Sell Extras"), $x + 352, $y + 4, -1, -1)
317+
$g_hChkSellRewards = GUICtrlCreateCheckBox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkSellRewards", "Sell Extras"), $x + 265, $y + 4, -1, -1)
311318
_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkSellExtra_Info_01", "Check to automatically sell all extra magic item rewards for gems."))
312319

313320
GUICtrlCreateGroup("", -99, -99, 1, 1)
@@ -502,8 +509,10 @@ Func CreateMiscClanGamesV3SubTab()
502509
$x += 25
503510
$y += 25
504511
$g_hChkClanGamesLoot = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkClanGamesLoot", "Loot Challenges"), $x, $y, -1, -1)
512+
$g_hChkClanGamesSuperTroop = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkClanSuperTroop", "SuperTroop Challenges"), $x + 130, $y, -1, -1)
505513
$y += 25
506514
$g_hChkClanGamesBattle = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkClanGamesBattle", "Battle Challenges"), $x, $y, -1, -1)
515+
$g_hChkClanGamesSpell = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkClanGamesSpell", "Spell Challenges"), $x + 130, $y, -1, -1)
507516
$y += 25
508517
$g_hChkClanGamesDestruction = GUICtrlCreateCheckbox(GetTranslatedFileIni("MBR GUI Design Child Village - Misc", "ChkClanGamesDestruction", "Destruction Challenges"), $x, $y, -1, -1)
509518
$y += 25

‎COCBot/MBR Functions.au3‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@
236236
#include "functions\Village\CheckBaseQuick.au3"
237237
#include "functions\Village\chkShieldStatus.au3"
238238
#include "functions\Village\Collect.au3"
239+
#include "functions\Village\CollectAchievements.au3"
239240
#include "functions\Village\TreasuryCollect.au3"
240241
#include "functions\Village\DonateCC.au3"
241242
#include "functions\Village\DonateCCWBL.au3"

0 commit comments

Comments
 (0)