Skip to content

Commit 67db27e

Browse files
committed
fix(scriptform): accidentally confused the start button with the form
1 parent 77d3b34 commit 67db27e

File tree

4 files changed

+45
-5
lines changed

4 files changed

+45
-5
lines changed

examples/script_template.simba

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,7 @@ end;
131131

132132
begin
133133
TemplateForm.Init();
134+
135+
WriteLn 'HELLO';
134136
Template.Run();
135137
end.

osrs/interfaces/mainscreen/grandexchange/grandexchange_offer.simba

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,17 @@ type
1515
EGEOfferInterface = enum(SETUP, STATUS);
1616
```
1717
Enum to represent the type of {ref}`GrandExchange` offer interfaces.
18+
19+
There's 2 types of "Offer" interfaces:
20+
```{figure} ../../images/geo_setup.png
21+
The "Setup offer" interface.
22+
```
23+
24+
```{figure} ../../images/geo_status.png
25+
The "Status offer" interface.
26+
```
27+
28+
You can differ them by their layout and interface title.
1829
*)
1930
EGEOfferInterface = enum(SETUP, STATUS);
2031

@@ -118,6 +129,7 @@ begin
118129
Self.InfoBounds.Examine := [X1+166, Y1+65, X2-20, Y1+128];
119130

120131
Self.QuantityBounds.Quantity := [X1+39, Y1+158, X1+191, Y1+177];
132+
Self.ConfirmButton := [X1+166,Y2-54,X2-166,Y2-15];
121133
end;
122134

123135
with Self.QuantityBounds.Quantity do
@@ -246,7 +258,6 @@ WriteLn GrandExchangeOffer.OfferInterface;
246258
*)
247259
property TRSGrandExchangeOffer.OfferInterface: EGEOfferInterface;
248260
begin
249-
if not Self.IsOpen() then Exit;
250261
if Self.Title.IsTitle('Grand Exchange: Offer status') then
251262
Exit(EGEOfferInterface.STATUS);
252263
Result := EGEOfferInterface.SETUP;
@@ -428,6 +439,33 @@ begin
428439
end;
429440

430441

442+
(*
443+
## GrandExchangeOffer.Confirm
444+
```pascal
445+
function TRSGrandExchangeOffer.Confirm(): Boolean;
446+
```
447+
Attempts to click the confirm button:
448+
449+
```{figure} ../../images/geo_confirm.png
450+
```
451+
452+
Example:
453+
```pascal
454+
if GrandExchangeOffer.Change('Abyssal whip') then
455+
GrandExchangeOffer.Confirm();
456+
```
457+
*)
458+
function TRSGrandExchangeOffer.Confirm(): Boolean;
459+
begin
460+
if not Self.IsOpen() then Exit;
461+
if Self.OfferInterface <> EGEOfferInterface.SETUP then Exit;
462+
463+
if not Target.HasColor(RSColors.TEXT_WHITE, 0, 1, Self.ConfirmButton) then
464+
Exit;
465+
466+
Mouse.Click(Self.ConfirmButton, EMouseButton.LEFT);
467+
Result := GrandExchange.WaitOpen(2000);
468+
end;
431469

432470
var
433471
(*

utils/forms/scriptform.simba

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ procedure TScriptForm.OnClose(sender: TLazObject; var closeAction: ELazFormClose
6161
begin
6262
Self._FormClosed := True;
6363
end;
64-
{$H+}
6564

6665
(*
6766
### ScriptForm.OnStart
@@ -86,8 +85,8 @@ end;
8685
*)
8786
procedure TScriptForm.OnStart(sender: TLazObject);
8887
begin
89-
TLazForm(sender).OnClose := nil;
90-
TLazForm(sender).Close();
88+
Self.Form.OnClose := nil;
89+
Self.Form.Close();
9190

9291
if (Self.Goals.Actions <> nil) then
9392
begin
@@ -113,6 +112,7 @@ begin
113112
Self.ConfigData.AddInt('goal_level', Self.Goals.Level.Value);
114113
end;
115114
end;
115+
{$H+}
116116

117117

118118

wasplib-docs

0 commit comments

Comments
 (0)