From 531a3b5866e2724c87e93c5535f9806f063ccce7 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Fri, 3 May 2024 16:43:15 +0200 Subject: [PATCH] add different icon for smart bullet --- .../TanksServer/Graphics/DrawPowerUpsStep.cs | 34 +++++++++++------- .../TanksServer/assets/powerup_smart.png | Bin 0 -> 126 bytes 2 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 tanks-backend/TanksServer/assets/powerup_smart.png diff --git a/tanks-backend/TanksServer/Graphics/DrawPowerUpsStep.cs b/tanks-backend/TanksServer/Graphics/DrawPowerUpsStep.cs index c67a5e6..10cbdae 100644 --- a/tanks-backend/TanksServer/Graphics/DrawPowerUpsStep.cs +++ b/tanks-backend/TanksServer/Graphics/DrawPowerUpsStep.cs @@ -4,26 +4,34 @@ namespace TanksServer.Graphics; internal sealed class DrawPowerUpsStep(MapEntityManager entityManager) : IDrawStep { - private readonly Sprite _explosiveSprite = Sprite.FromImageFile("assets/powerup_explosive.png"); + private readonly Sprite _genericSprite = Sprite.FromImageFile("assets/powerup_explosive.png"); + private readonly Sprite _smartSprite = Sprite.FromImageFile("assets/powerup_smart.png"); public void Draw(GamePixelGrid pixels) { foreach (var powerUp in entityManager.PowerUps) { - var position = powerUp.Bounds.TopLeft; + var sprite = _genericSprite; + if (powerUp is { Type: PowerUpType.MagazineType, MagazineType: MagazineType.Smart }) + sprite = _smartSprite; - for (byte dy = 0; dy < MapService.TileSize; dy++) - for (byte dx = 0; dx < MapService.TileSize; dx++) - { - var pixelState = _explosiveSprite[dx, dy]; - if (!pixelState.HasValue) - continue; + DrawPowerUp(pixels, sprite, powerUp.Bounds.TopLeft); + } + } - var (x, y) = position.GetPixelRelative(dx, dy); - pixels[x, y].EntityType = pixelState.Value - ? GamePixelEntityType.PowerUp - : null; - } + private static void DrawPowerUp(GamePixelGrid pixels, Sprite sprite, PixelPosition position) + { + for (byte dy = 0; dy < MapService.TileSize; dy++) + for (byte dx = 0; dx < MapService.TileSize; dx++) + { + var pixelState = sprite[dx, dy]; + if (!pixelState.HasValue) + continue; + + var (x, y) = position.GetPixelRelative(dx, dy); + pixels[x, y].EntityType = pixelState.Value + ? GamePixelEntityType.PowerUp + : null; } } } diff --git a/tanks-backend/TanksServer/assets/powerup_smart.png b/tanks-backend/TanksServer/assets/powerup_smart.png new file mode 100644 index 0000000000000000000000000000000000000000..c3ceff5cff32ea537dbfe25c242cc014771fa9b6 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqEX7WqAsj$Z!;#Vf