feat(TRSItem): added TRSItem.Spread()

- spreads items with "(a..b)" into a TRSItemArray for each quantity from `a` to `b`.
- time contants were all missing a 0.... oops. This caused a ton of issues, notably with antiban

Author: Torwent

osrs/antiban/antibantasks.simba

@@ -64,7 +64,7 @@ begin
 
   b := RSClient.Bounds.Expand(150);
 
-  for i := 1 to Trunc(GaussRand(1, 6)) do
+  for i := 1 to Trunc(Abs(GaussRand(1, 6))) do
   begin
     if Random() < 0.30 then
       Mouse.Move(b, True, EMouseDistribution.GAUSS)
@@ -152,7 +152,7 @@ begin
     Exit;
   end;
 
-  Self.OpenSkill(Self.Skills.Random(), Trunc(GaussRand(1000, 10000)), RandomBoolean(0.5));
+  Self.OpenSkill(Self.Skills.Random(), Biometrics.RandomModeInteger(3000, 1000, 8000), RandomBoolean(0.5));
 end;
 
 

osrs/finders/itemfinder.simba

@@ -261,16 +261,20 @@ end;
 function TRSItemFinder.FindAll(items: TRSItemArray; boxes: TBoxArray; maxToFind: Integer = 0): TImageMatchArray;
 var
   item: TRSItem;
+  spread: TRSItemArray;
   img: TImage;
   i: Integer;
   skip: TBooleanArray;
   match: Single;
 begin
   SetLength(skip, Length(boxes));
 
+  for item in items do
+    spread += item.Spread();
+
   Target.FreezeImage();
 
-  for item in items do
+  for item in spread do
   begin
     item := LowerCase(item);
     Self.ImageCompare.Filter := @Self.GetFilter(item);
@@ -301,6 +305,7 @@ end;
 function TRSItemFinder.FindAll(items: TRSItemArray; boxes: TBoxArray; out matches: TImageMatchArray): Boolean; overload;
 var
   item: TRSItem;
+  spread: TRSItemArray;
   results: TImageMatchArray;
   i: Integer;
   img: TImage;
@@ -309,9 +314,12 @@ var
 begin
   SetLength(skip, Length(boxes));
 
+  for item in items do
+    spread += item.Spread();
+
   Target.FreezeImage();
 
-  for item in items do
+  for item in spread do
   begin
     item := LowerCase(item);
     Self.ImageCompare.Filter := @Self.GetFilter(item);
@@ -352,6 +360,7 @@ end;
 function TRSItemFinder.Find(items: TRSItemArray; boxes: TBoxArray; out match: TImageMatch): Boolean;
 var
   item: TRSItem;
+  spread: TRSItemArray;
   img: TImage;
   i: Integer;
   similarity: Single;
@@ -361,6 +370,9 @@ begin
   Target.FreezeImage();
 
   for item in items do
+    spread += item.Spread();
+
+  for item in spread do
   begin
     item := LowerCase(item);
     Self.ImageCompare.Filter := @Self.GetFilter(item);

osrs/interfaces/gametabs/worldswitcher.simba

@@ -149,7 +149,7 @@ WriteLn WorldSwitcher.IsLoading();
 *)
 function TRSWorldSwitcher.IsLoading(): Boolean;
 begin
-  Result := not Target.HasColor(RSFonts.ORANGE, 0, 1, Self.CurrentWorldBounds);
+  Result := not Target.HasColor(RSFonts.ORANGE, 0, 50, Self.CurrentWorldBounds);
 end;
 
 (*
@@ -189,9 +189,9 @@ WriteLn WorldSwitcher.Open();
 function TRSWorldSwitcher.Open(waitLoad: Boolean = True): Boolean;
 begin
   //overriden in TRSLogout.
-  Result := SleepUntil(not Self._IsOpen(), RandomMode(100, 50, 1500), 600);
+  Result := SleepUntil(not Self._IsOpen(), RandomMode(100, 50, 1500), TICK);
   if Result and waitLoad then
-    Self.WaitLoading();
+    Self.WaitLoading(4*TICK);
 end;
 
 
@@ -247,23 +247,6 @@ begin
 end;
 
 
-(*
-## WorldSwitcher.GetCurrentWorld
-```pascal
-function TRSWorldSwitcher.GetCurrentWorld(): Integer;
-```
-Returns the current world we are on.
-
-Example:
-```pascal
-WriteLn WorldSwitcher.GetCurrentWorld();
-```
-*)
-function TRSWorldSwitcher.GetCurrentWorld(): Integer;
-begin
-  Result := OCR.RecognizeNumber(Self.CurrentWorldBounds, RSFonts.BOLD, [RSFonts.ORANGE], 0);
-end;
-
 (*
 ## WorldSwitcher.GetWorlds
 ```pascal
@@ -383,74 +366,123 @@ begin
   Result := SleepUntil(Self.IsSorted(), 50, 600);
 end;
 
-(*
-## WorldSwitcher.WaitSwitch
-```pascal
-function TRSWorldSwitcher.WaitSwitch(world: Integer; failCooldown: Boolean = True): Boolean;
-```
-Exits false if "Please wait" not found, presumably due to combat.
-Returns true if we find "Please wait" and finish world hopping successfully to
-the specified `world`
-*)
-function TRSWorldSwitcher.WaitSwitch(world: Integer; failCooldown: Boolean = True): Boolean;
+function TRSWorldSwitcher.WaitSwitch(world: Integer; failCooldown: Boolean = True): Boolean; forward;
+
+function TRSWorldSwitcher._Hop(next: Integer): Boolean;
+var
+  timeout: TCountDown;
+  available: TRSWorldArray;
+  world: TRSWorld;
 begin
-  if not SleepUntil(MainScreen.IsServerMessage('Please wait'), 50, 600) then
-  begin
-    if failCooldown then Self.Cooldown.Restart(0, 7000);
+  if not Self.IsSorted() and not Self.Sort() then
     Exit;
-  end;
 
-  Result := SleepUntil(Self.GetCurrentWorld() = world, 200, 10000);
+  timeout.Start(20 * ONE_SECOND);
+
+  repeat
+    available := Self.GetWorlds();
+    if available = [] then Exit;
+
+    for world in available do
+      if world.Number = next then
+      begin
+        Mouse.Click(world.Bounds, EMouseButton.LEFT);
+        if Self.WaitSwitch(next) then
+          Exit(True);
+      end;
+
+    Self.Scroll.Scroll(Biometrics.RandomModeInteger(2,1,3), next > available[0].Number);
+  until not InRange(Self.Scroll.GetLevel(), 1, 99) or timeout.IsFinished;
 end;
 
 (*
-## WorldSwitcher.Hop
+## WorldSwitcher.World
 ```pascal
-function TRSWorldSwitcher.Hop(worlds: TIntegerArray): Boolean;
+property TRSWorldSwitcher.World: Integer;
+property TRSWorldSwitcher.World(world: Integer): Boolean;
+property TRSWorldSwitcher.World(worlds: TIntegerArray): Boolean;
 ```
-Switches to a different world from the specified `worlds`. By default the
-world switcher will sort the worlds, you can change this by passing `False` to `sort`.
-If the `TRSWorldSwitcher.Cooldown` is still active the function will return `False`.
+Returns or sets the current world we are on.
+
+When setting, if there's multiple worlds available we will hop to the next on
+the list available.
+
+Setting a new world will only happen if `TRSWorldSwitcher.Cooldown` is finished,
+which is a cooldown that starts everytime you change worlds.
 
 Example:
 ```pascal
-WriteLn WorldSwitcher.Hop([303, 304, 305]);
+WriteLn WorldSwitcher.World;
+WorldSwitcher.World := 311;
+WriteLn WorldSwitcher.World;
+WorldSwitcher.World[[311,312,313]];
+WriteLn WorldSwitcher.World;
 ```
 *)
-function TRSWorldSwitcher.Hop(worlds: TIntegerArray): Boolean;
+property TRSWorldSwitcher.World: Integer;
+begin
+  Result := OCR.RecognizeNumber(Self.CurrentWorldBounds, RSFonts.BOLD, [RSFonts.ORANGE], 0);
+end;
+
+property TRSWorldSwitcher.World(next: Integer): Boolean;
+var
+  current: Integer;
+begin
+  if not Self.Cooldown.IsFinished then
+    Exit;
+
+  if not Self.Open() then
+    Exit;
+
+  current := Self.World;
+  if next = current then
+    Exit(True);
+
+  Result := Self._Hop(next);
+end;
+
+property TRSWorldSwitcher.World(worlds: TIntegerArray): Boolean;
 var
   current, next: Integer;
-  available: TRSWorldArray;
-  world: TRSWorld;
 begin
+  if not Self.Cooldown.IsFinished or not Self.Open() then
+    Exit;
+
   if worlds = [] then
-    raise GetDebugLn('WorldSwitcher', 'worlds is empty.');
-  if not Self.Cooldown.IsFinished then Exit;
-  if not Self.Open() then Exit;
+    raise GetDebugLn('WorldSwitcher', 'worlds parameter is empty.');
 
-  current := Self.GetCurrentWorld();
-  if worlds = [current] then Exit(True);
-  if not Self.IsSorted() and not Self.Sort() then Exit;
+  current := Self.World;
+  if worlds = [current] then
+    Exit(True);
 
   next := worlds.IndexOf(current) + 1;
-  if next > High(worlds) then next := 0;
+  if next > High(worlds) then
+    next := 0;
 
-  repeat
-    available := Self.GetWorlds();
-    if available = [] then Exit;
+  Result := Self._Hop(next);
+end;
 
-    for world in available do
-      if world.Number = next then
-      begin
-        Mouse.Click(world.Bounds, EMouseButton.LEFT);
-        if Self.WaitSwitch(next) then
-          Exit(True);
-      end;
+(*
+## WorldSwitcher.WaitSwitch
+```pascal
+function TRSWorldSwitcher.WaitSwitch(world: Integer; failCooldown: Boolean = True): Boolean;
+```
+Exits false if "Please wait" not found, presumably due to combat.
+Returns true if we find "Please wait" and finish world hopping successfully to
+the specified `world`
+*)
+function TRSWorldSwitcher.WaitSwitch(world: Integer; failCooldown: Boolean = True): Boolean;
+begin
+  if not SleepUntil(MainScreen.IsServerMessage('Please wait'), 50, 600) then
+  begin
+    if failCooldown then Self.Cooldown.Restart(0, 7000);
+    Exit;
+  end;
 
-    Self.Scroll.Scroll(Biometrics.RandomModeInteger(2,1,3), next > available[0].Number);
-  until not InRange(Self.Scroll.GetLevel(), 1, 99);
+  Result := SleepUntil(Self.World = world, 200, 10000);
 end;
 
+
 var
 (*
 ## WorldSwitcher variable

utils/item.simba

@@ -235,6 +235,47 @@ begin
   Result := Self.EndsWith(')', True);
 end;
 
+(*
+## TRSItem.Spread
+```pascal
+function TRSItem.Spread(): TRSItemArray;
+```
+Checks if the `TRSItem` has `(a..b)` in it's name and will spread it into a
+`TRSItemArray`.
+
+Example:
+```pascal
+item := 'prayer potion(1..4)';
+WriteLn item.Spread(); ['prayer potion(1)', 'prayer potion(2)', 'prayer potion(3)'. 'prayer potion(4)']
+item := 'prayer potion(2..1)';
+WriteLn item.Spread(); ['prayer potion(2)', 'prayer potion(1)']
+```
+*)
+function TRSItem.Spread(): TRSItemArray;
+var
+  parts: TStringArray;
+  first, last, i: Integer;
+  name: String;
+begin
+  parts := Self.Split('..');
+  if Length(parts) <= 1 then
+    Exit([Self]);
+
+  first := StrToInt(parts[0].Last);
+  last :=  StrToInt(parts[1].First);
+  name := parts[0].CopyRange(1, parts[0].Length-1);
+
+  if first < last then
+  begin
+    for i := first to last do
+      Result += name + ToStr(i) + ')';
+    Exit;
+  end;
+
+  for i := first downto last do
+    Result += name + ToStr(i) + ')';
+end;
+
 (*
 ## TRSItem.SimplifyName
 ```pascal

utils/time.simba

@@ -7,9 +7,9 @@ Time related misc functions and variables
 const
   TICK: Integer = 600;
   ONE_SECOND: Integer = 1000;
-  ONE_MINUTE: Integer = 6000;
-  ONE_HOUR: Integer   = 360000;
-  ONE_DAY: Integer    = 8640000;
+  ONE_MINUTE: Integer = 60000;
+  ONE_HOUR: Integer   = 3600000;
+  ONE_DAY: Integer    = 86400000;
   TIME_FORMAL: String = 'h \ho\ur\s, m \min\ute\s and s \second\s';
   MINUTES_FORMAL: String = 'm \min\ute\s and s \second\s';
   FILE_TIME_FORMAT: String = 'YYYY-MM-DD_hh-mm-ss-ms';