Merge pull request #111 from Pauwelz/fix/antiban-breaks

fix: Antiban Breaks with different signatures

Author: Torwent

osrs/antiban/antiban.simba

@@ -173,7 +173,7 @@ Example:
 Antiban.AddBreak(30 * ONE_MINUTE, 5 * ONE_MINUTE); //Every 30 minutes the script will take a 5 minute break, subject to variance from the randomness variable.
 ```
 *)
-procedure TAntiban.AddBreak(length, interval: Double; randomness: Double = 0.2; logoutChance: Double = 0.33);
+procedure TAntiban.AddBreak(interval, length: Double; randomness: Double = 0.2; logoutChance: Double = 0.33);
 var
   len: Integer;
 begin

osrs/antiban/antibanform.simba

@@ -271,21 +271,21 @@ begin
   begin
     for i := 0 to tasks.Count-1 do
     begin
-      taskName := tasks.Item[i].Item[0].AsString;
+      taskName := tasks.Item[i].Item['task'].AsString;
 
       Self.TaskList.Items.Add(
         Self.GetTaskListString(
           taskName,
-          ToStr(tasks.Item[i].Item[1].AsFloat) + ' mins',
-          ToStr(tasks.Item[i].Item[2].AsFloat * 100) + '%'
+          ToStr(tasks.Item[i].Item['interval'].AsFloat) + ' mins',
+          ToStr(tasks.Item[i].Item['variation'].AsFloat * 100) + '%'
         )
       );
 
       for j := 0 to High(ANTIBAN_TASKS) do
         if ANTIBAN_TASKS[j].Name = taskName then
           Break;
 
-      Antiban.AddTask(@ANTIBAN_TASKS[j].Method, tasks.Item[i].Item[1].AsFloat * ONE_MINUTE, tasks.Item[i].Item[2].AsFloat);
+      Antiban.AddTask(@ANTIBAN_TASKS[j].Method, tasks.Item[i].Item['interval'].AsFloat * ONE_MINUTE, tasks.Item[i].Item['variation'].AsFloat);
     end;
 
     Self.TasksCheckbox.SetChecked(obj.Item['enabled'].AsBool);
@@ -294,13 +294,13 @@ begin
 
   for i := 0 to tasks.Count-1 do
   begin
-    taskName := tasks.Item[i].Item[0].AsString;
+    taskName := tasks.Item[i].Item['task'].AsString;
     for j := 0 to High(ANTIBAN_TASKS) do
       if ANTIBAN_TASKS[j].Name = taskName then
         Break;
 
     Antiban.AddTask(
-      @ANTIBAN_TASKS[j].Method, tasks.Item[i].Item[1].AsFloat * ONE_MINUTE, tasks.Item[i].Item[2].AsFloat
+      @ANTIBAN_TASKS[j].Method, tasks.Item[i].Item['interval'].AsFloat * ONE_MINUTE, tasks.Item[i].Item['variation'].AsFloat
     );
   end;
 end;
@@ -318,18 +318,18 @@ begin
     begin
       Self.BreakList.Items.Add(
         Self.GetBreakListString(
-          ToStr(breaks.Item[i].Item[0].AsFloat) + ' mins',
-          ToStr(breaks.Item[i].Item[1].AsFloat) + ' mins',
-          ToStr(breaks.Item[i].Item[2].AsFloat * 100) + '%',
-          ToStr(breaks.Item[i].Item[3].AsFloat * 100) + '%'
+          ToStr(breaks.Item[i].Item['length'].AsFloat) + ' mins',
+          ToStr(breaks.Item[i].Item['interval'].AsFloat) + ' mins',
+          ToStr(breaks.Item[i].Item['variation'].AsFloat * 100) + '%',
+          ToStr(breaks.Item[i].Item['logout'].AsFloat * 100) + '%'
         )
       );
 
       Antiban.AddBreak(
-        breaks.Item[i].Item[0].AsFloat*ONE_MINUTE,
-        breaks.Item[i].Item[1].AsFloat*ONE_MINUTE,
-        breaks.Item[i].Item[2].AsFloat,
-        breaks.Item[i].Item[3].AsFloat
+        breaks.Item[i].Item['interval'].AsFloat*ONE_MINUTE,
+        breaks.Item[i].Item['length'].AsFloat*ONE_MINUTE,
+        breaks.Item[i].Item['variation'].AsFloat,
+        breaks.Item[i].Item['logout'].AsFloat
       );
     end;
 
@@ -339,8 +339,8 @@ begin
 
   for i := 0 to breaks.Count-1 do
     Antiban.AddBreak(
-      breaks.Item[i].Item[0].AsFloat*ONE_MINUTE, breaks.Item[i].Item[1].AsFloat*ONE_MINUTE,
-      breaks.Item[i].Item[2].AsFloat, breaks.Item[i].Item[3].AsFloat
+      breaks.Item[i].Item['interval'].AsFloat*ONE_MINUTE, breaks.Item[i].Item['length'].AsFloat*ONE_MINUTE,
+      breaks.Item[i].Item['variation'].AsFloat, breaks.Item[i].Item['logout'].AsFloat
     );
 end;