chestercs 2 tahun lalu
induk
melakukan
ac7fb9abb6
1 mengubah file dengan 13 tambahan dan 14 penghapusan
  1. 13 14
      klanhaboru_main.au3

+ 13 - 14
klanhaboru_main.au3

@@ -1,9 +1,9 @@
 #include <Date.au3>
-ConsoleWrite(";; Klanhaboru fun by ChesTeRcs@2023 ;;" & @CRLF)
+ConsoleWrite(";; Klanhaboru fun by ChesTeRcs@2023" & @CRLF & @CRLF)
 
 #Region === Configurations
-   AutoItSetOption("SendKeyDelay",      1)
-   AutoItSetOption("SendKeyDownDelay",  2)
+   AutoItSetOption("SendKeyDelay",      0)
+   AutoItSetOption("SendKeyDownDelay",  0)
    AutoItSetOption("WinTitleMatchMode", 2)
    AutoItSetOption("TrayAutoPause"     ,0)
 
@@ -36,7 +36,7 @@ While loopEnd()
    $gyujtogetesEventTimer = 	gyujtogetes(false, 3, 	0, 0, 0, 0,		-1, -1, -1, 0,					 	$gyujtogetesEventTimer)
    ;;;;;;;;;;;;;;;;;;;;;;;;;;;  Train Units
    ;;;;;;;;;;;;;;;;;;;;;;;;;;;  landzsas, kardforgato, bardos, ijasz  (can be -1 what is meant to all unit button)
-   $trainUnitsEventTimer = 		trainUnits(				0, 0, 0, 0, 						 			7200, 	$trainUnitsEventTimer)
+   $trainUnitsEventTimer = 		trainUnits(				0, 10, 0, 0, 						 			7200, 	$trainUnitsEventTimer)
    ;;;;;;;;;;;;;;;;;;;;;;;;;;;  Train Lovassag
    ;;;;;;;;;;;;;;;;;;;;;;;;;;;  kem, konnyulovas, lovasijasz, nehezlovas  (can be -1 what is meant to all unit button)
    $trainLovassagEventTimer = 	trainLovassag(			0, 0, 0, 0, 						 			3600, 	$trainLovassagEventTimer)
@@ -86,7 +86,7 @@ Func diamondGatheringEvent($eventTimer)
    $seconds = parseTimeToSeconds(getDataWithJs("document.getElementById('next_round_countdown').children[0]"))
    If ($seconds > 0) Then
 	  $eventTimer = eventStart($seconds)
-	  endTask("Diamong gathering done, next event: " & $eventTimer)
+	  endTask("Diamong gathering done, next event: " & @CRLF & $eventTimer)
 	  Return $eventTimer
    EndIf
    endTask("Diamong gathering ERROR!", 3)
@@ -103,7 +103,7 @@ Func gyujtogetes($sendAll, $mode, $landzsas, $kardforgato, $bardos, $ijasz, $kon
    $seconds = parseTimeToSeconds(getDataWithJs("document.getElementsByClassName('scavenge-option')[" & $mode & "].getElementsByClassName('return-countdown')[0]"))
    If ($seconds > 0) Then
 	  $eventTimer = eventStart($seconds)
-	  endTask("Gyüjtögetés in progress, next event: " & $eventTimer)
+	  endTask("Gyüjtögetés in progress, next event: " & @CRLF & $eventTimer)
 	  Return $eventTimer
    EndIf
 
@@ -119,7 +119,7 @@ Func gyujtogetes($sendAll, $mode, $landzsas, $kardforgato, $bardos, $ijasz, $kon
    $seconds = parseTimeToSeconds(getDataWithJs("document.getElementsByClassName('scavenge-option')[" & $mode & "].getElementsByClassName('return-countdown')[0]"))
    If ($seconds > 0) Then
 	  $eventTimer = eventStart($seconds)
-	  endTask("Gyüjtögetés done, next event: " & $eventTimer)
+	  endTask("Gyüjtögetés done, next event: " & @CRLF & $eventTimer)
 	  Return $eventTimer
    EndIf
    endTask("Gyüjtögetés ERROR!", 3)
@@ -137,7 +137,7 @@ Func trainUnits($landzsas, $kardforgato, $bardos, $ijasz, $repeatTimer, $eventTi
    sendJsClickByClass("btn-recruit")
 
    $eventTimer = eventStart($repeatTimer)
-   endTask("Train Units done, next event: " & $eventTimer)
+   endTask("Train Units done, next event: " & @CRLF & $eventTimer)
    Return $eventTimer
 EndFunc
 
@@ -153,7 +153,7 @@ Func trainLovassag($kem, $konnyulovas, $lovasijasz, $nehezlovas, $repeatTimer, $
    sendJsClickByClass("btn-recruit")
 
    $eventTimer = eventStart($repeatTimer)
-   endTask("Train Lovassag done, next event: " & $eventTimer)
+   endTask("Train Lovassag done, next event: " & @CRLF & $eventTimer)
    Return $eventTimer
 EndFunc
 
@@ -168,7 +168,7 @@ Func trainMachines($kos, $katapult, $repeatTimer, $eventTimer)
    sendJsClickByClass("btn-recruit")
 
    $eventTimer = eventStart($repeatTimer)
-   endTask("Train Machines done, next event: " & $eventTimer)
+   endTask("Train Machines done, next event: " & @CRLF & $eventTimer)
    Return $eventTimer
 EndFunc
 
@@ -182,7 +182,7 @@ Func epites($buildingId, $repeatTimer, $eventTimer) ;Options: main, barracks, st
    jsExecutor("document.querySelector('{#}main_buildrow_" & $buildingId & "').querySelector('a.btn-build').click();")
 
    $eventTimer = eventStart($repeatTimer)
-   endTask("Epites done, next event: " & $eventTimer)
+   endTask("Epites done, next event: " & @CRLF & $eventTimer)
    Return $eventTimer
 EndFunc
 
@@ -198,7 +198,7 @@ Func trainKnight($repeatTimer, $eventTimer)
    sendJsClickByClass("knight_regimen_confirm")
 
    $eventTimer = eventStart($repeatTimer)
-   endTask("Train Knight, next event: " & $eventTimer & @CRLF)
+   endTask("Train Knight, next event: " & @CRLF & $eventTimer & @CRLF)
    Return $eventTimer
 EndFunc
 
@@ -219,9 +219,8 @@ Func sendAttack($x, $y, $landzsas, $kardforgato, $bardos, $ijasz, $kem, $konnyul
    Sleep(1000)
    sendJsClickById("troop_confirm_submit")
 
-
    $eventTimer = eventStart($repeatTimer)
-   endTask("Send Attack done, next event: " & $eventTimer)
+   endTask("Send Attack done, next event: " & @CRLF & $eventTimer)
    Return $eventTimer
 EndFunc