Treat Player as object in the same cell

This commit is contained in:
Eddoursul 2023-10-24 19:20:47 +02:00
parent af72530448
commit f855efcc69

View File

@ -209,10 +209,13 @@ begin
end end
else if (packageLoc = 'Near linked reference') then begin else if (packageLoc = 'Near linked reference') then begin
linkedRefKeyword := LinksTo(ElementByPath(inputVal, 'PLDT\Keyword')); linkedRefKeyword := LinksTo(ElementByPath(inputVal, 'PLDT\Keyword'));
if FormID(linkedRefKeyword) = $14 then continue;
if not IsLinkedRefRemote(e, linkedRefKeyword) then continue; if not IsLinkedRefRemote(e, linkedRefKeyword) then continue;
end end
else if (packageLoc = 'Near reference') then begin else if (packageLoc = 'Near reference') then begin
if InSameCell(e, LinksTo(ElementByPath(inputVal, 'PLDT\Reference'))) then continue; linkedRef := LinksTo(ElementByPath(inputVal, 'PLDT\Reference'));
if FormID(linkedRef) = $14 then continue;
if InSameCell(e, linkedRef) then continue;
end; end;
end end
@ -221,10 +224,12 @@ begin
if (packageLoc = 'Linked Reference') then begin if (packageLoc = 'Linked Reference') then begin
linkedRefKeyword := LinksTo(ElementByPath(inputVal, 'PTDA\Target Data\Reference')); linkedRefKeyword := LinksTo(ElementByPath(inputVal, 'PTDA\Target Data\Reference'));
if FormID(linkedRefKeyword) = $14 then continue;
if not IsLinkedRefRemote(e, linkedRefKeyword) then continue; if not IsLinkedRefRemote(e, linkedRefKeyword) then continue;
end end
else if (packageLoc = 'Specific Reference') then begin else if (packageLoc = 'Specific Reference') then begin
linkedRef := LinksTo(ElementByPath(inputVal, 'PTDA\Target Data\Reference')); linkedRef := LinksTo(ElementByPath(inputVal, 'PTDA\Target Data\Reference'));
if FormID(linkedRef) = $14 then continue;
if InSameCell(e, linkedRef) then continue; if InSameCell(e, linkedRef) then continue;
end end
else continue; else continue;
@ -377,7 +382,7 @@ begin
if ReferencedByCount(actorLocation) > 1 then begin if ReferencedByCount(actorLocation) > 1 then begin
Inc(persLocSkipped); Inc(persLocSkipped);
AddMessage(' Skipping actor with Persistent Location: ' + GetElementEditValues(e, 'NAME') + ' - (' + Name(e) + ')'); //AddMessage(' Skipping actor with Persistent Location: ' + GetElementEditValues(e, 'NAME') + ' - (' + Name(e) + ')');
exit; exit;
end; end;
end; end;