From 061c893456335c94e25691f64e312515352be3ec Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Tue, 30 Apr 2024 11:17:02 +0200
Subject: [PATCH] remove mine

---
 tanks-backend/TanksServer/GameLogic/CollectPowerUp.cs | 4 ++--
 tanks-backend/TanksServer/GameLogic/SpawnPowerUp.cs   | 6 +++---
 tanks-backend/TanksServer/Models/Magazine.cs          | 3 ---
 tanks-backend/TanksServer/Models/PowerUp.cs           | 4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/tanks-backend/TanksServer/GameLogic/CollectPowerUp.cs b/tanks-backend/TanksServer/GameLogic/CollectPowerUp.cs
index e3a68a5..cf1fc04 100644
--- a/tanks-backend/TanksServer/GameLogic/CollectPowerUp.cs
+++ b/tanks-backend/TanksServer/GameLogic/CollectPowerUp.cs
@@ -26,7 +26,7 @@ internal sealed class CollectPowerUp(
 
             switch (obj.Type)
             {
-                case PowerUpType.MagazineTypeUpgrade:
+                case PowerUpType.MagazineType:
                     if (obj.MagazineType == null)
                         throw new UnreachableException();
 
@@ -40,7 +40,7 @@ internal sealed class CollectPowerUp(
                         tank.ReloadingUntil = DateTime.Now;
 
                     break;
-                case PowerUpType.MagazineSizeUpgrade:
+                case PowerUpType.MagazineSize:
                     tank.Magazine = tank.Magazine with
                     {
                         MaxBullets = (byte)int.Clamp(tank.Magazine.MaxBullets + 1, 1, 32)
diff --git a/tanks-backend/TanksServer/GameLogic/SpawnPowerUp.cs b/tanks-backend/TanksServer/GameLogic/SpawnPowerUp.cs
index 56c7ae7..263a1f6 100644
--- a/tanks-backend/TanksServer/GameLogic/SpawnPowerUp.cs
+++ b/tanks-backend/TanksServer/GameLogic/SpawnPowerUp.cs
@@ -19,12 +19,12 @@ internal sealed class SpawnPowerUp(
 
 
         var type = Random.Shared.Next(4) == 0
-            ? PowerUpType.MagazineSizeUpgrade
-            : PowerUpType.MagazineTypeUpgrade;
+            ? PowerUpType.MagazineSize
+            : PowerUpType.MagazineType;
 
         MagazineType? magazineType = type switch
         {
-            PowerUpType.MagazineTypeUpgrade => Random.Shared.Next(0, 3) switch
+            PowerUpType.MagazineType => Random.Shared.Next(0, 3) switch
             {
                 0 => MagazineType.Fast,
                 1 => MagazineType.Explosive,
diff --git a/tanks-backend/TanksServer/Models/Magazine.cs b/tanks-backend/TanksServer/Models/Magazine.cs
index b3143b5..febd5b8 100644
--- a/tanks-backend/TanksServer/Models/Magazine.cs
+++ b/tanks-backend/TanksServer/Models/Magazine.cs
@@ -9,7 +9,6 @@ internal enum MagazineType
     Fast = 1 << 0,
     Explosive = 1 << 1,
     Smart = 1 << 2,
-    Mine = 1 << 3,
 }
 
 internal readonly record struct Magazine(MagazineType Type, byte UsedBullets, byte MaxBullets)
@@ -26,8 +25,6 @@ internal readonly record struct Magazine(MagazineType Type, byte UsedBullets, by
             sb.Append("* ");
         if (Type.HasFlag(MagazineType.Smart))
             sb.Append("@ ");
-        if (Type.HasFlag(MagazineType.Mine))
-            sb.Append("\u263c ");
 
         sb.Append("[ ");
         for (var i = 0; i < UsedBullets; i++)
diff --git a/tanks-backend/TanksServer/Models/PowerUp.cs b/tanks-backend/TanksServer/Models/PowerUp.cs
index 6305a2d..a8adb25 100644
--- a/tanks-backend/TanksServer/Models/PowerUp.cs
+++ b/tanks-backend/TanksServer/Models/PowerUp.cs
@@ -4,8 +4,8 @@ namespace TanksServer.Models;
 
 internal enum PowerUpType
 {
-    MagazineTypeUpgrade,
-    MagazineSizeUpgrade
+    MagazineType,
+    MagazineSize
 }
 
 internal sealed class PowerUp: IMapEntity