Skip to content

Commit 08e4595

Browse files
committed
* v8.0.2 **
* Respond faster to "Stop" during zoomout. * Fixed CheckZoomOut reset. * Converted some coords to use offsets. * Laboratory Last Page, 5 columns coordinates. * Fixed TH Weapon Level. * Clan Capital : Just Green Bar check for upgrades not started yet. * Remove tutorial checks for Clan Capital (Bringed some false postive). * Fixed Drag Rider Training when 2 unlocked Elixir Super Troops. * Fixed "Any siege" option in scripted attacks. * MultiCheck For Sieges level before attacks. * Add CCSPL optionnal command for scripted attacks. * Added GetDiamondFromRect2 * Added Amazon CoC to Distributors List - temporary removed Google * Change default to Amazon * Added Skeleton Park District Support. * Clan Capital : Remove Green Bar Progression Check for Prioritized not started yet. * Fixed OCR for Heroes Upgrades Cost. * Improve Resource Detection for Wall Upgrade (Home village). * Added Tombs to decoration list (Clan Capital). * Added Super Miner. * Improve Dead Eagle Detection. * Added game distribution reset button. * Fixed SCID login screen. * Added Siege OCR template. * Reduced StoneJS image tolerance. * Added reset message if bot failed to find CoC. * Added 'Connection Error' template and adjusted some obstacles checks. * Fixed OCR Level 0 Read When "Any siege". * Typo and addings for donate keywords.
1 parent c5f860e commit 08e4595

122 files changed

Lines changed: 1105 additions & 834 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.

CHANGELOG

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
1+
* v8.0.2 **
2+
* Respond faster to "Stop" during zoomout.
3+
* Fixed CheckZoomOut reset.
4+
* Converted some coords to use offsets.
5+
* Laboratory Last Page, 5 columns coordinates.
6+
* Fixed TH Weapon Level.
7+
* Clan Capital : Just Green Bar check for upgrades not started yet.
8+
* Remove tutorial checks for Clan Capital (Bringed some false postive).
9+
* Fixed Drag Rider Training when 2 unlocked Elixir Super Troops.
10+
* Fixed "Any siege" option in scripted attacks.
11+
* MultiCheck For Sieges level before attacks.
12+
* Add CCSPL optionnal command for scripted attacks.
13+
* Added GetDiamondFromRect2
14+
* Added Amazon CoC to Distributors List - temporary removed Google
15+
* Change default to Amazon
16+
* Added Skeleton Park District Support.
17+
* Clan Capital : Remove Green Bar Progression Check for Prioritized not started yet.
18+
* Fixed OCR for Heroes Upgrades Cost.
19+
* Improve Resource Detection for Wall Upgrade (Home village).
20+
* Added Tombs to decoration list (Clan Capital).
21+
* Added Super Miner.
22+
* Improve Dead Eagle Detection.
23+
* Added game distribution reset button.
24+
* Fixed SCID login screen.
25+
* Added Siege OCR template.
26+
* Reduced StoneJS image tolerance.
27+
* Added reset message if bot failed to find CoC.
28+
* Added 'Connection Error' template and adjusted some obstacles checks.
29+
* Fixed OCR Level 0 Read When "Any siege".
30+
* Typo and addings for donate keywords.
31+
132
* v8.0.1 **
233
* Design. New GUI Icons.
334
* Builder Base & Clan Capital Resources always in Number Format.

COCBot/GUI/MBR GUI Control Attack Scripted.au3

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,11 @@ EndFunc ;==>DuplicateScriptAB
267267
Func ApplyScriptDB()
268268
Local $iApply = 0
269269
Local $iApplySieges = 0
270-
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]
270+
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]
271272
Local $aiCSVSpells[$eSpellCount] = [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]
274+
Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
272275
Local $aiCSVSieges[$eSiegeMachineCount] = [0, 0, 0, 0, 0, 0, 0]
273276
Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0]]
274277
Local $aiCSVWardenMode = -1
@@ -278,7 +281,7 @@ Func ApplyScriptDB()
278281
Local $sFilename = $aTemp[_GUICtrlComboBox_GetCurSel($g_hCmbScriptNameDB) + 1]
279282

280283
SetLog("CSV settings apply starts: " & $sFilename, $COLOR_INFO)
281-
$iApply = ParseAttackCSV_Settings_variables($aiCSVTroops, $aiCSVSpells, $aiCSVSieges, $aiCSVHeros, $aiCSVWardenMode, $iCSVRedlineRoutineItem, $iCSVDroplineEdgeItem, $sCSVCCReq, $sFilename)
284+
$iApply = ParseAttackCSV_Settings_variables($aiCSVTroops, $aiCSVSpells, $aiCSVSieges, $aiCSVHeros, $aiCSVWardenMode, $iCSVRedlineRoutineItem, $iCSVDroplineEdgeItem, $sCSVCCReq, $sCSVCCSpl, $sFilename)
282285
If Not $iApply Then
283286
SetLog("CSV settings apply failed", $COLOR_ERROR)
284287
Return
@@ -307,7 +310,7 @@ Func ApplyScriptDB()
307310
EndIf
308311

309312
If IsArray($aiCSVSieges) And $iApplySieges > 0 Then
310-
Local $aMachine = _ArrayMaxIndex($aiCSVSieges, 0, 1)
313+
Local $aMachine = _ArrayMaxIndex($aiCSVSieges)
311314
_GUICtrlComboBox_SetCurSel($g_hCmbDBSiege, $aMachine + 1)
312315
GUICtrlSetState($g_hChkDBDropCC, $GUI_CHECKED)
313316
GUICtrlSetState($g_hCmbDBSiege, $GUI_ENABLE)
@@ -365,10 +368,32 @@ Func ApplyScriptDB()
365368
If IsArray($ahChkDBSpell) Then
366369
For $i = 0 To UBound($ahChkDBSpell) - 1
367370
GUICtrlSetState($ahChkDBSpell[$i], $aiCSVSpells[$i] > 0 ? $GUI_CHECKED : $GUI_UNCHECKED)
371+
If $sCSVCCSpl[$i] = 1 Then GUICtrlSetState($ahChkDBSpell[$i], $GUI_CHECKED)
368372
If $aiCSVSpells[$i] > 0 Then $iApply += 1
369373
Next
370374
If $iApply > 0 Then SetLog("CSV 'Attack with' Spell settings applied", $COLOR_SUCCESS)
371375
EndIf
376+
377+
For $t = 0 To UBound($sCSVCCSpl) - 1
378+
If $sCSVCCSpl[$t] = 1 Then $iSlot += 1
379+
Next
380+
If $iSlot > 0 Then
381+
GUICtrlSetState($g_hChkRequestType_Spells, $GUI_CHECKED)
382+
For $x = 0 To UBound($g_ahCmbClanCastleSpell) - 1
383+
_GUICtrlComboBox_SetCurSel($g_ahCmbClanCastleSpell[$x], 0);Reset To Any
384+
Next
385+
chkRequestCountCC()
386+
EndIf
387+
For $i = 0 To UBound($g_ahCmbClanCastleSpell) - 1
388+
If $i > $iSlot - 1 Then ExitLoop
389+
For $z = 0 To UBound($sCSVCCSpl) - 1
390+
If $sCSVCCSpl[$z] = 1 And $z <> $ToIgnore[$z] Then
391+
_GUICtrlComboBox_SetCurSel($g_ahCmbClanCastleSpell[$i], $z+1)
392+
If $ToIgnore[$z] = -1 Then $ToIgnore[$z] = $z
393+
ExitLoop
394+
EndIf
395+
Next
396+
Next
372397

373398
If $iCSVRedlineRoutineItem > 0 And $iCSVRedlineRoutineItem <= _GUICtrlComboBox_GetCount($g_hCmbScriptRedlineImplDB) + 1 Then
374399
_GUICtrlComboBox_SetCurSel($g_hCmbScriptRedlineImplDB, $iCSVRedlineRoutineItem - 1)
@@ -396,8 +421,11 @@ EndFunc ;==>ApplyScriptDB
396421
Func ApplyScriptAB()
397422
Local $iApply = 0
398423
Local $iApplySieges = 0
399-
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]
424+
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]
400426
Local $aiCSVSpells[$eSpellCount] = [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]
428+
Local $ToIgnore[$eSpellCount] = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]
401429
Local $aiCSVSieges[$eSiegeMachineCount] = [0, 0, 0, 0, 0, 0, 0]
402430
Local $aiCSVHeros[$eHeroCount][2] = [[0, 0], [0, 0], [0, 0], [0, 0]]
403431
Local $aiCSVWardenMode = -1
@@ -407,7 +435,7 @@ Func ApplyScriptAB()
407435
Local $sFilename = $aTemp[_GUICtrlComboBox_GetCurSel($g_hCmbScriptNameAB) + 1]
408436

409437
SetLog("CSV settings apply starts: " & $sFilename, $COLOR_INFO)
410-
$iApply = ParseAttackCSV_Settings_variables($aiCSVTroops, $aiCSVSpells, $aiCSVSieges, $aiCSVHeros, $aiCSVWardenMode, $iCSVRedlineRoutineItem, $iCSVDroplineEdgeItem, $sCSVCCReq, $sFilename)
438+
$iApply = ParseAttackCSV_Settings_variables($aiCSVTroops, $aiCSVSpells, $aiCSVSieges, $aiCSVHeros, $aiCSVWardenMode, $iCSVRedlineRoutineItem, $iCSVDroplineEdgeItem, $sCSVCCReq, $sCSVCCSpl, $sFilename)
411439
If Not $iApply Then
412440
SetLog("CSV settings apply failed", $COLOR_ERROR)
413441
Return
@@ -494,10 +522,32 @@ Func ApplyScriptAB()
494522
If IsArray($ahChkABSpell) Then
495523
For $i = 0 To UBound($ahChkABSpell) - 1
496524
GUICtrlSetState($ahChkABSpell[$i], $aiCSVSpells[$i] > 0 ? $GUI_CHECKED : $GUI_UNCHECKED)
525+
If $sCSVCCSpl[$i] = 1 Then GUICtrlSetState($ahChkABSpell[$i], $GUI_CHECKED)
497526
If $aiCSVSpells[$i] > 0 Then $iApply += 1
498527
Next
499528
If $iApply > 0 Then SetLog("CSV 'Attack with' Spell settings applied", $COLOR_SUCCESS)
500529
EndIf
530+
531+
For $t = 0 To UBound($sCSVCCSpl) - 1
532+
If $sCSVCCSpl[$t] = 1 Then $iSlot += 1
533+
Next
534+
If $iSlot > 0 Then
535+
GUICtrlSetState($g_hChkRequestType_Spells, $GUI_CHECKED)
536+
For $x = 0 To UBound($g_ahCmbClanCastleSpell) - 1
537+
_GUICtrlComboBox_SetCurSel($g_ahCmbClanCastleSpell[$x], 0);Reset To Any
538+
Next
539+
chkRequestCountCC()
540+
EndIf
541+
For $i = 0 To UBound($g_ahCmbClanCastleSpell) - 1
542+
If $i > $iSlot - 1 Then ExitLoop
543+
For $z = 0 To UBound($sCSVCCSpl) - 1
544+
If $sCSVCCSpl[$z] = 1 And $z <> $ToIgnore[$z] Then
545+
_GUICtrlComboBox_SetCurSel($g_ahCmbClanCastleSpell[$i], $z+1)
546+
If $ToIgnore[$z] = -1 Then $ToIgnore[$z] = $z
547+
ExitLoop
548+
EndIf
549+
Next
550+
Next
501551

502552
If $iCSVRedlineRoutineItem > 0 And $iCSVRedlineRoutineItem <= _GUICtrlComboBox_GetCount($g_hCmbScriptRedlineImplAB) + 1 Then
503553
_GUICtrlComboBox_SetCurSel($g_hCmbScriptRedlineImplAB, $iCSVRedlineRoutineItem - 1)

COCBot/GUI/MBR GUI Control Child Army.au3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -674,8 +674,8 @@ Func BtnTroopOrderSet()
674674
Local $bMissingTroop = False ; flag for when troops are not assigned by user
675675
Local $aiUsedTroop[$eTroopCount] = [ _
676676
$eTroopBarbarian, $eTroopSuperBarbarian, $eTroopArcher, $eTroopSuperArcher, $eTroopGiant, $eTroopSuperGiant, $eTroopGoblin, $eTroopSneakyGoblin, $eTroopWallBreaker, _
677-
$eTroopSuperWallBreaker, $eTroopBalloon, $eTroopRocketBalloon, $eTroopWizard, $eTroopSuperWizard, $eTroopHealer, $eTroopDragon, $eTroopSuperDragon, $eTroopPekka, $eTroopBabyDragon, $eTroopInfernoDragon, $eTroopMiner, _
678-
$eTroopElectroDragon, $eTroopYeti, $eTroopDragonRider, $eTroopElectroTitan, _
677+
$eTroopSuperWallBreaker, $eTroopBalloon, $eTroopRocketBalloon, $eTroopWizard, $eTroopSuperWizard, $eTroopHealer, $eTroopDragon, $eTroopSuperDragon, $eTroopPekka, $eTroopBabyDragon, $eTroopInfernoDragon, _
678+
$eTroopMiner, $eTroopSuperMiner, $eTroopElectroDragon, $eTroopYeti, $eTroopDragonRider, $eTroopElectroTitan, _
679679
$eTroopMinion, $eTroopSuperMinion, $eTroopHogRider, $eTroopValkyrie, $eTroopSuperValkyrie, $eTroopGolem, $eTroopWitch, $eTroopSuperWitch, _
680680
$eTroopLavaHound, $eTroopIceHound, $eTroopBowler, $eTroopSuperBowler, $eTroopIceGolem, $eTroopHeadhunter]
681681

COCBot/GUI/MBR GUI Control Child Misc.au3

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,40 @@ Func btnResetBuilding()
383383
AndroidShield("btnResetBuilding") ; Update shield status due to manual $g_bRunState
384384
EndFunc ;==>btnResetBuilding
385385

386+
Func btnResetDistributor()
387+
Local $wasRunState = $g_bRunState
388+
$g_bRunState = True
389+
While 1
390+
If _Sleep(500) Then Return ; add small delay before display message window
391+
392+
_ExtMsgBoxSet(1 + 64, $SS_CENTER, 0x004080, 0xFFFF00, 12, "Comic Sans MS", 600)
393+
Local $stext = @CRLF & GetTranslatedFileIni("MBR Popups", "Reset_Distributor_info", "Click OK to Reset Game Distributor,") & @CRLF & @CRLF & _
394+
GetTranslatedFileIni("MBR Popups", "Bot_will_exit", "NOTE =>> Bot will exit and need to be restarted when complete") & @CRLF & @CRLF & GetTranslatedFileIni("MBR Popups", "Cancel_to_exit", "Or Click Cancel to exit") & @CRLF
395+
Local $MsgBox = _ExtMsgBox(0, GetTranslatedFileIni("MBR Popups", "Ok_Cancel", "Ok|Cancel"), GetTranslatedFileIni("MBR Popups", "Reset_Game_Distributor_Info", "Delete Game Distributor Infomation ?"), $stext, 120)
396+
If $g_bDebugSetlog Then SetDebugLog("$MsgBox= " & $MsgBox, $COLOR_DEBUG)
397+
If $MsgBox = 1 Then
398+
Local $stext = @CRLF & GetTranslatedFileIni("MBR Popups", "Sure_Game_Distributor_Info", "Are you 100% sure you want to reset Game Distributor information ?") & @CRLF & @CRLF & _
399+
GetTranslatedFileIni("MBR Popups", "Reset_then_restart_bot", "Click OK to Reset and then restart the bot (manually)") & @CRLF & @CRLF & GetTranslatedFileIni("MBR Popups", "Cancel_to_exit", -1) & @CRLF
400+
Local $MsgBox = _ExtMsgBox(0, GetTranslatedFileIni("MBR Popups", "Ok_Cancel", -1), GetTranslatedFileIni("MBR Popups", "Reset_Game_Distributor_Info", -1), $stext, 120)
401+
If $g_bDebugSetlog Then SetDebugLog("$MsgBox= " & $MsgBox, $COLOR_DEBUG)
402+
If $MsgBox = 1 Then
403+
$g_sAndroidGameDistributor = "Amazon" ; Default CoC Game Distributor, loaded from config.ini
404+
$g_sAndroidGamePackage = "com.supercell.clashofclans.amazon" ; Default CoC Game Package, loaded from config.ini
405+
$g_sAndroidGameClass = "com.supercell.titan.amazon.GameAppAmazon" ; Default CoC Game Class, loaded from config.ini
406+
$g_sUserGameDistributor = "Amazon" ; User Added CoC Game Distributor, loaded from config.ini
407+
$g_sUserGamePackage = "com.supercell.clashofclans.amazon" ; User Added CoC Game Package, loaded from config.ini
408+
$g_sUserGameClass = "com.supercell.titan.amazon.GameAppAmazon" ; User Added CoC Game Class, loaded from config.ini
409+
410+
SaveConfig()
411+
BotClose(False)
412+
EndIf
413+
EndIf
414+
ExitLoop
415+
WEnd
416+
$g_bRunState = $wasRunState
417+
AndroidShield("btnResetDistributor") ; Update shield status due to manual $g_bRunState
418+
EndFunc ;==>btnResetDistributor
419+
386420
Func btnLab()
387421
Local $wasRunState = $g_bRunState
388422
$g_bRunState = True

COCBot/GUI/MBR GUI Control Donate.au3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
Global $g_aiDonIcons[$eTroopCount + 1] = [$eIcnDonBarbarian, $eIcnSuperBarbarian, $eIcnDonArcher, $eIcnSuperArcher, $eIcnDonGiant, $eIcnSuperGiant, $eIcnDonGoblin, $eIcnSneakyGoblin, _
1818
$eIcnDonWallBreaker, $eIcnSuperWallBreaker, $eIcnDonBalloon, $eIcnRocketBalloon, $eIcnDonWizard, $eIcnSuperWizard, _
1919
$eIcnDonHealer, $eIcnDonDragon, $eIcnSuperDragon, $eIcnDonPekka, $eIcnDonBabyDragon, _
20-
$eIcnInfernoDragon, $eIcnDonMiner, $eIcnElectroDragon, $eIcnYeti, $eIcnDragonRider, $eIcnElectroTitan, _
20+
$eIcnInfernoDragon, $eIcnDonMiner, $eIcnSuperMiner, $eIcnElectroDragon, $eIcnYeti, $eIcnDragonRider, $eIcnElectroTitan, _
2121
$eIcnDonMinion, $eIcnSuperMinion, $eIcnDonHogRider, $eIcnDonValkyrie, $eIcnSuperValkyrie, $eIcnDonGolem, _
2222
$eIcnDonWitch, $eIcnSuperWitch, $eIcnDonLavaHound, $eIcnIceHound, $eIcnDonBowler, $eIcnSuperBowler, $eIcnIceGolem, $eIcnHeadhunter, $eIcnDonBlank]
2323

COCBot/GUI/MBR GUI Design Attack.au3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Func LoadTranslatedDropOrderList()
2626
Global $g_asDropOrderList = ["", _
2727
"Barbarians", "Super Barbarians", "Archers", "Super Archers", "Giants", "Super Giants", "Goblins", "Sneaky Goblins", _
2828
"Wall Breakers", "Super Wall Breakers", "Balloons", "Rocket Balloons", "Wizards", "Super Wizards", "Healers", _
29-
"Dragons", "Super Dragons", "Pekkas", "Baby Dragons", "Inferno Dragons", "Miners", "Electro Dragons", "Yetis", "Dragon Riders", _
29+
"Dragons", "Super Dragons", "Pekkas", "Baby Dragons", "Inferno Dragons", "Miners", "Super Miners", "Electro Dragons", "Yetis", "Dragon Riders", _
3030
"Electro Titans", "Minions", "Super Minions", "Hog Riders", "Valkyries", "Super Valkyries", "Golems", _
3131
"Witchs", "Super Witchs", "Lava Hounds", "Ice Hounds", "Bowlers", "Super Bowlers", "Ice Golems", "Headhunters", "Clan Castle", "Heroes"]
3232
EndFunc ;==>LoadTranslatedDropOrderList

COCBot/GUI/MBR GUI Design Child Attack - Troops.au3

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ Global $g_hGUI_TRAINTYPE_TAB = 0, $g_hGUI_TRAINTYPE_TAB_ITEM1 = 0, $g_hGUI_TRAIN
2828

2929
; Troops/Spells sub-tab
3030
Global $g_hRadCustomTrain = 0, $g_hRadQuickTrain = 0, $g_ahChkArmy[3] = [0, 0, 0]
31-
Global $g_ahTxtTrainArmyTroopCount[$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]
31+
Global $g_ahTxtTrainArmyTroopCount[$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]
3232
Global $g_ahTxtTrainArmySpellCount[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
3333
Global $g_ahTxtTrainArmySiegeCount[$eSiegeMachineCount] = [0, 0, 0, 0, 0, 0, 0]
3434
Global $g_hTxtFullTroop = 0, $g_hChkTotalCampForced = 0, $g_hTxtTotalCampForced = 0
3535
Global $g_hChkDoubleTrain = 0, $g_hChkPreciseArmy = 0
3636

3737
Global $g_hGrpTrainTroops = 0
38-
Global $g_ahPicTrainArmyTroop[$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]
38+
Global $g_ahPicTrainArmyTroop[$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]
3939
Global $g_ahPicTrainArmySpell[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
4040
Global $g_ahPicTrainArmySiege[$eSiegeMachineCount] = [0, 0, 0, 0, 0, 0, 0]
4141
Global $g_hLblTotalTimeCamp = 0, $g_hLblElixirCostCamp = 0, $g_hLblDarkCostCamp = 0, $g_hCalTotalTroops = 0, $g_hLblTotalProgress = 0, $g_hLblCountTotal = 0, _
@@ -44,7 +44,7 @@ Global $g_hLblTotalTimeCamp = 0, $g_hLblElixirCostCamp = 0, $g_hLblDarkCostCamp
4444

4545
; Quick Train sub-tab
4646
Global $g_aQuickTroopIcon[$eTroopCount] = [$eIcnBarbarian, $eIcnSuperBarbarian, $eIcnArcher, $eIcnSuperArcher, $eIcnGiant, $eIcnSuperGiant, $eIcnGoblin, $eIcnSneakyGoblin, $eIcnWallBreaker, $eIcnSuperWallBreaker, _
47-
$eIcnBalloon, $eIcnRocketBalloon, $eIcnWizard, $eIcnSuperWizard, $eIcnHealer, $eIcnDragon, $eIcnSuperDragon, $eIcnPekka, $eIcnBabyDragon, $eIcnInfernoDragon, $eIcnMiner, $eIcnElectroDragon, $eIcnYeti, $eIcnDragonRider, $eIcnElectroTitan, $eIcnMinion, $eIcnSuperMinion, _
47+
$eIcnBalloon, $eIcnRocketBalloon, $eIcnWizard, $eIcnSuperWizard, $eIcnHealer, $eIcnDragon, $eIcnSuperDragon, $eIcnPekka, $eIcnBabyDragon, $eIcnInfernoDragon, $eIcnMiner, $eIcnSuperMiner, $eIcnElectroDragon, $eIcnYeti, $eIcnDragonRider, $eIcnElectroTitan, $eIcnMinion, $eIcnSuperMinion, _
4848
$eIcnHogRider, $eIcnValkyrie, $eIcnSuperValkyrie, $eIcnGolem, $eIcnWitch, $eIcnSuperWitch, $eIcnLavaHound, $eIcnIceHound, $eIcnBowler, $eIcnSuperBowler, $eIcnIceGolem, $eIcnHeadhunter]
4949
Global $g_aQuickSpellIcon[$eSpellCount] = [$eIcnLightSpell, $eIcnHealSpell, $eIcnRageSpell, $eIcnJumpSpell, $eIcnFreezeSpell, $eIcnCloneSpell, $eIcnInvisibilitySpell, $eIcnRecallSpell, $eIcnPoisonSpell, $eIcnEarthQuakeSpell, $eIcnHasteSpell, $eIcnSkeletonSpell, $eIcnBatSpell]
5050
Global $g_ahChkUseInGameArmy[3], $g_ahPicTotalQTroop[3], $g_ahPicTotalQSpell[3], $g_ahLblTotalQTroop[3], $g_ahLblTotalQSpell[3]
@@ -55,7 +55,7 @@ Global $g_hGUI_QuickTrainEdit = 0, $g_hGrp_QTEdit = 0
5555
Global $g_hBtnRemove_QTEdit, $g_hBtnSave_QTEdit, $g_hBtnCancel_QTEdit
5656
Global $g_ahPicQTEdit_Troop[7], $g_ahTxtQTEdit_Troop[7], $g_ahPicQTEdit_Spell[7], $g_ahTxtQTEdit_Spell[7]
5757
Global $g_ahLblQTEdit_TotalTroop, $g_ahLblQTEdit_TotalSpell
58-
Global $g_ahPicTroop_QTEdit[$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]
58+
Global $g_ahPicTroop_QTEdit[$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]
5959
Global $g_ahPicSpell_QTEdit[$eSpellCount] = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
6060

6161
; Boost sub-tab
@@ -91,6 +91,7 @@ Func LoadTranslatedTrainTroopsOrderList()
9191
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtBabyDragons", "Baby Dragons"), _
9292
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtInfernoDragons", "Inferno Dragons"), _
9393
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtMiners", "Miners"), _
94+
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtSuperMiners", "Super Miners"), _
9495
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtElectroDragons", "Electro Dragons"), _
9596
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtYetis", "Yetis"), _
9697
GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtDragonRiders", "Dragon Riders"), _
@@ -112,8 +113,8 @@ Func LoadTranslatedTrainTroopsOrderList()
112113
EndFunc ;==>LoadTranslatedTrainTroopsOrderList
113114

114115
Global $g_hChkCustomTrainOrderEnable = 0
115-
Global $g_ahCmbTroopOrder[$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]
116-
Global $g_ahImgTroopOrder[$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]
116+
Global $g_ahCmbTroopOrder[$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]
117+
Global $g_ahImgTroopOrder[$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]
117118
Global $g_hBtnTroopOrderSet = 0, $g_ahImgTroopOrderSet = 0
118119
Global $g_hBtnRemoveTroops
119120

@@ -855,6 +856,20 @@ $x += $iIconAndSpace
855856
GUICtrlSetLimit(-1, 2)
856857
GUICtrlSetOnEvent(-1, "TrainTroopCountEdit")
857858

859+
$x += $iIconAndSpace
860+
; Super Miner
861+
Local $sTroopName = GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtSuperMiners", "Super Miners")
862+
$g_ahPicTrainArmyTroop[$eTroopInfernoDragon] = _GUICtrlCreateIcon($g_sLibIconPath, $eIcnSuperMiner, $x, $y - 5, 32, 32)
863+
;_GUICtrlSetTip(-1, GetTranslatedFileIni("MBR Global GUI Design", "Level", -1) & " " & $sTroopName & ":" & @CRLF & GetTranslatedFileIni("MBR GUI Design Child Attack - Troops", "Mouse_Left_Click", -1))
864+
;GUICtrlSetOnEvent(-1, "TrainTroopLevelClick")
865+
;$g_ahLblTrainArmyTroopLevel[$eTroopInfernoDragon] = GUICtrlCreateLabel("0", $x + 2, $y + 14, 10, 11, $SS_CENTER)
866+
;GUICtrlSetBkColor(-1, $COLOR_WHITE)
867+
;GUICtrlSetFont(-1, 7, 400)
868+
$g_ahTxtTrainArmyTroopCount[$eTroopSuperMiner] = GUICtrlCreateInput("0", $x + 1, $y + 29, 30, 17, BitOR($GUI_SS_DEFAULT_INPUT, $ES_CENTER, $ES_NUMBER))
869+
_GUICtrlSetTip(-1, $sTxtSetPerc & " " & $sTroopName & " " & $sTxtSetPerc2)
870+
GUICtrlSetLimit(-1, 2)
871+
GUICtrlSetOnEvent(-1, "TrainTroopCountEdit")
872+
858873
$x += $iIconAndSpace
859874
; Super Minions
860875
Local $sTroopName = GetTranslatedFileIni("MBR Global GUI Design Names Troops", "TxtSuperMinions", "SuperMinions")
@@ -1554,7 +1569,7 @@ Func CreateOrderTroopsSubTab()
15541569
Else
15551570
If $z = 26 Then
15561571
$x += 145
1557-
$y = 53
1572+
$y = 40
15581573
EndIf
15591574
GUICtrlCreateLabel($z + 1 & ":", $x - 13, $y + 2, -1, 18)
15601575
$g_ahCmbTroopOrder[$z] = GUICtrlCreateCombo("", $x + 4, $y, 94, 18, BitOR($CBS_DROPDOWNLIST + $WS_VSCROLL, $CBS_AUTOHSCROLL))

0 commit comments

Comments
 (0)