Merging into feature/inventory-system

Client/Gui/Inventory/inventory.js

@@ -15,7 +15,6 @@ var inventoryWeight;
 var items = [[]];
 
 var grid = [];
-
 grid[0] = [0.3375, 0.305]
 grid[1] = [0.4195, 0.305]
 grid[2] = [0.5015, 0.305]
@@ -65,20 +64,6 @@ mp.events.add("showInventory", (invWeight, itemArr) => {
 mp.events.add("render", () => {
     if (show === true) {
         var pos = mp.gui.cursor.position;
-        //DEBUG 2D-SCREEN-KOORDINATEN
-        //mp.game.graphics.drawText("~r~X: " + pos[0] + " ~g~Y: " + pos[1] + "~s~ ---~b~" + parseFloat(pos[0] / screenX).toFixed(3) + " ~y~" + parseFloat(pos[1] / screenY).toFixed(3) + "   " + mouseLDown, [pos[0] / screenX, (pos[1] / screenY) - 0.02], {
-        //    font: 0,
-        //    color: [255, 255, 255, 185],
-        //    scale: [0.3, 0.3],
-        //    outline: true,
-        //});
-
-        //mp.game.graphics.drawText("~r~drag: " + dragItem + "~s~... ~b~hover:" + hoverItem + "~y~....FREESLOT: " + isMouseOverFreeSlot(pos[0], pos[1]) + "..." + isItemOverSameItem(pos[0], pos[1]), [0.5, 0.02], {
-        //    font: 0,
-        //    color: [255, 255, 255, 185],
-        //    scale: [0.3, 0.3],
-        //    outline: true,
-        //});
 
         mp.game.graphics.set2dLayer(1);
         //INVENTARHINTERGRUND
@@ -339,10 +324,4 @@ mp.events.add('click', (x, y, upOrDown, leftOrRight, relativeX, relativeY, world
             }
         }
     }  
-});
-
-//items[userItems.IndexOf(item)][0] = iItem.Name;
-//items[userItems.IndexOf(item)][1] = iItem.Description;
-//items[userItems.IndexOf(item)][2] = iItem.Gewicht.ToString();
-//items[userItems.IndexOf(item)][3] = item.Amount.ToString();
-//items[userItems.IndexOf(item)][4] = item.Slot.ToString();
+});

Client/Gui/deathscreen.js

@@ -49,14 +49,7 @@ mp.events.add("respawnDeathPlayer", () => {
 });
 
 mp.events.add("updateDutyMedics", (count) => {
-    if (count === true)
-    {
-        dutyMedics++;
-    }
-    else
-    {
-        dutyMedics--;
-    }
+    dutyMedics = count;
 });
 
 
@@ -68,7 +61,13 @@ mp.events.add("render", () => {
 
         var medicString;
         if (dutyMedics > 0) {
-            medicString = "Derzeit sind ~g~" + dutyMedics + " Medics ~s~im Dienst ~c~und versuchen dich wiederzubeleben...";
+            medicString = "Derzeit ";
+            if (dutyMedics === 1) {
+                medicString += "ist ~g~" + dutyMedics + " Medic";
+            } else {
+                medicString = "sind ~g~" + dutyMedics + " Medics";
+            }
+            medicString += " ~s~im Dienst ~c~und versuchen dich wiederzubeleben...";
         } else {
             medicString = "Derzeit sind ~r~keine Medics ~s~im Dienst.";
         }
@@ -76,6 +75,7 @@ mp.events.add("render", () => {
         deathSeconds = respawnTime - Math.floor(currentDate.getTime() / 1000);
         var alpha = fade + Math.floor(currentDate.getTime() / 1000 - deathDate.getTime() / 1000);
         if (deathSeconds >= 0) {
+            mp.game.graphics.set2dLayer(2);
             mp.game.graphics.drawSprite("Mptattoos", "clearout", 0.625, 0.52, 0.1, 0.1, 0, 255, 255, 255, 236);
             mp.game.graphics.drawText("Respawn in: ~y~" + deathSeconds, [0.5, 0.5],
                 {
@@ -91,6 +91,7 @@ mp.events.add("render", () => {
                     scale: [0.4, 0.4],
                     outline: true
                 });
+            mp.game.graphics.set2dLayer(1);
             mp.game.graphics.drawRect(0.5, 0.5, 1, 1, 0, 0, 0, alpha);
 
         } else {

Client/Gui/infobox.js

@@ -69,7 +69,7 @@ mp.events.add("toggleUi", (show) => {
 //}
 
 mp.events.add("updateMoney", (money) => {
-    playerMoney = money;
+    playerMoney = money.toLocaleString("de-DE", { minimumFractionDigits: 0 });
 });
 
 mp.events.add("render", () => {