Patched Actions Rework (#6899)
* Rejig Actions * fix merge errors * lambda-b-gon * fix PAI, add innate actions * Revert "fix PAI, add innate actions" This reverts commit 4b501ac083e979e31ebd98d7b98077e0dbdd344b. * Just fix by making nullable. if only require: true actually did something somehow. * Make AddActions() ensure an actions component and misc comments * misc cleanup * Limit range even when not checking for obstructions * remove old guardian code * rename function and make EntityUid nullable * fix magboot bug * fix action search menu * make targeting toggle all equivalent actions * fix combat popups (enabling <-> disabling) * fix networking * Allow action locking * prevent telepathy
This commit is contained in:
@@ -204,7 +204,7 @@ namespace Content.Client.DragDrop
|
||||
}
|
||||
|
||||
HighlightTargets();
|
||||
_outline.Enabled = false;
|
||||
_outline.SetEnabled(false);
|
||||
|
||||
// drag initiated
|
||||
return true;
|
||||
@@ -257,7 +257,7 @@ namespace Content.Client.DragDrop
|
||||
EntityManager.DeleteEntity(_dragShadow);
|
||||
}
|
||||
|
||||
_outline.Enabled = true;
|
||||
_outline.SetEnabled(true);
|
||||
_dragShadow = default;
|
||||
_draggables.Clear();
|
||||
_dragger = default;
|
||||
@@ -353,6 +353,7 @@ namespace Content.Client.DragDrop
|
||||
return false;
|
||||
}
|
||||
|
||||
// TODO make this just use TargetOutlineSystem
|
||||
private void HighlightTargets()
|
||||
{
|
||||
if (_dragDropHelper.Dragged == default || Deleted(_dragDropHelper.Dragged) ||
|
||||
@@ -370,7 +371,7 @@ namespace Content.Client.DragDrop
|
||||
RemoveHighlights();
|
||||
|
||||
// find possible targets on screen even if not reachable
|
||||
// TODO: Duplicated in SpriteSystem
|
||||
// TODO: Duplicated in SpriteSystem and TargetOutlineSystem. Should probably be cached somewhere for a frame?
|
||||
var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition).Position;
|
||||
var bounds = new Box2(mousePos - 1.5f, mousePos + 1.5f);
|
||||
var pvsEntities = IoCManager.Resolve<IEntityLookup>().GetEntitiesIntersecting(_eyeManager.CurrentMap, bounds, LookupFlags.Approximate | LookupFlags.IncludeAnchored);
|
||||
|
||||
Reference in New Issue
Block a user