Merge Conflicts

Client/Gui/deathscreen.js

@@ -0,0 +1,61 @@
+/**
+ * @overview Life of German Reallife - Gui Infobox infobox.js
+ * @author VegaZ
+ * @copyright (c) 2008 - 2018 Life of German
+ */
+
+var playerName;
+var playerId;
+var playerMoney;
+
+var isDeath = false;
+var deathTime;
+var respawnTime;
+var deathSeconds;
+var fade;
+
+mp.game.gameplay.setFadeOutAfterDeath(false);
+
+mp.events.add("startDeathTimer", () => {
+    if (isDeath === false) {
+        isDeath = true;
+        mp.gui.chat.activate(false);
+        deathDate = new Date();
+        respawnTime = Math.floor(deathDate.getTime() / 1000 + 120);
+        fade = 255 - 120;
+    }   
+});
+
+mp.events.add("onPlayerRevived", () => {
+    isDeath = false;
+    mp.gui.chat.activate(true);
+    mp.game.gameplay.setFadeOutAfterDeath(false);
+});
+
+mp.events.add("respawnDeathPlayer", () => {
+    isDeath = false;
+    mp.gui.chat.activate(true);
+    mp.game.gameplay.setFadeOutAfterDeath(false);
+    mp.events.callRemote('RespawnPlayerAtHospital');
+});
+
+mp.events.add("render", () => {
+    currentDate = new Date();
+
+    if (isDeath === true) {
+        deathSeconds = respawnTime - Math.floor(currentDate.getTime() / 1000);
+        var alpha = fade + (Math.floor((currentDate.getTime() / 1000) - (deathDate.getTime() / 1000)));
+        if (deathSeconds >= 0) {
+            mp.game.graphics.drawText("~y~" + deathSeconds, [0.5, 0.5],
+                {
+                    font: 7,
+                    color: [255, 255, 255, 255],
+                    scale: [0.8, 0.8],
+                    outline: true
+                })
+            mp.game.graphics.drawRect(0.5, 0.5, 1, 1, 0, 0, 0, alpha);
+        } else {
+            mp.events.call("respawnDeathPlayer");
+        }             
+    }
+});

Client/index.js

@@ -6,12 +6,10 @@
 
 
 require('./Login/main.js');
-
 require('./Save/main.js');
-
+require('./Gui/deathscreen.js');
 require('./Gui/infobox.js');
 require('./Gui/playerlist.js');
-
 require('./Player/keys.js');
 
 require('./FactionManagement/main.js');