Extend Death System; Add Revive-System

Client/Gui/deathscreen.js

@@ -30,7 +30,6 @@ mp.events.add("onPlayerRevived", () => {
     isDeath = false;
     mp.gui.chat.activate(true);
     mp.game.gameplay.setFadeOutAfterDeath(false);
-    mp.events.callRemote('RespawnPlayerAtDeathpoint');
 });
 
 mp.events.add("respawnDeathPlayer", () => {

Server/Commands/Faction.cs

@@ -20,6 +20,8 @@ namespace reallife_gamemode.Server.Commands
 {
     class Faction : Script
     {
+        #region Chat Commands
+
         [Command("f", "~m~Benutzung: ~s~/f [Nachricht]", GreedyArg = true)]
         public void CmdFactionF(Client player, string message)
         {
@@ -64,6 +66,8 @@ namespace reallife_gamemode.Server.Commands
                 ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.StateOwned));
             }
         }
+        #endregion
+        #region Leader Commands
 
         [Command("invite", "~m~Benutzung: ~s~/invite [Name]")]
         public void CmdFactionInvite(Client player, string name)
@@ -199,5 +203,27 @@ namespace reallife_gamemode.Server.Commands
                 if (p.GetUser()?.FactionLeader ?? false) p.SendChatMessage(broadcastMsg);
             });
         }
+        #endregion
+        #region Sanitäter Commands
+
+        [Command("revive", "~m~Benutzung: ~s~/invite")]
+        public void CmdFactionMedicRevive(Client player)
+        {
+            if (player.GetUser()?.FactionId == null || player.GetUser().FactionId != 2)
+            {
+                ChatService.NotAuthorized(player);
+                return;
+            }
+
+            var nearPlayers = NAPI.Player.GetPlayersInRadiusOfPlayer(2, player);
+            var deadPlayer = nearPlayers.Where(i => i.GetData("isDead") == true).FirstOrDefault();
+
+            deadPlayer.TriggerEvent("onPlayerRevived");
+            deadPlayer.SendNotification("Du wurdest von ~y~" + player.Name + "~s~ wiederbelebt.");
+            deadPlayer.SetData("isDead", false);
+            NAPI.Player.SpawnPlayer(deadPlayer, deadPlayer.Position);
+            deadPlayer.Health = 50;
+        }
+        #endregion
     }
 }

Server/Entities/User.cs

@@ -36,6 +36,8 @@ namespace reallife_gamemode.Server.Entities
         public string Email { get; set; }
         public AdminLevel AdminLevel { get; set; }
 
+        public bool Dead { get; set; }
+
         public float PositionX { get; set; }
         public float PositionY { get; set; }
         public float PositionZ { get; set; }

Server/Events/Connect.cs

@@ -47,6 +47,21 @@ namespace reallife_gamemode.Server.Events
 
                 return;
             }
+
+            using (var loginUser = new DatabaseContext())
+            {
+                var user = loginUser.Users.SingleOrDefault(b => b.Name == player.Name);
+                if(user.Dead == true)
+                {
+                    player.TriggerEvent("startDeathTimer");
+                    player.SetData("isDead", true);
+                }
+                else
+                {
+                    player.SetData("isDead", false);
+                }
+            }
+
             player.SetData("isLoggedIn", false);
             player.Position = new Vector3(-1883.736, -781.4911, -10);
             player.FreezePosition = true;

Server/Events/Death.cs

@@ -22,7 +22,7 @@ namespace reallife_gamemode.Server.Events
         [ServerEvent(Event.PlayerDeath)]
         public void OnPlayerDeath(Client player, Client killer, uint reason)
         {
-
+            player.SetData("isDead", true);
             player.TriggerEvent("startDeathTimer");            
 
             //TODO: Zum Full Release entfernen
@@ -65,14 +65,9 @@ namespace reallife_gamemode.Server.Events
         [RemoteEvent("RespawnPlayerAtHospital")]
         public void RespawnPlayerAtHospital(Client player)
         {
+            player.SetData("isDead", false);
             player.RemoveAllWeapons();
             NAPI.Player.SpawnPlayer(player, new Vector3(-495.45, -336.33, 34.5));
         }
-        [RemoteEvent("RespawnPlayerAtDeathpoint")]
-        public void RespawnPlayerAtDeathpoint(Client player)
-        {
-            NAPI.Player.SpawnPlayer(player, player.Position);
     }
 }
-    
-}

Server/Events/Disconnect.cs

@@ -46,6 +46,7 @@ namespace reallife_gamemode.Server.Events
                     user.PositionX = player.Position.X;
                     user.PositionY = player.Position.Y;
                     user.PositionZ = player.Position.Z;
+                    user.Dead = player.GetData("isDead");
                     saveUser.SaveChanges();
                 }             
             }