fix: removed TRSButton.Index, not needed anymore

started logout tab

Author: Torwent

osrs.simba

@@ -34,6 +34,7 @@
 {$IFNDEF SRLT_MAGIC_INCLUDED}               {$INCLUDE_ONCE osrs/interfaces/gametabs/magic.simba}
 {$IFNDEF SRLT_OPTIONS_INCLUDED}             {$INCLUDE_ONCE osrs/interfaces/gametabs/options.simba}
 {$IFNDEF SRLT_PRAYER_INCLUDED}              {$INCLUDE_ONCE osrs/interfaces/gametabs/prayer.simba}
+{$IFNDEF SRLT_LOGOUT_INCLUDED}              {$INCLUDE_ONCE osrs/interfaces/gametabs/logout.simba}
 
 {$IFNDEF SRLT_MM2MS_PROJECTOR_INCLUDED}     {$INCLUDE_ONCE osrs/interfaces/mm2ms_projector.simba}
 {$IFNDEF SRLT_MM2MS_INCLUDED}               {$INCLUDE_ONCE osrs/interfaces/mm2ms.simba}
@@ -91,3 +92,4 @@
 {$ENDIF}
 {$ENDIF}
 {$ENDIF}
+{$ENDIF}

osrs/interfaces/chat/chat.simba

@@ -27,8 +27,6 @@ var
   b: TBox;
 begin
   Self.Tabs.SetupInterface();
-
-  Self.ReportButton.Index := 0;
   Self.ReportButton.EnabledColors := [[1555,6], [5399922, 0], [795452, 0]];
 
   with Self.Tabs.Bounds do

osrs/interfaces/chat/chattabs.simba

@@ -28,7 +28,6 @@ begin
     for i := 0 to 6 do
     begin
       Self.Tabs[i].Tab := ERSChatTab(i+1);
-      Self.Tabs[i].Button.Index := i;
       Self.Tabs[i].Button.EnabledColors := [[1555,6], [5399922, 0], [795452, 0]];
       Self.Tabs[i].Button.Bounds := Box(X1 + 3 + (i * 62), Y1, X1 + 58 + (i * 62), Y2 - 1);
     end;

osrs/interfaces/gametabs/equipment.simba

@@ -60,7 +60,6 @@ begin
 
   for i := 0 to 3 do
   begin
-    Self.Buttons[i].Index := i;
     Self.Buttons[i].EnabledColors := [];
     Self.Buttons[i].Bounds := btns[i];
   end;

osrs/interfaces/gametabs/logout.simba

@@ -0,0 +1,95 @@
+(*
+# Logout
+Methods to interact with the logout tab.
+*)
+{$DEFINE SRLT_LOGOUT_INCLUDED}
+{$IFNDEF SRLT_OSR}
+  {$I SRLT/osrs.simba}
+{$ENDIF}
+
+type
+  ERSLogoutButton = (WORLD_SWITCHER, CLICK_HERE);
+  ERSLogoutRating = (ONE, TWO, THREE, FOUR, FIVE);
+
+  TRSLogout = record
+    Buttons: array [ERSLoginButton] of TRSButton;
+    Ratings: array [ERSLogoutRating] of TRSButton;
+  end;
+
+procedure TRSLogout.SetupInterface();
+var
+  btns: TBoxArray;
+  i: Integer;
+begin
+  btns := TBoxArray.Create(GameTab.TopLeft.Offset(2,61), 5, 1, 31, 35, [6, 0]);
+  for i := 0 to High(btns) do
+  begin
+    Self.Ratings[i].EnabledColors := [[$0F1043, 0], [$23269F, 0.227]];
+    Self.Ratings[i].Bounds := btns[i];
+  end;
+
+  Self.Buttons[ERSLogoutButton.WORLD_SWITCHER].EnabledColors := [[$0F1043, 0], [$23269F, 0.227]];
+  Self.Buttons[ERSLogoutButton.CLICK_HERE].EnabledColors := [[$0F1043, 0], [$23269F, 0.227]];
+
+  with GameTab.Bounds do
+  begin
+    Self.Buttons[ERSLogoutButton.WORLD_SWITCHER].Bounds := TBox.Create(X1+22, Y2-97, X2-22, Y2-66);
+    Self.Buttons[ERSLogoutButton.CLICK_HERE].Bounds := TBox.Create(X1+22, Y2-49, X2-22, Y2-18);
+  end;
+end;
+
+(*
+## Logout.IsOpen
+```pascal
+function TRSLogout.IsOpen(): Boolean;
+```
+Returns true if the logout gametab is open, false if it's not.
+
+Example:
+```pascal
+WriteLn Logout.IsOpen();
+```
+*)
+function TRSLogout.IsOpen(): Boolean;
+begin
+  Result := GameTabs.IsOpen(ERSGameTab.LOGOUT);
+end;
+
+(*
+## Logout.Open
+```pascal
+function TRSLogout.Open(): Boolean;
+```
+Attempts to open the logout tab, returns true if it succeeds.
+
+Example:
+```pascal
+WriteLn Logout.Open();
+```
+*)
+function TRSLogout.Open(): Boolean;
+begin
+  Result := GameTabs.Open(ERSGameTab.LOGOUT);
+end;
+
+
+(*
+## Logout.IsRated
+```pascal
+function TRSLogout.IsRated(): Boolean;
+```
+Returns true if a star button was clicked.
+
+Example:
+```pascal
+WriteLn Logout.IsRated();
+```
+*)
+function TRSLogout.IsRated(): Boolean;
+begin
+  Result := Self.Ratings[ERSLogoutRating.ONE].Enabled();
+end;
+
+var
+  Logout: TRSLogout;
+

osrs/interfaces/interfacecontrols.simba

@@ -8,7 +8,6 @@ type
       Tolerance: Single;
     end;
 
-    Index: Integer;
     Bounds: TBox;
   end;
 
@@ -51,23 +50,11 @@ end;
 
 procedure TRSButton.Draw(img: TImage; color: Integer = $00FFFF);
 var
-  oldSize: Single;
   oldColor: Integer;
-  oldAntialiasing: Boolean;
 begin
-  oldSize := img.FontSize;
-  oldAntialiasing := img.FontAntialiasing;
   oldColor := img.DrawColor;
-
-  img.FontSize := 20;
-  img.FontAntialiasing := True;
   img.DrawColor := color;
-
   img.DrawBox(Self.Bounds);
-  img.DrawText(ToStr(Self.Index), Self.Bounds, [EImageTextAlign.CENTER]);
-
-  img.FontSize := oldSize;
-  img.FontAntialiasing := oldAntialiasing;
   img.DrawColor := oldColor;
 end;
 
@@ -83,27 +70,15 @@ end;
 
 procedure TRSButtonArray.Draw(img: TImage; color: Integer = $00FFFF);
 var
-  oldSize: Single;
   oldColor: Integer;
-  oldAntialiasing: Boolean;
   button: TRSButton;
 begin
-  oldSize := img.FontSize;
-  oldAntialiasing := img.FontAntialiasing;
   oldColor := img.DrawColor;
-
-  img.FontSize := 20;
-  img.FontAntialiasing := True;
   img.DrawColor := color;
 
   for button in Self do
-  begin
     img.DrawBox(button.Bounds);
-    img.DrawText(ToString(button.Index), button.Bounds, [EImageTextAlign.CENTER]);
-  end;
 
-  img.FontSize := oldSize;
-  img.FontAntialiasing := oldAntialiasing;
   img.DrawColor := oldColor;
 end;
 

osrs/interfaces/mainscreen/bank.simba

@@ -170,25 +170,16 @@ begin
 
   for i := 0 to 1 do
   begin
-    Self.Buttons[i].Index := i;
-    Self.Buttons[i].EnabledColors := [[$0F1043, 0], [$23269F, 0.227]];
-    Self.ArrangementButtons[i].Index := i;
-    Self.ArrangementButtons[i].EnabledColors := [[$0F1043, 0], [$23269F, 0.227]];
-    Self.WithdrawModeButtons[i].Index := i;
+    Self.Buttons[i].EnabledColors             := [[$0F1043, 0], [$23269F, 0.227]];
+    Self.ArrangementButtons[i].EnabledColors  := [[$0F1043, 0], [$23269F, 0.227]];
     Self.WithdrawModeButtons[i].EnabledColors := [[$0F1043, 0], [$23269F, 0.227]];
   end;
 
   for i := 0 to 4 do
-  begin
-    Self.QuantityButtons[i].Index := i;
     Self.QuantityButtons[i].EnabledColors := [[$0F1043, 0], [$23269F, 0.227]];
-  end;
 
   for i := 0 to 3 do
-  begin
-    Self.DynamicButtons[i].Index := i;
     Self.DynamicButtons[i].EnabledColors := [[$0F1043, 0], [$23269F, 0.227]];
-  end;
 
   with Self.Bounds do
   begin

osrs/interfaces/setup.simba

@@ -13,6 +13,7 @@ begin
   Inventory.SetupInterface();
   Equipment.SetupInterface();
   Options.SetupInterface();
+  Logout.SetupInterface();
   MM2MS.Projector.SetupProjection();
   Chat.SetupInterface();
   InterfaceArea.SetupInterface();