Skip to content

Commit 6551cc4

Browse files
author
MonkeyHunter
committed
* v8.1.7
* Added Fireball equipment support. * Improved Donation system. * Fixed Overgrowth spell donate strings translation. * Improved Builder count. * Updated donateCCWBL. * Added Space Scenery support (attack only). * Typo * Added Blacksmith level 7/8 template. * Improved Super Dragon detection in attack bar. * Improved Space Scenery detection (Attack only). * Improved Hog puppet equipment detection. * Improved Pet level OCR (3 and 1). * Improved Hero heal status detection. * Updated Hero heal time OCR area. * Improved Boost button detection. * Improved Army cap OCR (0). * Improved Open donate window detection. * Added DE Drill level 10 template. * Added ClanGamesRewards.ini creating if missing. * Updated Upgrade in progress color detection. * Improved CG events detection. * Improved Troops upgrade cost detection (3 white OCR). * Fixed Share replay function. * Fixed Unbreakable function. * Improved Remaining training time OCR (7/9). * Improved Donate button detection. * Improved Elixir collector level 16 detection (Dead base and smart). * Improved Giant and wall breaker detection for donation. * Fixed Battle Copter window detection. * Fixed Bob Control upgrades white zeros detection. * Added Builder boost perks to bob control upgrades prices. * Improved EQ spell detection for donation. * Improved Laboratory status detection. * Added Full support for Magic and Egypt Scenery. * Changed Loot Cart templates for detection. * Improved Obstacles remove. * Improved Buildings info OCR. * Added New pet support (Angry Jelly). * Added Support for Eagle level 7 and Monolith level 3. * Update Flame Flinger max level. * Added Equipment challenges to Clan Games (Code Only). * Updated some GUI images. ** Added support for COC 16.253.15. * Fixed Donations. * Fixed CC Status Detection. * Fixed missing _FilloBldgLevels() call. * Updated CC Spells/Sieges remove. * Change Egypt and Magic scenery fixed point detection. * Improved egyptian boat detection. * Increased cc spells/sieges speed detection. * Added Hog Gliders clan games event template. * Added Dead Eagle level 6 template. * Reduced Equipment updgrade display to 10 equipment. * Improved Donate window position detection. * Updated Siege switching detection area. * Fixed siege switching. * Fixed 6 red OCR for queue troops. * Added support for Streak Event in bonus calculation. * Improved Super Troops Count OCR in Army Overview. * Improved Egypt and Magic Scenery Zoom Out. * Fixed donation (COC 16.253.25). * Added Spiky Ball equipment support. * Fixed CC Sieges Removing array issue. * Added Football scenery support (Attack Only). * Added Pressure and zoom out script randomization (Minitouch). * Added Rocket Spear Equipment support. * Added Wild West scenery (Attack Only). * Improved Sieges training ClickDrag. * Improved Blacksmith auto location. * Improved TH16 detection. * Improved Army count OCR. * Improved Donate detection for : SWall, ETitan, FFlinger, SDrag, Wizard. * Improved BatSpell detection in Army Overview. * Improved few obstacles detection. * Added Full Support for Druid Troop. * Updated Pets Cost. * Fixed SCID Switch. * Added Builder's Apprentice Support. * Updated Walls Cost. * Added Streak Event Window Support. * Added Choice To Finish Current Equipment Upgrade first. * Added New Survey Window Detection. * Updated Ban Window Detection. * Typo * Improved Builder's Apprentice Cooldown OCR. * Added Magic Mirror Equipment Support. * Added Clash Game Stadium and Anime Sceneries Support (Attack Only). * Added More Builder's Apprentice Options. * Updated Close SCID Window Button Coordinates. * Updated Trader Menu Coordinates. * Updated Clan Capital Buildings OCR Area (Menu). * Improved Daily Challenge Collect. * Updated Nox Version Support. * Improved Few OCR Libs. * Improved few Sceneries Detection (Attack Only). * Improved Heroes Status Detection. * Fixed Super Archer Donation. * Improved Anime Scenery Detection (Attack Only). * Fixed BS5 Shared Folder Mounting. * Updated Nox and BS5 Supported Versions. * Fixed Clan Games Rewards Collect (6th column + BOE). * Fixed SCID Switch (COC 16.517.4). * Added Auto-Deny for Personnal Datas Sharing. * Updated Building Info Position. * Fixed App Builder Assign Button detection. * Improved Apprentice Builder Time OCR. * Added support for dynamic building info position (Supercharge). * Improved Builder Base Upgrade Detection. * Added Treasury Hunt Event Window Support. * Fixed Shared_Prefs Switch Method. * Removed Google Play Switch. * Improved DonateWindowCap(). * Updated Use Boost Potion Button Position. * Improved Daily Challenges Collect. * Added Clash of Dragons Scenery Support (Attack Only). * Added Special Event Attack Button Support. * Improved Chest Room Support. * Added Collect Resources only if not full. * Improved Build lib ("O" and "E"). * Improved few time controlers. * Improved Treasury chest control. * Improved Attack! Button management. * Improved Claim Reward Button detection. * Improved Donation System. * Improved 8 digit detection for GuardShield. * Added WaitForClanMessage for donation. * Improved MakingDonatedTroops(). * Improved IsDonateQueueOnly(). * Improved Clan Games Event Purge Cooldown Management. * Hidden Clan Games Equipement Challenges. * Changed Defaut Scenery Detection Points (Allows broken boat). * Improved BB Troops Upgrade Red Cost OCR. * Fixed BB Broken Buildings OCR. * Added Dont Collect Loot Cart And Treasury If Resources are Full. * Updated Legend League support. * Improved Profil Report. * Added Supercharge Collector Detection (Dead Bases). * Added Support For 7 Extra Troops * Improved CC Building names OCR in Menu. * Added Support For Lavaloon Puppet Equipment. * Added Doomed Scenery Support (Attack Only).
1 parent c6ca238 commit 6551cc4

File tree

585 files changed

+6476
-4667
lines changed

Some content is hidden

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

585 files changed

+6476
-4667
lines changed

‎CHANGELOG‎

Lines changed: 144 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,147 @@
1-
* v8.1.6
1+
* v8.1.7
2+
* Added Fireball equipment support.
3+
* Improved Donation system.
4+
* Fixed Overgrowth spell donate strings translation.
5+
* Improved Builder count.
6+
* Updated donateCCWBL.
7+
* Added Space Scenery support (attack only).
8+
* Typo
9+
* Added Blacksmith level 7/8 template.
10+
* Improved Super Dragon detection in attack bar.
11+
* Improved Space Scenery detection (Attack only).
12+
* Improved Hog puppet equipment detection.
13+
* Improved Pet level OCR (3 and 1).
14+
* Improved Hero heal status detection.
15+
* Updated Hero heal time OCR area.
16+
* Improved Boost button detection.
17+
* Improved Army cap OCR (0).
18+
* Improved Open donate window detection.
19+
* Added DE Drill level 10 template.
20+
* Added ClanGamesRewards.ini creating if missing.
21+
* Updated Upgrade in progress color detection.
22+
* Improved CG events detection.
23+
* Improved Troops upgrade cost detection (3 white OCR).
24+
* Fixed Share replay function.
25+
* Fixed Unbreakable function.
26+
* Improved Remaining training time OCR (7/9).
27+
* Improved Donate button detection.
28+
* Improved Elixir collector level 16 detection (Dead base and smart).
29+
* Improved Giant and wall breaker detection for donation.
30+
* Fixed Battle Copter window detection.
31+
* Fixed Bob Control upgrades white zeros detection.
32+
* Added Builder boost perks to bob control upgrades prices.
33+
* Improved EQ spell detection for donation.
34+
* Improved Laboratory status detection.
35+
* Added Full support for Magic and Egypt Scenery.
36+
* Changed Loot Cart templates for detection.
37+
* Improved Obstacles remove.
38+
* Improved Buildings info OCR.
39+
* Added New pet support (Angry Jelly).
40+
* Added Support for Eagle level 7 and Monolith level 3.
41+
* Update Flame Flinger max level.
42+
* Added Equipment challenges to Clan Games (Code Only).
43+
* Updated some GUI images.
44+
** Added support for COC 16.253.15.
45+
* Fixed Donations.
46+
* Fixed CC Status Detection.
47+
* Fixed missing _FilloBldgLevels() call.
48+
* Updated CC Spells/Sieges remove.
49+
* Change Egypt and Magic scenery fixed point detection.
50+
* Improved egyptian boat detection.
51+
* Increased cc spells/sieges speed detection.
52+
* Added Hog Gliders clan games event template.
53+
* Added Dead Eagle level 6 template.
54+
* Reduced Equipment updgrade display to 10 equipment.
55+
* Improved Donate window position detection.
56+
* Updated Siege switching detection area.
57+
* Fixed siege switching.
58+
* Fixed 6 red OCR for queue troops.
59+
* Added support for Streak Event in bonus calculation.
60+
* Improved Super Troops Count OCR in Army Overview.
61+
* Improved Egypt and Magic Scenery Zoom Out.
62+
* Fixed donation (COC 16.253.25).
63+
* Added Spiky Ball equipment support.
64+
* Fixed CC Sieges Removing array issue.
65+
* Added Football scenery support (Attack Only).
66+
* Added Pressure and zoom out script randomization (Minitouch).
67+
* Added Rocket Spear Equipment support.
68+
* Added Wild West scenery (Attack Only).
69+
* Improved Sieges training ClickDrag.
70+
* Improved Blacksmith auto location.
71+
* Improved TH16 detection.
72+
* Improved Army count OCR.
73+
* Improved Donate detection for : SWall, ETitan, FFlinger, SDrag, Wizard.
74+
* Improved BatSpell detection in Army Overview.
75+
* Improved few obstacles detection.
76+
* Added Full Support for Druid Troop.
77+
* Updated Pets Cost.
78+
* Fixed SCID Switch.
79+
* Added Builder's Apprentice Support.
80+
* Updated Walls Cost.
81+
* Added Streak Event Window Support.
82+
* Added Choice To Finish Current Equipment Upgrade first.
83+
* Added New Survey Window Detection.
84+
* Updated Ban Window Detection.
85+
* Typo
86+
* Improved Builder's Apprentice Cooldown OCR.
87+
* Added Magic Mirror Equipment Support.
88+
* Added Clash Game Stadium and Anime Sceneries Support (Attack Only).
89+
* Added More Builder's Apprentice Options.
90+
* Updated Close SCID Window Button Coordinates.
91+
* Updated Trader Menu Coordinates.
92+
* Updated Clan Capital Buildings OCR Area (Menu).
93+
* Improved Daily Challenge Collect.
94+
* Updated Nox Version Support.
95+
* Improved Few OCR Libs.
96+
* Improved few Sceneries Detection (Attack Only).
97+
* Improved Heroes Status Detection.
98+
* Fixed Super Archer Donation.
99+
* Improved Anime Scenery Detection (Attack Only).
100+
* Fixed BS5 Shared Folder Mounting.
101+
* Updated Nox and BS5 Supported Versions.
102+
* Fixed Clan Games Rewards Collect (6th column + BOE).
103+
* Fixed SCID Switch (COC 16.517.4).
104+
* Added Auto-Deny for Personnal Datas Sharing.
105+
* Updated Building Info Position.
106+
* Fixed App Builder Assign Button detection.
107+
* Improved Apprentice Builder Time OCR.
108+
* Added support for dynamic building info position (Supercharge).
109+
* Improved Builder Base Upgrade Detection.
110+
* Added Treasury Hunt Event Window Support.
111+
* Fixed Shared_Prefs Switch Method.
112+
* Removed Google Play Switch.
113+
* Improved DonateWindowCap().
114+
* Updated Use Boost Potion Button Position.
115+
* Improved Daily Challenges Collect.
116+
* Added Clash of Dragons Scenery Support (Attack Only).
117+
* Added Special Event Attack Button Support.
118+
* Improved Chest Room Support.
119+
* Added Collect Resources only if not full.
120+
* Improved Build lib ("O" and "E").
121+
* Improved few time controlers.
122+
* Improved Treasury chest control.
123+
* Improved Attack! Button management.
124+
* Improved Claim Reward Button detection.
125+
* Improved Donation System.
126+
* Improved 8 digit detection for GuardShield.
127+
* Added WaitForClanMessage for donation.
128+
* Improved MakingDonatedTroops().
129+
* Improved IsDonateQueueOnly().
130+
* Improved Clan Games Event Purge Cooldown Management.
131+
* Hidden Clan Games Equipement Challenges.
132+
* Changed Defaut Scenery Detection Points (Allows broken boat).
133+
* Improved BB Troops Upgrade Red Cost OCR.
134+
* Fixed BB Broken Buildings OCR.
135+
* Added Dont Collect Loot Cart And Treasury If Resources are Full.
136+
* Updated Legend League support.
137+
* Improved Profil Report.
138+
* Added Supercharge Collector Detection (Dead Bases).
139+
* Added Support For 7 Extra Troops
140+
* Improved CC Building names OCR in Menu.
141+
* Added Support For Lavaloon Puppet Equipment.
142+
* Added Doomed Scenery Support (Attack Only).
143+
144+
* v8.1.6 **
2145
* Added "Before you upgrade" window support.
3146
* Improved Blacksmith equipement upgrade.
4147
* Fixed BB Repair Building.

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,7 @@ Func getAllEmulators()
187187

188188
Local $aEmulator = StringSplit($sEmulatorString, "|", $STR_NOCOUNT)
189189
If $sEmulatorString <> "" Then
190-
If UBound($aEmulator) = 1 Then
191-
Setlog("Emulator Found In Your Machine :")
192-
Else
193-
Setlog(UBound($aEmulator) & " Emulators Found In Your Machine :")
194-
EndIf
190+
Setlog("Emulator" & (UBound($aEmulator) > 1 ? "s" : "") & " Found In Your Machine :")
195191
For $i = 0 To UBound($aEmulator) - 1
196192
Local $emuVer = ""
197193
If StringInStr($aEmulator[$i], "BlueStacks") Then $emuVer = $__BlueStacks_Version

‎COCBot/GUI/MBR GUI Control Attack Scripted.au3‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ Func ApplyScriptDB()
268268
Local $iApply = 0
269269
Local $iApplySieges = 0
270270
Local $iSlot = 0
271-
Local $aiCSVTroops[$eTroopCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
271+
Local $aiCSVTroops[$eTroopCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
272272
Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
273273
Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
274274
Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
@@ -422,7 +422,7 @@ Func ApplyScriptAB()
422422
Local $iApply = 0
423423
Local $iApplySieges = 0
424424
Local $iSlot = 0
425-
Local $aiCSVTroops[$eTroopCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
425+
Local $aiCSVTroops[$eTroopCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
426426
Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
427427
Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
428428
Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]

‎COCBot/GUI/MBR GUI Control BOT Options.au3‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ Func chkDebugFunc()
359359
SetDebugLog("DebugFunc " & ($bDebugFunc ? "enabled" : "disabled"))
360360
EndFunc ;==>chkDebugFunc
361361

362-
Func chkDebugDisableZoomout()
362+
Func chkDebugDisableZoomOut()
363363
$g_bDebugDisableZoomout = (GUICtrlRead($g_hChkDebugDisableZoomout) = $GUI_CHECKED)
364364
SetDebugLog("DebugDisableZoomout " & ($g_bDebugDisableZoomout ? "enabled" : "disabled"))
365365
EndFunc ;==>chkDebugDisableZoomout
@@ -437,7 +437,7 @@ Func btnTestDonateCC()
437437
$g_aiCurrentSiegeMachines[$eSiegeLogLauncher] = 1
438438
$g_aiCurrentSiegeMachines[$eSiegeFlameFlinger] = 1
439439
$g_aiCurrentSiegeMachines[$eSiegeBattleDrill] = 1
440-
DonateCC()
440+
DonateCC(False)
441441
SetLog(_PadStringCenter(" Test DonateCC end ", 54, "="), $COLOR_INFO)
442442

443443
$g_bRunState = $currentRunState
@@ -625,6 +625,8 @@ Func btnTestVillageSize()
625625
EndFunc ;==>btnTestVillageSize
626626

627627
Func btnTestDeadBase()
628+
_GUICtrlTab_ClickTab($g_hTabMain, 0)
629+
628630
Local $hBMP = 0, $hHBMP = 0
629631
Local $sImageFile = FileOpenDialog("Select CoC screenshot to test, cancel to use live screenshot", $g_sProfileTempPath, "Image (*.png)", $FD_FILEMUSTEXIST, "", $g_hFrmBot)
630632
If @error <> 0 Then
@@ -652,7 +654,7 @@ Func btnTestDeadBase()
652654
SetLog("$g_sImglocRedline = " & $g_sImglocRedline, $COLOR_INFO)
653655

654656
SetLog("Testing checkDeadBase()", $COLOR_INFO)
655-
SetLog("Result checkDeadBase() = " & checkDeadBase(), $COLOR_INFO)
657+
SetLog("Result checkDeadBase() = " & checkDeadBase(True), $COLOR_INFO)
656658
SetLog("Testing checkDeadBase() DONE", $COLOR_INFO)
657659

658660
If $hHBMP <> 0 Then
@@ -664,17 +666,15 @@ Func btnTestDeadBase()
664666
EndFunc ;==>btnTestDeadBase
665667

666668
Func btnTestDeadBaseFolder()
669+
_GUICtrlTab_ClickTab($g_hTabMain, 0)
667670

668671
;Local $directory = FileOpenDialog("Select folder of CoC village screenshot to test for dead base", $g_sProfileTempPath, "Image (*.png)", $FD_PATHMUSTEXIST, "", $g_hFrmBot)
669672
Local $directory = FileSelectFolder("Select folder of CoC village screenshot to test for dead base", "", $FSF_NEWDIALOG, @ScriptDir, $g_hFrmBot)
670673
If @error <> 0 Then
671674
SetLog("btnTestDeadBaseFolder cancelled", $COLOR_INFO)
672675
EndIf
673676

674-
;checkDeadBaseFolder($directory, "checkDeadBaseNew()", "checkDeadBaseSuperNew()")
675-
Local $oldFill = 'checkDeadBaseSuperNew(False, "' & @ScriptDir & "\imgxml\deadbase\elix\fill\old\" & '")'
676-
Local $newFill = 'checkDeadBaseSuperNew(False, "' & @ScriptDir & "\imgxml\deadbase\elix\fill\new\" & '")'
677-
checkDeadBaseFolder($directory, $oldFill, $newFill)
677+
checkDeadBaseFolder($directory)
678678

679679
EndFunc ;==>btnTestDeadBaseFolder
680680

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ Func Initiate()
5656

5757
$g_bInitiateSwitchAcc = True
5858
$g_sLabUpgradeTime = ""
59+
$g_sPetUpgradeTime = ""
60+
$g_sBSmithUpgradeTime = ""
5961
For $i = 0 To $eLootCount - 1
6062
$g_abFullStorage[$i] = False
6163
Next

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,10 +1525,10 @@ Func RemoveAllTmpTrain($sWhat = "All")
15251525
EndFunc ;==>RemoveAllTmpTrain
15261526

15271527
Func HideAllTroops()
1528-
For $i = $g_ahPicTrainArmyTroop[$eTroopMinion] To $g_ahPicTrainArmyTroop[$eTroopAppWard]
1528+
For $i = $g_ahPicTrainArmyTroop[$eTroopMinion] To $g_ahPicTrainArmyTroop[$eTroopDruid]
15291529
GUICtrlSetState($i, $GUI_HIDE)
15301530
Next
1531-
For $i = $g_ahTxtTrainArmyTroopCount[$eTroopMinion] To $g_ahTxtTrainArmyTroopCount[$eTroopAppWard]
1531+
For $i = $g_ahTxtTrainArmyTroopCount[$eTroopMinion] To $g_ahTxtTrainArmyTroopCount[$eTroopDruid]
15321532
GUICtrlSetState($i, $GUI_HIDE)
15331533
Next
15341534
For $i = $g_ahPicTrainArmyTroop[$eTroopBarbarian] To $g_ahPicTrainArmyTroop[$eTroopRootRider]
@@ -1590,10 +1590,10 @@ EndFunc ;==>BtnElixirTroops
15901590

15911591
Func BtnDarkElixirTroops()
15921592
HideAllTroops()
1593-
For $i = $g_ahPicTrainArmyTroop[$eTroopMinion] To $g_ahPicTrainArmyTroop[$eTroopAppWard]
1593+
For $i = $g_ahPicTrainArmyTroop[$eTroopMinion] To $g_ahPicTrainArmyTroop[$eTroopDruid]
15941594
GUICtrlSetState($i, $GUI_SHOW)
15951595
Next
1596-
For $i = $g_ahTxtTrainArmyTroopCount[$eTroopMinion] To $g_ahTxtTrainArmyTroopCount[$eTroopAppWard]
1596+
For $i = $g_ahTxtTrainArmyTroopCount[$eTroopMinion] To $g_ahTxtTrainArmyTroopCount[$eTroopDruid]
15971597
GUICtrlSetState($i, $GUI_SHOW)
15981598
Next
15991599
SetBtnSelector("DarkElixirTroops")

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,13 +978,15 @@ Func chkActivateClangames()
978978
GUICtrlSetState($i, $GUI_ENABLE)
979979
Next
980980
GUICtrlSetState($g_hChkClanGamesCollectRewards, $GUI_ENABLE)
981+
GUICtrlSetState($g_hTxtClanGamesLog, $GUI_ENABLE)
981982
Else
982983
GUICtrlSetState($g_hBtnCGRewardsSettingsOpen, $GUI_DISABLE)
983984
GUICtrlSetState($g_hBtnCGSettingsOpen, $GUI_DISABLE)
984985
For $i = $g_hChkClanGamesAllTimes To $g_hChkClanGamesNoOneDay
985986
GUICtrlSetState($i, $GUI_DISABLE)
986987
Next
987988
GUICtrlSetState($g_hChkClanGamesCollectRewards, $GUI_DISABLE)
989+
GUICtrlSetState($g_hTxtClanGamesLog, $GUI_DISABLE)
988990
EndIf
989991
EndFunc ;==>chkActivateClangames
990992

@@ -1202,6 +1204,33 @@ Func CGMainGroundTVItem()
12021204
Next
12031205
EndFunc ;==>CGMainGroundTVItem
12041206

1207+
Func CGEquipmentTVRoot()
1208+
If BitAND(GUICtrlRead($g_hChkCGEquipment), $GUI_CHECKED) And GUICtrlRead($g_hChkCGRootEnabledAll) = $GUI_CHECKED Then ;root Clangames MainVillage Equipment Challenges
1209+
For $i = 0 To UBound($g_ahCGEquipmentItem) - 1
1210+
GUICtrlSetState($g_ahCGEquipmentItem[$i], $GUI_CHECKED)
1211+
Next
1212+
EndIf
1213+
If Not BitAND(GUICtrlRead($g_hChkCGEquipment), $GUI_CHECKED) And GUICtrlRead($g_hChkCGRootEnabledAll) = $GUI_CHECKED Then ;root Clangames MainVillage Equipment Challenges
1214+
For $i = 0 To UBound($g_ahCGEquipmentItem) - 1
1215+
GUICtrlSetState($g_ahCGEquipmentItem[$i], $GUI_UNCHECKED)
1216+
Next
1217+
EndIf
1218+
GUICtrlSetData($g_hLabelClangamesDesc, "Enable/Disable Main Village Equipment Challenges")
1219+
EndFunc ;==>CGEquipmentTVRoot
1220+
1221+
Func CGEquipmentTVItem()
1222+
Local $tmpChallenges = ClanGamesChallenges("$EquipmentChallenges")
1223+
For $i = 0 To UBound($g_ahCGEquipmentItem) - 1
1224+
If GUICtrlRead($g_hClanGamesTV) = $g_ahCGEquipmentItem[$i] Then
1225+
GUICtrlSetData($g_hLabelClangamesDesc, $tmpChallenges[$i][4] & @CRLF & "Required TH Level : " & $tmpChallenges[$i][2] _
1226+
& @CRLF & "Difficulty : " & $tmpChallenges[$i][3])
1227+
ExitLoop
1228+
Else
1229+
GUICtrlSetData($g_hLabelClangamesDesc, "")
1230+
EndIf
1231+
Next
1232+
EndFunc ;==>CGEquipmentTVItem
1233+
12051234
Func CGMainMiscTVRoot()
12061235
If BitAND(GUICtrlRead($g_hChkCGMainMisc), $GUI_CHECKED) And GUICtrlRead($g_hChkCGRootEnabledAll) = $GUI_CHECKED Then ;root Clangames MainVillage Miscellaneous Challenges
12071236
For $i = 0 To UBound($g_ahCGMainMiscItem) - 1
@@ -1423,11 +1452,13 @@ Func EnableAutoUpgradeCC()
14231452
For $i = $g_hChkAutoUpgradeCCPriorArmy To $g_hChkAutoUpgradeCCWallIgnore
14241453
GUICtrlSetState($i, $GUI_ENABLE)
14251454
Next
1455+
GUICtrlSetState($g_hTxtAutoUpgradeCCLog, $GUI_ENABLE)
14261456
Else
14271457
$g_bChkEnableAutoUpgradeCC = False
14281458
For $i = $g_hChkAutoUpgradeCCPriorArmy To $g_hChkAutoUpgradeCCWallIgnore
14291459
GUICtrlSetState($i, $GUI_DISABLE)
14301460
Next
1461+
GUICtrlSetState($g_hTxtAutoUpgradeCCLog, $GUI_DISABLE)
14311462
EndIf
14321463
EndFunc ;==>EnableAutoUpgradeCC
14331464

0 commit comments

Comments
 (0)