Merge pull request #111 from MrDave1999/feat/ChangeTeam

feat: Allow players to change teams
MrDave1999 · Sep 28, 2024 · 32534ca · 32534ca
2 parents fbf4c8e + 8d8d472
commit 32534ca
Show file tree

Hide file tree

Showing 4 changed files with 156 additions and 0 deletions.
diff --git a/src/Application/Common/Resources/Messages.Designer.cs b/src/Application/Common/Resources/Messages.Designer.cs
diff --git a/src/Application/Common/Resources/Messages.resx b/src/Application/Common/Resources/Messages.resx
@@ -213,6 +213,9 @@
   <data name="NoPermissions" xml:space="preserve">
     <value>You do not have permissions to use this command</value>
   </data>
+  <data name="NoTeam" xml:space="preserve">
+    <value>You do not belong to any team</value>
+  </data>
   <data name="OnFlagAtBasePosition" xml:space="preserve">
     <value>~n~~n~~n~{GameText}Defend this flag from enemy capture!</value>
   </data>
@@ -240,6 +243,12 @@
   <data name="PasswordSuccessfullyChanged" xml:space="preserve">
     <value>Password successfully changed. New password: {NewPassword}</value>
   </data>
+  <data name="PlayerHasChangedTeams" xml:space="preserve">
+    <value>Attention, team! {PlayerName} has made the switch and is now part of the {TeamName} team</value>
+  </data>
+  <data name="PlayerIsAlreadyInTeam" xml:space="preserve">
+    <value>You are already a member of that team</value>
+  </data>
   <data name="PlayerNameAlreadyExists" xml:space="preserve">
     <value>That player name already exists</value>
   </data>
@@ -267,6 +276,12 @@
   <data name="SuccessfulLogin" xml:space="preserve">
     <value>You have successfully logged in</value>
   </data>
+  <data name="TeamIsFull" xml:space="preserve">
+    <value>The team is currently full</value>
+  </data>
+  <data name="TeamsAreEqualInMembers" xml:space="preserve">
+    <value>Both teams have the same number of members</value>
+  </data>
   <data name="TiedTeams" xml:space="preserve">
     <value>It's a tie! Both teams couldn't beat each other this time</value>
   </data>

diff --git a/src/Application/Players/PlayerSpawnSystem.cs b/src/Application/Players/PlayerSpawnSystem.cs
@@ -15,6 +15,7 @@ public void OnPlayerSpawn(Player player)
         player.Interior = currentMap.Interior;
         player.Color = playerInfo.Team.ColorHex;
         player.Team = (int)playerInfo.Team.Id;
+        player.Skin = (int)playerInfo.Team.SkinId;
         if (playerInfo.HasSkin())
         {
             player.Skin = playerInfo.SkinId;

diff --git a/src/Application/Teams/Systems/ChangeTeamSystem.cs b/src/Application/Teams/Systems/ChangeTeamSystem.cs
@@ -0,0 +1,95 @@
+namespace CTF.Application.Teams.Systems;
+
+public class ChangeTeamSystem(
+    IWorldService worldService,
+    IDialogService dialogService,
+    TeamTextDrawRenderer teamTextDrawRenderer,
+    OnFlagDropped onFlagDropped) : ISystem
+{
+    [PlayerCommand("team")]
+    public async void ShowTeams(Player player)
+    {
+        PlayerInfo playerInfo = player.GetInfo();
+        if (playerInfo.Team == Team.None)
+        {
+            player.SendClientMessage(Color.Red, Messages.NoTeam);
+            return;
+        }
+
+        var columnHeaders = new[]
+        {
+            "Name",
+            "Members"
+        };
+        var tablistDialog = new TablistDialog(
+            caption: "Select a team", 
+            button1: "Select", 
+            button2: "Close", 
+            columnHeaders);
+
+        Team alphaTeam = Team.Alpha;
+        tablistDialog.Add(columns:
+        [
+            $"{alphaTeam.ColorHex}{alphaTeam.Name}",
+            $"{alphaTeam.ColorHex}{alphaTeam.Members.Count}"
+        ], tag: alphaTeam);
+
+        Team betaTeam = Team.Beta;
+        tablistDialog.Add(columns:
+        [
+            $"{betaTeam.ColorHex}{betaTeam.Name}",
+            $"{betaTeam.ColorHex}{betaTeam.Members.Count}"
+        ], tag: betaTeam);
+
+        TablistDialogResponse response = await dialogService.ShowAsync(player, tablistDialog);
+        if (response.IsRightButtonOrDisconnected())
+            return;
+
+        Team selectedTeam = response.Item.Tag as Team;
+        ChangeTeam(player, selectedTeam);
+    }
+
+    private void ChangeTeam(Player player, Team selectedTeam)
+    {
+        Team alphaTeam = Team.Alpha;
+        Team betaTeam = Team.Beta;
+        PlayerInfo playerInfo = player.GetInfo();
+        if (playerInfo.Team == selectedTeam)
+        {
+            player.SendClientMessage(Color.Red, Messages.PlayerIsAlreadyInTeam);
+            return;
+        }
+
+        if (alphaTeam.Members.Count == betaTeam.Members.Count)
+        {
+            player.SendClientMessage(Color.Red, Messages.TeamsAreEqualInMembers);
+            return;
+        }
+
+        if (selectedTeam.IsFull())
+        {
+            player.SendClientMessage(Color.Red, Messages.TeamIsFull);
+            return;
+        }
+
+        if (playerInfo.HasCapturedFlag())
+        {
+            onFlagDropped.Handle(selectedTeam, player);
+        }
+
+        Team rivalTeam = selectedTeam.RivalTeam;
+        selectedTeam.Members.Add(player);
+        rivalTeam.Members.Remove(player);
+        teamTextDrawRenderer.UpdateTeamMembers(selectedTeam);
+        teamTextDrawRenderer.UpdateTeamMembers(rivalTeam);
+        var message = Smart.Format(Messages.PlayerHasChangedTeams, new
+        {
+            PlayerName = player.Name,
+            TeamName = selectedTeam.Name
+        });
+        worldService.SendClientMessage(selectedTeam.ColorHex, message);
+        playerInfo.SetTeam(selectedTeam.Id);
+        player.Team = (int)selectedTeam.Id;
+        player.Spawn();
+    }
+}