sigonasr2/FFXIVAutoCrafter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug with missing a step to buff counters with Tricks of The Trade

Browse Source
This commit is contained in:
Joshua Sigona 2020-06-11 12:12:39 +09:00
parent 10b65cc061
commit 91ef70d2c7
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
autocraft.ahk
View File

@ -136,6 +136,18 @@ WaitForCraftingWindow() {
} }
} }
ChooseConserveBestProgressStep(ByRef step,ByRef cp,cp_save,ByRef durability,stepcount=1) {
if (cp-cp_save >= 32) {
StandardTouch(step,cp,durability,stepcount)
} else
if (cp-cp_save >= 18) {
BasicTouch(step,cp,durability,stepcount)
} else
{
HastyTouch(step,cp,durability,stepcount)
}
}
ChooseBestProgressStep(ByRef step,ByRef cp,ByRef durability,stepcount=1) { ChooseBestProgressStep(ByRef step,ByRef cp,ByRef durability,stepcount=1) {
;Stdout("Choosing progress step... " . step . "/" . cp . "/" . durability) ;Stdout("Choosing progress step... " . step . "/" . cp . "/" . durability)
if (cp >= 32) { if (cp >= 32) {
@ -312,7 +324,7 @@ StrongCraft60(ByRef STEP) {
GreatStrides(STEP,CP,DURABILITY,0) GreatStrides(STEP,CP,DURABILITY,0)
} }
if (IsGood() or IsExcellent()) { if (IsGood() or IsExcellent()) {
ChooseBestProgressStep(STEP,CP,DURABILITY,0) ChooseConserveBestProgressStep(STEP,CP,18,DURABILITY,0)
} }
STEP := 3 STEP := 3
Case 3: Case 3:
@ -320,7 +332,7 @@ StrongCraft60(ByRef STEP) {
Innovation(STEP,CP,DURABILITY,0) Innovation(STEP,CP,DURABILITY,0)
} }
if (GREATSTRIDES > 0 or CP <= 32) { if (GREATSTRIDES > 0 or CP <= 32) {
ChooseBestProgressStep(STEP,CP,DURABILITY,0) ChooseConserveBestProgressStep(STEP,CP,18,DURABILITY,0)
} }
STEP := 2 STEP := 2
} }
@ -338,11 +350,11 @@ LongCraft60(ByRef STEP) {
loop { loop {
if (IsMaxQuality()) { if (IsMaxQuality()) {
STEP := 99
RECIPEDONE := true
Veneration(STEP,CP,DURABILITY,0) Veneration(STEP,CP,DURABILITY,0)
BasicSynthesis(STEP,CP,DURABILITY,0) BasicSynthesis(STEP,CP,DURABILITY,0)
BasicSynthesis(STEP,CP,DURABILITY) BasicSynthesis(STEP,CP,DURABILITY)
STEP := 99
RECIPEDONE := true
} }
Switch STEP Switch STEP
{ {
@ -366,15 +378,20 @@ LongCraft60(ByRef STEP) {
} }
Innovation(STEP,CP,DURABILITY) Innovation(STEP,CP,DURABILITY)
Case 9,10,11,12: Case 9,10,11,12:
if (CP >= 36) {
BasicTouch(STEP,CP,DURABILITY) BasicTouch(STEP,CP,DURABILITY)
} else {
HastyTouch(STEP,CP,DURABILITY)
}
Case 13: Case 13:
if (DURABILITY <= 20) { if (DURABILITY <= 20) {
if (CP >= 56) { if (CP >= 74) {
WasteNot(STEP,CP,DURABILITY,0) WasteNot(STEP,CP,DURABILITY,0)
loop { loop {
ChooseBestProgressStep(STEP,CP,DURABILITY,0) ChooseConserveBestProgressStep(STEP,CP,18,DURABILITY,0)
} until (DURABILITY = 10 or IsMaxQuality()) } until (DURABILITY = 10 or IsMaxQuality())
} }
Veneration(STEP,CP,DURABILITY,0)
BasicSynthesis(STEP,CP,DURABILITY,0) BasicSynthesis(STEP,CP,DURABILITY,0)
BasicSynthesis(STEP,CP,DURABILITY) BasicSynthesis(STEP,CP,DURABILITY)
} else { } else {
@ -439,7 +456,11 @@ CraftingRotation(ByRef STEP) {
Case 5: Case 5:
if (DURABILITY > 10) { if (DURABILITY > 10) {
if (IsExcellent() or IsGood()) { if (IsExcellent() or IsGood()) {
if (CP >= 18) {
BasicTouch(STEP,CP,DURABILITY) BasicTouch(STEP,CP,DURABILITY)
} else {
HastyTouch(STEP,CP,DURABILITY)
}
} else } else
{ {
if (DURABILITY = 20 and CP >= 18) { if (DURABILITY = 20 and CP >= 18) {
@ -731,6 +752,9 @@ TricksOfTheTrade(ByRef cp) {
if (IsGood() and KeyPressAllowed()) { if (IsGood() and KeyPressAllowed()) {
PressKeyWithModifier("Ctrl","2") PressKeyWithModifier("Ctrl","2")
cp := cp + 20 cp := cp + 20
tempstep := 0
tempcp := 0
ProgressStep(tempstep,tempcp,0)
loop { loop {
sleep, 250 sleep, 250
} until ActionReady() } until ActionReady()

BIN
autocraft.exe
View File

Binary file not shown.