Skip to content

Commit

Permalink
* **V7.5.2**
Browse files Browse the repository at this point in the history 
* Added Electro Dragon Support
* Added TH12 Images
* Added Clan Castle Selection on Attack (Siege Machine not supported yet)
* Added Capacity OCR for Siege on Donations (Siege Machine donating not supported yet)
* Added TH12 CSV settings support. Refer "Barch four fingers.csv" for sample commands
* Added Verification the display resolution and taskbar on Prerequisites
* Added TH12 Giga Tesla upgrade support (both auto and manual)
* Added Attack Now Button (Useful for CSV Testing) in Debug mode
* Added Heroes and Laboratory status to bot UI
* Fixed Remaining time for CC request - June Update
* Fixed Donations - June Update
* Fixed Attack Bar - June Update
* Fixed Train Tabs - June Update
* Fixed Remain Train Time - June Update
* Fixed Request Clan Castle Troops - June Update
* Fixed Freeze Spell Attack/Train/Donate - June Update
* Fixed Spells CC on Army Window - June Update
* Fixed SuperCell ID Login main page- June Update
* Fixed Buildings Upgrade - June Update
* Updated Troop/Spell/Hero Values - June Update
* Updated Wall Values - June Update
  • Loading branch information
@promac2k
promac2k committed Jun 15, 2018
1 parent c8e67d3 commit 482c4d9
Show file tree
Hide file tree
Showing 120 changed files with 2,538 additions and 1,209 deletions.
25 changes: 24 additions & 1 deletion CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
* **V7.5.1**
* **V7.5.2**
* Added Electro Dragon Support
* Added TH12 Images
* Added Clan Castle Selection on Attack (Siege Machine not supported yet)
* Added Capacity OCR for Siege on Donations (Siege Machine donating not supported yet)
* Added TH12 CSV settings support. Refer "Barch four fingers.csv" for sample commands
* Added Verification the display resolution and taskbar on Prerequisites
* Added TH12 Giga Tesla upgrade support (both auto and manual)
* Added Attack Now Button (Useful for CSV Testing) in Debug mode
* Added Heroes and Laboratory status to bot UI
* Fixed Remaining time for CC request - June Update
* Fixed Donations - June Update
* Fixed Attack Bar - June Update
* Fixed Train Tabs - June Update
* Fixed Remain Train Time - June Update
* Fixed Request Clan Castle Troops - June Update
* Fixed Freeze Spell Attack/Train/Donate - June Update
* Fixed Spells CC on Army Window - June Update
* Fixed SuperCell ID Login main page- June Update
* Fixed Buildings Upgrade - June Update
* Updated Troop/Spell/Hero Values - June Update
* Updated Wall Values - June Update

* **V7.5.1**
* Fixed Switch account on SC_ID log out Button
* Fixed Personal Break time stuck on reload button
* Fixed Personal Break time not forcing to switch to another account
Expand Down
19 changes: 15 additions & 4 deletions COCBot/GUI/MBR GUI Control Attack Scripted.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,15 +266,15 @@ EndFunc ;==>DuplicateScriptAB

Func ApplyScriptDB()
Local $iApply = 0
Local $aiCSVTroops[$eTroopCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
Local $aiCSVTroops[$eTroopCount] = [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]
Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0]]
Local $iCSVRedlineRoutineItem = 0, $iCSVDroplineEdgeItem = 0
Local $sCSVCCReq = ""
Local $aTemp = _GUICtrlComboBox_GetListArray($g_hCmbScriptNameDB)
Local $sFilename = $aTemp[_GUICtrlComboBox_GetCurSel($g_hCmbScriptNameDB) + 1]

SetLog("CSV settings apply starts", $COLOR_INFO)
SetLog("CSV settings apply starts: " & $sFilename, $COLOR_INFO)
$iApply = ParseAttackCSV_Settings_variables($aiCSVTroops, $aiCSVSpells, $aiCSVHeros, $iCSVRedlineRoutineItem, $iCSVDroplineEdgeItem, $sCSVCCReq, $sFilename)
If Not $iApply Then
SetLog("CSV settings apply failed", $COLOR_ERROR)
Expand Down Expand Up @@ -372,15 +372,15 @@ EndFunc ;==>ApplyScriptDB

Func ApplyScriptAB()
Local $iApply = 0
Local $aiCSVTroops[$eTroopCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
Local $aiCSVTroops[$eTroopCount] = [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]
Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0]]
Local $iCSVRedlineRoutineItem = 0, $iCSVDroplineEdgeItem = 0
Local $sCSVCCReq = ""
Local $aTemp = _GUICtrlComboBox_GetListArray($g_hCmbScriptNameAB)
Local $sFilename = $aTemp[_GUICtrlComboBox_GetCurSel($g_hCmbScriptNameAB) + 1]

SetLog("CSV settings apply starts", $COLOR_INFO)
SetLog("CSV settings apply starts: " & $sFilename, $COLOR_INFO)
$iApply = ParseAttackCSV_Settings_variables($aiCSVTroops, $aiCSVSpells, $aiCSVHeros, $iCSVRedlineRoutineItem, $iCSVDroplineEdgeItem, $sCSVCCReq, $sFilename)
If Not $iApply Then
SetLog("CSV settings apply failed", $COLOR_ERROR)
Expand Down Expand Up @@ -503,3 +503,14 @@ EndFunc ;==>cmbScriptDroplineDB
Func cmbScriptDroplineAB()
$g_aiAttackScrDroplineEdge[$LB] = _GUICtrlComboBox_GetCurSel($g_hCmbScriptDroplineAB)
EndFunc ;==>cmbScriptDroplineAB

Func AttackNow()
Local $tempbRunState = $g_bRunState
$g_aiAttackAlgorithm[$LB] = 1 ; Select Scripted Attack
$g_sAttackScrScriptName[$LB] = GuiCtrlRead($g_hCmbScriptNameAB) ; Select Scripted Attack File From The Combo Box, Cos it wasn't refreshing until pressing Start button
$g_iMatchMode = $LB ; Select Live Base As Attack Type
$g_bRunState = True
PrepareAttack($g_iMatchMode) ;
Attack() ; Fire xD
$g_bRunState = $tempbRunState
EndFunc ;==>AttackNow
6 changes: 3 additions & 3 deletions COCBot/GUI/MBR GUI Control Child Army.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Func lblTotalCountTroop2()
Local $TotalTotalTimeTroop = 0
Local $NbrOfBarrack = 4 ;For the moment fix to 4 until fine detect level of each Barrack
Local $NbrOfDarkBarrack = 2 ;For the moment fix to 2 until fine detect level of each Barrack
For $i = $eTroopBarbarian To $eTroopMiner
For $i = $eTroopBarbarian To $eTroopElectroDragon
Local $NbrOfTroop = GUICtrlRead($g_ahTxtTrainArmyTroopCount[$i])
Local $LevOfTroop = $g_aiTrainArmyTroopLevel[$i]

Expand Down Expand Up @@ -575,7 +575,7 @@ Func BtnTroopOrderSet()
Local $bMissingTroop = False ; flag for when troops are not assigned by user
Local $aiUsedTroop[$eTroopCount] = [ _
$eTroopBarbarian, $eTroopArcher, $eTroopGiant, $eTroopGoblin, $eTroopWallBreaker, $eTroopBalloon, $eTroopWizard, _
$eTroopHealer, $eTroopDragon, $eTroopPekka, $eTroopBabyDragon, $eTroopMiner, $eTroopMinion, $eTroopHogRider, _
$eTroopHealer, $eTroopDragon, $eTroopPekka, $eTroopBabyDragon, $eTroopMiner, $eTroopElectroDragon, $eTroopMinion, $eTroopHogRider, _
$eTroopValkyrie, $eTroopGolem, $eTroopWitch, $eTroopLavaHound, $eTroopBowler]

; check for duplicate combobox index and take action
Expand Down Expand Up @@ -885,7 +885,7 @@ EndFunc ;==>TrainSpellLevelClick
Func CalCostCamp()
Local $iElixirCostCamp = 0, $iDarkCostCamp = 0

For $i = $eTroopBarbarian To $eTroopMiner
For $i = $eTroopBarbarian To $eTroopElectroDragon
$iElixirCostCamp += $g_aiArmyCompTroops[$i] * $g_aiTroopCostPerLevel[$i][$g_aiTrainArmyTroopLevel[$i]]
Next

Expand Down
2 changes: 2 additions & 0 deletions COCBot/GUI/MBR GUI Control Child Misc.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,7 @@ EndFunc ;==>chkStartClockTowerBoost

Func chkActivateClangames()
If GUICtrlRead($g_hChkClanGamesEnabled) = $GUI_CHECKED Then
GUICtrlSetState($g_hChkClanGamesOnly, $GUI_ENABLE)
GUICtrlSetState($g_hChkClanGamesAir, $GUI_ENABLE)
GUICtrlSetState($g_hChkClanGamesGround, $GUI_ENABLE)
GUICtrlSetState($g_hChkClanGamesMisc, $GUI_ENABLE)
Expand All @@ -580,6 +581,7 @@ Func chkActivateClangames()
GUICtrlSetState($g_hChkClanGamesStopBeforeReachAndPurge, $GUI_ENABLE)
GUICtrlSetState($g_hChkClanGamesDebug, $GUI_ENABLE)
Else
GUICtrlSetState($g_hChkClanGamesOnly, $GUI_DISABLE)
GUICtrlSetState($g_hChkClanGamesAir, $GUI_DISABLE)
GUICtrlSetState($g_hChkClanGamesGround, $GUI_DISABLE)
GUICtrlSetState($g_hChkClanGamesMisc, $GUI_DISABLE)
Expand Down
2 changes: 1 addition & 1 deletion COCBot/GUI/MBR GUI Control Child Upgrade.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ Func cmbWalls()
GUICtrlSetState($g_ahWallsCurrentCount[$i], $GUI_SHOW)
GUICtrlSetState($g_ahPicWallsLevel[$i], $GUI_SHOW)
Next
For $i = $g_iCmbUpgradeWallsLevel+6 To 12
For $i = $g_iCmbUpgradeWallsLevel+6 To 13
GUICtrlSetState($g_ahWallsCurrentCount[$i], $GUI_HIDE)
GUICtrlSetState($g_ahPicWallsLevel[$i], $GUI_HIDE)
Next
Expand Down
4 changes: 2 additions & 2 deletions COCBot/GUI/MBR GUI Control Donate.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
; ===============================================================================================================================
#include-once

Global $g_aiDonIcons[20] = [$eIcnDonBarbarian, $eIcnDonArcher, $eIcnDonGiant, $eIcnDonGoblin, $eIcnDonWallBreaker, $eIcnDonBalloon, $eIcnDonWizard, $eIcnDonHealer, _
$eIcnDonDragon, $eIcnDonPekka, $eIcnDonBabyDragon, $eIcnDonMiner, $eIcnDonMinion, $eIcnDonHogRider, $eIcnDonValkyrie, $eIcnDonGolem, _
Global $g_aiDonIcons[21] = [$eIcnDonBarbarian, $eIcnDonArcher, $eIcnDonGiant, $eIcnDonGoblin, $eIcnDonWallBreaker, $eIcnDonBalloon, $eIcnDonWizard, $eIcnDonHealer, _
$eIcnDonDragon, $eIcnDonPekka, $eIcnDonBabyDragon, $eIcnDonMiner, $eIcnElectroDragon, $eIcnDonMinion, $eIcnDonHogRider, $eIcnDonValkyrie, $eIcnDonGolem, _
$eIcnDonWitch, $eIcnDonLavaHound, $eIcnDonBowler, $eIcnDonBlank]

Func btnDonateTroop()
Expand Down
2 changes: 1 addition & 1 deletion COCBot/GUI/MBR GUI Control Tab DropOrder.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Func BtnDropOrderSet()
Local $bMissingDrop = False ; flag for when troops are not assigned by user
Local $aiDropOrder[$eDropOrderCount] = [ _
$eTroopBarbarianS, $eTroopArcherS, $eTroopGiantS, $eTroopGoblinS, $eTroopWallBreakerS, $eTroopBalloonS, $eTroopWizardS, _
$eTroopHealerS, $eTroopDragonS, $eTroopPekkaS, $eTroopBabyDragonS, $eTroopMinerS, $eTroopMinionS, $eTroopHogRiderS, _
$eTroopHealerS, $eTroopDragonS, $eTroopPekkaS, $eTroopBabyDragonS, $eTroopMinerS, $eTroopElectroDragonS, $eTroopMinionS, $eTroopHogRiderS, _
$eTroopValkyrieS, $eTroopGolemS, $eTroopWitchS, $eTroopLavaHoundS, $eTroopBowlerS, $eHeroeS, $eCCS]

; check for duplicate combobox index and take action
Expand Down
2 changes: 1 addition & 1 deletion COCBot/GUI/MBR GUI Design About.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Func CreateAboutTab()
GUICtrlCreateLabel($sText, $x - 5, $y, 410, 20, BitOR($WS_VISIBLE, $ES_AUTOVSCROLL, $SS_LEFT), 0)
GUICtrlSetFont(-1, 9.5, $FW_BOLD, Default, "Arial")
GUICtrlSetColor(-1, $COLOR_NAVY)
$sText = "Cosote, Fliegerfaust, MHK2012, MMHK, TripleM"
$sText = "Cosote, Fliegerfaust, MMHK, TripleM"
GUICtrlCreateLabel($sText, $x + 5, $y + 15, 410, 50, BitOR($WS_VISIBLE, $ES_AUTOVSCROLL, $SS_LEFT), 0)
GUICtrlSetFont(-1, 9, $FW_MEDIUM, Default, "Arial")

Expand Down
6 changes: 3 additions & 3 deletions COCBot/GUI/MBR GUI Design Attack.au3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ Func LoadTranslatedDropOrderList()
Global $g_asDropOrderList = ["", _
"Barbarians", "Archers", "Giants", "Goblins", _
"Wall Breakers", "Balloons", "Wizards", "Healers", _
"Dragons", "Pekkas", "Baby Dragons", "Miners", _
"Dragons", "Pekkas", "Baby Dragons", "Miners", "Electro Dragons", _
"Minions", "Hog Riders", "Valkyries", "Golems", _
"Witches", "Lava Hounds", "Bowlers", "Clan Castle", "Heroes"]
EndFunc ;==>LoadTranslatedDropOrderList

Global $g_hChkCustomDropOrderEnable = 0
Global $g_ahCmbDropOrder[$eDropOrderCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
Global $g_ahImgDropOrder[$eDropOrderCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
Global $g_ahCmbDropOrder[$eDropOrderCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
Global $g_ahImgDropOrder[$eDropOrderCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
Global $g_hBtnDropOrderSet = 0, $g_ahImgDropOrderSet = 0
Global $g_hBtnRemoveDropOrder = 0

Expand Down
Loading

0 comments on commit 482c4d9

Please sign in to comment.