Merge pull request #287 from MrDave1999/dev

9.5.0 Release

Author: DevD4v3

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       with:
         dotnet-version: ${{ env.DOTNET_VERSION }}
     - name: Execute unit tests
-      run: dotnet test ./tests/Application.Tests/CTF.Application.Tests.csproj -c Release
+      run: dotnet test ./tests/Application.Tests/CTF.Application.Tests.csproj -c Release --framework=net8.0
 
   integration_testing:
     runs-on: ubuntu-latest
@@ -55,4 +55,4 @@ jobs:
     - name: Create .env.test file
       run: cp ./tests/Persistence.Tests/.env.test.example ./tests/Persistence.Tests/.env.test
     - name: Execute integration tests
-      run: dotnet test ./tests/Persistence.Tests/Persistence.Tests.csproj -c Release
+      run: dotnet test ./tests/Persistence.Tests/Persistence.Tests.csproj -c Release --framework=net8.0

src/Application/Common/Resources/Messages.Designer.cs

@@ -162,6 +162,9 @@
   <data name="ChatDisabled" xml:space="preserve">
     <value>Chat is currently disabled while you select your class. Please finish your selection before chatting!</value>
   </data>
+  <data name="ComboUsage" xml:space="preserve">
+    <value>Use /combos or NUM 4 key</value>
+  </data>
   <data name="CommandLockClassSelection" xml:space="preserve">
     <value>You cannot execute commands in the class selection</value>
   </data>
@@ -180,9 +183,15 @@
   <data name="DemotedToRole" xml:space="preserve">
     <value>Demoted to {RoleName} role</value>
   </data>
+  <data name="DisableRocketLauncher" xml:space="preserve">
+    <value>{PlayerName} has disabled the Rocket Launcher(RPG)</value>
+  </data>
   <data name="EmptyWeaponPackage" xml:space="preserve">
     <value>You have no items in your weapon package</value>
   </data>
+  <data name="EnableRocketLauncher" xml:space="preserve">
+    <value>{PlayerName} has enabled the Rocket Launcher(RPG). Use /combos or NUM 4 key</value>
+  </data>
   <data name="ExitSpectatorMode" xml:space="preserve">
     <value>To exit spectator mode use the command /class</value>
   </data>
@@ -195,6 +204,9 @@
   <data name="GameModeDescription" xml:space="preserve">
     <value>~r~Welcome to Capture The Flag mode~n~~y~It is a game mode in which two teams (Alpha and Beta) compete to capture the other team's flag and bring it back to their own base to score a point</value>
   </data>
+  <data name="GiveJetpackToPlayers" xml:space="preserve">
+    <value>{PlayerName} has given all players a jetpack</value>
+  </data>
   <data name="GiveMeCoins" xml:space="preserve">
     <value>You have obtained 100 coins!</value>
   </data>
@@ -204,12 +216,18 @@
   <data name="HeadshotToPlayer" xml:space="preserve">
     <value>{PlayerName1} landed a headshot with a sniper at {PlayerName2}</value>
   </data>
+  <data name="HideFlagCarriersOnRadarMap" xml:space="preserve">
+    <value>{PlayerName} decided that the flag carriers will be hidden on the radar map</value>
+  </data>
   <data name="InsufficientCoins" xml:space="preserve">
     <value>You do not have enough coins to obtain this combo</value>
   </data>
   <data name="InvalidAddCoins" xml:space="preserve">
     <value>Coins must be between 1 to 100</value>
   </data>
+  <data name="InvalidFlagColor" xml:space="preserve">
+    <value>Invalid color. Only 'red' and 'blue' are valid options for this command</value>
+  </data>
   <data name="InvalidInterval" xml:space="preserve">
     <value>The interval must be between 0 to {Max}</value>
   </data>
@@ -363,6 +381,15 @@
   <data name="PlayerWithInsufficientHealth" xml:space="preserve">
     <value>You don't have enough health</value>
   </data>
+  <data name="PrivateMessagesBlocked" xml:space="preserve">
+    <value>That player has private messages blocked</value>
+  </data>
+  <data name="PrivateMessagesDisabled" xml:space="preserve">
+    <value>Now players cannot send you a private message</value>
+  </data>
+  <data name="PrivateMessagesEnabled" xml:space="preserve">
+    <value>Now players can send you a private message</value>
+  </data>
   <data name="PromotedToRole" xml:space="preserve">
     <value>Promoted to {RoleName} role</value>
   </data>
@@ -396,12 +423,18 @@
   <data name="ReportToAnotherPlayer" xml:space="preserve">
     <value>{CurrentPlayer} reported to {TargetPlayer} [Reason: {Reason}]</value>
   </data>
+  <data name="ResetFlagPosition" xml:space="preserve">
+    <value>{PlayerName} has reset the {ColorName} flag to its base position</value>
+  </data>
   <data name="ResetPlayerStats" xml:space="preserve">
     <value>{PlayerName} has reset their stats, such as score, kills and deaths</value>
   </data>
   <data name="ResetTeamStats" xml:space="preserve">
     <value>{PlayerName} has reset the statistics of both teams (Alpha and Beta)</value>
   </data>
+  <data name="RocketLauncherDisabled" xml:space="preserve">
+    <value>The rocket launcher is disabled. It must be enabled by the STAFF</value>
+  </data>
   <data name="RoleSuccessfullyChanged" xml:space="preserve">
     <value>You have assigned the {RoleName} role to {PlayerName}</value>
   </data>
@@ -417,6 +450,9 @@
   <data name="SetSpawnToPlayer" xml:space="preserve">
     <value>You've spawned {PlayerName} into the game!</value>
   </data>
+  <data name="ShowFlagCarriersOnRadarMap" xml:space="preserve">
+    <value>{PlayerName} decided that the flag carriers will be shown on the radar map</value>
+  </data>
   <data name="SpawnLocationFailure" xml:space="preserve">
     <value>A spawn location can only be obtained for the alpha or beta team</value>
   </data>

src/Application/Common/Resources/Messages.resx

@@ -18,6 +18,11 @@ public class MapRotationService(
     private bool _isMapLoading;
     public bool IsMapLoading() => _isMapLoading;
 
+    public delegate void LoadingMapEventHandler();
+    public delegate void LoadedMapEventHandler();
+    public event LoadingMapEventHandler LoadingMapEvent;
+    public event LoadedMapEventHandler LoadedMapEvent;
+
     public void StartRotationTimer()
     {
         _loadTime ??= new LoadTime(OnLoadingMap, OnLoadedMap);
@@ -49,6 +54,7 @@ private void OnTimer(IServiceProvider serviceProvider)
     private void OnLoadingMap()
     {
         _isMapLoading = true;
+        LoadingMapEvent?.Invoke();
         if (Team.Alpha.IsWinner())
             worldService.SendClientMessage(Color.Yellow, Messages.AlphaIsWinner);
         else if(Team.Beta.IsWinner())
@@ -84,6 +90,7 @@ private void OnLoadingMap()
     private void OnLoadedMap()
     {
         _isMapLoading = false;
+        LoadedMapEvent?.Invoke();
         TimeLeft.Reset();
         CurrentMap currentMap = mapInfoService.Read();
         string message = Smart.Format(Messages.MapSuccessfullyLoaded, new { currentMap.Name });

src/Application/Maps/Services/MapRotationService.cs

@@ -0,0 +1,76 @@
+namespace CTF.Application.Players.Chats;
+
+public class PrivateMessageSystem(IEntityManager entityManager) : ISystem
+{
+    [PlayerCommand("pm")]
+    public void SendMessageToPlayer(
+        Player sender,
+        [CommandParameter(Name = "playerId")]Player receiver,
+        string message)
+    {
+        if (sender == receiver)
+        {
+            sender.SendClientMessage(Color.Red, Messages.PlayerIsEqualsToTargetPlayer);
+            return;
+        }
+
+        var privateMessageComponent = receiver.GetComponent<PrivateMessageComponent>();
+        if (privateMessageComponent.IsBlocked) 
+        {
+            sender.SendClientMessage(Color.Red, Messages.PrivateMessagesBlocked);
+            return;
+        }
+
+        int senderId = sender.Entity.Handle;
+        int receiverId = receiver.Entity.Handle;
+        sender.SendClientMessage(Color.Yellow, $"PM to {receiver.Name}({receiverId}): {message}");
+        sender.PlaySound(1058);
+        receiver.SendClientMessage(Color.Yellow, $"PM from {sender.Name}({senderId}): {message}");
+        receiver.PlaySound(1058);
+
+        // Send private message to the STAFF.
+        var players = entityManager.GetComponents<Player>();
+        foreach (Player player in players)
+        {
+            PlayerInfo playerInfo = player.GetInfo();
+            if (playerInfo.HasLowerRoleThan(RoleId.Moderator))
+                continue;
+
+            // This prevents double messaging.
+            if (player == sender || player == receiver)
+                continue;
+
+            var messageForStaff = $"[PM] {sender.Name} writes to {receiver.Name}: {message}";
+            player.SendClientMessage(Color.Yellow, messageForStaff);
+        }
+    }
+
+    [PlayerCommand("blockpm")]
+    public void Block(Player player)
+    {
+        var privateMessageComponent = player.GetComponent<PrivateMessageComponent>();
+        privateMessageComponent.IsBlocked = true;
+        player.SendClientMessage(Color.Yellow, Messages.PrivateMessagesDisabled);
+        player.PlaySound(1139);
+    }
+
+    [PlayerCommand("unblockpm")]
+    public void Unblock(Player player)
+    {
+        var privateMessageComponent = player.GetComponent<PrivateMessageComponent>();
+        privateMessageComponent.IsBlocked = false;
+        player.SendClientMessage(Color.Yellow, Messages.PrivateMessagesEnabled);
+        player.PlaySound(1139);
+    }
+
+    [Event]
+    public void OnPlayerConnect(Player player) 
+    {
+        player.AddComponent<PrivateMessageComponent>();
+    }
+
+    private class PrivateMessageComponent : Component
+    {
+        public bool IsBlocked { get; set; }
+    }
+}