From eda68a1f2046d4488511f0e463287ca7786bcdc3 Mon Sep 17 00:00:00 2001 From: Cegaiel Date: Mon, 26 Mar 2012 06:07:07 -0400 Subject: [PATCH] Add Thermometer Macro, update error catching on many scripts. Fix/Replace some images for compatibility. Signed-off-by: Cegaiel --- VeggieTales/FlaxNileGreen.png | Bin 2180 -> 0 bytes VeggieTales/FlaxOldEgypt.png | Bin 2108 -> 0 bytes VeggieTales/FlaxTedra.png | Bin 2332 -> 0 bytes VeggieTales/Take.png | Bin 1360 -> 1001 bytes VeggieTales/blank.png | Bin 0 -> 2271 bytes VeggieTales/kettle_take.png | Bin 0 -> 817 bytes VeggieTales/luaScripts/Casting.inc | 36 ++--- VeggieTales/luaScripts/Casting.lua | 5 +- VeggieTales/luaScripts/Fishing.lua | 2 +- .../{sand_mine.lua => Sand_mine.lua.t5} | 138 +++++++++--------- VeggieTales/luaScripts/barrel_grinder.lua | 4 +- VeggieTales/luaScripts/barrel_vise.lua | 8 +- VeggieTales/luaScripts/boards.lua | 23 +-- VeggieTales/luaScripts/brick_rack.lua | 34 ++++- VeggieTales/luaScripts/crematory.lua | 4 +- VeggieTales/luaScripts/cut_stones.lua | 11 +- VeggieTales/luaScripts/forge.inc | 68 ++++----- VeggieTales/luaScripts/forge.lua | 5 +- VeggieTales/luaScripts/glass.lua | 2 +- VeggieTales/luaScripts/kettle_full.lua | 23 +-- VeggieTales/luaScripts/kiln.lua | 29 +++- VeggieTales/luaScripts/multi_click.lua | 2 +- VeggieTales/luaScripts/paper_press.lua | 5 +- VeggieTales/luaScripts/thermometer.lua | 94 ++++++++++++ VeggieTales/ok.png | Bin 0 -> 408 bytes VeggieTales/thermometer.png | Bin 0 -> 1209 bytes 26 files changed, 318 insertions(+), 175 deletions(-) delete mode 100644 VeggieTales/FlaxNileGreen.png delete mode 100644 VeggieTales/FlaxOldEgypt.png delete mode 100644 VeggieTales/FlaxTedra.png create mode 100644 VeggieTales/blank.png create mode 100644 VeggieTales/kettle_take.png rename VeggieTales/luaScripts/{sand_mine.lua => Sand_mine.lua.t5} (96%) create mode 100644 VeggieTales/luaScripts/thermometer.lua create mode 100644 VeggieTales/ok.png create mode 100644 VeggieTales/thermometer.png diff --git a/VeggieTales/FlaxNileGreen.png b/VeggieTales/FlaxNileGreen.png deleted file mode 100644 index 8f9d9557ac97c420180bc5547b2a3de48caafb98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2180 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 X)Xe>hN?2-}00000NkvXXu0mjf#~j3r literal 1360 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 literal 0 HcmV?d00001 diff --git a/VeggieTales/kettle_take.png b/VeggieTales/kettle_take.png new file mode 100644 index 0000000000000000000000000000000000000000..c072496f7afbc2c8f203ce967746796c70480bd4 GIT binary patch literal 817 zcmV-11J3-3P)yHfzm=e}ZnO(C2nvfL=q^)3vx_1!7fTJi zss2FWy4$MhqGC!H_7iH?eczcmomnA*hTWIlIWy;Z&htDkg6hcU)q?FFZyhHpKQ2;6}qbOFWNCJY44-bVDysI?d1ns@9Y3>mJt)29oL?cmp z2i`hV=0s!XUUrdWSk5w@34nl(oRHcvBuFBs00arQ^L2r|XBM^1-Fq8LD3N?jrPjnJ z5rojl12Ii)_#~4e@`#$N+?y$q)Lsy(GH%F_VRZ6VqRR z$qOowKjdpBVN@AfSFmwj1heefrs^<(v;0hDax0mQ8-rcJ9;}#{o^New5Qt|Q>(bdR z#}Y6hmY?kgEGHq!msAASs?5g4^xAehlN*2b_FwnLrsjsP_bOBFfya})bG+vK-zrK) zE-%SOAuAyl+Lx@c);r5RqrNM5z4zbO7xuorKSJa0yH}4mR?De%J{&Fzaj^aIVEe;v zc7A_@wGyBzr1!s=u=holoE*WDhyyTvCV#mTSdA vgvPKyN@;5?zkwcr-=g^NcU-i(%rN*LST}tt^M*^i00000NkvXXu0mjf$31us literal 0 HcmV?d00001 diff --git a/VeggieTales/luaScripts/Casting.inc b/VeggieTales/luaScripts/Casting.inc index 4adc4c7..6e68067 100644 --- a/VeggieTales/luaScripts/Casting.inc +++ b/VeggieTales/luaScripts/Casting.inc @@ -36,7 +36,7 @@ tools_button_names = { function heavyleadbowl() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -58,7 +58,7 @@ function heavyleadbowl() end function monkeywrench() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -81,7 +81,7 @@ end function silverbowl() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -104,7 +104,7 @@ end function ironcookpot() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -127,7 +127,7 @@ end function anvilbed() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -150,7 +150,7 @@ end function orichalcumpellets() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -178,7 +178,7 @@ end function mediumgear() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -206,7 +206,7 @@ end function smallgear() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -233,7 +233,7 @@ function smallgear() end function bearing() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -261,7 +261,7 @@ function bearing() end function washers() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -289,7 +289,7 @@ function washers() end function bolts() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -316,7 +316,7 @@ function bolts() end function heavymallethead() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -344,7 +344,7 @@ function heavymallethead() end function widetungstenchisel() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -372,7 +372,7 @@ function widetungstenchisel() end function roundhammer() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -401,7 +401,7 @@ end function ballpeenhammer() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -428,7 +428,7 @@ function ballpeenhammer() end function shapingmallet() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -456,7 +456,7 @@ function shapingmallet() end function leadmallet() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); @@ -484,7 +484,7 @@ function leadmallet() end function pewterincenseprong() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill casting boxes with charcoal, arrange, and fire the casting boxes first before you pin the menu."); srReadScreen(); diff --git a/VeggieTales/luaScripts/Casting.lua b/VeggieTales/luaScripts/Casting.lua index 4268937..66c6a84 100644 --- a/VeggieTales/luaScripts/Casting.lua +++ b/VeggieTales/luaScripts/Casting.lua @@ -50,8 +50,9 @@ function clickAll(image_name) local buttons = findAllImages(image_name); if #buttons == 0 then - statusScreen("Could not find specified buttons..."); - lsSleep(1500); + error 'Could not find \'Casting Box\' windows.' + --statusScreen("Could not find specified buttons..."); + --lsSleep(1500); else statusScreen("Clicking " .. #buttons .. "button(s)..."); if up then diff --git a/VeggieTales/luaScripts/Fishing.lua b/VeggieTales/luaScripts/Fishing.lua index 330b7f4..8edcc72 100644 --- a/VeggieTales/luaScripts/Fishing.lua +++ b/VeggieTales/luaScripts/Fishing.lua @@ -52,7 +52,7 @@ function SetupLureGroup() LastLure=nil; end else - error("didnt find pin"); + error("Didn\'t find pin up."); end diff --git a/VeggieTales/luaScripts/sand_mine.lua b/VeggieTales/luaScripts/Sand_mine.lua.t5 similarity index 96% rename from VeggieTales/luaScripts/sand_mine.lua rename to VeggieTales/luaScripts/Sand_mine.lua.t5 index 4aeb4e4..b62e88c 100644 --- a/VeggieTales/luaScripts/sand_mine.lua +++ b/VeggieTales/luaScripts/Sand_mine.lua.t5 @@ -1,69 +1,69 @@ --- --- --- - -loadfile("luaScripts/screen_reader_common.inc")(); -loadfile("luaScripts/ui_utils.inc")(); - -xyWindowSize = srGetWindowSize(); -imgWork1 = "WorkThisMine.png"; -imgWork2 = "WorkThisMine2.png"; -imgRepair1 = "RepairThisMine1.png"; -imgRepair2 = "RepairThisMine2.png"; -imgStrBlack = "Strength-Black.png"; -imgPerBlack = "Perception-Black.png"; -delay_time = 10; - -function doit() - local mine_count=0; - askForWindow("Make sure the Skills window is visible and Sand Mine window is pinned."); - local end_red; - local failures=0; - local just_repaired=nil; - while 1 do - checkBreak(); - lsSleep(delay_time); - checkBreak(); - if str_black and per_black then - statusScreen("(" .. mine_count .. " pulls) Mining..."); - else - statusScreen("(" .. mine_count .. " pulls) Waiting (STR or PER is not black)"); - end - srReadScreen(); - str_black = srFindImage(imgStrBlack); - per_black = srFindImage(imgPerBlack); - if str_black and per_black then - local mine = srFindImage(imgWork1, 4000); - if not mine then - mine = srFindImage(imgWork2, 4000); - end - if mine then - srClickMouseNoMove(mine[0]+5, mine[1], 0); - mine_count = mine_count + 1; - failures = 0; - just_repaired = nil; - else - repair = srFindImage(imgRepair1, 4000); - if not repair then - repair = srFindImage(imgRepair2, 4000); - end - if repair then - if just_repaired then - error ("Repaired once, but still broken? (did " .. mine_count .. " pulls)"); - else - srClickMouseNoMove(repair[0]+5, repair[1], 0); - lsSleep(500); - just_repaired = 1; - end - end - failures = failures + 1; - if (failures == 50) then - error ("Could not find Work This Mine button (did " .. mine_count .. " pulls)"); - else - statusScreen("Failed to find Work This Mine button..."); - lsSleep(1000); - end - end - end - end -end +-- +-- +-- + +loadfile("luaScripts/screen_reader_common.inc")(); +loadfile("luaScripts/ui_utils.inc")(); + +xyWindowSize = srGetWindowSize(); +imgWork1 = "WorkThisMine.png"; +imgWork2 = "WorkThisMine2.png"; +imgRepair1 = "RepairThisMine1.png"; +imgRepair2 = "RepairThisMine2.png"; +imgStrBlack = "Strength-Black.png"; +imgPerBlack = "Perception-Black.png"; +delay_time = 10; + +function doit() + local mine_count=0; + askForWindow("Make sure the Skills window is visible and Sand Mine window is pinned."); + local end_red; + local failures=0; + local just_repaired=nil; + while 1 do + checkBreak(); + lsSleep(delay_time); + checkBreak(); + if str_black and per_black then + statusScreen("(" .. mine_count .. " pulls) Mining..."); + else + statusScreen("(" .. mine_count .. " pulls) Waiting (STR or PER is not black)"); + end + srReadScreen(); + str_black = srFindImage(imgStrBlack); + per_black = srFindImage(imgPerBlack); + if str_black and per_black then + local mine = srFindImage(imgWork1, 4000); + if not mine then + mine = srFindImage(imgWork2, 4000); + end + if mine then + srClickMouseNoMove(mine[0]+5, mine[1], 0); + mine_count = mine_count + 1; + failures = 0; + just_repaired = nil; + else + repair = srFindImage(imgRepair1, 4000); + if not repair then + repair = srFindImage(imgRepair2, 4000); + end + if repair then + if just_repaired then + error ("Repaired once, but still broken? (did " .. mine_count .. " pulls)"); + else + srClickMouseNoMove(repair[0]+5, repair[1], 0); + lsSleep(500); + just_repaired = 1; + end + end + failures = failures + 1; + if (failures == 50) then + error ("Could not find Work This Mine button (did " .. mine_count .. " pulls)"); + else + statusScreen("Failed to find Work This Mine button..."); + lsSleep(1000); + end + end + end + end +end diff --git a/VeggieTales/luaScripts/barrel_grinder.lua b/VeggieTales/luaScripts/barrel_grinder.lua index 88790a8..bbc3770 100644 --- a/VeggieTales/luaScripts/barrel_grinder.lua +++ b/VeggieTales/luaScripts/barrel_grinder.lua @@ -18,7 +18,7 @@ num_clicks = 0; num_repairs = 0; function doit() - askForWindow(); + askForWindow("Pin up your barrel grinder menu, then press Shift to continue."); while 1 do lsSleep(100); if (lsShiftHeld() and lsControlHeld()) then @@ -29,7 +29,7 @@ function doit() lsPrintln(lsGetTimer() .. " start it"); local st = srFindImage(imgStart, 4000); if not st then - error 'Could not find start button'; + error 'Could not find \'Start grinding\' button.'; end lsPrintln(lsGetTimer() .. " winding and waiting"); statusScreen("Winding and waiting."); diff --git a/VeggieTales/luaScripts/barrel_vise.lua b/VeggieTales/luaScripts/barrel_vise.lua index f427870..a011a11 100644 --- a/VeggieTales/luaScripts/barrel_vise.lua +++ b/VeggieTales/luaScripts/barrel_vise.lua @@ -164,7 +164,7 @@ function process_vise(window_pos) return "DANGER; No Stoke (0 Wood)"; end; - return 'Flame: OK; Fuel OK;'; + return 'Flame: OK; Fuel OK'; end @@ -176,7 +176,7 @@ end function doit() -- testReorder(); - num_barrels = promptNumber("How many barrels?", 100); + num_barrels = promptNumber("How many barrels?", 1); askForWindow("Have 100 Boards, 2 Copper Straps, and 80 Wood in your inventory for every barrel you want to make.\n \nFor large numbers of barrels you can get away with less wood, the average used is 60.\n \nPin as many vises as you want, put the cursor over the ATITD window, press Shift."); srReadScreen(); @@ -184,7 +184,7 @@ function doit() local vise_windows = findAllImages("ThisIs.png"); if #vise_windows == 0 then - error 'Did not find any open windows'; + error 'Could not \'Barrel Vice\' windows.'; end local last_ret = {}; @@ -221,7 +221,7 @@ function doit() if not (#vise_windows == #vise_windows2) then lsPrintWrapped(10, 45, 5, lsScreenX-15, 1, 1, 0xFF7070ff, "Expected " .. #vise_windows .. " windows, found " .. #vise_windows2 .. ", not ticking."); elseif (made>=num_barrels) or (taken >= num_barrels) or (stop_cooking>0) then - lsPrint(10, 45, 5, 1.5, 1.5, 0x70FF70ff, "finishing up."); + lsPrint(10, 45, 5, 1.5, 1.5, 0x70FF70ff, "Finishing up."); elseif (taken > made) then lsPrint(10, 45, 5, 1.5, 1.5, 0xFFFFFFff, taken .. "/" .. num_barrels .. " finished"); else diff --git a/VeggieTales/luaScripts/boards.lua b/VeggieTales/luaScripts/boards.lua index 981f030..5fffc44 100644 --- a/VeggieTales/luaScripts/boards.lua +++ b/VeggieTales/luaScripts/boards.lua @@ -7,21 +7,10 @@ loadfile("luaScripts/ui_utils.inc")(); per_click_delay = 10; -button_names = { --- "Potash.png", "Begin.png", "Ignite.png", "StokeMax.png", -"ThisIs.png", -"Take.png", -"UnPin.png", -"ThistleAsc.png", -"Harvest.png", - -"CUSTOM", "Last CUSTOM"}; - -up = nil; right_click = nil; function doit() - askForWindow("Pin any number of windows, after selecting the window, you will be given a prompt of what kind of button to click on."); + askForWindow("Pin any number of Wood Plane or Carpentry Bench windows. Press Shift to continue."); while 1 do local image_name = "ThisIs.png"; @@ -31,8 +20,9 @@ function doit() local buttons = findAllImages(image_name); if #buttons == 0 then - statusScreen("Could not find specified buttons..."); - lsSleep(1500); + error 'Could not find \'Start Planing\' button.' + --statusScreen("Could not find specified buttons..."); + --lsSleep(1500); else statusScreen("Clicking " .. #buttons .. "button(s)..."); for i=#buttons, 1, -1 do @@ -51,8 +41,9 @@ function doit() local buttons = findAllImages(image_name); if #buttons == 0 then - statusScreen("Could not find specified buttons..."); - lsSleep(1500); + error 'Could not find any windows.' + --statusScreen("Could not find specified buttons..."); + --lsSleep(1500); else statusScreen("Clicking " .. #buttons .. "button(s)..."); for i=#buttons, 1, -1 do diff --git a/VeggieTales/luaScripts/brick_rack.lua b/VeggieTales/luaScripts/brick_rack.lua index eb0b326..3e46728 100644 --- a/VeggieTales/luaScripts/brick_rack.lua +++ b/VeggieTales/luaScripts/brick_rack.lua @@ -35,8 +35,9 @@ function clickAll(image_name) local buttons = findAllImages(image_name); if #buttons == 0 then - statusScreen("Could not find specified buttons..."); - lsSleep(1500); + error 'Could not find any \'Brick Rack\' windows.' + --statusScreen("Could not find specified buttons..."); + --lsSleep(1500); else statusScreen("Clicking " .. #buttons .. "button(s)..."); if up then @@ -109,7 +110,7 @@ end function Bricks() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Pin all Brickrack windows up and stand where all of them can be reached."); srReadScreen(); @@ -140,11 +141,21 @@ function Bricks() clickAll("Everything.png", 1); lsSleep(200); -- refocus(); + + + -- refresh windows, one last time so we know for sure the machine is empty (Take menu disappears) + clickAll("This.png", 1); + lsSleep(200); + -- refocus(); + + + + end end function Clay_Bricks() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Pin all Brickrack windows up and stand where all of them can be reached."); srReadScreen(); @@ -175,11 +186,18 @@ function Clay_Bricks() clickAll("Everything.png", 1); lsSleep(200); -- refocus(); + + -- refresh windows, one last time so we know for sure the machine is empty (Take menu disappears) + clickAll("This.png", 1); + lsSleep(200); + -- refocus(); + + end end function Firebricks() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Pin all Brickrack windows up and stand where all of them can be reached."); srReadScreen(); @@ -210,6 +228,12 @@ function Firebricks() clickAll("Everything.png", 1); lsSleep(200); -- refocus(); + + -- refresh windows, one last time so we know for sure the machine is empty (Take menu disappears) + clickAll("This.png", 1); + lsSleep(200); + -- refocus(); + end end diff --git a/VeggieTales/luaScripts/crematory.lua b/VeggieTales/luaScripts/crematory.lua index 894cd47..f553f72 100644 --- a/VeggieTales/luaScripts/crematory.lua +++ b/VeggieTales/luaScripts/crematory.lua @@ -57,10 +57,10 @@ windows = nil; ------------------------------------------------------------------------------- function doit() - askForWindow("Crematory script by Tallow."); --- askForWindow("Make sure all your crematory windows are pinned. Each crematory should be empty."); while true do promptLoad(); + askForWindow("Crematory script by Tallow.\n\nMake sure all your crematory windows are pinned. Each crematory should be empty BEFORE pinning them up."); + for i=1,passCount do currentPass = i; takeAll(); diff --git a/VeggieTales/luaScripts/cut_stones.lua b/VeggieTales/luaScripts/cut_stones.lua index 198c6e5..00f78f0 100644 --- a/VeggieTales/luaScripts/cut_stones.lua +++ b/VeggieTales/luaScripts/cut_stones.lua @@ -6,7 +6,11 @@ loadfile("luaScripts/screen_reader_common.inc")(); loadfile("luaScripts/ui_utils.inc")(); -local expected_windows = 40; -- Just to double check you don't have any extra windows open that it'll try to click on +--local expected_windows = 40; -- Just to double check you don't have any extra windows open that it'll try to click on + +expected_windows = promptNumber("How many Rock Saws?", 1); + + local per_click_delay = 0; function setWaitSpot(x0, y0) @@ -34,8 +38,9 @@ function clickAll(image_name, up) local buttons = findAllImages(image_name); if #buttons == 0 then - statusScreen("Could not find specified buttons..."); - lsSleep(1500); + error 'Could not find any \'Rock Saw\' windows.' + --statusScreen("Could not find specified buttons..."); + --lsSleep(1500); else statusScreen("Clicking " .. #buttons .. "button(s)..."); if up then diff --git a/VeggieTales/luaScripts/forge.inc b/VeggieTales/luaScripts/forge.inc index 228624e..230df5d 100644 --- a/VeggieTales/luaScripts/forge.inc +++ b/VeggieTales/luaScripts/forge.inc @@ -57,7 +57,7 @@ wire_button_names = { function KnifeBlade() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -79,7 +79,7 @@ function KnifeBlade() end function ShovelBlade() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -102,7 +102,7 @@ end function Nails() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill with charcoal, arrange, and pin the forges first before you light the fire."); srReadScreen(); @@ -125,7 +125,7 @@ end function CopperPipe() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -148,7 +148,7 @@ end function LeadPipe() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -171,7 +171,7 @@ end function IronBar() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -199,7 +199,7 @@ end function GoldBar() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -227,7 +227,7 @@ end function SilverBar() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -254,7 +254,7 @@ function SilverBar() end function LeadSheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -282,7 +282,7 @@ function LeadSheeting() end function GoldSheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -310,7 +310,7 @@ function GoldSheeting() end function CopperSheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -338,7 +338,7 @@ function CopperSheeting() end function OctecsAlloySheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -366,7 +366,7 @@ function OctecsAlloySheeting() end function SilverSheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -394,7 +394,7 @@ function SilverSheeting() end function SteelSheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -423,7 +423,7 @@ end function GoldFoil() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -450,7 +450,7 @@ function GoldFoil() end function MetalBlueSheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -478,7 +478,7 @@ function MetalBlueSheeting() end function TinSheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -506,7 +506,7 @@ function TinSheeting() end function MoonSteelSheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -534,7 +534,7 @@ function MoonSteelSheeting() end function ThothsMetalSheeting() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -563,7 +563,7 @@ end function WaterMetalStrap() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -591,7 +591,7 @@ end function IronStrap() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -619,7 +619,7 @@ end function AluminumStrap() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -647,7 +647,7 @@ end function CopperStrap() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -675,7 +675,7 @@ end function IronPoker() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -703,7 +703,7 @@ end function SteelBlade() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -731,7 +731,7 @@ end function LeadChisel() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -758,7 +758,7 @@ function LeadChisel() end function ThothsMetalWire() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -786,7 +786,7 @@ function ThothsMetalWire() end function MetalBlueWire() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -814,7 +814,7 @@ function MetalBlueWire() end function MagnesiumWire() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -842,7 +842,7 @@ function MagnesiumWire() end function OctecsAlloyWire() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -870,7 +870,7 @@ function OctecsAlloyWire() end function SilverWire() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -898,7 +898,7 @@ function SilverWire() end function CopperWire() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -926,7 +926,7 @@ function CopperWire() end function SteelWire() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); @@ -954,7 +954,7 @@ function SteelWire() end function GoldWire() - num_loops = promptNumber("How many passes ?", 100); + num_loops = promptNumber("How many passes ?", 1); askForWindow("Fill forges with charcoal, arrange, and fire the forges first before you pin the menu."); srReadScreen(); diff --git a/VeggieTales/luaScripts/forge.lua b/VeggieTales/luaScripts/forge.lua index dc62ba0..2a60310 100644 --- a/VeggieTales/luaScripts/forge.lua +++ b/VeggieTales/luaScripts/forge.lua @@ -50,8 +50,9 @@ function clickAll(image_name) local buttons = findAllImages(image_name); if #buttons == 0 then - statusScreen("Could not find specified buttons..."); - lsSleep(1500); + error 'Could not find \'Forge\' windows.' + --statusScreen("Could not find specified buttons..."); + --lsSleep(1500); else statusScreen("Clicking " .. #buttons .. "button(s)..."); if up then diff --git a/VeggieTales/luaScripts/glass.lua b/VeggieTales/luaScripts/glass.lua index 01daebf..4a8dc24 100644 --- a/VeggieTales/luaScripts/glass.lua +++ b/VeggieTales/luaScripts/glass.lua @@ -227,7 +227,7 @@ function doit() local glass_windows = findAllImages("ThisIs.png"); if #glass_windows == 0 then - error 'Did not find any open windows'; + error 'Could not find any \'Glazier\'s Bench\' windows.'; end local glass_state = {}; diff --git a/VeggieTales/luaScripts/kettle_full.lua b/VeggieTales/luaScripts/kettle_full.lua index e111809..745919e 100644 --- a/VeggieTales/luaScripts/kettle_full.lua +++ b/VeggieTales/luaScripts/kettle_full.lua @@ -28,8 +28,9 @@ function clickAll(image_name) local buttons = findAllImages(image_name); if #buttons == 0 then - statusScreen("Could not find specified buttons..."); - lsSleep(1500); + error 'Could not find \'Kettle\' windows.' + --statusScreen("Could not find specified buttons..."); + --lsSleep(1500); else statusScreen("Clicking " .. #buttons .. "button(s)..."); if up then @@ -123,7 +124,7 @@ function FlowerFert() sleepWithStatus(40*1000, "[" .. i .. "/" .. num_loops .. "] Waiting for Flower Fertilizer to finish"); - clickAll("Take.png", 1); + clickAll("Kettle_Take.png", 1); lsSleep(200); -- refocus(); end @@ -153,7 +154,7 @@ function GrainFert() sleepWithStatus(40*1000, "[" .. i .. "/" .. num_loops .. "] Waiting for Grain Fertilizer to finish"); - clickAll("Take.png", 1); + clickAll("Kettle_Take.png", 1); lsSleep(200); -- refocus(); @@ -229,7 +230,7 @@ function Acid() sleepWithStatus(10*60*340, "[" .. i .. "/" .. num_loops .. "] Waiting for Acid to finish"); - clickAll("Take.png", 1); + clickAll("Kettle_Take.png", 1); lsSleep(200); -- refocus(); @@ -306,7 +307,7 @@ function Potash() sleepWithStatus(10*60*340, "[" .. i .. "/" .. num_loops .. "] Waiting for Potash to finish"); - clickAll("Take.png", 1); + clickAll("Kettle_Take.png", 1); lsSleep(200); -- refocus(); @@ -383,7 +384,7 @@ function Sulfur() sleepWithStatus(10*60*340, "[" .. i .. "/" .. num_loops .. "] Waiting for sulfur to finish"); - clickAll("Take.png", 1); + clickAll("Kettle_Take.png", 1); lsSleep(200); -- refocus(); @@ -460,7 +461,7 @@ function Salt() sleepWithStatus(10*60*340, "[" .. i .. "/" .. num_loops .. "] Waiting for Salt to finish"); - clickAll("Take.png", 1); + clickAll("Kettle_Take.png", 1); lsSleep(200); -- refocus(); @@ -492,7 +493,7 @@ function WeedKiller() sleepWithStatus(80*1000, "[" .. i .. "/" .. num_loops .. "] Waiting for Weed Killer to finish"); - clickAll("Take.png", 1); + clickAll("Kettle_Take.png", 1); lsSleep(200); -- refocus(); @@ -523,7 +524,7 @@ function Arsenic() sleepWithStatus(40*1000, "[" .. i .. "/" .. num_loops .. "] Waiting for Arsenic to finish"); - clickAll("Take.png", 1); + clickAll("Kettle_Take.png", 1); lsSleep(200); -- refocus(); @@ -554,7 +555,7 @@ function GebsTears() sleepWithStatus(40*1000, "[" .. i .. "/" .. num_loops .. "] Waiting for Gebs Tears to finish"); - clickAll("Take.png", 1); + clickAll("Kettle_Take.png", 1); lsSleep(200); -- refocus(); diff --git a/VeggieTales/luaScripts/kiln.lua b/VeggieTales/luaScripts/kiln.lua index c403d8a..c8b552a 100644 --- a/VeggieTales/luaScripts/kiln.lua +++ b/VeggieTales/luaScripts/kiln.lua @@ -36,8 +36,9 @@ function clickAll(image_name) local buttons = findAllImages(image_name); if #buttons == 0 then - statusScreen("Could not find specified buttons..."); - lsSleep(1500); + error 'Could not find \'Kiln\' windows.' + --statusScreen("Could not find specified buttons..."); + --lsSleep(1500); else statusScreen("Clicking " .. #buttons .. "button(s)..."); if up then @@ -149,6 +150,12 @@ function Clay_Morter() lsSleep(200); -- refocus(); + -- refresh windows, one last time so we know for sure the machine is empty (Take menu disappears) + clickAll("This.png", 1); + lsSleep(200); + -- refocus(); + + end end @@ -195,6 +202,12 @@ function Jugs() lsSleep(200); -- refocus(); + -- refresh windows, one last time so we know for sure the machine is empty (Take menu disappears) + clickAll("This.png", 1); + lsSleep(200); + -- refocus(); + + end end @@ -241,6 +254,12 @@ function Clay_Bricks() lsSleep(200); -- refocus(); + -- refresh windows, one last time so we know for sure the machine is empty (Take menu disappears) + clickAll("This.png", 1); + lsSleep(200); + -- refocus(); + + end end @@ -287,6 +306,12 @@ function Firebricks() lsSleep(200); -- refocus(); + -- refresh windows, one last time so we know for sure the machine is empty (Take menu disappears) + clickAll("This.png", 1); + lsSleep(200); + -- refocus(); + + end end diff --git a/VeggieTales/luaScripts/multi_click.lua b/VeggieTales/luaScripts/multi_click.lua index 4fcdddf..c1af455 100644 --- a/VeggieTales/luaScripts/multi_click.lua +++ b/VeggieTales/luaScripts/multi_click.lua @@ -12,7 +12,7 @@ button_names = { "ThisIs.png", "Take.png", "UnPin.png", -"ThistleAsc.png", +"This.png", "Harvest.png", "CUSTOM", "Last CUSTOM"}; diff --git a/VeggieTales/luaScripts/paper_press.lua b/VeggieTales/luaScripts/paper_press.lua index ba22594..3e3e470 100644 --- a/VeggieTales/luaScripts/paper_press.lua +++ b/VeggieTales/luaScripts/paper_press.lua @@ -37,8 +37,9 @@ function clickAll(image_name, up, image_name2) end if #buttons == 0 then - statusScreen("Could not find specified buttons..."); - lsSleep(1500); + error 'Could not find \'Paper Press\' windows.' + --statusScreen("Could not find specified buttons..."); + --lsSleep(1500); else statusScreen("Clicking " .. #buttons .. "button(s)..."); if up then diff --git a/VeggieTales/luaScripts/thermometer.lua b/VeggieTales/luaScripts/thermometer.lua new file mode 100644 index 0000000..bb08a3a --- /dev/null +++ b/VeggieTales/luaScripts/thermometer.lua @@ -0,0 +1,94 @@ +-- +-- +-- + +loadfile("luaScripts/screen_reader_common.inc")(); +loadfile("luaScripts/ui_utils.inc")(); + +per_click_delay = 20; + + +up = nil; +right_click = nil; + +-- optional message +function askForWindowAndPixel(message) + -- Wait for release if it's already held + while lsShiftHeld() do end; + -- Display message until shift is held + while not lsShiftHeld() do + lsPrintWrapped(0, 0, 1, lsScreenX, 0.7, 0.7, 0xFFFFFFff, + "Mouse over the relevant pixel and press Shift."); + if message then + lsPrintWrapped(0, 40, 1, lsScreenX, 0.7, 0.7, 0xB0B0B0ff, + message); + end + lsSetCaptureWindow(); + mouse_x, mouse_y = srMousePos(); + lsPrintWrapped(0, 40, 1, lsScreenX, 0.7, 0.7, 0xB0B0B0ff, + mouse_x .. ", " .. mouse_y); + lsDoFrame(); + if lsButtonText(lsScreenX - 110, lsScreenY - 30, 0, 100, 0xFFFFFFff, "Exit") then + error "Canceled"; + end + end + lsSetCaptureWindow(); + -- Wait for shift to be released + while lsShiftHeld() do end; + xyWindowSize = srGetWindowSize(); +end + +function clickAll(image_name, up) + if nil then + lsPrintln("Would click '".. image_name .. "'"); + return; -- not clicking buttons for debugging + end + -- Find buttons and click them! + srReadScreen(); + xyWindowSize = srGetWindowSize(); + local buttons = findAllImages(image_name, 2000); + + if #buttons == 0 then + statusScreen("Could not find " .. image_name); + else + statusScreen("Clicking " .. #buttons .. "button(s)..."); + if up then + for i=#buttons, 1, -1 do + srClickMouseNoMove(buttons[i][0]+2, buttons[i][1]+2); + lsSleep(per_click_delay); + end + else + for i=1, #buttons do + srClickMouseNoMove(buttons[i][0]+2, buttons[i][1]+2); + lsSleep(per_click_delay); + end + end + statusScreen("Done clicking (" .. #buttons .. " clicks)."); + lsSleep(50); + end +end + +recipe = "aaaaaaaaaaaaaaaaammmmmmmmmmmmmmmmmmmbmmbmmbmmbmmmqm" + + +keyDelay = 50; +function doit() + local num_rounds; + num_rounds = promptNumber("How many thermos?", 1); + askForWindowAndPixel(" Pin up the 'Start Making' menu. Make sure your chat is minimized! Click in ATITD, hover your mouse over the glory hole and push shift. Ensure your heater control is set to Standard."); + for i = 1, num_rounds do + clickAll("Thermometer.png", true); + lsSleep(100); + srSetMousePos(mouse_x, mouse_y); + for j = 1, string.len(recipe) do + --recipe time + srKeyEvent(string.sub(recipe, j, j)); + lsSleep(keyDelay); + end + -- lsSleep(400); + srKeyEvent("u"); + clickAll("Blank.png"); + lsSleep(keyDelay); + clickAll("Ok.png"); + end +end diff --git a/VeggieTales/ok.png b/VeggieTales/ok.png new file mode 100644 index 0000000000000000000000000000000000000000..30d0aa64e27d78b815dcdc4e9229c09005a05cee GIT binary patch literal 408 zcmV;J0cZY+P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0WC>HK~yMHO;Axz z!axw+^QfPQ*DzYq15g4~@W(&#hu{$m(L_XwUD`t7!$Z)PZd!pZyRE=coVr`$X0mxR zJ8$N_McZh6SGz+0j;3Bx53|4&wS?f5n4|X&;IqOpYSyj+H7d&5#niVoH6v@P!pT$+ zn2+^tE9*Wz*)3;s@}T<=yF*T_kH0rKJTL^ny*Av%!ciJpyX8a@HVc#b7AFoTV>vjN zBxa}4WV@Q}*ZBq(SP)6*Fi#HVp>yzMymi18><5}GvV}ptVHWe(e8Wh9A{a$Te|e;? zo`kXpd5e0VvD@!I-;2JDhjXTteGWotWT%md8r2&}ZY!mgi&yhOy?gPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1WrjrK~y+TT~yg} z8$}fL-*}1hWXp@fA3((}1-p3Q4M-f>;7tyxUeg)wMT=e=S}0V4c-mgEU+Chtml2V5`CQxFfj^j_~6;VuX0XyZxeon zI{@J?KmSPPoLbHobHA9K8m*??11NIZBd3|o70brTVlC%WbN+ar2?$_!d-ap1c%m0m z9r@fKsS4-Ti}9{}-YgxdLI_wR?(Z}qW{@OhB^?_i0rD-8PP;d!9r^Ux=BL}MORZA8 zB_>WnuRfT&-;s`NtI%$uE5+O8>`f z_VUF(d?m}k*0Me&!_;`cUZ7-ZJliOSDXWZE%d<2a1r{RJc%RDq`|%!FooCdnAIz03 zJy^N2!><=YdNC|rIq5@uK*iimc^2&OGUEqqV~tB#ZyvZ|)NO2#c+>`|=TzI5@Xd`Ve>-Z0`nf6~Rz zT8<{Y%GqlK8(3=HsS7d7$d$&yU zJmgkj>N!`l$l~mf73vKyshI=Jfk1rsll12xZ}yERi(6KUhN>$B6CT=EkiZaVrG*_k zxMJICv8{d#C`KU|XLijq_jG}B?v&%GPaT=bxVlmjpi$2#MMT1)ucEH60lF?wz1w0$ z$$DBO7J?|C&c&%^_D(A(Xl6Gu8T^z*CO^xC!0twWNE405o zSVSe*td?QG^jN~XTji)aXf`Aqy2#h|HbDhCAqaSKH21hnm7StT&Ns)