Merge pull request #44 from Aoreias/master

Text_reading updates

VeggieTales/ScriptingReference.txt

@@ -22,6 +22,8 @@ The functions prefixed with "sr" (short for Screen Reader) generally operate on
 the ATITD window, so srGetWindowSize() gets the width and height of the ATITD
 window.
 
+The functions with neither an sr or ls prefix are lua-script library functions.
+
 * Note that you *MUST* call srReadScreen to update the screen before calling srFindImageInRange etc.
 
 == Function List ==
@@ -56,6 +58,33 @@ window.
   Vec2[] lsAnalyzePapyrus(int minsize, int maxsize, int debug, int relevant_radius)
   Vec2[] lsAnalyzeSilt(int minsize, int maxsize, int debug, int relevant_radius)
   [l,t,r,b] srGetWindowBorders(int x, int y)
+  Vec2[] findAllImages(String imgName, int tol)
+=== Text Parsing ===
+  Region object is a table where region[0] = x0, region[1] = y0, region[2] = width, region[3] = height
+  Parse object is a table where parse[0] = x0, parse[1] = y0, parse[2] = text
+  region[] findAllTextRegions()
+  parse findText(String s, bool isExact)
+  void stripRegion(region r)
+  parse[] parseRegion(region r)
+  parse findTextInRegion(region r, String t, bool isExact)
+  region[] findAllRegionsWithText(String t, bool isExact)
+  parse waitForText(String t, int delay, int timeout, bool isExact)
+  int waitForNoText(String t, int delay, int timeout, bool isExact)
+  region waitForRegionWithText(String t, int delay, int timeout, bool isExact)
+  parse waitForTextInRegion(Region r, String t, int delay, int timeout, bool isExact)
+  int waitForNoTextInRegion(Region r, String t, int delay, int timeout, bool isExact)
+  void clickText(parse p)
+  parse[] getChatText()
+  parse[] getAllText()
+  region srFindInvRegion()
+I recommend not using the below functions unless you're modifying lua library functions.
+  void srStripScreen()
+  void srStripRegion(int x0, int y0, int w, int h)
+  region srFindFirstTextRegion()
+  region srFindNextTextRegion()
+  parse[] srParseTextRegion(int x0, int y0, int w, int h)
+  region srFindChatRegion()
+  void srTrainTextReader(int x, int y, const char *c)
 === User Interface ===
   int lsScreenX
   int lsScreenY
@@ -82,7 +111,9 @@ window.
   void lsTopmost(int value)
   {bool done, selection} lsEditBox(const char *key, int x, int y, int z, int w, int h, float xsc, float ysc, const char *color, const char *def)
   int lsGetTimer()
-
+  const char *lsClipboardGet()
+  void lsClipboardSet(const char *str)
+  void askForWindow(String t)
 == Specific reference ==
 === void srKeyEvent(const char *s) ===
 

VeggieTales/luaScripts/common.inc

@@ -8,6 +8,7 @@ assert(loadfile("luaScripts/common_wait.inc"))();
 assert(loadfile("luaScripts/common_click.inc"))();
 assert(loadfile("luaScripts/common_find.inc"))();
 assert(loadfile("luaScripts/common_window.inc"))();
+assert(loadfile("luaScripts/common_text.inc"))();
 
 -------------------------------------------------------------------------------
 -- makePoint(x, y)

VeggieTales/luaScripts/common_click.inc

@@ -179,3 +179,18 @@ function drawWater()
   end
   return result;
 end
+
+------------------------------------------------------------------------------
+-- clickText(parse)
+--
+-- convenient wrapper to click on text 20, 7 pixels in from where the top
+-- left of the parse object
+-- parse - parse object which we're clicking
+--
+-- always returns nil
+------------------------------------------------------------------------------
+
+function clickText(parse)
+	srClickMouseNoMove(parse[0] + 20, parse[1] + 7);
+	lsSleep(per_click_delay);
+end