From cc978838360299a07ddade9e7f13650c7d3f0838 Mon Sep 17 00:00:00 2001 From: Torwent Date: Tue, 4 Jun 2024 14:14:01 +0200 Subject: [PATCH] fix: compatibility with latest SRL-T and WaspLib --- wasp_blast_furnace.simba | 2 +- wasp_builder.simba | 12 ------------ wasp_woodcutter.simba | 24 ------------------------ 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/wasp_blast_furnace.simba b/wasp_blast_furnace.simba index 79b69d9..ed28fc1 100644 --- a/wasp_blast_furnace.simba +++ b/wasp_blast_furnace.simba @@ -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; diff --git a/wasp_builder.simba b/wasp_builder.simba index 2412640..99206d5 100644 --- a/wasp_builder.simba +++ b/wasp_builder.simba @@ -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; @@ -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; @@ -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; @@ -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; @@ -608,18 +604,14 @@ 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; @@ -627,11 +619,7 @@ begin tpa := cuboidArray[i].ShapeFill(); if tpa <> [] then - begin - RSClient.DrawTPA(tpa, $0000FF); - RSClient.DrawCuboid(cuboidArray[i], $FFFFFF, 0.8); Result += tpa; - end; end; end; diff --git a/wasp_woodcutter.simba b/wasp_woodcutter.simba index 4564735..a883716 100644 --- a/wasp_woodcutter.simba +++ b/wasp_woodcutter.simba @@ -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; @@ -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;