浏览代码

optimizations

chestercs 2 年之前
父节点
当前提交
8e9e45362c
共有 1 个文件被更改,包括 6 次插入11 次删除
  1. 6 11
      klanhaboru_main.au3

+ 6 - 11
klanhaboru_main.au3

@@ -7,6 +7,7 @@ ConsoleWrite(";; Klanhaboru fun by ChesTeRcs@2023" & @CRLF & @CRLF)
    AutoItSetOption("WinTitleMatchMode", 2)
    AutoItSetOption("TrayAutoPause"     ,0)
 
+   Global $toggleRestoreLastWindow = 	false           ; dont change
    Global $browser = 					IniRead(@ScriptDir & "/config.ini", "Options", "browser", 		"Google Chrome")
    Global $gameTitle = 					IniRead(@ScriptDir & "/config.ini", "Options", "gameTitle", 	"Klánháború")
    Global $server = 					IniRead(@ScriptDir & "/config.ini", "Options", "server", 		"hu83")     ; get it from game url
@@ -23,9 +24,8 @@ ConsoleWrite(";; Klanhaboru fun by ChesTeRcs@2023" & @CRLF & @CRLF)
    Global $sendAttackEventTimer = 		eventStart(0)   ; delay task after bot started with seconds (default: 0)
    Global $diamondGatheringEventTimer = eventStart(0)   ; delay task after bot started with seconds (default: 0)
 
-   Global $pageLoadTime = 				0 				; inMs  ; look at navigateToUrl last WinWaitActive
+   Global $pageLoadTime = 				400 			; inMs
    Global $sleepTimesInEndOfTasks = 	0				; inMs
-   Global $toggleRestoreLastWindow = 	false           ; dont change
 #EndRegion
 
 
@@ -81,7 +81,7 @@ Func diamondGatheringEvent($eventTimer)
    openNewTab()
    navigateUrl(getGameUrl("event_mine"), false)
    sendJsClickById("minecart_action_free")
-   Sleep(1000)
+   Sleep($pageLoadTime)
 
    $seconds = parseTimeToSeconds(getDataWithJs("document.getElementById('next_round_countdown').children[0]"))
    If ($seconds > 0) Then
@@ -115,7 +115,7 @@ Func gyujtogetes($sendAll, $mode, $landzsas, $kardforgato, $bardos, $ijasz, $kon
 	  sendRoyalties($lovag, 0)
    EndIf
    jsExecutor("document.getElementsByClassName('scavenge-option')[" & $mode & "].getElementsByClassName('btn-default')[0].click();")
-   Sleep(1000)
+   Sleep($pageLoadTime)
    $seconds = parseTimeToSeconds(getDataWithJs("document.getElementsByClassName('scavenge-option')[" & $mode & "].getElementsByClassName('return-countdown')[0]"))
    If ($seconds > 0) Then
 	  $eventTimer = eventStart($seconds)
@@ -148,7 +148,6 @@ Func trainLovassag($kem, $konnyulovas, $lovasijasz, $nehezlovas, $repeatTimer, $
    TraytipGG("Train Lovassag started!" & @CRLF)
    openNewTab()
    navigateUrl(getGameUrl("stable"), false)
-   Sleep($pageLoadTime)
    sendLovassag($kem, $konnyulovas, $lovasijasz, $nehezlovas)
    sendJsClickByClass("btn-recruit")
 
@@ -163,7 +162,6 @@ Func trainMachines($kos, $katapult, $repeatTimer, $eventTimer)
    TraytipGG("Train Machines started!" & @CRLF)
    openNewTab()
    navigateUrl(getGameUrl("garage"), false)
-   Sleep($pageLoadTime)
    sendMachines($kos, $katapult)
    sendJsClickByClass("btn-recruit")
 
@@ -178,7 +176,6 @@ Func epites($buildingId, $repeatTimer, $eventTimer) ;Options: main, barracks, st
    TraytipGG("Epites started: " & $buildingId & @CRLF)
    openNewTab()
    navigateUrl(getGameUrl("main"), false)
-   Sleep($pageLoadTime)
    jsExecutor("document.querySelector('{#}main_buildrow_" & $buildingId & "').querySelector('a.btn-build').click();")
 
    $eventTimer = eventStart($repeatTimer)
@@ -192,9 +189,8 @@ Func trainKnight($repeatTimer, $eventTimer)
    TraytipGG("Train Knight started! " & @CRLF)
    openNewTab()
    navigateUrl(getGameUrl("statue"), false)
-   Sleep($pageLoadTime)
    sendJsClickByClass("knight_train_launch")
-   Sleep(500)
+   Sleep($pageLoadTime)
    sendJsClickByClass("knight_regimen_confirm")
 
    $eventTimer = eventStart($repeatTimer)
@@ -209,14 +205,13 @@ Func sendAttack($x, $y, $landzsas, $kardforgato, $bardos, $ijasz, $kem, $konnyul
    TraytipGG("Send Attack started!" & @CRLF)
    openNewTab()
    navigateUrl(getGameUrl("place"), false)
-   Sleep($pageLoadTime)
    sendUnits($landzsas, $kardforgato, $bardos, $ijasz)
    sendLovassag($kem, $konnyulovas, $lovasijasz, $nehezlovas)
    sendMachines($kos, $katapult)
    sendRoyalties($lovag, $nemes)
    jsExecutor("document.getElementsByClassName('target-input-field')[0].value = '" & $x & "|" & $y & "'")
    sendJsClickById("target_attack")
-   Sleep(1000)
+   Sleep($pageLoadTime)
    sendJsClickById("troop_confirm_submit")
 
    $eventTimer = eventStart($repeatTimer)