Skip to content

Commit

Permalink
fix: compatibility with latest SRL-T and WaspLib
Browse files Browse the repository at this point in the history
  • Loading branch information
Torwent committed Jun 4, 2024
1 parent 12afdfa commit cc97883
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 37 deletions.
2 changes: 1 addition & 1 deletion wasp_blast_furnace.simba
Original file line number Diff line number Diff line change
Expand Up @@ -916,7 +916,7 @@ end;
var
BlastFurnace: TBlastFurnace;

procedure TRSMinimap.WaitMoving(doAntiban: Boolean = True); override;
procedure TRSMinimap.WaitMoving(doAntiban: Boolean); override;
begin
BlastFurnace.WaitMoving(doAntiban, Antiban.BioDice());
end;
Expand Down
12 changes: 0 additions & 12 deletions wasp_builder.simba
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ begin
if Self.LastPoint <> [0, 0] then
begin
tpa := TPAGrow([Self.LastPoint], 6);
RSClient.DrawTPA(tpa, $00FF00);
Mouse.Move(tpa);
end;

Expand Down Expand Up @@ -239,7 +238,6 @@ begin
if Self.LastPoint <> [0, 0] then
begin
tpa := TPAGrow([Self.LastPoint], 6);
RSClient.DrawTPA(tpa, $00FF00);
Mouse.Move(tpa);
end;

Expand Down Expand Up @@ -339,7 +337,6 @@ begin
begin
tpa := TPAGrow([Self.LastPoint], 6);
ASyncMouse.Move(tpa);
RSClient.DrawTPA(tpa, $00FF00);
end;
Result := WaitUntil(Chat.GetChatTitle() <> 'Really remove it?', 200, 3000);
end;
Expand Down Expand Up @@ -372,7 +369,6 @@ begin
if (Self.LastPoint <> [0, 0]) then
begin
tpa := TPAGrow([Self.LastPoint], 6);
RSClient.DrawTPA(tpa, $00FF00);
ASyncMouse.Move(tpa);
end;

Expand Down Expand Up @@ -608,30 +604,22 @@ begin
tempFinder := Self.Finder.Unlimited();
cuboidArray := MainScreen.Filter(cuboidArray);

RSClient.Clear(MainScreen.Bounds());

for i := 0 to High(cuboidArray) do
begin
RSClient.DrawCuboid(cuboidArray[i], $FFFFFF, 0.8);
tpa := MainScreen.FindObject(tempFinder, cuboidArray[i].Bounds()).Merge();
if tpa <> [] then
begin
tpa := cuboidArray[i].Filter(tpa);
if tpa <> [] then
begin
RSClient.DrawTPA(tpa, $0000FF);
Result += tpa;
Continue;
end;
end;

tpa := cuboidArray[i].ShapeFill();
if tpa <> [] then
begin
RSClient.DrawTPA(tpa, $0000FF);
RSClient.DrawCuboid(cuboidArray[i], $FFFFFF, 0.8);
Result += tpa;
end;
end;
end;

Expand Down
24 changes: 0 additions & 24 deletions wasp_woodcutter.simba
Original file line number Diff line number Diff line change
Expand Up @@ -461,20 +461,10 @@ begin
searchBox := cuboid.Bounds().Expand(2);
atpa := MainScreen.FindObject(Self.RSTree.Finder, searchBox);
if atpa = [] then
begin
RSClient.Clear(MainScreen.Bounds());
Exit;
end;

tpa := cuboid.Filter(atpa.Merge());
Result := tpa <> [];

RSClient.Clear(MainScreen.Bounds());
if Result then
begin
RSClient.DrawCuboid(cuboid, $FFFFFF);
RSClient.DrawTPA(tpa);
end;
end;

function TWoodcutter.IsCutting(): Boolean;
Expand Down Expand Up @@ -661,38 +651,24 @@ begin
cuboidArray := MainScreen.Filter(cuboidArray);
Woodcutter.TreeCuboids := cuboidArray;

RSClient.Clear(MainScreen.Bounds());

for i := 0 to High(cuboidArray) do
begin
if Self.Filter.Finder then
begin
RSClient.DrawCuboid(cuboidArray[i], $FFFFFF, 0.8);

tpa := MainScreen.FindObject(tempFinder, cuboidArray[i].Bounds()).Merge();
if tpa = [] then
Continue;

tpa := cuboidArray[i].Filter(tpa);
if tpa <> [] then
begin
Result += tpa;
RSClient.DrawTPA(tpa, $0000FF);
end;

Continue;
end;

tpa := cuboidArray[i].ShapeFill();
if tpa <> [] then
begin
if WLSettings.RemoteInput.HUDDebug then
begin
RSClient.DrawTPA(tpa, $0000FF);
RSClient.DrawCuboid(cuboidArray[i], $FFFFFF, 0.8);
end;
Result += tpa;
end;
end;
end;

Expand Down

0 comments on commit cc97883

Please sign in to comment.