Merge pull request #303 from MrDave1999/dev

9.5.4 Release

Author: DevD4v3

.env.example

@@ -4,6 +4,7 @@ ServerInfo__GameModeText=CTF/Team Deathmatch [v9]
 ServerInfo__MapName=RC_Battlefield
 ServerInfo__WebUrl=https://github.com/MrDave1999/Capture-The-Flag
 ServerInfo__IntroAudioUrl=https://od.lk/s/Nl8yMDg4MTc0NDBf/intro-cs.mp3
+ServerInfo__HeadshotAudioUrl=https://od.lk/s/Nl8yMTE2ODQ3MTVf/headshot.mp3
 # Expressed in seconds.
 ServerInfo__FlagAutoReturnTime=120
 
@@ -53,7 +54,8 @@ BlueTeamScoresUrl=https://od.lk/s/Nl8yMDg4MTc0MzJf/blue_team_scores.mp3
 #
 # Primary keys used by docker-compose
 #
-MaxPlayers=30  # Number of players that can enter the SA-MP Server
+ServerPassword=
+MaxPlayers=30 # Number of players that can enter the SA-MP Server
 LagCompMode=1 # Lag Compensation
 Port=7777 # The port to be published by the container
 TZ=America/Bogota # Time Zone

docker-compose.yml

@@ -7,6 +7,7 @@ services:
       bash -c "sed -i 's/lagcompmode 1/lagcompmode ${LagCompMode}/' server.cfg 
       && sed -i 's/maxplayers 30/maxplayers ${MaxPlayers}/' server.cfg 
       && sed -i 's/port 7777/port ${Port}/' server.cfg 
+      && sed -i 's/^password/password ${ServerPassword}/' server.cfg 
       && ./omp-server"
     ports:
       - ${Port}:${Port}/udp

server.cfg.example

@@ -5,6 +5,7 @@ gamemode0 empty 1
 plugins libSampSharp.so streamer.so
 filterscripts
 rcon_password password
+password
 port 7777
 hostname [CTF] Capture The Flag | TDM
 maxplayers 30

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

@@ -157,7 +157,7 @@
     <value>This round was won by the Beta team</value>
   </data>
   <data name="BlueFlagIsNotAtBasePosition" xml:space="preserve">
-    <value>~n~~n~~n~~b~The blue flag is not at its base position</value>
+    <value>~n~~n~~b~Your blue flag has been taken!~n~Recover it before the enemy scores!</value>
   </data>
   <data name="ChatDisabled" xml:space="preserve">
     <value>Chat is currently disabled while you select your class. Please finish your selection before chatting!</value>
@@ -415,7 +415,7 @@
     <value>{PlayerName} redeemed their coins for the combo: {ComboName}</value>
   </data>
   <data name="RedFlagIsNotAtBasePosition" xml:space="preserve">
-    <value>~n~~n~~n~~r~The red flag is not at its base position</value>
+    <value>~n~~n~~r~Your red flag has been taken!~n~Recover it before the enemy scores!</value>
   </data>
   <data name="ReportSuccessfullySent" xml:space="preserve">
     <value>You have successfully sent the report</value>

src/Application/Common/Resources/Messages.resx

@@ -8,5 +8,6 @@ public class ServerSettings
     public string MapName { get; init; } = string.Empty;
     public string WebUrl { get; init; } = string.Empty;
     public string IntroAudioUrl { get; init; } = string.Empty;
+    public string HeadshotAudioUrl { get; init; } = string.Empty;
     public int FlagAutoReturnTime { get; init; } = 120;
 }

src/Application/Common/Settings/ServerSettings.cs

@@ -2,12 +2,13 @@
 
 public class HeadShotSystem(
     IPlayerRepository playerRepository,
-    IWorldService worldService) : ISystem
+    IWorldService worldService,
+    ServerSettings serverSettings) : ISystem
 {
     /// <summary>
     /// This callback is called when a player takes damage.
     /// </summary>
-    /// <param name="player">
+    /// <param name="receiver">
     /// The player that took damage.
     /// </param>
     /// <param name="issuer">
@@ -23,7 +24,7 @@ public class HeadShotSystem(
     /// The <see href="https://www.open.mp/docs/scripting/resources/bodyparts">body part</see> that was hit.
     /// </param>
     [Event]
-    public void OnPlayerTakeDamage(Player player, Player issuer, float amount, Weapon weapon, BodyPart bodyPart)
+    public void OnPlayerTakeDamage(Player receiver, Player issuer, float amount, Weapon weapon, BodyPart bodyPart)
     {
         if (issuer.IsInvalidPlayer())
             return;
@@ -33,17 +34,23 @@ public void OnPlayerTakeDamage(Player player, Player issuer, float amount, Weapo
             issuer.PlaySound(soundId: 17802);
         }
 
-        if (issuer.Team != player.Team && weapon == Weapon.Sniper && bodyPart == BodyPart.Head)
+        if (issuer.Team != receiver.Team && weapon == Weapon.Sniper && bodyPart == BodyPart.Head)
         {
             PlayerInfo issuerInfo = issuer.GetInfo();
+            PlayerInfo receiverInfo = receiver.GetInfo();
             issuerInfo.AddHeadShots();
             issuerInfo.StatsPerRound.AddCoins(5);
             playerRepository.UpdateHeadShots(issuerInfo);
-            player.Health = 0;
+            receiver.Health = 0;
+            if (!receiverInfo.HasCapturedFlag())
+            {
+                issuer.PlayAudioStream(serverSettings.HeadshotAudioUrl);
+                receiver.PlayAudioStream(serverSettings.HeadshotAudioUrl);
+            }
             var message = Smart.Format(Messages.HeadshotToPlayer, new
             {
                 PlayerName1 = issuer.Name,
-                PlayerName2 = player.Name
+                PlayerName2 = receiver.Name
             });
             worldService.SendClientMessage(Color.Yellow, message);
         }