myondev/LunarInfantry
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

following

Browse source
This commit is contained in:
reisenlol 2026-01-05 23:54:15 -08:00
parent fd8778e9f2
commit b7562d53ae
No known key found for this signature in database
4 changed files with 20 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assets/Scenes/Prototype.unity
View file

@ -689,7 +689,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
health: 100 health: 100
maxHealth: 100 maxHealth: 100
maxMovement: 4 maxMovement: 120
currentTile: {fileID: 0} currentTile: {fileID: 0}
canMove: 1 canMove: 1
invincible: 0 invincible: 0

1
Assets/Scripts/Enemy.cs
View file

@ -14,7 +14,6 @@ public class Enemy : Entity
[ContextMenu("ForceTurn")] [ContextMenu("ForceTurn")]
public void StartTurn() public void StartTurn()
{ {
//attack the nearest player?
TurnHandler.instance.UpdateTurns(); TurnHandler.instance.UpdateTurns();
closestPlayer = FindClosestPlayer(); closestPlayer = FindClosestPlayer();
Debug.Log(closestPlayer); Debug.Log(closestPlayer);

69
Assets/Scripts/EnemyMovement.cs
View file

@ -18,14 +18,14 @@ public class EnemyMovement : MonoBehaviour
} }
#endregion #endregion
private Queue<TileObject> allMovableTiles = new(); private Queue<TileObject> frontier = new();
private Queue<TileObject> currentMovableTiles = new(); private HashSet<TileObject> visited = new();
private Dictionary<TileObject, TileObject> currentPaths = new(); private Dictionary<TileObject, TileObject> currentPaths = new();
public void PathfindToTarget(TileObject target, Enemy selectedEntity) public void PathfindToTarget(TileObject target, Enemy selectedEntity)
{ {
allMovableTiles.Clear(); frontier.Clear();
currentMovableTiles.Clear(); visited.Clear();
currentPaths.Clear(); currentPaths.Clear();
GetTilesInRange(selectedEntity); GetTilesInRange(selectedEntity);
TileObject requestedTile = GetPathToTarget(target, selectedEntity); TileObject requestedTile = GetPathToTarget(target, selectedEntity);
@ -34,71 +34,34 @@ public class EnemyMovement : MonoBehaviour
} }
private void GetTilesInRange(Enemy selectedEntity) private void GetTilesInRange(Enemy selectedEntity)
{ {
foreach (TileObject tileObject in selectedEntity.currentTile.neighbors) frontier.Enqueue(selectedEntity.currentTile);
while (frontier.Count > 0)
{ {
if (!tileObject.blocked && !tileObject.hasUnit) TileObject currentTile = frontier.Dequeue();
foreach (TileObject neighboringTiles in currentTile.neighbors)
{ {
currentMovableTiles.Enqueue(tileObject); if (!visited.Contains(neighboringTiles))
allMovableTiles.Enqueue(tileObject);
currentPaths.Add(tileObject, selectedEntity.currentTile);
}
}
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) visited.Add(neighboringTiles);
{ frontier.Enqueue(neighboringTiles);
currentMovableTiles.Enqueue(neighboringTiles); currentPaths.TryAdd(neighboringTiles, currentTile);
currentPaths.TryAdd(neighboringTiles, tileObject);
}
}
}
}
foreach (TileObject tileObject in allMovableTiles.ToArray())
{
foreach (TileObject neighboringTiles in tileObject.neighbors)
{
if (!neighboringTiles.blocked && !neighboringTiles.hasUnit)
{
allMovableTiles.Enqueue(neighboringTiles);
currentPaths.TryAdd(neighboringTiles, tileObject);
} }
} }
} }
Debug.Log(frontier.Count);
} }
private TileObject GetPathToTarget(TileObject target, Enemy selectedEntity) private TileObject GetPathToTarget(TileObject target, Enemy selectedEntity)
{ {
TileObject currentTile = target; TileObject currentTile = target;
List<TileObject> pathToTarget = new(); List<TileObject> pathToTarget = new();
TileObject pathTileInRange = null;
while (currentTile != selectedEntity.currentTile) while (currentTile != selectedEntity.currentTile)
{ {
pathToTarget.Add(currentTile); pathToTarget.Add(currentTile);
currentTile = currentPaths[currentTile]; currentTile = currentPaths[currentTile];
} }
pathToTarget.Reverse();
for (int i = 0; i < pathToTarget.Count; i++) int validMovementRange = Mathf.Min(pathToTarget.Count, selectedEntity.maxMovement) - 1;
{ return pathToTarget[validMovementRange];
if (currentMovableTiles.Contains(pathToTarget[i]))
{
pathTileInRange = pathToTarget[i];
return pathTileInRange;
}
}
List<TileObject> pathToRange = new();
/*if (pathTileInRange != null)
{
while (pathTileInRange != selectedEntity.currentTile)
{
pathToTarget.Add(pathTileInRange);
pathTileInRange = currentPaths[pathTileInRange];
}
return pathToRange;
}*/
return null;
} }
} }

5
Assets/Scripts/TurnHandler.cs
View file

@ -26,7 +26,7 @@ public class TurnHandler : MonoBehaviour
public enum GameState {PlayerTurn, EnemyTurn} public enum GameState {PlayerTurn, EnemyTurn}
public GameState currentGameState = GameState.PlayerTurn; public GameState currentGameState = GameState.PlayerTurn;
private int currentEnemy; private int currentEnemy = 0;
private void SortEnemies() private void SortEnemies()
{ {
@ -53,13 +53,14 @@ public class TurnHandler : MonoBehaviour
if (allDone) if (allDone)
{ {
currentGameState = GameState.EnemyTurn; currentGameState = GameState.EnemyTurn;
enemyEntities[0].StartTurn();
} }
} }
else if (currentGameState == GameState.EnemyTurn) else if (currentGameState == GameState.EnemyTurn)
{ {
enemyEntities[currentEnemy].StartTurn(); enemyEntities[currentEnemy].StartTurn();
currentEnemy++; currentEnemy++;
if (currentEnemy > enemyEntities.Count) if (currentEnemy > enemyEntities.Count - 1)
{ {
currentGameState = GameState.PlayerTurn; currentGameState = GameState.PlayerTurn;
foreach (PlayerEntity player in playerEntities) foreach (PlayerEntity player in playerEntities)