Skip to content

feat: add functions to get actors adjacent and with specified distance #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LordMidas wants to merge 2 commits into
base: development
Choose a base branch
from
Open

feat: add functions to get actors adjacent and with specified distance #344

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
969b5f4
feat: add functions to get actors adjacent and within specified range
LordMidas Apr 11, 2024
15e50d9
perf: optimize getActors functions for when distance is 1
LordMidas May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 91 additions & 12 deletions msu/hooks/entity/tactical/tactical_entity_manager.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,73 @@
}
return ret;
}
q.getAlliedActors <- function( _faction, _tile = null, _distance = null, _atDistance = false )

q.getActorsWithinRange <- function( _tile, _max = 1, _min = 1 )
{
if (_tile != null && _tile.ID == 0)
if (_tile.ID == 0)
{
::logError("The ID of _tile is 0 which means that the actor this tile was fetched from is not placed on map.");
throw ::MSU.Exception.InvalidValue(_tile);
}

if (_max < _min)
{
::logError("_max must be equal to or greater than _min");
throw ::MSU.Exception.InvalidValue(_max);
}

if (_max == 1)
{
local ret = this.getAdjacentActors(_tile);
if (_min == 0 && _tile.IsOccupiedByActor)
ret.push(_tile.getEntity());
return ret;
}

return this.getActorsByFunction(function(_actor) {
if (!_actor.isPlacedOnMap())
return false;
local distance = _tile.getDistanceTo(_actor.getTile());
return distance <= _max && distance >= _min;
});
}

q.getAdjacentActors <- function( _tile )
{
if (_tile.ID == 0)
{
::logError("The ID of _tile is 0 which means that the actor this tile was fetched from is not placed on map.");
throw ::MSU.Exception.InvalidValue(_tile);
}

local ret = [];
for (local i = 0; i < 6; i++)
{
if (!_tile.hasNextTile(i))
continue;

local nextTile = _tile.getNextTile(i);
if (nextTile.IsOccupiedByActor)
ret.push(nextTile.getEntity());
}
return ret;
}

q.getAlliedActors <- function( _faction, _tile = null, _distance = null, _atDistance = false )
{
if (_tile != null)
{
if (_tile.ID == 0)
{
::logError("The ID of _tile is 0 which means that the actor this tile was fetched from is not placed on map.");
throw ::MSU.Exception.InvalidValue(_tile);
}
if (_distance == 1)
{
return this.getActorsWithinRange(_tile, 1, _atDistance ? 1 : 0).filter(@(_, _a) _a.isAlliedWith(_faction));
}
}

return this.getActorsByFunction(function(_actor) {
if (!_actor.isAlliedWith(_faction)) return false;
if (_tile != null)
Expand All @@ -55,10 +113,17 @@

q.getHostileActors <- function( _faction, _tile = null, _distance = null, _atDistance = false )
{
if (_tile != null && _tile.ID == 0)
if (_tile != null)
{
::logError("The ID of _tile is 0 which means that the actor this tile was fetched from is not placed on map.");
throw ::MSU.Exception.InvalidValue(_tile);
if (_tile.ID == 0)
{
::logError("The ID of _tile is 0 which means that the actor this tile was fetched from is not placed on map.");
throw ::MSU.Exception.InvalidValue(_tile);
}
if (_distance == 1)
{
return this.getActorsWithinRange(_tile, 1, _atDistance ? 1 : 0).filter(@(_, _a) !_a.isAlliedWith(_faction));
}
}

return this.getActorsByFunction(function(_actor) {
Expand All @@ -79,10 +144,17 @@
{
return clone this.getInstancesOfFaction(_faction);
}
else if (_tile.ID == 0)
else
{
::logError("The ID of _tile is 0 which means that the actor this tile was fetched from is not placed on map.");
throw ::MSU.Exception.InvalidValue(_tile);
if (_tile.ID == 0)
{
::logError("The ID of _tile is 0 which means that the actor this tile was fetched from is not placed on map.");
throw ::MSU.Exception.InvalidValue(_tile);
}
if (_distance == 1)
{
return this.getActorsWithinRange(_tile, 1, _atDistance ? 1 : 0).filter(@(_, _a) _a.getFaction() == _faction);
}
}

local actors = this.getInstancesOfFaction(_faction);
Expand All @@ -99,10 +171,17 @@

q.getNonFactionAlliedActors <- function( _faction, _tile = null, _distance = null, _atDistance = false )
{
if (_tile != null && _tile.ID == 0)
if (_tile != null)
{
::logError("The ID of _tile is 0 which means that the actor this tile was fetched from is not placed on map.");
throw ::MSU.Exception.InvalidValue(_tile);
if (_tile.ID == 0)
{
::logError("The ID of _tile is 0 which means that the actor this tile was fetched from is not placed on map.");
throw ::MSU.Exception.InvalidValue(_tile);
}
if (_distance == 1)
{
return this.getActorsWithinRange(_tile, 1, _atDistance ? 1 : 0).filter(@(_, _a) _a.getFaction() != _faction && _a.isAlliedWith(_faction));
}
}

return this.getActorsByFunction(function(_actor) {
Expand Down