vinzenz/servicepoint-tanks
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add power ups collected score

Browse source
This commit is contained in:
Vinzenz Schroeter 2024-04-29 13:54:29 +02:00
parent bf22fd6c85
commit 259d63d683
8 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tanks-backend/TanksServer/GameLogic/CollectPowerUp.cs
View file

@ -20,8 +20,9 @@ internal sealed class CollectPowerUp(
position.Y < topLeft.Y || position.Y > bottomRight.Y)
continue;
// this works because now the tank overlaps the power up
// now the tank overlaps the power up by at least 0.5 tiles
tank.ExplosiveBullets += 10;
tank.Owner.Scores.PowerUpsCollected++;
return true;
}

52
tanks-backend/TanksServer/GameLogic/TankSpawnQueue.cs
View file

@ -5,7 +5,7 @@ namespace TanksServer.GameLogic;
internal sealed class TankSpawnQueue(
IOptions<GameRules> options,
MapEntityManager entityManager
): ITickStep
) : ITickStep
{
private readonly ConcurrentQueue<Player> _queue = new();
private readonly ConcurrentDictionary<Player, DateTime> _spawnTimes = new();
@ -16,31 +16,8 @@ internal sealed class TankSpawnQueue(
public void EnqueueForDelayedSpawn(Player player)
{
_queue.Enqueue(player);
_spawnTimes.AddOrUpdate(player, DateTime.MinValue, (_, _) => DateTime.Now + _spawnDelay);
}
private bool TryDequeueNext([MaybeNullWhen(false)] out Player player)
{
if (!_queue.TryDequeue(out player))
return false; // no one on queue
if (player.LastInput + _idleTimeout < DateTime.Now)
{
// player idle
_queue.Enqueue(player);
return false;
}
var now = DateTime.Now;
if (_spawnTimes.GetOrAdd(player, DateTime.MinValue) > now)
{
// spawn delay
_queue.Enqueue(player);
return false;
}
return true;
_queue.Enqueue(player);
}
public ValueTask TickAsync(TimeSpan _)
@ -51,4 +28,29 @@ internal sealed class TankSpawnQueue(
entityManager.SpawnTank(player);
return ValueTask.CompletedTask;
}
private bool TryDequeueNext([MaybeNullWhen(false)] out Player player)
{
if (!_queue.TryDequeue(out player))
return false; // no one on queue
var now = DateTime.Now;
if (player.LastInput + _idleTimeout < now)
{
// player idle
_queue.Enqueue(player);
player = null;
return false;
}
if (_spawnTimes.GetOrAdd(player, DateTime.MinValue) > now)
{
// spawn delay
_queue.Enqueue(player);
player = null;
return false;
}
return true;
}
}