fix: read notes

- inventory actions now open the inventory first
- worldswitcher doesn't run it's cooldown on startup now

Author: Torwent

osrs/interfaces/gametabs/inventory.simba

@@ -125,6 +125,7 @@ WriteLn Inventory.IsSelected('Vial');
 *)
 function TRSInventory.IsSelected(slot: TBox): Boolean;
 begin
+  if not Self.Open() then Exit;
   slot.Y1 += 8;
   Result := Target.HasColor(TRSItem.BorderWhite, 1, 1, slot);
 end;
@@ -150,6 +151,7 @@ function TRSInventory.GetSelected(): Integer;
 var
   slots: TBoxArray;
 begin
+  if not Self.Open() then Exit(-1);
   slots := Self.Slots.Boxes();
   for Result := 0 to High(slots) do
     if Self.IsSelected(slots[Result]) then
@@ -188,6 +190,7 @@ var
   boxes: TBoxArray;
   b, tmp: TBox;
 begin
+  if not Self.Open() then Exit;
   boxes := Self.Slots.Boxes();
   if slot > -1 then
   begin
@@ -214,6 +217,7 @@ var
   selected: Integer;
   slots: TIntegerArray;
 begin
+  if not Self.Open() then Exit;
   selected := Self.GetSelected();
   slots := Self.Items.IndicesOf([item]);
 
@@ -240,6 +244,7 @@ WriteLn Inventory.Combine('Coins', 'Asgarnian ale');
 *)
 function TRSInventory.Combine(slotA, slotB: Integer): Boolean;
 begin
+  if not Self.Open() then Exit;
   Result := Self.Select(slotA);
   if Result then
   begin
@@ -256,6 +261,7 @@ var
   centers: TPointArray;
   i, j: Integer;
 begin
+  if not Self.Open() then Exit;
   slotsA := Self.Items.IndicesOf([itemA]);
   if slotsA = [] then Exit;
 
@@ -360,6 +366,7 @@ var
   b: TBox;
   i: Integer;
 begin
+  if not Self.Open() then Exit;
   if Length(slots) = 0 then Exit(True);
 
   boxes := Self.Slots.Boxes();
@@ -389,6 +396,7 @@ function TRSInventory.Drop(items: TRSItemArray; pattern: TIntegerArray = []): Bo
 var
   slots: TIntegerArray;
 begin
+  if not Self.Open() then Exit;
   if pattern = [] then pattern := Self.RandomPattern();
   slots := Self.Items.IndicesOf(items);
   Result := (slots <> []) and Self.Drop(pattern.Intersection(slots));
@@ -417,6 +425,7 @@ var
   i: Integer;
 begin
   if Length(slots) = 0 then Exit(True);
+  if not Self.Open() then Exit;
 
   if not Self.ShiftEnabled then Exit(Self.Drop(slots));
 
@@ -466,6 +475,7 @@ function TRSInventory.ShiftDrop(items: TRSItemArray; pattern: TIntegerArray): Bo
 var
   slots: TIntegerArray;
 begin
+  if not Self.Open() then Exit;
   slots := Self.Items.IndicesOf(items);
   Result := (slots <> []) and Self.ShiftDrop(pattern.Intersection(slots));
 end;

osrs/interfaces/gametabs/worldswitcher.simba

@@ -63,6 +63,26 @@ Main record that interacts with the {ref}`WorldSwitcher`.
     const YELLOW: TColor = $00F0F0;
   end;
 
+(*
+## TRSWorldSwitcher.Setup
+```pascal
+procedure TRSWorldSwitcher.Setup();
+```
+Interal method used to setup the {ref}`TRSWorldSwitcher` cooldown.
+
+This is automatically called for you on the {ref}`WorldSwitcher variable`.
+*)
+procedure TRSWorldSwitcher.Setup();
+var
+  t: Int64;
+begin
+  t := Time();
+  Self.Cooldown.FLength := 8000;
+  Self.Cooldown.FStartTime := t-8000;
+  Self.Cooldown.FFinishTime := t;
+  Self.Cooldown.FPauseTime := 0;
+end;
+
 (*
 ## TRSWorldSwitcher.SetupGameTab
 ```pascal
@@ -428,16 +448,11 @@ property TRSWorldSwitcher.World(next: Integer): Boolean;
 var
   current: Integer;
 begin
-  if not Self.Cooldown.IsFinished then
-    Exit;
-
-  if not Self.Open() then
+  if not Self.Cooldown.IsFinished or not Self.Open() then
     Exit;
-
   current := Self.World;
   if next = current then
     Exit(True);
-
   Result := Self._Hop(next);
 end;
 
@@ -455,11 +470,11 @@ begin
   if worlds = [current] then
     Exit(True);
 
-  next := worlds.IndexOf(current) + 1;
-  if next > High(worlds) then
+  next := worlds.IndexOf(current);
+  if Inc(next) > High(worlds) then
     next := 0;
 
-  Result := Self._Hop(next);
+  Result := Self._Hop(worlds[next]);
 end;
 
 (*
@@ -473,9 +488,10 @@ the specified `world`
 *)
 function TRSWorldSwitcher.WaitSwitch(world: Integer; failCooldown: Boolean = True): Boolean;
 begin
-  if not SleepUntil(MainScreen.IsServerMessage('Please wait'), 50, 600) then
+  if not SleepUntil(MainScreen.IsServerMessage('Please wait'), 200, 3*TICK) then
   begin
-    if failCooldown then Self.Cooldown.Restart(0, 7000);
+    if failCooldown then
+      Self.Cooldown.Restart(0, 7000);
     Exit;
   end;
 

osrs/interfaces/setup.simba

@@ -157,7 +157,7 @@ begin
   MM2MS.Projector.RSZoom := -1;
   RSMouseZoom.ZoomLevel := -1;
   RSMouseZoom.Enabled := True;
-  WorldSwitcher.Cooldown.Start(8000);
+  WorldSwitcher.Setup();
   FairyRing.Setup();
 
   Antiban.Zoom.Max := 100;

utils/webgraph.simba

@@ -224,45 +224,6 @@ begin
   end;
 end;
 
-function TWebGraph.NearestWalkablePoint(p: TPoint): TPoint;
-var
-  pArea, obj, tpa, bestObj: TPointArray;
-  pAreaClusters: T2DPointArray;
-  i, bestLength, tempLength: Integer;
-begin
-  pArea := TPointArray.CreateFromCircle(p, 20, True).Intersection(Self.WalkableSpace);
-  pAreaClusters := pArea.Cluster(1);
-
-  if Self.ObjectClusters = [] then Exit(pArea.NearestPoint(p));
-
-  obj := [];
-  for i := 0 to High(Self.ObjectClusters) do
-  begin
-    if not Self.ObjectClusters[i].Bounds().Contains(p) then Continue;
-    if Self.ObjectClusters[i].Contains(p) then
-    begin
-      obj := Self.ObjectClusters[i];
-      {$IFDEF DEBUG_WALKER}
-      WriteLn('Point was inside object! with edges: ', obj);
-      {$ENDIF}
-      Break;
-    end;
-  end;
-
-  if obj = [] then Exit(pArea.NearestPoint(p));
-
-  for i := 0 to High(pAreaClusters) do
-  begin
-    tpa := pAreaClusters[i].Intersection(obj);
-    tempLength := Length(tpa);
-    if tempLength > bestLength then
-    begin
-      bestLength := tempLength;
-      bestObj := tpa;
-    end;
-  end;
-  Result := bestObj.NearestPoint(p);
-end;
 
 function TWebGraph.PathBetween(a, b: TPoint; rnd: Double = 0; attempts: Integer = 3): TGraphNodeArray;
 var