feat: TRSObject and TRSNPC can use TModel now

- fixed a bug where TWebGraphGenerator.Hash was being calculated without taking into account the whole record data
- Tweaks to TModel

Author: Torwent

.github/workflows/version-release.yml

@@ -117,7 +117,9 @@ jobs:
         run: |
             BODY=$(jq -nc \
               --arg title "WaspLib Version $TAG_NAME" \
-              --arg desc "${{ github.event.workflow_run.head_commit.message }}\n\nDownload: https://github.com/WaspScripts/WaspLib/releases/tag/$TAG_NAME" \
+              --arg desc "${{ github.event.workflow_run.head_commit.message }}
+              
+              Download: https://github.com/WaspScripts/WaspLib/releases/tag/$TAG_NAME" \
               --arg url  "https://github.com/WaspScripts/WaspLib/commit/${{ github.event.workflow_run.head_commit.id }}" \
               --arg foot "Author: ${{ github.event.workflow_run.head_commit.author.name }}" \
               --argjson color 16742912 \

osrs/interfaces/mainscreen/anvil.simba

@@ -213,6 +213,30 @@ begin
       Exit(btns[i].Enable());
 end;
 
+
+(*
+## Anvil.CanSmith
+```pascal
+function TRSAnvil.CanSmith(item: TRSItem): Boolean;
+```
+Checks if the specified `item` is currently available to smith.
+
+## Example:
+```pascal
+WriteLn Anvil.CanSmith('Rune 2h sword');
+```
+*)
+function TRSAnvil.CanSmith(item: TRSItem): Boolean;
+var
+  slot: Integer;
+begin
+  slot := Self.Items.IndexOf([item]);
+  if slot = -1 then Exit;
+
+  Result := Target.HasColor($00FF00, 0, 1, Self.Slots.Box(slot));
+end;
+
+
 (*
 ## Anvil.Smith
 ```pascal

osrs/interfaces/mainscreen/finders/colorfinder.simba

@@ -320,10 +320,10 @@ begin
   Result := atpa <> [];
 end;
 
-function TColorFinder.Find(out atpa: T2DPointArray; areas: TPolygonArray): Boolean; overload;
+function TColorFinder.Find(out atpa: T2DPointArray; areas: T2DPointArray; polygon: Boolean): Boolean; overload;
 var
   transformer: TColorFinderTransformer;
-  area: TPolygon;
+  area: TPointArray;
   tpa, tmp: TPointArray;
 begin
   transformer := Self.Transformer.Normalize();
@@ -332,27 +332,10 @@ begin
   begin
     tmp := Self._FindHelper(area.Bounds());
     if tmp = [] then Continue;
-    tpa += tmp.ExtractPolygon(area);
-    tmp := [];
-  end;
-
-  atpa := transformer.Process(tpa);
-  Result := atpa <> [];
-end;
-
-function TColorFinder.Find(out atpa: T2DPointArray; areas: TCuboidArray): Boolean; overload;
-var
-  transformer: TColorFinderTransformer;
-  area: TCuboid;
-  tpa, tmp: TPointArray;
-begin
-  transformer := Self.Transformer.Normalize();
-
-  for area in areas do
-  begin
-    tmp := Self._FindHelper(area.Bounds());
-    if tmp = [] then Continue;
-    tpa += tmp.ExtractPolygon(area.Polygon());
+    if polygon then
+      tpa += tmp.ExtractPolygon(area)
+    else
+      tpa += tmp.Intersection(area);
     tmp := [];
   end;
 
@@ -385,7 +368,7 @@ begin
   Result := atpa <> [];
 end;
 
-function TColorFinder.FindEx(out atpa: T2DPointArray; out found: TBooleanArray; areas: TPolygonArray): Boolean; overload;
+function TColorFinder.FindEx(out atpa: T2DPointArray; out found: TBooleanArray; areas: T2DPointArray; polygon: Boolean): Boolean; overload;
 var
   transformer: TColorFinderTransformer;
   i: Integer;
@@ -394,36 +377,32 @@ begin
   transformer := Self.Transformer.Normalize();
 
   SetLength(found, Length(areas));
-  for i := 0 to High(areas) do
+
+  if polygon then
   begin
-    tpa := Self._FindHelper(areas[i].Bounds());
-    if tpa = [] then Continue;
-    tpa := transformer.Process(tpa.ExtractPolygon(areas[i])).Merge();
-    if tpa = [] then Continue;
+    for i := 0 to High(areas) do
+    begin
+      tpa := Self._FindHelper(areas[i].Bounds());
+      if tpa = [] then Continue;
 
-    found[i] := True;
-    atpa += tpa;
-    tpa := [];
-  end;
+      tpa := tpa.ExtractPolygon(areas[i]);
+      tpa := transformer.Process(tpa).Merge();
+      if tpa = [] then Continue;
 
-  Result := atpa <> [];
-end;
+      found[i] := True;
+      atpa += tpa;
+      tpa := [];
+    end;
 
-function TColorFinder.FindEx(out atpa: T2DPointArray; out found: TBooleanArray; areas: TCuboidArray): Boolean; overload;
-var
-  transformer: TColorFinderTransformer;
-  i: Integer;
-  tpa: TPointArray;
-begin
-  transformer := Self.Transformer.Normalize();
+    Exit(atpa <> []);
+  end;
 
-  SetLength(found, Length(areas));
   for i := 0 to High(areas) do
   begin
     tpa := Self._FindHelper(areas[i].Bounds());
-
     if tpa = [] then Continue;
-    tpa := transformer.Process(tpa.ExtractPolygon(areas[i].Polygon())).Merge();
+    tpa := tpa.Intersection(areas[i]);
+    tpa := transformer.Process(tpa).Merge();
     if tpa = [] then Continue;
 
     found[i] := True;

osrs/position/map/entities.simba

@@ -27,6 +27,7 @@ Main type to handle {ref}`RSEntity`.
   TRSEntity = record
     UpText: TStringArray;
     Size: TVector3;
+    Model: TModel;
     Coordinates: TPointArray;
     Filter: TRSDotFilterArray;
     Finder: TColorFinder;
@@ -99,8 +100,9 @@ end;
 
 function TRSEntity.Create(json: TJSONObject): TRSEntity; static; overload;
 var
-  i: Integer;
-  colors: TColorArray;
+  i, j, l: Integer;
+  unique: array of TColorArray;
+  color: TColor;
   best: TBestColor;
   coord: TJSONArray;
 begin
@@ -134,12 +136,27 @@ begin
 
   with json.Item[Ord(ENPCData.COLORS)] do
     for i := 0 to Count-1 do
-      colors += Item[i].AsInt;
+    begin
+      color := Item[i].AsInt;
+
+      for j := 0 to High(unique) do
+      begin
+        for l := 0 to High(unique[j]) do
+          if ColorDistance(color, unique[j, l], EColorSpace.HSL, [1.5, 1.5, 1.5]) < 15 then
+          begin
+            unique[j] += color;
+            Continue(3);
+          end;
+      end;
+
+      unique += [color];
+    end;
 
-  if colors <> [] then
+  for i := 0 to High(unique) do
   begin
-    best := GetBestColor(EColorSpace.HSV, colors);
-    Result.Finder.Colors += [best.Color, best.Tolerance, EColorSpace.HSV, best.Mods];
+    best := GetBestColor(EColorSpace.HSL, unique[i]);
+    WriteLn best;
+    Result.Finder.Colors += [best.Color, best.Tolerance*1.5, EColorSpace.HSL, [best.Mods[0]*1.5, best.Mods[1]*1.5, best.Mods[2]*1.5]];
   end;
 
   Result.Walker := @Map.Walker;
@@ -181,19 +198,21 @@ end;
 
 
 (*
-## Entity._GetCuboid
+## Entity._GetBounds
 ```pascal
-function TRSEntity._GetCuboid(me: TPoint; vector: TVector2; size: TVector3; height, radians: Single): TCuboid;
+function TRSEntity._GetBounds(me: TPoint; vector: TVector2; size: TVector3; height, radians: Single): TCuboid;
 ```
-Internal helper function for {ref}`TRSEntity.GetCuboidArray`.
+Internal helper function for {ref}`TRSEntity.GetBoundsArray`.
 *)
-function TRSEntity._GetCuboid(me: TPoint; vector: TVector2; size: TVector3; height, radians: Single): TCuboid;
+function TRSEntity._GetBounds(me: TPoint; vector: TVector2; size: TVector3; height, radians: Single): TPolygon;
 var
   corners: TVector3Array;
   pt: TPoint;
-  arr: TPointArray;
 begin
   pt := me + vector.ToPoint() - Minimap.Center;
+  if Self.Model <> nil then
+    Exit(Self.Model.GetArea(Self.Model.Project(vector.ToVec3(Self.Walker^.Height(pt, False) - height), 0, radians)));
+
 
   size.X := size.X*2;
   size.Y := size.Y*2;
@@ -209,21 +228,18 @@ begin
     [vector.X-size.X, vector.Y+size.Y, Self.Walker^.Height(pt - [1,1],  False) - height+size.Z]
   ];
 
-  arr := Projection.Run(corners, radians);
-  Result := [
-    [arr[4], arr[5], arr[6], arr[7]], [arr[0], arr[1], arr[2], arr[3]]
-  ];
+  Result := Projection.Run(corners, radians).ConvexHull();
 end;
 
 (*
-## Entity.GetCuboidArray
+## Entity.GetBoundsArray
 ```pascal
-function TRSEntity.GetCuboidArray(me: TPoint; angle: Single = $FFFF): TCuboidArray;
+function TRSEntity.GetBoundsArray(me: TPoint; angle: Single = $FFFF): TCuboidArray;
 ```
 Internal function that returns an array of cuboids of the entity if it's visible
 on the {ref}`MainScreen`.
 *)
-function TRSEntity.GetCuboidArray(me: TPoint; out coordinates: TPointArray; radians: Single = $FFFF): TCuboidArray;
+function TRSEntity.GetBoundsArray(me: TPoint; out coordinates: TPointArray; radians: Single = $FFFF): TPolygonArray;
 var
   weights: TDoubleArray;
   meLocal, pt: TPoint;
@@ -255,7 +271,7 @@ begin
 
       vector := Self.Walker^.Point2MMVec(me, pt, radians);
       vector := vector.Rotate(-radians, Minimap.Center);
-      Result += Self._GetCuboid(meLocal, vector, Self.Size, h, radians);
+      Result += Self._GetBounds(meLocal, vector, Self.Size, h, radians);
     end;
     Exit;
   end;
@@ -272,12 +288,12 @@ begin
 
     vector := Self.Walker^.Point2MMVec(me, pt, radians);
     vector := vector.Rotate(-radians, Minimap.Center);
-    Result += Self._GetCuboid(meLocal, vector, Self.Size, h, radians);
+    Result += Self._GetBounds(meLocal, vector, Self.Size, h, radians);
   end;
 
   if Result <> [] then
   begin
-    Result.Sort(weights, True);
+    Sort(Result, weights, True);
     coordinates.Sort(weights, True);
   end;
 end;
@@ -288,17 +304,17 @@ end;
 function TRSEntity.Find(cuboidArray: TCuboidArray): T2DPointArray;
 ```
 Internal TRSEntity method responsible for filtering a TCuboidArray by what's visible in the mainscren.
-This is meant to filter TRSEntity.GetCuboidArray() so targets that are outside of the mainscreen are filtered out.
+This is meant to filter TRSEntity.GetBoundsArray() so targets that are outside of the mainscreen are filtered out.
 You will probably never need to use this directly.
 *)
-function TRSEntity.FindOnMainScreen(out coordinates: TPointArray; cuboidArray: TCuboidArray): T2DPointArray;
+function TRSEntity.FindOnMainScreen(out coordinates: TPointArray; boundsArray: TPolygonArray): T2DPointArray;
 var
   i: Integer;
   found: TBooleanArray;
 begin
   if Self.Finder <> Default(TColorFinder) then
   begin
-    Self.Finder.FindEx(Result, found, cuboidArray);
+    Self.Finder.FindEx(Result, found, boundsArray, Self.Model = nil);
 
     for i := High(found) downto 0 do
       if not found[i] then
@@ -307,8 +323,8 @@ begin
     Exit;
   end;
 
-  for i := 0 to High(cuboidArray) do
-    Result += cuboidArray[i].ShapeFill();
+  for i := 0 to High(boundsArray) do
+    Result += TPointArray(boundsArray[i]).ShapeFill();
 end;
 
 (*
@@ -327,29 +343,29 @@ WriteLn RSObjects.GEBank.Find(atpa); //Be in ge and with a walker setup there.
 Debug(atpa);
 ```
 *)
-function TRSEntity.FindEx(me: TPoint; out cuboids: TCuboidArray; out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
+function TRSEntity.FindEx(me: TPoint; out boundsArray: TPolygonArray; out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
 begin
-  cuboids := Self.GetCuboidArray(me, coordinates);
-  if cuboids = [] then Exit;
-  atpa := Self.FindOnMainScreen(coordinates, cuboids);
+  boundsArray := Self.GetBoundsArray(me, coordinates);
+  if boundsArray = [] then Exit;
+  atpa := Self.FindOnMainScreen(coordinates, boundsArray);
 
   Result := atpa <> [];
 end;
 
 
 function TRSEntity.Find(out coordinates: TPointArray; out atpa: T2DPointArray): Boolean;
 var
-  cuboids: TCuboidArray;
+  boundsArray: TPolygonArray;
 begin
-  Result := Self.FindEx(Self.Walker^.Position(), cuboids, coordinates, atpa);
+  Result := Self.FindEx(Self.Walker^.Position(), boundsArray, coordinates, atpa);
 end;
 
 function TRSEntity.FindFrom(position: TPoint; out atpa: T2DPointArray): Boolean;
 var
-  cuboids: TCuboidArray;
+  boundsArray: TPolygonArray;
   coordinates: TPointArray;
 begin
-  Result := Self.FindEx(position, cuboids, coordinates, atpa);
+  Result := Self.FindEx(position, boundsArray, coordinates, atpa);
 end;
 
 (*
@@ -803,7 +819,7 @@ procedure TImage.DrawEntity(entity: TRSEntity);
 var
   me: TPoint;
   atpa: T2DPointArray;
-  cuboids: TCuboidArray;
+  boundsArray: TPolygonArray;
   i: Integer;
   filters: TRSDotFilterArray;
   filter: TRSDotFilter;
@@ -826,22 +842,15 @@ begin
     Self.DrawCircle(filter.Circle);
   end;
 
-  if not entity.FindEx(me, cuboids, coordinates, atpa) then
-    Exit;
-
-  Self.DrawColor := $00FFFF;
-  for i := 0 to High(cuboids) do
+  if entity.FindEx(me, boundsArray, coordinates, atpa) then
   begin
-    Self.DrawTPA(cuboids[i].Bottom.Corners.Connect().Grow(1));
-    Self.DrawTPA(cuboids[i].Top.Corners.Connect().Grow(1));
+    Self.DrawColor := TColor.Random();
+    Self.DrawATPA(atpa);
   end;
 
-  Self.DrawColor := TColor.Random();
-  Self.DrawATPA(atpa);
-
-  Self.DrawColor := $FFFFFF;
-  for i := 0 to High(cuboids) do
-    Self.DrawTPA(cuboids[i].Edges());
+  Self.DrawColor := $FFFFF;
+  for i := 0 to High(boundsArray) do
+    Self.DrawTPA(boundsArray[i].Connect());
 end;
 
 procedure ShowOnTarget(entity: TRSEntity); overload;