Merge branch 'develop' into 'feature/atm-system'

# Conflicts: # ReallifeGamemode.Server/Migrations/DatabaseContextModelSnapshot.cs
2019-04-02 18:50:17 +02:00
parent bed35f8f08
commit 63838e133a
20 changed files with 1226 additions and 42 deletions
--- a/ReallifeGamemode.Client/Gui/handmoney.ts
+++ b/ReallifeGamemode.Client/Gui/handmoney.ts
@@ -0,0 +1,75 @@
+export default function handMoney() {
+    var currentMoney = null;
+    var showMoneyChange = null;
+    var difference;
+    var screen = mp.game.graphics.getScreenResolution(0, 0);
+    var res_X = screen.x;
+
+    mp.events.add("SERVER:SET_HANDMONEY", (amount) => {
+        difference = currentMoney - amount;
+        if (difference != 0 && currentMoney != null) {
+            showMoneyChange = 1000;
+        }
+        currentMoney += amount;   
+    });
+
+    mp.events.add("render", () => {
+        if (currentMoney != null) {
+            var numberFormat = formatNumber(currentMoney.toFixed(0));
+            if (currentMoney >= 0) {
+                mp.game.graphics.drawText("+$" + numberFormat, [0.96, 0.1],
+                    {
+                        font: 7,
+                        color: [115, 186, 131, 255],
+                        scale: [0.65, 0.65],
+                        outline: false,
+                        centre: true,
+                    })
+            }
+            else {
+                mp.game.graphics.drawText("-$" + numberFormat, [0.96, 0.1],
+                    {
+                        font: 7,
+                        color: [255, 0, 45, 255],
+                        scale: [0.65, 0.65],
+                        outline: false,
+                        centre: true,
+                    })
+            }
+            if (showMoneyChange > 0) {
+                showMoneyChange--;
+                if (difference > 0) {
+                    var alpha = 255;
+                    if (showMoneyChange <= 70) {
+                        alpha = (showMoneyChange * (255 / 70)) | 0;
+                    }
+                    mp.game.graphics.drawText("- $" + formatNumber(difference), [0.96, 0.145], {
+                        font: 7,
+                        color: [255, 0, 45, alpha],
+                        scale: [0.65, 0.65],
+                        outline: false,
+                        centre: true
+                    })
+
+                } else {
+                    var nDef = difference * -1;
+                    var alpha = 255;
+                    if (showMoneyChange <= 70) {
+                        alpha = (showMoneyChange * (255 / 70)) | 0;
+                    }
+                    mp.game.graphics.drawText("+ $" + formatNumber(nDef), [0.96, 0.145], {
+                        font: 7,
+                        color: [115, 186, 131, alpha],
+                        scale: [0.65, 0.65],
+                        outline: false,
+                        centre: true
+                    })
+                }
+            }
+        }
+    });
+
+    function formatNumber(num) {
+        return num.toLocaleString('de-DE', { minimumFractionDigits: 0 });
+    }
+}