Merge remote-tracking branch 'upstream/main' into feature/gehistory-back

Author: Pauwelz

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;
 

osrs/interfaces/mainscreen/shop.simba

@@ -26,9 +26,6 @@ Main record to interact with the {ref}`Shop` interface.
     Slots: TRSSlotInterface;
     Items: TRSItemInterface;
 
-    InventorySlots: TRSSlotInterface;
-    InventoryItems: TRSItemInterface;
-
     Bounds, SlotsArea, InfoBox: TBox;
     SlotBoxes, InventorySlotBoxes: TBoxArray;
 

osrs/position/map/entities.simba

@@ -177,10 +177,10 @@ Example:
 {$I WaspLib/osrs.simba}
 
 var
-  objs: TRSObjectArray;
+  entities: TRSEntityArray;
 begin
   Map.Setup([ERSChunk.VARROCK]);
-  objs := TRSObject.Create(ObjectsJSON.GetByName('bank'));
+  entities := TRSEntityArray.Create(NPCsJSON.GetByName('Banker')); 
 end;
 ```
 *)
@@ -853,6 +853,13 @@ begin
     Self.DrawTPA(boundsArray[i].Connect());
 end;
 
+(*
+## ShowOnTarget TRSEntity
+```pascal
+procedure ShowOnTarget(entity: TRSEntity); overload;
+```
+Shows an image of the target with the `TRSEntity` drawn on it.
+*)
 procedure ShowOnTarget(entity: TRSEntity); overload;
 var
   img: TImage;
@@ -862,6 +869,25 @@ begin
   img.Show();
 end;
 
+(*
+## ShowOnTarget TRSEntityArray
+```pascal
+procedure ShowOnTarget(entities: TRSEntityArray); overload;
+```
+Shows an image of the target with the `TRSEntityArray` drawn on it.
+*)
+
+procedure ShowOnTarget(entities: TRSEntityArray); overload;
+var
+  img: TImage;
+  i: Integer;
+begin
+  img := Target.GetImage();
+  for i := 0 to High(entities) do
+    img.DrawEntity(entities[i]);
+  img.Show();
+end;
+
 
 function ToString(constref entity: TRSEntity): String; override;
 begin

osrs/position/map/objects.simba

@@ -157,7 +157,7 @@ var
   objs: TRSObjectArray;
 begin
   Map.Setup([ERSChunk.VARROCK]);
-  objs := TRSObject.Create(ObjectsJSON.GetByName('bank'));
+  objs := TRSObjectArray.Create(ObjectsJSON.GetByName('Bank booth')); 
 end;
 ```
 *)
@@ -1071,6 +1071,23 @@ begin
   img.Show();
 end;
 
+(*
+## ShowOnTarget TRSObjectArray
+```pascal
+procedure ShowOnTarget(objs: TRSObjectArray); overload;
+```
+Shows an image of the target with the `TRSObjectArray` drawn on it.
+*)
+procedure ShowOnTarget(objs: TRSObjectArray); overload;
+var
+  img: TImage;
+  i: Integer;
+begin
+  img := Target.GetImage();
+  for i := 0 to High(objs) do
+    img.DrawObject(objs[i]);
+  img.Show();
+end;
 
 function ToString(constref obj: TRSObject): String; override;
 begin

version.simba

@@ -49,7 +49,7 @@ WL_VERSION_COMMIT_HASH
 Should be self explanatory but holds the shortened hash of the commit that has
 created the current WaspLib version.
 *)
-  WL_VERSION_COMMIT_HASH: String = '080061e';
+  WL_VERSION_COMMIT_HASH: String = '725b002';
 
 
 (*