Skip to content

Commit 0d61464

Browse files
author
MonkeyHunter
committed
* v8.1.8 **
* Improved Shield Time OCR (Partially Hidden "M" is now read). * Improved Donate System (Requests with Pictures). * Updated Close While Training/Without Shield Option. * Added Snow Day Scenery Full Support. * Fixed Open Machines Tab When Donate Queue Only For Troops And Spells is unchecked. * Improved BB Tropps Red Cost OCR. * Improved Battle Drill Detection. * Improved Train "Hidden Troops" when the troop bar is moved all the way to the right. * Improved Clan Games Moved Tile Detection. * Added Clan Games Challenges Sorting by Scores. * Improved Few Clan Games Challenges Detection. * Cleaned CG Purge Code. * Improved Sieges Training Logic. * Updated IsPostDefenseSummaryPage() and CheckObstacles() * Increased Tolerance for CC/BB/Main White Menu Border Detection. * Fixed Array Bounds Error in CheckDonate(). * Fixed Druid Donation. * Updated CheckObstacles(). * Improved Builder's Apprentice Cooldown OCR. * Rewrited Custom Sceneries Code. * Updated BB New Buildings Placement. * Added Justice Scenery Full support. * Removed BS1 and BS2 Code. * Improved Finish Now Button Detection (Apprentice). * Fixed Read Laboratory Remaining Time When Goblin Builder is working. * Changed Main UTC Provider. * Updated IsAttackWhileShieldPage(). * Improved Remove Obstacles System (DeDup). * Improved Army Cap OCR. * Improved Loot Cart Detection. * Adjusted Resources Reading Area. * Fixed Array Bounds Error in ClanGames(). * Fixed IsCoordSafe(Obstacles). * Readded "I understand" detection (Chat). * Updated Pet Cost. * Updated Equipment Exclusion. * Improved Archer Puppet Detection. * Improved Hero Hall/Hero Status Detection. * Added Hero Slot Auto Detection. * Bug Fixes. * Improved Obstacles Detection. * Improved Level 7 and 8 Wall Detection. * Updated BS5 version. * Improved Lab Assistant System. * Improved Hero Upgrade and Cost * Improved Hero Status Detection. * Added Missing Variables. * Few Bug Fixes. * Added Full support For COC 16.654.13-16 * Added Minion Prince Full support. * Updated Blacksmith support. * Added New equipment support. * Added Thrower and Revive Spell Full support. * Added TH17 full Support. * Updated train slots position. * Updated Close Button Search Area. * Improved Upgrade Logic Between Lab/Heroes/Buildings/Walls. * Added Snake Bracelet Equipment Code. * Increased Hidden Troops Range Due To Thrower Slot. * Improved few icons quality. * Fixed Attack Window Fail When only 1 type of troop and empty siege. * Improved Justice Scenery detection (Main). * Improved Second Army Check Before Donate.
1 parent 6551cc4 commit 0d61464

File tree

561 files changed

+10735
-6765
lines changed

Some content is hidden

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

561 files changed

+10735
-6765
lines changed

‎CHANGELOG‎

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,69 @@
1-
* v8.1.7
1+
* v8.1.8
2+
* Improved Shield Time OCR (Partially Hidden "M" is now read).
3+
* Improved Donate System (Requests with Pictures).
4+
* Updated Close While Training/Without Shield Option.
5+
* Added Snow Day Scenery Full Support.
6+
* Fixed Open Machines Tab When Donate Queue Only For Troops And Spells is unchecked.
7+
* Improved BB Tropps Red Cost OCR.
8+
* Improved Battle Drill Detection.
9+
* Improved Train "Hidden Troops" when the troop bar is moved all the way to the right.
10+
* Improved Clan Games Moved Tile Detection.
11+
* Added Clan Games Challenges Sorting by Scores.
12+
* Improved Few Clan Games Challenges Detection.
13+
* Cleaned CG Purge Code.
14+
* Improved Sieges Training Logic.
15+
* Updated IsPostDefenseSummaryPage() and CheckObstacles()
16+
* Increased Tolerance for CC/BB/Main White Menu Border Detection.
17+
* Fixed Array Bounds Error in CheckDonate().
18+
* Fixed Druid Donation.
19+
* Updated CheckObstacles().
20+
* Improved Builder's Apprentice Cooldown OCR.
21+
* Rewrited Custom Sceneries Code.
22+
* Updated BB New Buildings Placement.
23+
* Added Justice Scenery Full support.
24+
* Removed BS1 and BS2 Code.
25+
* Improved Finish Now Button Detection (Apprentice).
26+
* Fixed Read Laboratory Remaining Time When Goblin Builder is working.
27+
* Changed Main UTC Provider.
28+
* Updated IsAttackWhileShieldPage().
29+
* Improved Remove Obstacles System (DeDup).
30+
* Improved Army Cap OCR.
31+
* Improved Loot Cart Detection.
32+
* Adjusted Resources Reading Area.
33+
* Fixed Array Bounds Error in ClanGames().
34+
* Fixed IsCoordSafe(Obstacles).
35+
* Readded "I understand" detection (Chat).
36+
* Updated Pet Cost.
37+
* Updated Equipment Exclusion.
38+
* Improved Archer Puppet Detection.
39+
* Improved Hero Hall/Hero Status Detection.
40+
* Added Hero Slot Auto Detection.
41+
* Bug Fixes.
42+
* Improved Obstacles Detection.
43+
* Improved Level 7 and 8 Wall Detection.
44+
* Updated BS5 version.
45+
* Improved Lab Assistant System.
46+
* Improved Hero Upgrade and Cost
47+
* Improved Hero Status Detection.
48+
* Added Missing Variables.
49+
* Few Bug Fixes.
50+
* Added Full support For COC 16.654.13-16
51+
* Added Minion Prince Full support.
52+
* Updated Blacksmith support.
53+
* Added New equipment support.
54+
* Added Thrower and Revive Spell Full support.
55+
* Added TH17 full Support.
56+
* Updated train slots position.
57+
* Updated Close Button Search Area.
58+
* Improved Upgrade Logic Between Lab/Heroes/Buildings/Walls.
59+
* Added Snake Bracelet Equipment Code.
60+
* Increased Hidden Troops Range Due To Thrower Slot.
61+
* Improved few icons quality.
62+
* Fixed Attack Window Fail When only 1 type of troop and empty siege.
63+
* Improved Justice Scenery detection (Main).
64+
* Improved Second Army Check Before Donate.
65+
66+
* v8.1.7 **
267
* Added Fireball equipment support.
368
* Improved Donation system.
469
* Fixed Overgrowth spell donate strings translation.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; Return values .: None
77
; Author ........: MyBot.run team
88
; Modified ......: CodeSlinger69 (2017)
9-
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
9+
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
1010
; MyBot is distributed under the terms of the GNU GPL
1111
; Related .......:
1212
; Link ..........: https://github.com/MyBotRun/MyBot/wiki

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

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; Return values .: None
77
; Author ........: MMHK (11-2016)
88
; Modified ......: CodeSlinger69 (2017)
9-
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
9+
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
1010
; MyBot is distributed under the terms of the GNU GPL
1111
; Related .......:
1212
; Link ..........: https://github.com/MyBotRun/MyBot/wiki
@@ -163,12 +163,6 @@ Func getAllEmulators()
163163
GUICtrlSetData($g_hCmbAndroidEmulator, '')
164164

165165
; Bluestacks :
166-
$__BlueStacks_Version = RegRead($g_sHKLM & "\SOFTWARE\BlueStacks\", "Version")
167-
If Not @error Then
168-
If GetVersionNormalized($__BlueStacks_Version) < GetVersionNormalized("0.10") Then $sEmulatorString &= "BlueStacks|"
169-
If GetVersionNormalized($__BlueStacks_Version) > GetVersionNormalized("1.0") Then $sEmulatorString &= "BlueStacks2|"
170-
EndIf
171-
172166
$__BlueStacks5_Version = RegRead($g_sHKLM & "\SOFTWARE\BlueStacks_nxt\", "Version")
173167
If Not @error Then
174168
If GetVersionNormalized($__BlueStacks5_Version) > GetVersionNormalized("5.0") Then $sEmulatorString &= "BlueStacks5|"
@@ -187,17 +181,16 @@ Func getAllEmulators()
187181

188182
Local $aEmulator = StringSplit($sEmulatorString, "|", $STR_NOCOUNT)
189183
If $sEmulatorString <> "" Then
190-
Setlog("Emulator" & (UBound($aEmulator) > 1 ? "s" : "") & " Found In Your Machine :")
184+
SetLog("Emulator" & (UBound($aEmulator) > 1 ? "s" : "") & " Found In Your Machine :")
191185
For $i = 0 To UBound($aEmulator) - 1
192186
Local $emuVer = ""
193-
If StringInStr($aEmulator[$i], "BlueStacks") Then $emuVer = $__BlueStacks_Version
194187
If StringInStr($aEmulator[$i], "BlueStacks5") Then $emuVer = $__BlueStacks5_Version
195188
If StringInStr($aEmulator[$i], "Memu") Then $emuVer = $__MEmu_Version
196189
If StringInStr($aEmulator[$i], "nox") Then $emuVer = $__Nox_Version
197190
SetLog(" - " & $aEmulator[$i] & " version: " & $emuVer, $COLOR_SUCCESS)
198191
Next
199192
Else
200-
Setlog("No Emulator found in your machine")
193+
SetLog("No Emulator found in your machine")
201194
Return
202195
EndIf
203196

@@ -220,14 +213,6 @@ Func getAllEmulatorsInstances()
220213
Local $sEmulatorPath = 0
221214

222215
Switch $emulator
223-
Case "BlueStacks"
224-
GUICtrlSetData($g_hCmbAndroidInstance, "Android", "Android")
225-
Return
226-
Case "BlueStacks2"
227-
GUICtrlSetData($g_hCmbAndroidInstance, "Android", "Android")
228-
Local $VMsBlueStacks = ""
229-
$VMsBlueStacks = RegRead($g_sHKLM & "\SOFTWARE\BlueStacks\", "DataDir")
230-
$sEmulatorPath = $VMsBlueStacks ; C:\ProgramData\BlueStacks\Engine
231216
Case "BlueStacks5"
232217
Local $VMsBlueStacks = RegRead($g_sHKLM & "\SOFTWARE\BlueStacks_nxt\", "DataDir")
233218
$sEmulatorPath = $VMsBlueStacks ; C:\ProgramData\BlueStacks\Engine
@@ -244,7 +229,7 @@ Func getAllEmulatorsInstances()
244229
$sEmulatorPath = StringReplace($sEmulatorPath, "\\", "\")
245230

246231
; BS Multi Instance
247-
Local $sBlueStacksFolder = ($Emulator = "BlueStacks2" Or $Emulator = "BlueStacks5") ? ("Pie*;Oreo*;Nougat*;Android*") : ("*")
232+
Local $sBlueStacksFolder = ($Emulator = "BlueStacks5") ? ("Pie*;Oreo*;Nougat*;Android*") : ("*")
248233

249234
; Getting all VM Folders
250235
Local $eError = 0

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

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; Return values .: None
77
; Author ........: MyBot.run team
88
; Modified ......: CodeSlinger69 (2017), MMHK (01-2008)
9-
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
9+
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
1010
; MyBot is distributed under the terms of the GNU GPL
1111
; Related .......:
1212
; Link ..........: https://github.com/MyBotRun/MyBot/wiki
@@ -268,12 +268,12 @@ 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, 0]
272-
Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
273-
Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
274-
Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
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, 0]
272+
Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
273+
Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
274+
Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
275275
Local $aiCSVSieges[$eSiegeMachineCount] = [0, 0, 0, 0, 0, 0, 0]
276-
Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0]]
276+
Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]
277277
Local $aiCSVWardenMode = -1
278278
Local $iCSVRedlineRoutineItem = 0, $iCSVDroplineEdgeItem = 0
279279
Local $sCSVCCReq = ""
@@ -331,6 +331,9 @@ Func ApplyScriptDB()
331331
Case $eHeroArcherQueen
332332
$g_iActivateQueen = $aiCSVHeros[$h][0] - 1
333333
$g_iDelayActivateQueen = $aiCSVHeros[$h][1]
334+
Case $eHeroMinionPrince
335+
$g_iActivatePrince = $aiCSVHeros[$h][0] - 1
336+
$g_iDelayActivatePrince = $aiCSVHeros[$h][1]
334337
Case $eHeroGrandWarden
335338
$g_iActivateWarden = $aiCSVHeros[$h][0] - 1
336339
$g_iDelayActivateWarden = $aiCSVHeros[$h][1]
@@ -345,6 +348,7 @@ Func ApplyScriptDB()
345348

346349
GUICtrlSetState($g_hChkDBKingAttack, $aiCSVHeros[$eHeroBarbarianKing][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBKingAttack))
347350
GUICtrlSetState($g_hChkDBQueenAttack, $aiCSVHeros[$eHeroArcherQueen][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBQueenAttack))
351+
GUICtrlSetState($g_hChkDBPrinceAttack, $aiCSVHeros[$eHeroMinionPrince][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBPrinceAttack))
348352
GUICtrlSetState($g_hChkDBWardenAttack, $aiCSVHeros[$eHeroGrandWarden][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBWardenAttack))
349353
chkDBWardenAttack()
350354
GUICtrlSetState($g_hChkDBChampionAttack, $aiCSVHeros[$eHeroRoyalChampion][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBChampionAttack))
@@ -422,12 +426,12 @@ Func ApplyScriptAB()
422426
Local $iApply = 0
423427
Local $iApplySieges = 0
424428
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, 0]
426-
Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
427-
Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
428-
Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
429+
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, 0]
430+
Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
431+
Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
432+
Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
429433
Local $aiCSVSieges[$eSiegeMachineCount] = [0, 0, 0, 0, 0, 0, 0]
430-
Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0]]
434+
Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]
431435
Local $aiCSVWardenMode = -1
432436
Local $iCSVRedlineRoutineItem = 0, $iCSVDroplineEdgeItem = 0
433437
Local $sCSVCCReq = ""
@@ -485,6 +489,9 @@ Func ApplyScriptAB()
485489
Case $eHeroArcherQueen
486490
$g_iActivateQueen = $aiCSVHeros[$h][0] - 1
487491
$g_iDelayActivateQueen = $aiCSVHeros[$h][1]
492+
Case $eHeroMinionPrince
493+
$g_iActivatePrince = $aiCSVHeros[$h][0] - 1
494+
$g_iDelayActivatePrince = $aiCSVHeros[$h][1]
488495
Case $eHeroGrandWarden
489496
$g_iActivateWarden = $aiCSVHeros[$h][0] - 1
490497
$g_iDelayActivateWarden = $aiCSVHeros[$h][1]
@@ -499,6 +506,7 @@ Func ApplyScriptAB()
499506

500507
GUICtrlSetState($g_hChkABKingAttack, $aiCSVHeros[$eHeroBarbarianKing][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABKingAttack))
501508
GUICtrlSetState($g_hChkABQueenAttack, $aiCSVHeros[$eHeroArcherQueen][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABQueenAttack))
509+
GUICtrlSetState($g_hChkABPrinceAttack, $aiCSVHeros[$eHeroMinionPrince][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABPrinceAttack))
502510
GUICtrlSetState($g_hChkABWardenAttack, $aiCSVHeros[$eHeroGrandWarden][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABWardenAttack))
503511
chkABWardenAttack()
504512
GUICtrlSetState($g_hChkABChampionAttack, $aiCSVHeros[$eHeroRoyalChampion][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABChampionAttack))
@@ -648,14 +656,17 @@ Func AttackNow()
648656
; Reset hero variables
649657
$g_bCheckKingPower = False
650658
$g_bCheckQueenPower = False
659+
$g_bCheckPrincePower = False
651660
$g_bCheckWardenPower = False
652661
$g_bCheckChampionPower = False
653662
$g_bDropKing = False
654663
$g_bDropQueen = False
664+
$g_bDropPrince = False
655665
$g_bDropWarden = False
656666
$g_bDropChampion = False
657667
$g_aHeroesTimerActivation[$eHeroBarbarianKing] = 0
658668
$g_aHeroesTimerActivation[$eHeroArcherQueen] = 0
669+
$g_aHeroesTimerActivation[$eHeroMinionPrince] = 0
659670
$g_aHeroesTimerActivation[$eHeroGrandWarden] = 0
660671
$g_aHeroesTimerActivation[$eHeroRoyalChampion] = 0
661672

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; Return values .: None
77
; Author ........: MyBot.run team
88
; Modified ......: CodeSlinger69 (2017)
9-
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
9+
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
1010
; MyBot is distributed under the terms of the GNU GPL
1111
; Related .......:
1212
; Link ..........: https://github.com/MyBotRun/MyBot/wiki

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
; Return values .: None
77
; Author ........: MyBot.run Team
88
; Modified ......: CodeSlinger69 (2017)
9-
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
9+
; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
1010
; MyBot is distributed under the terms of the GNU GPL
1111
; Related .......:
1212
; Link ..........: https://github.com/MyBotRun/MyBot/wiki
@@ -338,8 +338,8 @@ EndFunc ;==>cmbSwitchAccProfileX
338338
; #DEBUG FUNCTION# ==============================================================================================================
339339

340340
Func chkDebugSetLog()
341-
$g_bDebugSetlog = (GUICtrlRead($g_hChkDebugSetlog) = $GUI_CHECKED) ;
342-
SetDebugLog("DebugSetlog " & ($g_bDebugSetlog ? "enabled" : "disabled"))
341+
$g_bDebugSetLog = (GUICtrlRead($g_hChkDebugSetLog) = $GUI_CHECKED) ;
342+
SetDebugLog("DebugSetLog " & ($g_bDebugSetLog ? "enabled" : "disabled"))
343343
EndFunc ;==>chkDebugSetLog
344344

345345
Func chkDebugAndroid()
@@ -390,8 +390,8 @@ Func chkDebugBuildingPos()
390390
EndFunc ;==>chkDebugBuildingPos
391391

392392
Func chkDebugTrain()
393-
$g_bDebugSetlogTrain = (GUICtrlRead($g_hChkdebugTrain) = $GUI_CHECKED)
394-
SetDebugLog("DebugTrain " & ($g_bDebugSetlogTrain ? "enabled" : "disabled"))
393+
$g_bDebugSetLogTrain = (GUICtrlRead($g_hChkdebugTrain) = $GUI_CHECKED)
394+
SetDebugLog("DebugTrain " & ($g_bDebugSetLogTrain ? "enabled" : "disabled"))
395395
EndFunc ;==>chkDebugTrain
396396

397397
Func chkdebugOCRDonate()
@@ -423,7 +423,7 @@ EndFunc ;==>btnTestTrain
423423

424424
Func btnTestDonateCC()
425425
Local $currentRunState = $g_bRunState
426-
Local $currentSetlog = $g_bDebugSetlog
426+
Local $currentSetLog = $g_bDebugSetLog
427427
_GUICtrlTab_ClickTab($g_hTabMain, 0)
428428
$g_bRunState = True
429429

@@ -441,7 +441,7 @@ Func btnTestDonateCC()
441441
SetLog(_PadStringCenter(" Test DonateCC end ", 54, "="), $COLOR_INFO)
442442

443443
$g_bRunState = $currentRunState
444-
$g_bDebugSetlog = $currentSetlog
444+
$g_bDebugSetLog = $currentSetLog
445445
EndFunc ;==>btnTestDonateCC
446446

447447
Func btnTestRequestCC()
@@ -686,13 +686,13 @@ Func btnTestAttackCSV()
686686
Local $currentDebugAttackCSV = $g_bDebugAttackCSV
687687
Local $currentMakeIMGCSV = $g_bDebugMakeIMGCSV
688688
Local $currentiMatchMode = $g_iMatchMode
689-
Local $currentdebugsetlog = $g_bDebugSetlog
689+
Local $currentdebugsetlog = $g_bDebugSetLog
690690
Local $currentDebugBuildingPos = $g_bDebugBuildingPos
691691

692692
$g_bRunState = True
693693
$g_bDebugAttackCSV = True
694694
$g_bDebugMakeIMGCSV = True
695-
$g_bDebugSetlog = True
695+
$g_bDebugSetLog = True
696696
$g_bDebugBuildingPos = True
697697

698698
$g_iMatchMode = $DB ; define which script to use
@@ -722,7 +722,7 @@ Func btnTestAttackCSV()
722722
$g_bDebugAttackCSV = $currentDebugAttackCSV
723723
$g_bDebugMakeIMGCSV = $currentMakeIMGCSV
724724
$g_iMatchMode = $currentiMatchMode
725-
$g_bDebugSetlog = $currentdebugsetlog
725+
$g_bDebugSetLog = $currentdebugsetlog
726726
$g_bDebugBuildingPos = $currentDebugBuildingPos
727727

728728
EndFunc ;==>btnTestAttackCSV
@@ -736,10 +736,10 @@ Func btnTestGetLocationBuilding()
736736
; Store variables changed, set test values
737737
Local $currentRunState = $g_bRunState
738738
Local $currentDebugBuildingPos = $g_bDebugBuildingPos
739-
Local $currentdebugsetlog = $g_bDebugSetlog
739+
Local $currentdebugsetlog = $g_bDebugSetLog
740740
$g_bRunState = True
741741
$g_bDebugBuildingPos = True
742-
$g_bDebugSetlog = True
742+
$g_bDebugSetLog = True
743743

744744
; reset village measures
745745
setVillageOffset(0, 0, 1)
@@ -783,7 +783,7 @@ Func btnTestGetLocationBuilding()
783783
; restore changed variables
784784
$g_bRunState = $currentRunState
785785
$g_bDebugBuildingPos = $currentDebugBuildingPos
786-
$g_bDebugSetlog = $currentdebugsetlog
786+
$g_bDebugSetLog = $currentdebugsetlog
787787

788788
EndFunc ;==>btnTestGetLocationBuilding
789789

@@ -974,12 +974,12 @@ Func btnRunFunction()
974974

975975
Local $saExecResult = Execute($sFunc)
976976
If $saExecResult = "" And @error <> 0 Then
977-
Setlog("Result : Error", $COLOR_ERROR)
977+
SetLog("Result : Error", $COLOR_ERROR)
978978
ElseIf IsArray($saExecResult) Then
979-
Setlog("Result (IsArray) : " & _ArrayToString($saExecResult, ","), $COLOR_INFO)
979+
SetLog("Result (IsArray) : " & _ArrayToString($saExecResult, ","), $COLOR_INFO)
980980
_ArrayDisplay($saExecResult, "Debug Func. Result")
981981
Else
982-
Setlog("Result : " & $saExecResult, $COLOR_INFO)
982+
SetLog("Result : " & $saExecResult, $COLOR_INFO)
983983
EndIf
984984

985985
$g_bRunState = $currentRunState
@@ -1133,12 +1133,12 @@ EndFunc ;==>chkSQLite
11331133
Func SQLiteExport()
11341134

11351135
If Not $g_bUseStatistics Then
1136-
Setlog("")
1136+
SetLog("")
11371137
Return
11381138
EndIf
1139-
Setlog("Exporting data from SQlite, please wait!", $COLOR_ACTION)
1139+
SetLog("Exporting data from SQlite, please wait!", $COLOR_ACTION)
11401140
ExportDataBase(False)
1141-
Setlog("Export successfully completed.", $COLOR_SUCCESS)
1141+
SetLog("Export successfully completed.", $COLOR_SUCCESS)
11421142

11431143
EndFunc ;==>SQLiteExport
11441144

0 commit comments

Comments
 (0)