From 9fb1989b3c0df3c54a42574769607215409a7a9b Mon Sep 17 00:00:00 2001
From: Joshua Sigona <sigonasr2@gmail.com>
Date: Tue, 16 Jun 2020 11:16:38 +0900
Subject: [PATCH] Add a more accurate Waste Not II rotation for quick craft.

---
 autocraft.ahk |  54 +++++++++++++++++++++++++++++++++++++-------------
 autocraft.exe | Bin 1132544 -> 1133568 bytes
 2 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/autocraft.ahk b/autocraft.ahk
index c0c7de4..b41cfdc 100644
--- a/autocraft.ahk
+++ b/autocraft.ahk
@@ -195,32 +195,58 @@ CraftingRotationTemplate(ByRef STEP) {
 		Switch STEP
 		{
 			Case 1:
-				send, {5}
-				ProgressStep(STEP,CP,18)
+				INNERQUIET(STEP,CP,DURABILITY)
 			Case 2:
 				if (IsExcellent()) {
-					send, {2}
-					ProgressStep(STEP,CP,18,2)
+					BASICTOUCH(STEP,CP,DURABILITY,0)
 					WaitForReady()
-					PressKeyWithModifier("Ctrl","1")
-					ProgressStep(STEP,CP,56,0)
+					WASTENOT(STEP,CP,DURABILITY,0)
 				}
 				TricksOfTheTrade(CP)
-				PressKeyWithModifier("Ctrl","1")
-				ProgressStep(STEP,CP,56)
+					WASTENOT(STEP,CP,DURABILITY)
 			Case 3, 4, 5, 6, 7:
 				if ((IsGood() or IsExcellent()) and CP > 160) {
-					send, {2}
-					ProgressStep(STEP,CP,18)
+					BASICTOUCH(STEP,CP,DURABILITY)
 				} else {
-					PressKeyWithModifier("Ctrl","3")
-					ProgressStep(STEP,CP,0)
+					HASTYTOUCH(STEP,CP,DURABILITY)
 				}
 		}
 		Stdout(DisplayInfo(STEP,CP,DURABILITY))
 	} until (STEP >= FINALSTEP + 1 or !toggle)
 }
 
+
+QuickAccCraftRotation(ByRef STEP) {
+	global toggle, CP, RECIPEDONE
+	FINALSTEP = 7
+	DURABILITY := 40
+	
+	loop {
+		if (IsMaxQuality() or (DURABILITY = 5 and WASTENOT > 0) or (DURABILITY = 10 and WASTENOT = 0)) {
+			BASICSYNTHESIS(STEP,CP,DURABILITY)
+			STEP := 999
+			RECIPEDONE := true
+		}
+		Switch STEP
+		{
+			Case 1:
+				INNERQUIET(STEP,CP,DURABILITY)
+			Case 2:
+				WASTENOTII(STEP,CP,DURABILITY)
+			Case 3,4,5:
+				BASICTOUCH(STEP,CP,DURABILITY)
+			Case 6:
+				if (IsGood() or IsExcellent()) {
+					BASICTOUCH(STEP,CP,DURABILITY,0)
+				}
+				INNOVATION(STEP,CP,DURABILITY)
+			Case 7:
+				BASICTOUCH(STEP,CP,DURABILITY,0)
+		}
+		Stdout(DisplayInfo(STEP,CP,DURABILITY))
+	} until (STEP >= FINALSTEP + 1 or !toggle)
+}
+
 QuickerCraftRotation(ByRef STEP) {
 	global toggle, CP, RECIPEDONE
 	FINALSTEP = 2
@@ -887,7 +913,7 @@ KeyPressAllowed() {
 
 
 CraftingWindowOpen() {
-	PixelGetColor,ScreenCol,1283,655
+	PixelGetColor,ScreenCol,1282,668
 	if (SubStr(ScreenCol,3,6) = "FFFFFF") {
 		return true
 	} else {
@@ -968,7 +994,7 @@ FINALAPPRAISAL := 0
 CPBASE := 280
 RECIPEDONE := false
 
-ScriptList := {"(40dura)Long Crafting Rotation":"CraftingRotation","(40dura)Quick Crafting Rotation":"QuickCraftRotation","(40dura)Quickest Crafting Rotation":"QuickerCraftRotation","(60+dura)Long Crafting Rotation":"LongCraft60","(60+dura)Quick Crafting Rotation":"StrongCraft60","(70dura)Long Crafting Rotation":"LongCraft70","(70dura)Quick Crafting Rotation":"StrongCraft70"}
+ScriptList := {"(40dura)Long Crafting Rotation":"CraftingRotation","(40dura)Quick Crafting Rotation":"QuickCraftRotation","(40dura)Quick Guaranteed Crafting Rotation":"QuickAccCraftRotation","(40dura)Quickest Crafting Rotation":"QuickerCraftRotation","(60+dura)Long Crafting Rotation":"LongCraft60","(60+dura)Quick Crafting Rotation":"StrongCraft60","(70dura)Long Crafting Rotation":"LongCraft70","(70dura)Quick Crafting Rotation":"StrongCraft70"}
 ;Stdout("Starting " . ScriptList[words])
 ;functioncall := ScriptList[words]
 ;%functioncall%(STEP)
diff --git a/autocraft.exe b/autocraft.exe
index d420c88f2759ddf2e12fd9ca122976fe67ea497e..33681afab2cf592e52f09726c38e9de097efb0b5 100644
GIT binary patch
delta 1088
zcmZpe;My?5b%P-z<G0C1jQUIrLX(pjJ()r_ZC=M{#mE)1iGhK^L6CuAOY<kD_D@WV
zKn$XpftUq|S%H`hh}nUd1Bf|+m<x!xftUw~d4ZS@i21jFViGtsqrNhdf#C@Y&`cnB
z@=B1w07OIiBCiD*M3DFzXnY$qegGOj1<3!yh%hhVtsuh}pxH3<g&FL&8_yANh~x6~
z^K%Uf4E1yknf{PfP;t7Nkf0E!W3Z=lh<~WF$Mi-HL2>c$#LN=6{Gy=L#FR=6O|Edq
z;1E|o|B&g9LW272Fb+_+)bz^V0`^=^2<?vig7QGqLLwoi0l8w+<^Bl7GCL+GPj~z$
zpgsK_yP!0q`SgB4LG9@Ztb#0&8ZMzhj!vFFo*|J6whE>SiFqjsFdG%@6bv*K@{1Hu
z6&V_!s<H*D(p0F1I3zgIFT}$&*fSX9Khf#y{|az0T24=364d8J@wzPBU!I;IrBc)V
zIR#mHtdP9}5@s};zL8H*1u2Yx!5|3=NB=O#5Kn(Uux4I!6pbJy)1Utph}vHLN1)7<
z)kw$8%wqaGBVcgo8wzr47cmk%&dROeUYb~xm{*dTnle4#Tu_uFurxC{8yHmE_n8Yi
n3DgHTy101yxkp4m8Fc2?yVKc1H2doP&;;nrmj{MDz7PNaXAUt%

delta 372
zcmZpe;o304b%P-z<EP0+jQUI;1ScmmdNO@jzj+;_6(iS&^$ZLQ4uT8}8=5~cwSQt_
z1Y!`)48$xz%nHP8K+F!r96-zo#9Tnk4a7V^%nQVPK+M1W6O+K98TF#!3=B_LfMx<g
z!wW$M10W6KZvgT|koZT?_&3n_Z_xM*F9jL?Fe1$R^GcB63(zi@`N9l#+l}W4IK)j4
zWfat(KJS-+;B;RtL3t5F3mqd(uJFXn61V)Kpwz^aN)63vdV=Qcre-<@nq0Nh6Ga8Z
zrZegZnlYK0O*i;0;0D&mWoQAER7lM!PMv;GNl;<>9$7(2MuX|Qe+wjRpY>0m%#_tw
Z$IR4px`nZz+;(FV!Q-sk?X3h=1pq}`X0!kR