movement anim
This commit is contained in:
parent
b7562d53ae
commit
5776d5e889
4 changed files with 114 additions and 54 deletions
|
|
@ -32,12 +32,12 @@ public class PlayerEntityMovement : MonoBehaviour
|
|||
|
||||
private float debounceTime;
|
||||
[SerializeField] private float debounceDuration;
|
||||
|
||||
public LayerMask playerLayer;
|
||||
|
||||
private Queue<TileObject> currentMovableTiles = new();
|
||||
private Dictionary<TileObject, TileObject> paths = new();
|
||||
private List<TileObject> currentPath = new();
|
||||
|
||||
private List<TileObject> currentMovableTiles = new();
|
||||
private Queue<TileObject> frontier = new();
|
||||
private HashSet<TileObject> visited = new();
|
||||
private Dictionary<TileObject, TileObject> currentPaths = new();
|
||||
public List<TileObject> pathRequested;
|
||||
private TileObject requestedTile;
|
||||
|
||||
private void Start()
|
||||
|
|
@ -55,28 +55,19 @@ public class PlayerEntityMovement : MonoBehaviour
|
|||
}
|
||||
if (isMoving)
|
||||
{
|
||||
if (Input.GetMouseButton(1))
|
||||
{
|
||||
Deselect();
|
||||
}
|
||||
TileObject newTile = GridManager.instance.GetTile(mouseGridPos);
|
||||
if (requestedTile != newTile)
|
||||
{
|
||||
requestedTile = newTile;
|
||||
foreach (TileObject tile in currentPath)
|
||||
foreach (TileObject tile in pathRequested)
|
||||
{
|
||||
tile.sprite.color = Color.green;
|
||||
}
|
||||
currentPath.Clear();
|
||||
if (currentMovableTiles.Contains(requestedTile))
|
||||
{
|
||||
TileObject currentTile = requestedTile;
|
||||
while (currentTile != selectedEntity.currentTile)
|
||||
{
|
||||
currentPath.Add(currentTile);
|
||||
currentTile = paths[currentTile];
|
||||
}
|
||||
foreach (TileObject tile in currentPath)
|
||||
{
|
||||
tile.sprite.color = Color.blue;
|
||||
}
|
||||
tile.sprite.color = new Color(137,137,137);
|
||||
}
|
||||
PathfindToTarget();
|
||||
}
|
||||
templateObject.transform.position = mouseGridPos;
|
||||
if (Input.GetMouseButtonDown(0) && debounceTime <= 0 && SelectLocation())
|
||||
|
|
@ -90,34 +81,14 @@ public class PlayerEntityMovement : MonoBehaviour
|
|||
{
|
||||
selectedEntity = entitySelected;
|
||||
isMoving = true;
|
||||
debounceTime = debounceDuration; //alotta for loops here
|
||||
debounceTime = debounceDuration;
|
||||
UncolorGrid();
|
||||
currentMovableTiles.Clear();
|
||||
paths.Clear();
|
||||
foreach (TileObject tileObject in selectedEntity.currentTile.neighbors)
|
||||
{
|
||||
if (!tileObject.blocked && !tileObject.hasUnit)
|
||||
{
|
||||
currentMovableTiles.Enqueue(tileObject);
|
||||
paths.Add(tileObject, selectedEntity.currentTile);
|
||||
tileObject.sprite.color = Color.green;
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < selectedEntity.maxMovement - 1; i++)
|
||||
{
|
||||
foreach (TileObject tileObject in currentMovableTiles.ToArray())
|
||||
{
|
||||
foreach (TileObject neighboringTiles in tileObject.neighbors)
|
||||
{
|
||||
if (!neighboringTiles.blocked && !neighboringTiles.hasUnit)
|
||||
{
|
||||
currentMovableTiles.Enqueue(neighboringTiles);
|
||||
neighboringTiles.sprite.color = Color.green;
|
||||
paths.TryAdd(neighboringTiles, tileObject);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
frontier.Clear();
|
||||
visited.Clear();
|
||||
currentPaths.Clear();
|
||||
pathRequested.Clear();
|
||||
GetAllTiles();
|
||||
GetTilesInRange();
|
||||
CreateTemplate();
|
||||
}
|
||||
|
||||
|
|
@ -129,6 +100,66 @@ public class PlayerEntityMovement : MonoBehaviour
|
|||
}
|
||||
}
|
||||
|
||||
private void GetAllTiles()
|
||||
{
|
||||
frontier.Enqueue(selectedEntity.currentTile);
|
||||
while (frontier.Count > 0)
|
||||
{
|
||||
TileObject currentTile = frontier.Dequeue();
|
||||
foreach (TileObject neighboringTiles in currentTile.neighbors)
|
||||
{
|
||||
if (!visited.Contains(neighboringTiles))
|
||||
{
|
||||
visited.Add(neighboringTiles);
|
||||
frontier.Enqueue(neighboringTiles);
|
||||
currentPaths.TryAdd(neighboringTiles, currentTile);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void PathfindToTarget()
|
||||
{
|
||||
pathRequested.Clear();
|
||||
TileObject currentTile = requestedTile;
|
||||
while (currentTile != selectedEntity.currentTile)
|
||||
{
|
||||
pathRequested.Add(currentTile);
|
||||
currentTile = currentPaths[currentTile];
|
||||
}
|
||||
pathRequested.Reverse();
|
||||
foreach (TileObject tile in pathRequested)
|
||||
{
|
||||
tile.sprite.color = Color.blue;
|
||||
}
|
||||
}
|
||||
|
||||
private void GetTilesInRange()
|
||||
{
|
||||
foreach (TileObject neighboringTiles in selectedEntity.currentTile.neighbors)
|
||||
{
|
||||
if (!neighboringTiles.blocked && !neighboringTiles.hasUnit)
|
||||
{
|
||||
currentMovableTiles.Add(neighboringTiles);
|
||||
neighboringTiles.sprite.color = Color.green;
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < selectedEntity.maxMovement - 1; i++)
|
||||
{
|
||||
foreach (TileObject tileObject in currentMovableTiles.ToArray())
|
||||
{
|
||||
foreach (TileObject neighboringTiles in tileObject.neighbors)
|
||||
{
|
||||
if (!neighboringTiles.blocked && !neighboringTiles.hasUnit)
|
||||
{
|
||||
currentMovableTiles.Add(neighboringTiles);
|
||||
neighboringTiles.sprite.color = Color.green;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private bool SelectLocation()
|
||||
{
|
||||
if (!requestedTile || requestedTile.blocked || requestedTile.hasUnit || !currentMovableTiles.Contains(requestedTile))
|
||||
|
|
@ -137,13 +168,17 @@ public class PlayerEntityMovement : MonoBehaviour
|
|||
}
|
||||
selectedEntity.currentTile.hasUnit = false;
|
||||
requestedTile.hasUnit = true;
|
||||
selectedEntity.currentTile = requestedTile;
|
||||
selectedEntity.transform.position = mouseGridPos;
|
||||
StartCoroutine(selectedEntity.MoveToLocation(pathRequested.ToArray()));
|
||||
templateObject.SetActive(false);
|
||||
UncolorGrid();
|
||||
return true;
|
||||
}
|
||||
|
||||
private void Deselect()
|
||||
{
|
||||
isMoving = false;
|
||||
}
|
||||
|
||||
private void CreateTemplate()
|
||||
{
|
||||
templateObject.SetActive(true);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue