Merge pull request #60 from MrDave1999/feat/NewCombos

feat!: Add new combos that improve the player's health and armour

src/Application/Players/Combos/ComboSystem.cs

@@ -54,6 +54,5 @@ public async void ShowCombos(Player player)
         });
         _worldService.SendClientMessage(Color.Yellow, message);
         selectedCombo.Give(player);
-        ShowCombos(player);
     }
 }

src/Application/Players/Combos/ICombo.cs

@@ -6,7 +6,18 @@
 /// </summary>
 public interface ICombo
 {
+    /// <summary>
+    /// Gets the name of a combo, e.g., 100 Health and 100 Armour.
+    /// </summary>
     string Name { get; }
+
+    /// <summary>
+    /// Gets the required points that a player must have to acquire the combo.
+    /// </summary>
     int RequiredPoints { get; }
+
+    /// <summary>
+    /// Assigns a combo to a player, e.g., 100 Health and 100 Armour.
+    /// </summary>
     void Give(Player player);
 }

src/Application/Players/Combos/ServiceCollectionExtensions.cs

@@ -5,11 +5,11 @@ public static class ComboServicesExtensions
     public static IServiceCollection AddComboServices(this IServiceCollection services)
     {
         services
-            .AddSingleton<ICombo, HealthArmour>()
-            .AddSingleton<ICombo, GrenadesArmour>()
-            .AddSingleton<ICombo, MolotovArmour>()
-            .AddSingleton<ICombo, SatchelChargesArmour>()
-            .AddSingleton<ICombo, TearGasHealth>();
+            .AddSingleton<ICombo, FlamethrowerVitality>()
+            .AddSingleton<ICombo, GrenadesVitality>()
+            .AddSingleton<ICombo, MolotovVitality>()
+            .AddSingleton<ICombo, SatchelChargesVitality>()
+            .AddSingleton<ICombo, TearGasVitality>();
 
         return services;
     }

src/Application/Players/Combos/Services/HealthArmour.cs → src/Application/Players/Combos/Services/FlamethrowerVitality.cs

@@ -1,6 +1,6 @@
 namespace CTF.Application.Players.Combos.Services;
 
-public class HealthArmour : ICombo
+public class FlamethrowerVitality : ICombo
 {
     public string Name => "100 Health, 100 Armour and FlameThrower";
     public int RequiredPoints => 100;

src/Application/Players/Combos/Services/GrenadesVitality.cs

@@ -0,0 +1,16 @@
+namespace CTF.Application.Players.Combos.Services;
+
+public class GrenadesVitality : ICombo
+{
+    public string Name => "100 Health, 100 Armour and 25 Grenades";
+    public int RequiredPoints => 100;
+
+    public void Give(Player player)
+    {
+        PlayerInfo playerInfo = player.GetInfo();
+        player.Health = 100;
+        player.Armour = 100;
+        player.GiveWeapon(Weapon.Grenade, ammo: 25);
+        playerInfo.StatsPerRound.ResetPoints();
+    }
+}

src/Application/Players/Combos/Services/MolotovVitality.cs

@@ -0,0 +1,16 @@
+namespace CTF.Application.Players.Combos.Services;
+
+public class MolotovVitality : ICombo
+{
+    public string Name => "100 Health, 100 Armour and 25 Molotov cocktail";
+    public int RequiredPoints => 100;
+
+    public void Give(Player player)
+    {
+        PlayerInfo playerInfo = player.GetInfo();
+        player.Health = 100;
+        player.Armour = 100;
+        player.GiveWeapon(Weapon.Moltov, ammo: 25);
+        playerInfo.StatsPerRound.ResetPoints();
+    }
+}

src/Application/Players/Combos/Services/SatchelChargesVitality.cs

@@ -0,0 +1,17 @@
+namespace CTF.Application.Players.Combos.Services;
+
+public class SatchelChargesVitality : ICombo
+{
+    public string Name => "100 Health, 100 Armour and 25 Satchel charges";
+    public int RequiredPoints => 100;
+
+    public void Give(Player player)
+    {
+        PlayerInfo playerInfo = player.GetInfo();
+        player.Health = 100;
+        player.Armour = 100;
+        player.GiveWeapon(Weapon.SatchelCharge, ammo: 25);
+        player.GiveWeapon(Weapon.Detonator, ammo: 1);
+        playerInfo.StatsPerRound.ResetPoints();
+    }
+}

src/Application/Players/Combos/Services/TearGasVitality.cs

@@ -0,0 +1,16 @@
+namespace CTF.Application.Players.Combos.Services;
+
+public class TearGasVitality : ICombo
+{
+    public string Name => "100 Health, 100 Armour and 50 Tear gas";
+    public int RequiredPoints => 100;
+
+    public void Give(Player player)
+    {
+        PlayerInfo playerInfo = player.GetInfo();
+        player.Health = 100;
+        player.Armour = 100;
+        player.GiveWeapon(Weapon.Teargas, ammo: 50);
+        playerInfo.StatsPerRound.ResetPoints();
+    }
+}