maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-01 11:15:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better handling of selection

Browse source
This commit is contained in:
Marco 2025-03-28 12:26:34 +01:00
commit 1c7afec7e2
2 changed files with 47 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Scripts/Components/Actors/ActivationProvider.cs
View file

@ -37,7 +37,12 @@ public partial class ActivationProvider : Area2D
{
if (_inputProvider.GetUseJustPressed())
{
TrySelect();
if (!TrySelect())
{
_selector.SelectNext();
}
return;
}
if (_inputProvider.GetScanJustPressed())
@ -46,33 +51,33 @@ public partial class ActivationProvider : Area2D
}
}
private void TrySelect()
private bool TrySelect()
{
var selected = _selector.SelectedInteractable;
if (selected is null)
{
_errorSound?.Play();
return;
return false;
};
if (!selected.CanActivate())
{
_errorSound?.Play();
return;
return true;
};
bool success = selected.Activate();
if (success)
{
// Deselect and scan for next
_selector.RemoveInteractable(selected);
//_selector.SelectedInteractable = null;
//_selector.SelectNext();
_selector.SelectNext();
//_selector.RemoveInteractable(selected);
}
else
{
_errorSound?.Play();
}
return true;
//var spaceState = GetWorld2D().DirectSpaceState;
//var query = PhysicsRayQueryParameters2D.Create(Vector2.Zero, )