Skip to content

Commit

Permalink
* **V7.1.2**
Browse files Browse the repository at this point in the history
 * Add Persian Alphabet Recognition for Donation
 * Fix MEmu wrong phone layout used for window resizing introduced in 7.1
 * Fix halt mode for Dark Elixir Full
 * Optimize Translate GUI and identify unused number of translate
 * Add auto slide bot when docked (when using new My Bot design Title Bar is used)
  • Loading branch information
cosote committed Apr 6, 2017
1 parent 6ba02da commit a860bec
Show file tree
Hide file tree
Showing 41 changed files with 931 additions and 427 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
* **V7.1**
* **V7.1.2**
* Add Persian Alphabet Recognition for Donation
* Fix MEmu wrong phone layout used for window resizing introduced in 7.1
* Fix halt mode for Dark Elixir Full
* Optimize Translate GUI and identify unused number of translate
* Add auto slide bot when docked (when using new My Bot design Title Bar is used)

* **V7.1.1**
* Fix DPI awareness switch from scaled compensation title bar height in classic window title bar design mode (docked Android window was cut off at bottom)
* Fix classic window title bar design mode resizing/hiding active window during bot launch
* Fix some incorrect GUI translate references

* **V7.1**
* Fix General BlackList Donations GUI setting not saved
* Stop troop training in Halt Mode(s) -On-line Only & -Donate Only
* Fix memory leak in OCR
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG_LANGUAGES
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
* **V7.1.2**
* Add auto slide bot when docked (when using new My Bot design Title Bar is used)
[636]
126=Auto Slide when docked
127=Enable auto sliding when Android is docked\r\non bot window activation/deactivation

9 changes: 8 additions & 1 deletion COCBot/GUI/MBR GUI Control BOT Options.au3
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,16 @@ Func cmbLanguage()
EndFunc ;==>cmbLanguage

Func chkBotCustomTitleBarClick()
$g_iBotDesignFlags = BitOR(BitAND($g_iBotDesignFlags, BitNOT(1)), ((GUICtrlRead($g_hChkBotCustomTitleBarClick) = $GUI_CHECKED) ? 1 : 0))
Local $bChecked = GUICtrlRead($g_hChkBotCustomTitleBarClick) = $GUI_CHECKED
$g_iBotDesignFlags = BitOR(BitAND($g_iBotDesignFlags, BitNOT(1)), (($bChecked) ? 1 : 0))
GUICtrlSetState($g_hChkBotAutoSlideClick, ($bChecked ? $GUI_ENABLE : $GUI_DISABLE))
EndFunc ;==>chkBotCustomTitleBarClick

Func chkBotAutoSlideClick()
Local $bChecked = GUICtrlRead($g_hChkBotAutoSlideClick) = $GUI_CHECKED
$g_iBotDesignFlags = BitOR(BitAND($g_iBotDesignFlags, BitNOT(2)), (($bChecked) ? 2 : 0))
EndFunc ;==>chkBotAutoSlideClick

Func chkUseRandomClick()
$g_bUseRandomClick = (GUICtrlRead($g_hChkUseRandomClick) = $GUI_CHECKED)
EndFunc ;==>chkUseRandomClick
Expand Down
8 changes: 4 additions & 4 deletions COCBot/GUI/MBR GUI Control Tab Village.au3
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ Func chkRequestCCHours()

If GUICtrlRead($g_hChkRequestTroopsEnable) = $GUI_CHECKED Then
GUICtrlSetState($g_hTxtRequestCC, $GUI_SHOW + $GUI_ENABLE)
For $i = $g_ahLblRequestCCHours0 To $g_hLblRequestCCHoursPM
For $i = $g_hLblRequestCChour To $g_hLblRequestCCHoursPM
GUICtrlSetState($i, $GUI_ENABLE)
Next
Else
GUICtrlSetState($g_hTxtRequestCC, $GUI_SHOW + $GUI_DISABLE)
For $i = $g_ahLblRequestCCHours0 To $g_hLblRequestCCHoursPM
For $i = $g_hLblRequestCChour To $g_hLblRequestCCHoursPM
GUICtrlSetState($i, $GUI_DISABLE)
Next
EndIf
Expand Down Expand Up @@ -79,11 +79,11 @@ Func chkDonateHours()
Local $bWasRedraw = SetRedrawBotWindow(False, Default, Default, Default, "chkDonateHours")

If GUICtrlRead($g_hChkDonateHoursEnable) = $GUI_CHECKED Then
For $i = $g_hLblDonateHours1 To $g_hLblDonateHoursPM
For $i = $g_hLblDonateCChour To $g_hLblDonateHoursPM
GUICtrlSetState($i, $GUI_ENABLE)
Next
Else
For $i = $g_hLblDonateHours1 To $g_hLblDonateHoursPM
For $i = $g_hLblDonateCChour To $g_hLblDonateHoursPM
GUICtrlSetState($i, $GUI_DISABLE)
Next
EndIf
Expand Down
2 changes: 1 addition & 1 deletion COCBot/GUI/MBR GUI Design Child Attack - Bully.au3
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Func CreateAttackSearchBully()
$g_hTxtATBullyMode = GUICtrlCreateInput("150", $x + 95, $y, 35, 18, BitOR($GUI_SS_DEFAULT_INPUT, $ES_CENTER, $ES_NUMBER))
GUICtrlSetLimit(-1, 3)
_GUICtrlSetTip(-1, GetTranslated(629,4, "TH Bully: No. of searches to wait before activating."))
GUICtrlCreateLabel(GetTranslated(603,5, -1), $x + 135, $y + 5, -1, -1)
GUICtrlCreateLabel(GetTranslated(603, 11, -1), $x + 135, $y + 5, -1, -1)

$y +=25
$g_hLblATBullyMode = GUICtrlCreateLabel(GetTranslated(629,6, "Max TH level") & ":", $x - 5, $y + 3, 90, -1, $SS_RIGHT)
Expand Down
32 changes: 18 additions & 14 deletions COCBot/GUI/MBR GUI Design Child Attack - Options-Attack.au3
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ Global $g_hLbAttackPlannerRandom = 0, $g_hLbAttackPlannerDayLimit = 0, $g_ahChkA

; Clan castle
Global $g_hChkDropCCHoursEnable = 0, $g_ahChkDropCCHours[24] = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]

GLobal $g_hLblDropCChour = 0, $g_ahLblDropCChoursE = 0
GLobal $g_hLblDropCChours[12] = [0,0,0,0,0,0,0,0,0,0,0,0]
Global $g_ahChkDropCCHoursE1 = 0, $g_ahChkDropCCHoursE2 = 0

Func CreateAttackSearchOptionsAttack()
Expand Down Expand Up @@ -336,19 +337,22 @@ Func CreateAttackSearchOptionsAttack()

$y += 14
$x -= 21
GUICtrlCreateLabel(" 0", $x + 30, $y, 13, 15)
GUICtrlCreateLabel(" 1", $x + 45, $y, 13, 15)
GUICtrlCreateLabel(" 2", $x + 60, $y, 13, 15)
GUICtrlCreateLabel(" 3", $x + 75, $y, 13, 15)
GUICtrlCreateLabel(" 4", $x + 90, $y, 13, 15)
GUICtrlCreateLabel(" 5", $x + 105, $y, 13, 15)
GUICtrlCreateLabel(" 6", $x + 120, $y, 13, 15)
GUICtrlCreateLabel(" 7", $x + 135, $y, 13, 15)
GUICtrlCreateLabel(" 8", $x + 150, $y, 13, 15)
GUICtrlCreateLabel(" 9", $x + 165, $y, 13, 15)
GUICtrlCreateLabel("10", $x + 180, $y, 13, 15)
GUICtrlCreateLabel("11", $x + 195, $y, 13, 15)
GUICtrlCreateLabel("X", $x + 213, $y+2, 11, 11)
$g_hLblDropCChour = GUICtrlCreateLabel(GetTranslated(603, 15, -1) & ":", $x , $y, -1, 15)
Local $sTxtTip = GetTranslated(603, 30, -1)
_GUICtrlSetTip(-1, $sTxtTip)
$g_hLblDropCChours[0] = GUICtrlCreateLabel(" 0", $x + 30, $y, 13, 15)
$g_hLblDropCChours[1] = GUICtrlCreateLabel(" 1", $x + 45, $y, 13, 15)
$g_hLblDropCChours[2] = GUICtrlCreateLabel(" 2", $x + 60, $y, 13, 15)
$g_hLblDropCChours[3] = GUICtrlCreateLabel(" 3", $x + 75, $y, 13, 15)
$g_hLblDropCChours[4] = GUICtrlCreateLabel(" 4", $x + 90, $y, 13, 15)
$g_hLblDropCChours[5] = GUICtrlCreateLabel(" 5", $x + 105, $y, 13, 15)
$g_hLblDropCChours[6] = GUICtrlCreateLabel(" 6", $x + 120, $y, 13, 15)
$g_hLblDropCChours[7] = GUICtrlCreateLabel(" 7", $x + 135, $y, 13, 15)
$g_hLblDropCChours[8] = GUICtrlCreateLabel(" 8", $x + 150, $y, 13, 15)
$g_hLblDropCChours[9] = GUICtrlCreateLabel(" 9", $x + 165, $y, 13, 15)
$g_hLblDropCChours[10] = GUICtrlCreateLabel("10", $x + 180, $y, 13, 15)
$g_hLblDropCChours[11] = GUICtrlCreateLabel("11", $x + 195, $y, 13, 15)
$g_ahLblDropCChoursE = GUICtrlCreateLabel("X", $x + 213, $y+2, 11, 11)

$y += 15
$g_ahChkDropCCHours[0] = GUICtrlCreateCheckbox("", $x + 30, $y, 15, 15)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,14 @@ Func CreateAttackSearchOptionsTrophySettings()
$g_hCmbTrophyHeroesPriority = GUICtrlCreateCombo("", $x + 125, $y - 4 , 170, 25, BitOR($CBS_DROPDOWNLIST, $CBS_AUTOHSCROLL))
_GUICtrlSetTip(-1, GetTranslated(609,12, "Set the order on which Hero the Bot drops first when available."))
Local $txtPriorityConnector = ">"
Local $txtPriorityDefault = GetTranslated(644,2,-1) & $txtPriorityConnector & GetTranslated(644,1,-1) & $txtPriorityConnector & GetTranslated(644,3,-1) ; default value Queen, King, G.Warden
Local $txtPriorityDefault = GetTranslated(603, 34, -1) & $txtPriorityConnector & GetTranslated(603, 33, -1) & $txtPriorityConnector & GetTranslated(603, 35, -1) ; default value Queen, King, G.Warden
Local $txtPriorityList = "" & _
GetTranslated(644,2,-1) & $txtPriorityConnector & GetTranslated(644,1,-1) & $txtPriorityConnector & GetTranslated(644,3,-1) & "|" & _
GetTranslated(644,2,-1) & $txtPriorityConnector & GetTranslated(644,3,-1) & $txtPriorityConnector & GetTranslated(644,1,-1) & "|" & _
GetTranslated(644,1,-1) & $txtPriorityConnector & GetTranslated(644,2,-1) & $txtPriorityConnector & GetTranslated(644,3,-1) & "|" & _
GetTranslated(644,1,-1) & $txtPriorityConnector & GetTranslated(644,3,-1) & $txtPriorityConnector & GetTranslated(644,2,-1) & "|" & _
GetTranslated(644,3,-1) & $txtPriorityConnector & GetTranslated(644,1,-1) & $txtPriorityConnector & GetTranslated(644,2,-1) & "|" & _
GetTranslated(644,3,-1) & $txtPriorityConnector & GetTranslated(644,2,-1) & $txtPriorityConnector & GetTranslated(644,1,-1) & "|" & _
GetTranslated(603, 34, -1) & $txtPriorityConnector & GetTranslated(603, 33, -1) & $txtPriorityConnector & GetTranslated(603, 35, -1) & "|" & _
GetTranslated(603, 34, -1) & $txtPriorityConnector & GetTranslated(603, 35, -1) & $txtPriorityConnector & GetTranslated(603, 33, -1) & "|" & _
GetTranslated(603, 33, -1) & $txtPriorityConnector & GetTranslated(603, 34, -1) & $txtPriorityConnector & GetTranslated(603, 35, -1) & "|" & _
GetTranslated(603, 33, -1) & $txtPriorityConnector & GetTranslated(603, 35, -1) & $txtPriorityConnector & GetTranslated(603, 34, -1) & "|" & _
GetTranslated(603, 35, -1) & $txtPriorityConnector & GetTranslated(603, 33, -1) & $txtPriorityConnector & GetTranslated(603, 34, -1) & "|" & _
GetTranslated(603, 35, -1) & $txtPriorityConnector & GetTranslated(603, 34, -1) & $txtPriorityConnector & GetTranslated(603, 33, -1) & "|" & _
""
If $g_iDebugSetlog = 1 Then Setlog($txtPriorityDefault)
If $g_iDebugSetlog = 1 Then Setlog($txtPriorityList)
Expand Down
Loading

0 comments on commit a860bec

Please sign in to comment.