feat: more GE

- also renamed GE "Progress" to "Status"
- added more GE Offer UI boxes

Author: Torwent

osrs/interfaces/mainscreen/grandexchange/grandexchange.simba

@@ -10,13 +10,13 @@ Methods to interact with the GrandExchange interface:
 
 type
 (*
-## EGEOfferProgress
+## EGEOfferStatus
 ```pascal
-EGEOfferProgress = enum(NONE, PROGRESSING, COMPLETED, ABORTED);
+EGEOfferStatus = enum(NONE, PROGRESSING, COMPLETED, ABORTED);
 ```
 Enum to represent the Grand Exchange offer slot states.
 *)
-  EGEOfferProgress = enum(NONE, PROGRESSING, COMPLETED, ABORTED);
+  EGEOfferStatus = enum(NONE, PROGRESSING, COMPLETED, ABORTED);
 
 (*
 ## EGESlotType
@@ -211,35 +211,35 @@ begin
 end;
 
 (*
-## TRSGrandExchangeSlot.ReadItem
+## TRSGrandExchangeSlot.Item
 ```pascal
-function TRSGrandExchangeSlot.ReadItem(): TRSItem;
+property TRSGrandExchangeSlot.Item: TRSItem;
 ```
 Reads the item text in the offer slot.
 
 Example:
 ```pascal
-WriteLn GrandExchange.Slots[7].ReadItem();
+WriteLn GrandExchange.Slots[7].Item;
 ```
 *)
-function TRSGrandExchangeSlot.ReadItem(): TRSItem;
+property TRSGrandExchangeSlot.Item: TRSItem;
 begin
   Result := OCR.RecognizeLines(Self.ItemNameBox, RSFonts.PLAIN_11, [RSColors.TEXT_LIGHT_ORANGE], 0).Join(' ');
 end;
 
 (*
 ## TRSGrandExchangeSlot.Value
 ```pascal
-function TRSGrandExchangeSlot.Value(): Integer;
+property TRSGrandExchangeSlot.Value: Integer;
 ```
 Reads the value text in the offer slot and returns it as an `Integer`.
 
 Example:
 ```pascal
-WriteLn GrandExchange.Slots[3].Value();
+WriteLn GrandExchange.Slots[3].Value;
 ```
 *)
-function TRSGrandExchangeSlot.Value(): Integer;
+property TRSGrandExchangeSlot.Value: Integer;
 var
   str: String;
 begin
@@ -248,31 +248,30 @@ begin
 end;
 
 (*
-## TRSGrandExchangeSlot.GetProgress
+## TRSGrandExchangeSlot.Status
 ```pascal
-function TRSGrandExchangeSlot.GetProgress(): EGEOfferProgress;
+property TRSGrandExchangeSlot.Status: EGEOfferStatus;
 ```
-Returns the slot {ref}`EGEOfferProgress`.
+Returns the slot {ref}`EGEOfferStatus` status.
 
 Example:
 ```pascal
-WriteLn GrandExchange.Slots[2].GetProgress();
+WriteLn GrandExchange.Slots[2].Status;
 ```
 *)
-function TRSGrandExchangeSlot.GetProgress(): EGEOfferProgress;
+property TRSGrandExchangeSlot.Status: EGEOfferStatus;
 begin
   if Target.HasColor($005F00, 0, 1, Self.StatusBox) then
-    Exit(EGEOfferProgress.COMPLETED);
+    Exit(EGEOfferStatus.COMPLETED);
   if Target.HasColor($2080D8, 0, 1, Self.StatusBox) then
-    Exit(EGEOfferProgress.PROGRESSING);
+    Exit(EGEOfferStatus.PROGRESSING);
   if Target.HasColor($00008F, 0, 1, Self.StatusBox) then
-    Exit(EGEOfferProgress.ABORTED);
+    Exit(EGEOfferStatus.ABORTED);
 
-  Result := EGEOfferProgress.NONE;
+  Result := EGEOfferStatus.NONE;
 end;
 
 
-
 type
 (*
 ## TRSGrandExchange

osrs/interfaces/mainscreen/grandexchange/grandexchange_offer.simba

@@ -27,6 +27,43 @@ Enum to represent the type of Grand Exchange offers.
 *)
   EGEOfferType = enum(SELL, BUY);
 
+(*
+## EGEOfferSpinButton
+```pascal
+EGEOfferSpinButton = enum(DECREASE, INCREASE);
+```
+Enum that represents the buttons to decrease/increase the quantity and price
+spinners of Grand Exchange offers.
+
+```{figure} ../../images/geo_spinners.png
+```
+*)
+  EGEOfferSpinButton = enum(DECREASE, INCREASE);
+
+(*
+## EGEOfferQuantity
+```pascal
+EGEOfferQuantity = enum(ONE, TEN, HUNDRED, THOUSAND, CUSTOM);
+```
+Enum that represents the quantity buttons of Grand Exchange offers.
+
+```{figure} ../../images/geo_quantity_buttons.png
+```
+*)
+  EGEOfferQuantity = enum(ONE, TEN, HUNDRED, THOUSAND, CUSTOM);
+
+(*
+## EGEOfferPrice
+```pascal
+EGEOfferPrice = enum(MINUS_CUSTOM, MINUS_FIVE, GUIDE, CUSTOM, PLUS_FIVE, PLUS_CUSTOM);
+```
+Enum that represents the price buttons of Grand Exchange offers.
+
+```{figure} ../../images/geo_price_buttons.png
+```
+*)
+  EGEOfferPrice = enum(MINUS_CUSTOM, MINUS_FIVE, GUIDE, CUSTOM, PLUS_FIVE, PLUS_CUSTOM);
+
 (*
 ## TRSGrandExchangeOffer
 Record responsible to handle the {ref}`GrandExchangeOffer` interface.
@@ -41,14 +78,14 @@ Record responsible to handle the {ref}`GrandExchangeOffer` interface.
 
     QuantityBounds: record
       Quantity: TBox;
-      Decrease, Increase: TBox;
-      One, Ten, Hundred, Thousand, Custom: TBox;
+      Spinner: TBoxArray;
+      Buttons: TBoxArray;
     end;
 
     PriceBounds: record
       Price: TBox;
-      Decrease, Increase: TBox;
-      MinusCustom, MinusFive, Guide, Custom, PlusFive, PlusCustom: TBox;
+      Spinner: TBoxArray;
+      Buttons: TBoxArray;
     end;
 
     TotalBounds: TBox;
@@ -75,9 +112,32 @@ begin
   with Self.Bounds do
   begin
     Self.InfoBounds.OfferType  := [X1+40, Y1+45, X1+130, Y1+61];
+    Self.InfoBounds.Item       := [X1+64, Y1+71, X1+103, Y1+106];
     Self.InfoBounds.GuidePrice := [X1+40, Y1+114, X1+130, Y1+122];
     Self.InfoBounds.Name       := [X1+166, Y1+45, X2-20, Y1+61];
     Self.InfoBounds.Examine    := [X1+166, Y1+65, X2-20, Y1+128];
+
+    Self.QuantityBounds.Quantity := [X1+39, Y1+158, X1+191, Y1+177];
+  end;
+
+  with Self.QuantityBounds.Quantity do
+  begin
+    Self.PriceBounds.Price := [X2+60, Y1, X2+253, Y2];
+
+    Self.QuantityBounds.Spinner := [
+      [X1-21, Y1+3, X1-9, Y2-4], [X2+9, Y1+3, X2+21, Y2-4]
+    ];
+
+    Self.QuantityBounds.Buttons := TBoxArray.Create([X1-23, Y2+4], 5, 1, 34, 24, [7,0]);
+  end;
+
+  with Self.PriceBounds.Price do
+  begin
+    Self.PriceBounds.Spinner := [
+      [X1-21, Y1+3, X1-9, Y2-4], [X2+10, Y1+3, X2+22, Y2-4]
+    ];
+
+    Self.PriceBounds.Buttons := TBoxArray.Create([X1-23, Y2+4], 6, 1, 34, 24, [7,0]);
   end;
 end;
 
@@ -348,6 +408,13 @@ begin
     Exit(SleepUntil(Self.Item.ToLower() = item.ToLower(), 200, 2000));
   end;
 
+  if not GrandExchangeChat.IsOpen() then
+  begin
+    Mouse.Click(Self.InfoBounds.Item, EMouseButton.LEFT);
+    if not GrandExchangeChat.WaitOpen(2000) then
+      Exit;
+  end;
+
   if not GrandExchangeChat.Contains(item) then
   begin
     if not GrandExchangeChat.SearchText[item] then