fix(sleep): randomness is more contained now

- small fix in WaspClient that would cause crashing without using the launcher

Author: Torwent

examples/script_template.simba

@@ -16,16 +16,22 @@ type
 
 function TTemplate.GetReportValues(): TStringArray;
 var
-  actionsStr: String;
+  actionsStr, sleepInfo: String;
 begin
   actionsStr := ToStr(Self.Actions);
   if Self.MaxActions <> 0 then
     actionsStr += '/' + ToStr(Self.MaxActions);
 
+  if Antiban.Sleeps = [] then
+    sleepInfo := '00:00:00'
+  else
+    sleepInfo := Antiban.TimeUntilSleep(Antiban.Sleeps.First, TIME_SHORT);
+
   Result := [
     GetTimeStamp(TIME_SHORT),
     Logger.TimeRunning.ElapsedFmt(TIME_SHORT),
     Antiban.TimeRunning.ElapsedFmt(TIME_SHORT),
+    sleepInfo,
     actionsStr
   ];
 end;
@@ -35,7 +41,10 @@ begin
   Logger.Setup('Template');
   ProgressReport.Setup(
     'Template',
-    ['Script runtime', 'Botting runtime', 'Antiban runtime', 'Actions'],
+    [
+      'Script runtime:', 'Botting runtime:', 'Antiban runtime:', 'Next sleep:',
+      'Actions:'
+    ],
     @Self.GetReportValues
   );
 
@@ -81,6 +90,7 @@ begin
     state := Self.GetState();
     Logger.Info(ToStr(state));
     ProgressReport.Print();
+    WaspClient.SubmitStats();
 
     case state of
       ETemplateState.LOGIN: Login.DoLogin();

osrs/antiban/antiban.simba

@@ -80,8 +80,7 @@ begin
   if res < 0 then res += 1;
 
   Result := GetTimeRunning() + UInt64(Trunc(res * ONE_DAY));
-  Result += Trunc(Abs(GaussRand(0, randomness * 10 * ONE_DAY)));
-  Result := Max(0, Result);
+  Result += Trunc(Abs(GaussRand(0, randomness * ONE_DAY / 2)));
 end;
 
 
@@ -119,7 +118,7 @@ begin
   Self.Sleeps[idx].Length := length;
   Self.Sleeps[idx].StdVar := randomness;
   Self.Sleeps[idx].LogoutChance := logoutChance;
-  Self.Sleeps[idx].Next := Self.TimeRunningAtClock(Self.Sleeps[idx].Time, Self.Sleeps[idx].StdVar);
+  Self.Sleeps[idx].Next := Self.TimeRunningAtClock(time, randomness);
 end;
 
 
@@ -198,6 +197,8 @@ in a "bare" time format (00:00:00).
 
 `randomness` is self explanatory, gives variance to the time our script will
 sleep at and it's length too.
+One thing to keep in mind is that randomness only affects time past `time`.
+In other words, you will never sleep before `time`.
 
 `logoutChance` is the probability of logging out for the sleep break or to
 simply afk and logout from inactivity.
@@ -514,25 +515,25 @@ end;
 (*
 ## Antiban.TimeUntilBreak
 ```pascal
-function TAntiban.TimeUntilBreak(task: TBreakTask): String;
+function TAntiban.TimeUntilBreak(constref task: TBreakTask; fmt: String = TIME_FORMAL): String;
 ```
 Check how much time is left until the specified break `task` should be taken.
 *)
-function TAntiban.TimeUntilBreak(task: TBreakTask): String;
+function TAntiban.TimeUntilBreak(constref task: TBreakTask; fmt: String = TIME_FORMAL): String;
 begin
-  Result := FormatMilliseconds(Max(0, Round(task.Next - GetTimeRunning())), True);
+  Result := FormatMilliseconds(Max(0, Round(task.Next - GetTimeRunning())), fmt);
 end;
 
 (*
 ## Antiban.TimeUntilSleep
 ```pascal
-function TAntiban.TimeUntilSleep(task: TSleepTask): String;
+function TAntiban.TimeUntilSleep(constref task: TSleepTask; fmt: String = TIME_FORMAL): String;
 ```
 Check how much time is left until the specified sleep break `task` should be taken.
 *)
-function TAntiban.TimeUntilSleep(task: TSleepTask): String;
+function TAntiban.TimeUntilSleep(constref task: TSleepTask; fmt: String = TIME_FORMAL): String;
 begin
-  Result := FormatMilliseconds(Max(0, Round(task.Next - GetTimeRunning())), True);
+  Result := FormatMilliseconds(Max(0, Round(task.Next - GetTimeRunning())), fmt);
 end;
 
 (*

utils/waspclient.simba

@@ -202,8 +202,8 @@ end;
 
 procedure TWaspClient.ResetPayload();
 begin
-  if not Self.Lock.TryEnter() or not Self.IsSetup then
-    Exit;
+  if not Self.IsSetup then Exit;
+  if not Self.Lock.TryEnter() then Exit;
 
   Self.Payload.Item['experience'].AsInt := 0;
   Self.Payload.Item['gold'].AsInt := 0;
@@ -215,8 +215,8 @@ procedure TWaspClient.UpdatePayload(xp, gp: Integer);
 var
   item: TJSONItem;
 begin
-  if not Self.Lock.TryEnter() or not Self.IsSetup then
-    Exit;
+  if not Self.IsSetup then Exit;
+  if not Self.Lock.TryEnter() then Exit;
 
   item := Self.Payload.Item['experience'];
   item.AsInt := item.AsInt + xp;
@@ -232,8 +232,9 @@ var
   status: Integer;
   logLevel: ELogLevel;
 begin
-  if not Self.Lock.TryEnter() then
-    Exit;
+  if not Self.IsSetup then Exit;
+  if not Self.Lock.TryEnter() then Exit;
+
   Self.Client.RequestHeader['Accept-Profile'] := 'stats';
 
   with Self.Payload.Item['runtime'] do