fix(Bank): SetQuantity and better uptext check

- json objects and npcs now calculate height properly like the game

Author: Torwent

osrs/interfaces/mainscreen/bank.simba

@@ -552,7 +552,7 @@ end;
 (*
 ## Bank.SetQuantity
 ```pascal
-function TRSBank.SetQuantity(quantity: ERSItemQuantity): Boolean;
+function TRSBank.SetQuantity(quantity: ERSItemQuantity; amount: Integer = 0): Boolean;
 ```
 Attempts to set the bank quantity to `quantity`, returns true if we succeed.
 
@@ -561,11 +561,19 @@ Example:
 WriteLn Bank.SetQuantity(ERSItemQuantity.FIVE);
 ```
 *)
-function TRSBank.SetQuantity(quantity: ERSItemQuantity): Boolean;
+function TRSBank.SetQuantity(quantity: ERSItemQuantity; amount: Integer = 0): Boolean;
 begin
   if Self.QuantityButtons[quantity].Enabled() then Exit(True);
   Result := Self.QuantityButtons[quantity].Enable();
-  if Result then Sleep(600, 800);
+
+  if Result or (quantity <> ERSItemQuantity.CUSTOM) then
+    Exit;
+
+  if Chat.AnswerQuery('Enter amount', ToString(amount), RandomLeft(1400, 2400)) then
+  begin
+    Self._Cache.Quantity := amount;
+    Result := Self.QuantityButtons[quantity].Enabled();
+  end;
 end;
 
 
@@ -943,6 +951,7 @@ function TRSBank._InteractionHelper(mode: ERSBankInteraction; slot: TBox; amount
 var
   quantity: ERSItemQuantity;
   amountStr, modeStr, upText: String;
+  timeout: TCountDown;
 begin
   amountStr := ToString(amount);
   quantity := ERSItemQuantity.Integer2Quantity(amount);
@@ -954,7 +963,7 @@ begin
 
   if useQuantityButton then
   begin
-    if not Self.SetQuantity(quantity) then
+    if not Self.SetQuantity(quantity, amount) then
       Exit;
 
     Mouse.Move(slot);
@@ -970,9 +979,21 @@ begin
       Exit(True);
     end;
 
-    upText := MainScreen.UpText;
-    if not upText.Contains(modeStr) then
-      Exit;
+    timeout.Start(Round(RandomMode(100, 85, 250)));
+
+    repeat
+      if MainScreen._IsUpText(upText, [modeStr], True, 0.85) then
+      begin
+        Sleep(50);
+        if MainScreen._IsUpText(upText, [modeStr], True, 0.85) then
+          Break;
+      end;
+
+      if timeout.IsFinished then
+        Exit;
+      Sleep(25);
+    until False;
+
 
     upText := upText.Between(modeStr, ' ');
 

osrs/interfaces/mainscreen/mainscreen.simba

@@ -125,17 +125,17 @@ end;
 (*
 ### MainScreen._IsUpText
 ```pascal
-function TRSMainScreen._IsUpText(strings: TStringArray; caseSensitive: Boolean; similarity: Single): Boolean;
+function TRSMainScreen._IsUpText(out upText: String; strings: TStringArray; caseSensitive: Boolean; similarity: Single): Boolean;
 ```
 Internal helper method used in {ref}`MainScreen.IsUpText`.
 
 `strings` casing must be lower case if `caseSensitive` is `False`.
 
 You probably won't ever need to call this method directly.
 *)
-function TRSMainScreen._IsUpText(strings: TStringArray; caseSensitive: Boolean; similarity: Single): Boolean;
+function TRSMainScreen._IsUpText(out upText: String; strings: TStringArray; caseSensitive: Boolean; similarity: Single): Boolean;
 var
-  upText, str: String;
+  str: String;
   i: Integer;
   match: Double;
 begin
@@ -173,7 +173,6 @@ begin
   end;
 end;
 
-
 (*
 ### MainScreen.IsUpText
 ```pascal
@@ -199,7 +198,7 @@ function TRSMainScreen.IsUpText(strings: TStringArray; caseSensitive: Boolean =
 var
   timeout: TCountDown;
   strs: TStringArray;
-  str: String;
+  txt, str: String;
 begin
   if time = -1 then
     time := Round(RandomMode(100, 85, 250));
@@ -215,10 +214,10 @@ begin
   end;
 
   repeat
-    if Self._IsUpText(strings, caseSensitive, similarity) then
+    if Self._IsUpText(txt, strings, caseSensitive, similarity) then
     begin
       Sleep(50);
-      if Self._IsUpText(strings, caseSensitive, similarity) then
+      if Self._IsUpText(txt, strings, caseSensitive, similarity) then
         Exit(True);
     end;
 

osrs/position/map/entities.simba

@@ -120,7 +120,7 @@ begin
   begin
     Result.Size.X := Item[0].AsInt * 0.8;
     Result.Size.Y := Item[1].AsInt * 0.8;
-    Result.Size.Z := Item[2].AsInt / 40;
+    Result.Size.Z := Item[2].AsInt / 128;
   end;
 
   if Abs(Result.Size.Z) < 0.05 then

osrs/position/map/objects.simba

@@ -100,7 +100,7 @@ begin
   begin
     Result.Size.X := Item[0].AsInt * 0.8;
     Result.Size.Y := Item[1].AsInt * 0.8;
-    Result.Size.Z := Item[2].AsInt / 40;
+    Result.Size.Z := Item[2].AsInt / 128;
   end;
 
   if Abs(Result.Size.Z) < 0.05 then