Merge pull request #59 from Cegaiel/Jun_8_2012_Part2

Various complimentary tweaks/updates to June 8, 2012 update.

VeggieTales/data/chartemplate.txt

@@ -0,0 +1,192 @@
+2,768,0,0,0,.
+2,792,0,0,0,:
+2,1023,0,0,0,l
+2,1022,0,0,0,l
+2,1018,0,0,0,i
+2,14,0,0,0,'
+2,15,0,0,0,'
+6,384,520,584,584,72,1008,512,448,0,0,784,8,a
+5,384,520,584,72,1008,576,448,0,784,8,a
+6,1023,0,520,520,0,224,0,792,0,0,792,272,b
+6,1022,0,520,520,0,224,0,792,0,0,792,272,b
+5,224,0,520,520,0,272,792,0,0,520,c
+6,224,0,520,520,0,1023,272,792,0,0,792,0,d
+6,224,0,520,520,0,1022,272,792,0,0,792,0,d
+6,224,64,576,576,64,96,272,792,8,8,792,784,e
+5,224,64,576,576,96,272,792,8,24,792,e
+4,8,1020,8,9,0,3,3,0,f
+4,8,1020,10,10,0,2,0,0,f
+6,224,4096,4616,4616,0,2040,272,792,0,0,6936,2048,g
+6,224,2048,2568,2056,0,1016,272,792,0,768,3864,1024,g
+6,1023,0,8,8,0,992,0,24,0,0,24,24,h
+6,1022,0,8,8,0,992,0,24,0,0,24,24,h
+3,4096,4104,4090,0,2048,4096,j
+6,1023,0,0,0,0,0,0,96,224,400,776,520,k
+6,1022,0,0,0,0,0,0,96,224,400,776,520,k
+9,1016,0,8,8,1008,0,8,8,1008,0,24,0,16,8,24,0,16,8,m
+6,1016,0,8,8,0,992,0,24,0,0,24,24,n
+6,224,0,520,520,0,224,272,792,0,0,792,272,o
+6,8184,0,520,520,0,224,0,792,0,0,792,272,p
+5,0,520,520,0,224,792,0,0,792,272,p
+6,224,0,520,8,0,8184,272,792,0,512,792,0,q
+4,1016,0,0,8,0,24,8,0,r
+3,1016,0,8,0,16,0,r
+5,48,512,584,72,384,840,376,0,896,600,s
+4,48,520,584,384,840,112,384,600,s
+4,8,510,520,520,0,512,256,0,t
+6,248,0,512,512,0,1016,768,768,0,0,768,0,u
+5,8,64,768,64,8,48,440,128,440,48,v
+9,8,64,768,64,24,64,768,64,8,48,432,128,432,32,432,128,432,48,w
+5,0,0,224,0,0,792,952,0,952,792,x
+5,8,4160,768,64,8,48,3512,7296,440,48,y
+5,8,64,768,64,8,48,3504,3200,432,48,y
+5,520,520,584,520,520,256,384,160,48,16,z
+4,520,648,552,520,256,320,80,16,z
+9,0,512,192,128,134,128,192,512,0,512,384,304,60,8,60,304,384,512,A
+6,1022,546,546,546,12,128,0,0,0,20,882,320,B
+6,1022,546,546,546,0,140,0,0,0,0,886,370,B
+7,112,260,0,514,514,514,0,396,650,774,0,0,260,774,C
+6,112,260,514,514,514,0,396,650,260,0,0,774,C
+7,1022,514,514,514,0,260,112,0,0,0,0,774,136,136,D
+6,1022,546,546,546,546,546,0,0,0,0,0,0,E
+6,1022,34,34,34,34,34,0,0,0,0,0,0,F
+7,112,260,0,514,578,578,448,396,650,774,0,0,4,518,G
+7,56,130,0,257,273,17,240,198,325,387,0,0,258,259,G
+7,112,260,0,514,546,34,480,396,650,774,0,0,516,518,G
+7,1022,32,32,32,32,32,1022,0,0,0,0,0,0,0,H
+3,514,1022,514,0,0,0,I
+4,512,514,2,510,0,0,768,512,J
+6,1022,0,0,128,0,0,0,32,112,328,774,514,K
+5,1022,512,512,512,512,0,0,0,0,0,L
+9,1022,6,24,96,128,64,16,4,1022,0,8,36,144,320,176,44,10,0,M
+8,1022,4,16,64,0,16,4,1022,0,10,108,416,480,104,10,0,M
+7,1022,0,0,32,0,256,1022,0,14,28,80,448,640,0,N
+8,112,260,0,514,514,0,260,112,396,650,774,0,0,774,650,396,O
+6,1022,66,66,66,0,24,0,0,0,0,102,36,P
+8,112,260,0,514,1538,2048,2308,2160,396,650,774,0,2048,1798,650,396,Q
+7,1022,66,66,66,0,24,0,0,0,0,128,486,804,512,R
+6,1022,34,34,2,12,0,0,0,64,244,402,768,R
+7,8,0,546,546,546,0,128,788,822,16,0,64,870,326,S
+7,2,2,2,1022,2,2,2,0,0,0,0,0,0,0,T
+7,254,0,0,0,0,0,254,256,768,512,512,512,768,256,U
+8,4,16,128,768,128,16,4,0,26,104,352,0,352,104,26,2,V
+6,16,128,768,128,16,4,104,352,0,352,104,26,V
+9,0,4,16,128,768,128,16,4,0,2,26,104,352,0,352,104,26,2,V
+7,2,16,128,512,128,16,2,12,108,864,256,864,108,12,V
+10,0,6,28,96,896,896,96,28,6,0,2,8,98,408,64,64,408,98,8,2,V
+13,0,4,64,512,0,0,6,16,0,0,64,4,0,2,58,952,384,480,62,8,108,960,768,952,58,2,W
+11,2,48,256,0,0,6,0,0,768,48,2,12,204,704,480,62,8,60,448,192,204,12,W
+7,0,0,0,32,0,0,0,514,396,216,0,216,396,514,X
+6,0,0,0,0,0,0,774,396,112,112,396,774,X
+7,0,4,16,992,16,4,0,6,10,40,0,40,10,6,Y
+6,514,514,514,514,514,514,256,192,96,48,24,4,Z
+5,516,516,1022,512,512,0,2,0,0,0,1
+6,512,512,514,514,544,520,262,390,192,96,22,54,2
+6,0,0,546,546,0,204,774,774,0,0,886,306,3
+6,64,80,64,64,1022,64,32,40,28,6,0,0,4
+6,30,18,530,530,2,194,768,768,0,0,816,288,5
+6,240,4,528,530,2,192,268,826,6,0,816,288,6
+6,2,2,2,2,2,6,0,768,960,240,56,8,7
+6,136,0,514,546,0,140,374,630,48,0,886,338,8
+6,24,512,578,66,256,120,36,102,0,768,742,388,9
+6,248,0,0,0,0,248,260,774,514,514,774,260,0
+3,4095,2049,2049,0,0,0,[
+3,1025,1025,2047,0,0,0,[
+3,2049,2049,4095,0,0,0,]
+3,2047,1025,1025,0,0,0,]
+8,0,0,0,0,0,0,0,0,16,24,12,6,6,12,24,16,^
+5,0,0,0,256,2048,3,30,240,1728,1536,\
+4,32,32,32,32,0,0,0,0,-
+3,32,32,32,0,0,0,-
+3,64,64,64,0,0,0,-
+3,0,768,0,3072,3072,256,,
+7,32,32,32,508,32,32,32,0,0,0,0,0,0,0,+
+7,32,0,0,16,0,0,8,16,24,24,40,48,48,48,~
+11,96,8,516,96,1282,1290,1034,1528,256,256,96,408,916,1026,1942,152,0,384,6,6,156,408,@
+7,64,584,104,586,104,74,8,0,384,404,404,404,20,0,#
+6,24,548,4095,516,68,128,804,8,0,96,768,332,$
+10,28,34,34,28,0,0,448,544,544,448,34,20,788,418,224,56,558,326,320,544,%
+8,0,0,0,0,0,0,0,0,16,24,12,6,6,12,24,16,^
+9,128,12,512,514,2,12,480,512,0,320,882,54,48,628,978,512,256,512,&
+5,10,4,31,4,10,4,10,0,10,4,*
+4,224,1028,0,0,792,2842,6147,4097,(
+4,0,0,1028,224,4097,6147,2842,792,)
+5,64,64,1822,2049,2049,0,160,2209,1026,0,{
+5,2049,2049,1822,0,64,0,1026,2209,224,0,}
+3,0,536,0,3072,3328,256,;
+3,0,768,0,3072,3072,256,,
+7,0,32,0,0,0,0,0,32,80,112,216,216,396,396,<
+7,0,0,0,0,0,32,0,396,396,216,216,112,80,32,>
+7,144,144,144,144,144,144,144,0,0,0,0,0,0,0,=
+5,0,832,2,0,12,6,34,48,22,18,?
+2,894,0,0,0,!
+7,256,896,512,584,72,1008,1008,640,88,472,0,784,8,8,a
+7,1023,1023,512,520,520,496,224,0,0,24,0,272,520,272,b
+6,224,504,520,520,512,0,272,512,272,0,8,792,c
+7,224,496,520,520,0,1023,1023,272,520,272,0,776,0,0,d
+7,224,496,584,584,584,624,96,792,520,272,0,16,264,784,e
+5,8,1020,1023,9,1,0,3,0,2,0,f
+7,224,496,4616,4616,4104,4088,2040,6416,6664,272,0,2816,4096,2048,g
+7,1023,1023,0,8,8,1016,1008,0,0,24,0,16,0,8,h
+2,1019,1019,0,0,i
+3,4104,4091,1019,0,4096,3072,j
+6,1023,1023,64,416,520,0,0,0,160,600,432,520,k
+2,1023,1023,0,0,l
+10,1016,1016,0,8,1016,1008,0,8,1016,1008,0,0,24,16,0,8,24,16,0,8,m
+7,1016,1016,0,8,8,1016,1008,0,0,24,0,16,0,8,n
+7,224,496,520,520,520,496,224,272,520,272,0,272,520,272,o
+7,8184,8184,0,520,520,496,224,0,0,536,0,272,520,272,p
+7,224,496,520,520,0,8184,8184,272,520,272,0,776,0,0,q
+5,1016,1016,16,16,24,0,0,40,8,0,r
+6,32,112,584,584,448,128,848,776,176,416,536,344,s
+5,8,510,1022,520,520,0,512,0,256,0,t
+7,504,1016,512,512,0,1016,1016,512,0,256,0,768,0,0,u
+9,0,24,112,448,768,448,112,24,0,8,32,392,544,128,544,392,32,8,v
+12,0,24,120,960,768,56,56,768,960,120,24,0,8,32,384,48,224,448,448,224,48,384,32,8,w
+8,0,520,272,224,224,272,520,0,520,272,744,272,272,680,272,520,x
+9,0,24,112,6592,7936,960,112,24,0,8,32,4488,1568,128,3120,392,96,8,y
+6,520,776,712,616,536,520,256,128,288,144,32,16,z
+9,256,448,112,78,70,78,112,448,256,640,560,396,48,0,48,396,560,640,A
+7,512,192,136,134,136,192,512,384,816,54,0,54,816,384,A
+7,1022,1022,546,546,546,476,204,0,0,0,0,340,546,306,B
+7,248,508,514,514,514,2,260,260,514,268,0,0,772,650,C
+8,1022,1022,514,514,514,260,252,112,0,0,0,0,260,650,256,136,D
+6,1022,1022,546,546,546,514,0,0,0,0,0,0,E
+6,1022,1022,34,34,34,2,0,0,0,0,0,0,F
+7,248,508,512,514,546,482,484,260,514,270,4,0,516,522,G
+8,1022,1022,32,32,32,32,1022,1022,0,0,0,0,0,0,0,0,H
+4,514,1022,1022,514,0,0,0,0,I
+5,512,514,514,510,254,0,0,256,512,256,J
+7,1022,1022,48,72,388,514,0,0,0,72,436,586,260,514,K
+6,1022,1022,512,512,512,512,0,0,0,0,0,0,L
+10,1022,6,30,112,192,64,16,4,1022,1022,0,8,32,140,304,176,44,10,0,0,M
+7,1022,6,28,120,480,896,1022,0,8,34,132,528,64,0,N
+8,248,508,514,514,514,514,508,248,260,514,396,0,0,396,514,260,O
+7,1022,1022,66,66,66,60,24,0,0,0,0,36,66,36,P
+8,248,508,2,514,514,1538,4092,2296,260,514,908,0,0,2444,2,260,Q
+8,1022,1022,34,34,98,412,524,0,0,0,0,64,404,610,402,512,R
+7,280,60,546,546,546,480,196,676,770,84,80,336,518,298,S
+6,2,2,1022,1022,2,2,0,0,0,0,0,0,T
+7,254,510,512,512,512,510,254,256,512,256,0,256,512,256,U
+10,0,3,14,48,448,448,48,14,3,0,1,4,49,204,32,32,204,49,4,1,V
+14,0,14,124,960,896,96,28,28,96,384,960,124,14,0,2,48,386,48,64,408,34,34,408,608,48,386,48,2,W
+10,0,257,130,68,56,56,68,130,257,0,257,130,325,170,68,68,186,325,130,257,X
+10,0,2,14,56,992,992,56,14,2,0,2,12,16,68,16,16,68,16,12,2,Y
+6,385,449,305,281,269,259,64,32,202,166,18,4,Z
+8,72,72,72,72,72,72,72,72,0,0,0,0,0,0,0,0,=
+5,96,96,96,96,96,0,0,0,0,0,-
+3,4096,1792,0,3584,6144,768,,
+2,768,768,0,0,.
+4,496,2046,6147,0,1548,6145,1548,6147,(
+4,0,6147,2046,496,6147,1548,6145,1548,)
+13,8,28,34,34,28,8,32,128,448,544,544,448,192,54,34,20,276,418,246,80,888,556,324,320,544,800,%
+7,248,508,514,0,514,508,248,260,514,1285,1539,1285,514,260,0
+6,516,516,1022,1022,512,512,0,2,0,0,0,0,1
+7,516,768,514,642,578,572,536,266,6,384,320,180,66,36,2
+7,0,0,546,546,546,508,136,774,774,0,0,340,514,374,3
+7,64,64,72,64,1022,1022,64,32,56,20,6,0,0,0,4
+7,0,30,542,530,530,482,194,768,768,0,0,288,528,288,5
+7,240,508,512,530,530,482,192,264,512,278,0,288,528,288,6
+7,2,2,770,450,122,14,2,0,512,192,560,132,48,12,7
+7,136,476,546,514,514,476,136,340,546,340,96,356,546,374,8
+7,24,572,578,578,2,508,120,36,66,36,256,964,2,134,9

VeggieTales/luaScripts/Extra_auto.lua.txt

@@ -0,0 +1,35 @@
+It uses data in chem-all.txt and chem-cheap.txt. The 'cheap' one is
+recipes that only involve common herbs, most resins, salts, and
+powdered gems. The 'all' is recipes involving every known essence
+except hyssop and hazlewort. Currently 'all' is used for Thoth's and
+Ra's extracts, and 'cheap' for everything else. If there is a recipe
+that you do not want to use, delete it from those files.
+
+Running the macro involves pressing 'shift' to mark the window like
+normal, but here is what you need to have pinned before you run:
+
+- A 3-callibrated chemistry lab on its main menu.
+- The extracts menu from a different chemistry lab.
+- Some number of 'take' menus. Each essence you want to use must be
+visible without scrolling. I use 6 warehouses, and have 6 pinned take
+menus.
+
+None of these windows can overlap with the middle of the screen where
+the select-compound menu will appear. Before starting the macro, make
+sure that the select-compound menu is closed. Otherwise you'll get the
+'chemistry lab is busy' message.
+
+While the macro is running, it will check requirements of Ra, Thoth,
+Osiris, Set, Maat, Geb in that order and will make it if it can find
+the ingredients.
+
+If it can't find the ingredients, it will pop up a window letting you
+know the recipe it couldn't find. You can then either exit the macro
+(useful if you want to produce the needed essences) or press shift to
+let it skip that recipe and try to find other requirements.
+
+IMPORTANT: If it gets into a bad state where it has added essences to
+a mixture but not finished, close the macro. You can then run
+'notepad.lua' which will let you select the type/requirememts and give
+you the recipe it was going for. You can then finish up adding any
+essences needed, mixing/etc. by hand.

VeggieTales/luaScripts/alembic.lua

@@ -72,7 +72,7 @@ isRising = {};
 isSmall = {};
 
 function doit()
-  askForWindow("Alembic Control");
+  askForWindow("Alembic Control -- Runs any alembic windows you have pinned. Press shift over ATITD window to continue.");
   alembicControl();
 end
 

VeggieTales/luaScripts/common_gps.inc

@@ -1,7 +1,7 @@
 function findCoords()
   lsPrintln("findCoords");
   local result = nil;
-  local anchor = findText("2,");
+  local anchor = findText("Year");
   if anchor then
     lsPrintln("anchor");
     local window = getWindowBorders(anchor[0], anchor[1]);

VeggieTales/luaScripts/extract_auto.lua

@@ -13,9 +13,9 @@ local properties = {"Aromatic", "Astringent", "Bitter", "Salty",
 local props = {"Ar", "As", "Bi", "Sa", "So", "Sp", "Sw", "To"};
 
 function doit()
-  cheapRecipes = loadNotes("chem-cheap.txt");
-  allRecipes = loadNotes("chem-all.txt");
-  askForWindow("Magical Chemistry Vibes of Doom!!!!!!");
+  cheapRecipes = loadNotes("luascripts/chem-cheap.txt");
+  allRecipes = loadNotes("luascripts/chem-all.txt");
+  askForWindow("Magical Chemistry Vibes of Doom!!!!!!\nView 'extra_auto.lua.txt' to read more detailed instructions. If you wish to view instructions: Click Exit button, Open Folder button, double click 'extra_auto.lua.txt' to view detailed instructions! Othersise, click Shift over ATITD window to continue.");
   while true do
     tryAllTypes();
     sleepWithStatus(2000, "Making more magic");

VeggieTales/luaScripts/info.lua

@@ -1,7 +1,7 @@
 assert(loadfile("luaScripts/common.inc"))();
 
 function doit()
-  askForWindow();
+  askForWindow("Shows currently hovered mouse position and RGB color values. Press shift over ATITD window to continue.");
   while true do
     srReadScreen();
     local pos = getMousePos();

VeggieTales/luaScripts/menu_helper.lua

@@ -1,23 +1,36 @@
 assert(loadfile("luaScripts/common.inc"))();
 
+askText = singleLine([[
+  Menu Helper v1.0 by Tallow -- Brings up building menu(s) and finds/clicks user inputed text on each menu. 
+
+-- Instructions: Click Add button then input text you want to find, in building menus.
+Repeat if there are multiple/embedded menus per building.
+Hover each building and tap Ctrl key.
+It will right click the building, bring up menu(s), search for text, click it. Tap Ctrl over each building to repeat.
+
+Press Shift over ATITD window to continue!
+]]);
+
+
 function doit()
-  askForWindow("Menu Helper v1.0 by Tallow");
+  askForWindow(askText);
   local menuList = {};
   while true do
+    checkBreak();
     local foo = nil;
 
-    local y = 100;
+    local y = 140;
     for i=1,#menuList do
       foo, menuList[i] = lsEditBox("menu" .. i, 10, y, 0, 250, 30, 1.0, 1.0,
 				   0x000000ff, menuList[i]);
-      y = y + 50;
+      y = y + 40;
     end
 
-    if lsButtonText(10, lsGetWindowSize()[1] - 40, 0, 100, 0xffffffff, "Add") then
+    if lsButtonText(10, lsGetWindowSize()[1] - 30, 0, 100, 0xffffffff, "Add") then
       table.insert(menuList, "");
     end
 
-    statusScreen("Enter menu options to select");
+    statusScreen("Click Add button...\nEnter text to click on each menu\nTap Ctrl over building to execute");
     if lsControlHeld() then
       while lsControlHeld() do
 	checkBreak();
@@ -33,3 +46,4 @@ function doit()
     end
   end
 end
+

VeggieTales/luaScripts/notepad.lua

@@ -2,7 +2,7 @@
 assert(loadfile("luaScripts/common.inc"))();
 
 function doit()
-  local tree = loadNotes("chem-cheap.txt");
+  local tree = loadNotes("luascripts/chem-cheap.txt");
   browseMenu(tree);
 end