Merge pull request 'enemies face south' (#6) from enemies-face-north into main
Reviewed-on: #6
This commit is contained in:
commit
90fd1c23d3
1 changed files with 13 additions and 3 deletions
|
|
@ -414,7 +414,7 @@ namespace TD.Gameplay
|
||||||
// PlayerZoneVolume (so OwnerGrid[spawnerTile] = None).
|
// PlayerZoneVolume (so OwnerGrid[spawnerTile] = None).
|
||||||
var spawner = zone.Spawners[0];
|
var spawner = zone.Spawners[0];
|
||||||
(float xHalf, float zHalf) = ComputeSpawnerHalfExtents(spawner.TileArea);
|
(float xHalf, float zHalf) = ComputeSpawnerHalfExtents(spawner.TileArea);
|
||||||
SpawnEnemy(def, spawner.TilePosition, zone.Owner, xHalf, zHalf, held);
|
SpawnEnemy(def, spawner.TilePosition, zone.Owner, xHalf, zHalf, held, spawner.Facing);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -440,7 +440,8 @@ namespace TD.Gameplay
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SpawnEnemy(EnemyDefinition def, Vector2Int spawnerTile, PlayerSlot ownerSlot,
|
private void SpawnEnemy(EnemyDefinition def, Vector2Int spawnerTile, PlayerSlot ownerSlot,
|
||||||
float xHalfExtent = 0f, float zHalfExtent = 0f, bool held = false)
|
float xHalfExtent = 0f, float zHalfExtent = 0f, bool held = false,
|
||||||
|
Direction facing = Direction.South)
|
||||||
{
|
{
|
||||||
if (def.EnemyPrefab == null)
|
if (def.EnemyPrefab == null)
|
||||||
{
|
{
|
||||||
|
|
@ -460,10 +461,19 @@ namespace TD.Gameplay
|
||||||
if (def.IsFlying)
|
if (def.IsFlying)
|
||||||
spawnPos.y += def.FlightHeight;
|
spawnPos.y += def.FlightHeight;
|
||||||
|
|
||||||
|
float yaw = facing switch
|
||||||
|
{
|
||||||
|
Direction.North => 0f,
|
||||||
|
Direction.East => 90f,
|
||||||
|
Direction.South => 180f,
|
||||||
|
Direction.West => 270f,
|
||||||
|
_ => 0f,
|
||||||
|
};
|
||||||
|
|
||||||
var go = Instantiate(
|
var go = Instantiate(
|
||||||
def.EnemyPrefab,
|
def.EnemyPrefab,
|
||||||
spawnPos,
|
spawnPos,
|
||||||
Quaternion.identity);
|
Quaternion.Euler(0f, yaw, 0f));
|
||||||
|
|
||||||
var health = go.GetComponent<EnemyHealth>();
|
var health = go.GetComponent<EnemyHealth>();
|
||||||
var movement = go.GetComponent<EnemyMovement>();
|
var movement = go.GetComponent<EnemyMovement>();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue