* 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.
MyBotRun · Jan 3, 2025 · 0d61464 · 0d61464
1 parent 6551cc4
commit 0d61464
Show file tree

Hide file tree

Showing 561 changed files with 10,735 additions and 6,765 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,69 @@
-* v8.1.7
+* 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.
+
+* v8.1.7 **
 * Added Fireball equipment support.
 * Improved Donation system.
 * Fixed Overgrowth spell donate strings translation.

diff --git a/COCBot/GUI/MBR GUI Control Achievements.au3 b/COCBot/GUI/MBR GUI Control Achievements.au3
@@ -6,7 +6,7 @@
 ; Return values .: None
 ; Author ........: MyBot.run team
 ; Modified ......: CodeSlinger69 (2017)
-; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
+; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
 ;                  MyBot is distributed under the terms of the GNU GPL
 ; Related .......:
 ; Link ..........: https://github.com/MyBotRun/MyBot/wiki

diff --git a/COCBot/GUI/MBR GUI Control Android.au3 b/COCBot/GUI/MBR GUI Control Android.au3
@@ -6,7 +6,7 @@
 ; Return values .: None
 ; Author ........: MMHK (11-2016)
 ; Modified ......: CodeSlinger69 (2017)
-; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
+; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
 ;                  MyBot is distributed under the terms of the GNU GPL
 ; Related .......:
 ; Link ..........: https://github.com/MyBotRun/MyBot/wiki
@@ -163,12 +163,6 @@ Func getAllEmulators()
 	GUICtrlSetData($g_hCmbAndroidEmulator, '')
 
 	; Bluestacks :
-	$__BlueStacks_Version = RegRead($g_sHKLM & "\SOFTWARE\BlueStacks\", "Version")
-	If Not @error Then
-		If GetVersionNormalized($__BlueStacks_Version) < GetVersionNormalized("0.10") Then $sEmulatorString &= "BlueStacks|"
-		If GetVersionNormalized($__BlueStacks_Version) > GetVersionNormalized("1.0") Then $sEmulatorString &= "BlueStacks2|"
-	EndIf
-
 	$__BlueStacks5_Version = RegRead($g_sHKLM & "\SOFTWARE\BlueStacks_nxt\", "Version")
     If Not @error Then
         If GetVersionNormalized($__BlueStacks5_Version) > GetVersionNormalized("5.0") Then $sEmulatorString &= "BlueStacks5|"
@@ -187,17 +181,16 @@ Func getAllEmulators()
 
 	Local $aEmulator = StringSplit($sEmulatorString, "|", $STR_NOCOUNT)
 	If $sEmulatorString <> "" Then
-		Setlog("Emulator" & (UBound($aEmulator) > 1 ? "s" : "") & " Found In Your Machine :")
+		SetLog("Emulator" & (UBound($aEmulator) > 1 ? "s" : "") & " Found In Your Machine :")
 		For $i = 0 To UBound($aEmulator) - 1
 			Local $emuVer = ""
-			If StringInStr($aEmulator[$i], "BlueStacks") Then $emuVer = $__BlueStacks_Version
 			If StringInStr($aEmulator[$i], "BlueStacks5") Then $emuVer = $__BlueStacks5_Version
 			If StringInStr($aEmulator[$i], "Memu") Then $emuVer = $__MEmu_Version
 			If StringInStr($aEmulator[$i], "nox") Then $emuVer = $__Nox_Version
 			SetLog("  - " & $aEmulator[$i] & " version: " & $emuVer, $COLOR_SUCCESS)
 		Next
 	Else
-		Setlog("No Emulator found in your machine")
+		SetLog("No Emulator found in your machine")
 		Return
 	EndIf
 
@@ -220,14 +213,6 @@ Func getAllEmulatorsInstances()
 	Local $sEmulatorPath = 0
 
 	Switch $emulator
-		Case "BlueStacks"
-			GUICtrlSetData($g_hCmbAndroidInstance, "Android", "Android")
-			Return
-		Case "BlueStacks2"
-			GUICtrlSetData($g_hCmbAndroidInstance, "Android", "Android")
-			Local $VMsBlueStacks = ""
-			$VMsBlueStacks = RegRead($g_sHKLM & "\SOFTWARE\BlueStacks\", "DataDir")
-			$sEmulatorPath = $VMsBlueStacks ; C:\ProgramData\BlueStacks\Engine
 		Case "BlueStacks5"
             Local $VMsBlueStacks = RegRead($g_sHKLM & "\SOFTWARE\BlueStacks_nxt\", "DataDir")
             $sEmulatorPath = $VMsBlueStacks ; C:\ProgramData\BlueStacks\Engine
@@ -244,7 +229,7 @@ Func getAllEmulatorsInstances()
 	$sEmulatorPath = StringReplace($sEmulatorPath, "\\", "\")
 
 	; BS Multi Instance
-	Local $sBlueStacksFolder = ($Emulator = "BlueStacks2" Or $Emulator = "BlueStacks5") ? ("Pie*;Oreo*;Nougat*;Android*") : ("*")
+	Local $sBlueStacksFolder = ($Emulator = "BlueStacks5") ? ("Pie*;Oreo*;Nougat*;Android*") : ("*")
 
 	; Getting all VM Folders
 	Local $eError = 0

diff --git a/COCBot/GUI/MBR GUI Control Attack Scripted.au3 b/COCBot/GUI/MBR GUI Control Attack Scripted.au3
@@ -6,7 +6,7 @@
 ; Return values .: None
 ; Author ........: MyBot.run team
 ; Modified ......: CodeSlinger69 (2017), MMHK (01-2008)
-; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
+; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
 ;                  MyBot is distributed under the terms of the GNU GPL
 ; Related .......:
 ; Link ..........: https://github.com/MyBotRun/MyBot/wiki
@@ -268,12 +268,12 @@ Func ApplyScriptDB()
 	Local $iApply = 0
 	Local $iApplySieges = 0
 	Local $iSlot = 0
-	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]
-	Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-	Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-	Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
+	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]
+	Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+	Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+	Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
 	Local $aiCSVSieges[$eSiegeMachineCount] = [0, 0, 0, 0, 0, 0, 0]
-	Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0]]
+	Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]
 	Local $aiCSVWardenMode = -1
 	Local $iCSVRedlineRoutineItem = 0, $iCSVDroplineEdgeItem = 0
 	Local $sCSVCCReq = ""
@@ -331,6 +331,9 @@ Func ApplyScriptDB()
 					Case $eHeroArcherQueen
 						$g_iActivateQueen = $aiCSVHeros[$h][0] - 1
 						$g_iDelayActivateQueen = $aiCSVHeros[$h][1]
+					Case $eHeroMinionPrince
+						$g_iActivatePrince = $aiCSVHeros[$h][0] - 1
+						$g_iDelayActivatePrince = $aiCSVHeros[$h][1]
 					Case $eHeroGrandWarden
 						$g_iActivateWarden = $aiCSVHeros[$h][0] - 1
 						$g_iDelayActivateWarden = $aiCSVHeros[$h][1]
@@ -345,6 +348,7 @@ Func ApplyScriptDB()
 
 		GUICtrlSetState($g_hChkDBKingAttack, $aiCSVHeros[$eHeroBarbarianKing][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBKingAttack))
 		GUICtrlSetState($g_hChkDBQueenAttack, $aiCSVHeros[$eHeroArcherQueen][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBQueenAttack))
+		GUICtrlSetState($g_hChkDBPrinceAttack, $aiCSVHeros[$eHeroMinionPrince][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBPrinceAttack))
 		GUICtrlSetState($g_hChkDBWardenAttack, $aiCSVHeros[$eHeroGrandWarden][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBWardenAttack))
 		chkDBWardenAttack()
 		GUICtrlSetState($g_hChkDBChampionAttack, $aiCSVHeros[$eHeroRoyalChampion][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkDBChampionAttack))
@@ -422,12 +426,12 @@ Func ApplyScriptAB()
 	Local $iApply = 0
 	Local $iApplySieges = 0
 	Local $iSlot = 0
-	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]
-	Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
-	Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
-	Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
+	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]
+	Local $aiCSVSpells[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
+	Local $sCSVCCSpl[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 , 0, 0]
+	Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
 	Local $aiCSVSieges[$eSiegeMachineCount] = [0, 0, 0, 0, 0, 0, 0]
-	Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0]]
+	Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]
 	Local $aiCSVWardenMode = -1
 	Local $iCSVRedlineRoutineItem = 0, $iCSVDroplineEdgeItem = 0
 	Local $sCSVCCReq = ""
@@ -485,6 +489,9 @@ Func ApplyScriptAB()
 					Case $eHeroArcherQueen
 						$g_iActivateQueen = $aiCSVHeros[$h][0] - 1
 						$g_iDelayActivateQueen = $aiCSVHeros[$h][1]
+					Case $eHeroMinionPrince
+						$g_iActivatePrince = $aiCSVHeros[$h][0] - 1
+						$g_iDelayActivatePrince = $aiCSVHeros[$h][1]
 					Case $eHeroGrandWarden
 						$g_iActivateWarden = $aiCSVHeros[$h][0] - 1
 						$g_iDelayActivateWarden = $aiCSVHeros[$h][1]
@@ -499,6 +506,7 @@ Func ApplyScriptAB()
 
 		GUICtrlSetState($g_hChkABKingAttack, $aiCSVHeros[$eHeroBarbarianKing][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABKingAttack))
 		GUICtrlSetState($g_hChkABQueenAttack, $aiCSVHeros[$eHeroArcherQueen][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABQueenAttack))
+		GUICtrlSetState($g_hChkABPrinceAttack, $aiCSVHeros[$eHeroMinionPrince][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABPrinceAttack))
 		GUICtrlSetState($g_hChkABWardenAttack, $aiCSVHeros[$eHeroGrandWarden][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABWardenAttack))
 		chkABWardenAttack()
 		GUICtrlSetState($g_hChkABChampionAttack, $aiCSVHeros[$eHeroRoyalChampion][0] > 0 ? $GUI_CHECKED : GUICtrlGetState($g_hChkABChampionAttack))
@@ -648,14 +656,17 @@ Func AttackNow()
 	; Reset hero variables
 	$g_bCheckKingPower = False
 	$g_bCheckQueenPower = False
+	$g_bCheckPrincePower = False
 	$g_bCheckWardenPower = False
 	$g_bCheckChampionPower = False
 	$g_bDropKing = False
 	$g_bDropQueen = False
+	$g_bDropPrince = False
 	$g_bDropWarden = False
 	$g_bDropChampion = False
 	$g_aHeroesTimerActivation[$eHeroBarbarianKing] = 0
 	$g_aHeroesTimerActivation[$eHeroArcherQueen] = 0
+	$g_aHeroesTimerActivation[$eHeroMinionPrince] = 0
 	$g_aHeroesTimerActivation[$eHeroGrandWarden] = 0
 	$g_aHeroesTimerActivation[$eHeroRoyalChampion] = 0
 

diff --git a/COCBot/GUI/MBR GUI Control Attack Standard.au3 b/COCBot/GUI/MBR GUI Control Attack Standard.au3
@@ -6,7 +6,7 @@
 ; Return values .: None
 ; Author ........: MyBot.run team
 ; Modified ......: CodeSlinger69 (2017)
-; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
+; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
 ;                  MyBot is distributed under the terms of the GNU GPL
 ; Related .......:
 ; Link ..........: https://github.com/MyBotRun/MyBot/wiki

diff --git a/COCBot/GUI/MBR GUI Control BOT Options.au3 b/COCBot/GUI/MBR GUI Control BOT Options.au3
@@ -6,7 +6,7 @@
 ; Return values .: None
 ; Author ........: MyBot.run Team
 ; Modified ......: CodeSlinger69 (2017)
-; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2024
+; Remarks .......: This file is part of MyBot, previously known as ClashGameBot. Copyright 2015-2025
 ;                  MyBot is distributed under the terms of the GNU GPL
 ; Related .......:
 ; Link ..........: https://github.com/MyBotRun/MyBot/wiki
@@ -338,8 +338,8 @@ EndFunc   ;==>cmbSwitchAccProfileX
 ; #DEBUG FUNCTION# ==============================================================================================================
 
 Func chkDebugSetLog()
-	$g_bDebugSetlog = (GUICtrlRead($g_hChkDebugSetlog) = $GUI_CHECKED) ;
-	SetDebugLog("DebugSetlog " & ($g_bDebugSetlog ? "enabled" : "disabled"))
+	$g_bDebugSetLog = (GUICtrlRead($g_hChkDebugSetLog) = $GUI_CHECKED) ;
+	SetDebugLog("DebugSetLog " & ($g_bDebugSetLog ? "enabled" : "disabled"))
 EndFunc   ;==>chkDebugSetLog
 
 Func chkDebugAndroid()
@@ -390,8 +390,8 @@ Func chkDebugBuildingPos()
 EndFunc   ;==>chkDebugBuildingPos
 
 Func chkDebugTrain()
-	$g_bDebugSetlogTrain = (GUICtrlRead($g_hChkdebugTrain) = $GUI_CHECKED)
-	SetDebugLog("DebugTrain " & ($g_bDebugSetlogTrain ? "enabled" : "disabled"))
+	$g_bDebugSetLogTrain = (GUICtrlRead($g_hChkdebugTrain) = $GUI_CHECKED)
+	SetDebugLog("DebugTrain " & ($g_bDebugSetLogTrain ? "enabled" : "disabled"))
 EndFunc   ;==>chkDebugTrain
 
 Func chkdebugOCRDonate()
@@ -423,7 +423,7 @@ EndFunc   ;==>btnTestTrain
 
 Func btnTestDonateCC()
 	Local $currentRunState = $g_bRunState
-	Local $currentSetlog = $g_bDebugSetlog
+	Local $currentSetLog = $g_bDebugSetLog
 	_GUICtrlTab_ClickTab($g_hTabMain, 0)
 	$g_bRunState = True
 
@@ -441,7 +441,7 @@ Func btnTestDonateCC()
 	SetLog(_PadStringCenter(" Test DonateCC end ", 54, "="), $COLOR_INFO)
 
 	$g_bRunState = $currentRunState
-	$g_bDebugSetlog = $currentSetlog
+	$g_bDebugSetLog = $currentSetLog
 EndFunc   ;==>btnTestDonateCC
 
 Func btnTestRequestCC()
@@ -686,13 +686,13 @@ Func btnTestAttackCSV()
 	Local $currentDebugAttackCSV = $g_bDebugAttackCSV
 	Local $currentMakeIMGCSV = $g_bDebugMakeIMGCSV
 	Local $currentiMatchMode = $g_iMatchMode
-	Local $currentdebugsetlog = $g_bDebugSetlog
+	Local $currentdebugsetlog = $g_bDebugSetLog
 	Local $currentDebugBuildingPos = $g_bDebugBuildingPos
 
 	$g_bRunState = True
 	$g_bDebugAttackCSV = True
 	$g_bDebugMakeIMGCSV = True
-	$g_bDebugSetlog = True
+	$g_bDebugSetLog = True
 	$g_bDebugBuildingPos = True
 
 	$g_iMatchMode = $DB ; define which script to use
@@ -722,7 +722,7 @@ Func btnTestAttackCSV()
 	$g_bDebugAttackCSV = $currentDebugAttackCSV
 	$g_bDebugMakeIMGCSV = $currentMakeIMGCSV
 	$g_iMatchMode = $currentiMatchMode
-	$g_bDebugSetlog = $currentdebugsetlog
+	$g_bDebugSetLog = $currentdebugsetlog
 	$g_bDebugBuildingPos = $currentDebugBuildingPos
 
 EndFunc   ;==>btnTestAttackCSV
@@ -736,10 +736,10 @@ Func btnTestGetLocationBuilding()
 	; Store variables changed, set test values
 	Local $currentRunState = $g_bRunState
 	Local $currentDebugBuildingPos = $g_bDebugBuildingPos
-	Local $currentdebugsetlog = $g_bDebugSetlog
+	Local $currentdebugsetlog = $g_bDebugSetLog
 	$g_bRunState = True
 	$g_bDebugBuildingPos = True
-	$g_bDebugSetlog = True
+	$g_bDebugSetLog = True
 
 	; reset village measures
 	setVillageOffset(0, 0, 1)
@@ -783,7 +783,7 @@ Func btnTestGetLocationBuilding()
 	; restore changed variables
 	$g_bRunState = $currentRunState
 	$g_bDebugBuildingPos = $currentDebugBuildingPos
-	$g_bDebugSetlog = $currentdebugsetlog
+	$g_bDebugSetLog = $currentdebugsetlog
 
 EndFunc   ;==>btnTestGetLocationBuilding
 
@@ -974,12 +974,12 @@ Func btnRunFunction()
 
 	Local $saExecResult = Execute($sFunc)
 	If $saExecResult = "" And @error <> 0 Then
-		Setlog("Result : Error", $COLOR_ERROR)
+		SetLog("Result : Error", $COLOR_ERROR)
 	ElseIf IsArray($saExecResult) Then
-		Setlog("Result (IsArray) : " & _ArrayToString($saExecResult, ","), $COLOR_INFO)
+		SetLog("Result (IsArray) : " & _ArrayToString($saExecResult, ","), $COLOR_INFO)
 		_ArrayDisplay($saExecResult, "Debug Func. Result")
 	Else
-		Setlog("Result : " & $saExecResult, $COLOR_INFO)
+		SetLog("Result : " & $saExecResult, $COLOR_INFO)
 	EndIf
 
 	$g_bRunState = $currentRunState
@@ -1133,12 +1133,12 @@ EndFunc   ;==>chkSQLite
 Func SQLiteExport()
 
 	If Not $g_bUseStatistics Then
-		Setlog("")
+		SetLog("")
 		Return
 	EndIf
-	Setlog("Exporting data from SQlite, please wait!", $COLOR_ACTION)
+	SetLog("Exporting data from SQlite, please wait!", $COLOR_ACTION)
 	ExportDataBase(False)
-	Setlog("Export successfully completed.", $COLOR_SUCCESS)
+	SetLog("Export successfully completed.", $COLOR_SUCCESS)
 
 EndFunc   ;==>SQLiteExport