Common: Added MSI_findColorsTolerance: "A simple wrapper of the funct…

…ion findColorsTolerance to help support MSI's arrays."
NCDS · May 20, 2012 · feee5bb · feee5bb
1 parent 2d37a32
commit feee5bb
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 14 deletions.
diff --git a/MSI/Skills/Common.simba b/MSI/Skills/Common.simba
@@ -119,6 +119,42 @@ begin
     end;
 end;
 
+(*
+MSI_FindColorsTolerance
+~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: pascal
+
+  function MSI_FindColorsTolerance(obj: TMSObject; index: Integer): TPointArray;
+
+A simple wrapper of the function findColorsTolerance to help support MSI's arrays.
+
+.. note::
+
+  | Author: NCDS
+  | Last Updated: 19 May 2012 by NCDS
+
+Example:
+
+.. code-block:: pascal
+  for i := 0 to h do
+    ATPA[i] := MSI_findColorsTolerance(fishSpot, i);
+*)
+function MSI_FindColorsTolerance(obj: TMSObject; index: Integer): TPointArray;
+var
+  tol: Integer;
+begin
+  try
+    tol := obj.tol[index];
+  except
+    tol := obj.tol[0];
+  finally
+    findColorsTolerance(result, obj.colors[index],
+                        obj.searchArea.x1, obj.searchArea.y1,
+                        obj.searchArea.x2, obj.searchArea.y2, tol);
+  end;
+end;
+
 (*
 MSI_AutoInvFull
 ~~~~~~~~~~~~~~~

diff --git a/MSI/Skills/Fishing.simba b/MSI/Skills/Fishing.simba
@@ -259,10 +259,7 @@ begin
   h := high(ATPA);
 
   for i := 0 to h do
-    findColorsTolerance(ATPA[i], fishSpot.colors[i],
+    ATPA[i] := MSI_findColorsTolerance(fishSpot, i);
-                        fishSpot.searchArea.x1, fishSpot.searchArea.y1,
-                        fishSpot.searchArea.x2, fishSpot.searchArea.y2,
-                        fishSpot.tol[i]);
 
   arr := mergeATPA(ATPA);
 
@@ -290,10 +287,7 @@ begin
 
     // looking for fishing spot
     for i := 0 to h do
-      findColorsTolerance(ATPA[i], fishSpot.colors[i],
+      ATPA[i] := MSI_findColorsTolerance(fishSpot, i);
-                          fishSpot.searchArea.x1, fishSpot.searchArea.y1,
-                          fishSpot.searchArea.x2, fishSpot.searchArea.y2,
-                          fishSpot.tol[i] + 3); // why +3?
 
     arr := mergeATPA(ATPA);
 

diff --git a/MSI/Skills/Mining.simba b/MSI/Skills/Mining.simba
@@ -120,9 +120,7 @@ begin
   h := high(ATPA);
 
   for i := 0 to h do
-    findColorsTolerance(ATPA[i], rock.colors[i],
+    ATPA[i] := MSI_findColorsTolerance(rock, i);
-                        rock.searchArea.x1, rock.searchArea.y1,
-                        rock.searchArea.x2, rock.searchArea.y2, rock.tol[i]);
 
   arr := mergeATPA(ATPA);
   rockColorCount := length(arr);
@@ -131,9 +129,7 @@ begin
     MSI_FindRandoms(false);
 
     for i := 0 to h do
-      findColorsTolerance(ATPA[i], rock.colors[i],
+      ATPA[i] := MSI_findColorsTolerance(rock, i);
-                          rock.searchArea.x1, rock.searchArea.y1,
-                          rock.searchArea.x2, rock.searchArea.y2, rock.tol[i]);
 
     arr := mergeATPA(ATPA);