Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

ReallifeGamemode.Client/Gui/blips.ts

@@ -26,13 +26,24 @@
                 }
                 let pBlip = playerBlipMap.get(player);
                 if (player.isDead()) {
-                    pBlip.setSprite(303);
+                    pBlip.setSprite(274);
+                    pBlip.setScale(0.7);
                 } else {
                     pBlip.setSprite(1);
+                    pBlip.setScale(0.7);
                 }
                 let color = player.getVariable("blipColor");
-                pBlip.setColour(isNaN(color) ? 0 : color);
+
-                pBlip.setPosition(player.position.x, player.position.y, player.position.z);
+                if (color == -1) {
+                    pBlip.setAlpha(0);
+                    player.setAlpha(0);
+                } else {
+                    pBlip.setAlpha(200);
+                    player.setAlpha(255);
+
+                    pBlip.setColour(isNaN(color) ? 0 : color);
+                    pBlip.setPosition(player.position.x, player.position.y, player.position.z);
+                }
                 
             });
     }, 50);

ReallifeGamemode.Client/Gui/infobox.ts

@@ -14,6 +14,8 @@ export default function (globalData: IGlobalData): void {
     var draw = false;
     var editMode = false;
     var adutyMode = false;
+    var adminUnshow = false;
+    var adminTSupport = false;
     var dutyMode = false;
     let jailTime = 0;
     let att_score = 0;
@@ -62,6 +64,14 @@ export default function (globalData: IGlobalData): void {
         adutyMode = toggle;
     });
 
+    mp.events.add('toggleTSupportMode', (toggle) => {
+        adminTSupport = toggle;
+    });
+
+    mp.events.add('toggleAdminUnshowMode', (toggle) => {
+        adminUnshow = toggle;
+    });
+
     mp.events.add("toggleEditMode", (toggle) => {
         editMode = toggle;
     });
@@ -300,16 +310,6 @@ export default function (globalData: IGlobalData): void {
                     centre: false
                 })
         }
-        if (adutyMode === true) {
-            mp.game.graphics.drawText("~r~SUPPORT", [0.92, 0.6],
-                {
-                    font: 2,
-                    color: [0, 255, 255, 255],
-                    scale: [0.7, 0.7],
-                    outline: true,
-                    centre: false
-                })
-        }
         if (dutyMode === true) {
             mp.game.graphics.drawText("~r~Duty", [0.92, 0.55],
                 {
@@ -320,6 +320,30 @@ export default function (globalData: IGlobalData): void {
                     centre: false
                 })
         }
+        if (adutyMode === true) {
+            var adutyText = "~r~SUPPORT";
+            if (adminTSupport) {
+                adutyText = "SUPPORT";
+            }
+            mp.game.graphics.drawText(adutyText, [0.92, 0.6],
+                {
+                    font: 2,
+                    color: [0, 229, 238, 255],
+                    scale: [0.7, 0.7],
+                    outline: true,
+                    centre: false
+                })
+        }
+        if (adminUnshow) {
+            mp.game.graphics.drawText("~r~UNSHOW", [0.92, 0.65],
+                {
+                    font: 2,
+                    color: [0, 255, 255, 255],
+                    scale: [0.7, 0.7],
+                    outline: true,
+                    centre: false
+                })
+        }
 
         if (countdown > 0) {
             var now = Date.now();

ReallifeGamemode.Client/Gui/nametags.ts

@@ -49,6 +49,10 @@ export default function customNametags() {
 
                 let colorId = game.players.at(player.remoteId).nametagColor;
 
+                if (colorId === -3) {
+                    return;
+                }
+
                 let color = colors.find(c => c.id === colorId).color;
 
                 let nametagText = player.name + " (" + player.remoteId + ")";

ReallifeGamemode.Client/Gui/playerlist.ts

@@ -1,4 +1,4 @@
-/**
+/**
  * @overview Life of German Reallife - Gui Playerlist playerlist.js
  * @author VegaZ. Siga.
  * @copyright (c) 2008 - 2018 Life of German
@@ -12,7 +12,6 @@ export default function playerList(globalData: IGlobalData): void {
     const factionIds = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
 
     mp.events.add("showPlayerlist", (playersJson) => {
-
         if (playerlistBrowser !== null) {
             playerlistBrowser.destroy();
             playerlistBrowser = null;
@@ -26,8 +25,6 @@ export default function playerList(globalData: IGlobalData): void {
             mp.gui.chat.activate(false);
             mp.gui.cursor.show(true, true);
             pList = JSON.parse(playersJson);
-
-
         }
     });
 
@@ -38,9 +35,7 @@ export default function playerList(globalData: IGlobalData): void {
 
         pList.forEach((player) => {
             var facId = player.FactionId;
-
+            playerlistBrowser.execute(`addPlayerEntry('${player.Id}','${player.Name}', '${facId}','${player.Ping}');`);
-            playerlistBrowser.execute(`addPlayerEntry('${player.Id}','${player.Name}', '${facId}', '${player.FactionName}','${player.Ping}');`);
-
             factionPlayersMap.set(facId, factionPlayersMap.get(facId) + 1);
         });
 

ReallifeGamemode.Client/Gui/vehiclemenu/main.ts

@@ -33,6 +33,7 @@ export default function vehicleMenu(globalData: IGlobalData) {
 
     mp.events.add("CEF:VehicleLook_Loaded", () => {
         lastDriversBrowser.execute(`setDrivers('${JSON.stringify(lastDrivers)}');`);
+        mp.gui.cursor.show(true, true);
     });
 
     mp.events.add("removeLookMenu", () => {

ReallifeGamemode.Client/Player/antiafk.ts

@@ -17,7 +17,7 @@
 
         let distance = mp.game.gameplay.getDistanceBetweenCoords(lp.x, lp.y, lp.z, np.x, np.y, np.z, false);
 
-        if (distance <= 5) {
+        if (distance <= 3) {
             if (!afkStatus) {
                 afkCounter++;
             }
@@ -30,7 +30,7 @@
             }
         }
 
-        if (afkCounter >= 30) {
+        if (afkCounter >= 60) {
             afkStatus = true;
             globalData.IsAfk = afkStatus;
             setServerAfkStatus(afkStatus);

ReallifeGamemode.Client/assets/chat/index.html

@@ -1,14 +0,0 @@
-<html>
-<head>
-    <link rel="stylesheet" type="text/css" href="style/checkbox.css" media="screen">
-    <link rel="stylesheet" type="text/css" href="style/main.css" media="screen">
-    <meta charset="utf-8" />
-</head>
-<body>
-    <div id="chat" class="ui_element">
-        <ul id="chat_messages"></ul>
-    </div>
-    <script type="text/javascript" src="jquery-1.11.3.min.js"></script>
-    <script src="js/main.js"></script>
-</body>
-</html>

ReallifeGamemode.Client/assets/css/chat/main.css

@@ -0,0 +1,107 @@
+html {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+*, *:before, *:after {
+  -webkit-box-sizing: inherit;
+          box-sizing: inherit;
+}
+
+*, body, html {
+  padding: 0;
+  margin: 0;
+}
+
+#chat, a, body, html {
+  color: #fff;
+}
+
+body, html {
+  -webkit-font-smoothing: antialiased;
+  overflow: hidden;
+  font-size: 14px;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+  font-size: calc(.75em + .3vw);
+  font-weight: 500;
+  direction: ltr;
+}
+
+a {
+  text-decoration: none;
+}
+
+.ui_element {
+  display: none;
+  position: absolute;
+  width: 100vw;
+  height: 100vh;
+  z-index: 2;
+}
+
+#chat {
+  display: block;
+  z-index: 0;
+  line-height: 1.25;
+  text-shadow: 1px 1px 0 #000,-1px -1px 0 #000,1px -1px 0 #000,-1px 1px 0 #000,1px 1px 0 #000;
+  letter-spacing: .4px;
+  margin-top: 1em;
+  margin-left: 1em;
+}
+
+#chat ul#chat_messages {
+  height: 16.45em;
+  min-width: 50ch;
+  max-width: calc(60vw + 10px);
+  -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+  overflow-y: auto;
+  overflow-x: hidden;
+  word-break: break-all;
+  list-style-type: none;
+  margin-bottom: .25em;
+}
+
+#chat ul#chat_messages > li {
+  -webkit-transform: rotate(0deg);
+          transform: rotate(0deg);
+  margin-bottom: .125em;
+}
+
+#chat ul#chat_messages > li:last-child {
+  margin-bottom: .25em;
+}
+
+#chat input#chat_msg {
+  width: 60vw;
+  outline: 0;
+  border: none;
+  border-radius: 3px;
+  font-size: inherit;
+  font-weight: inherit;
+  line-height: inherit;
+  color: white;
+  background: rgba(0, 0, 0, 0.5);
+  padding: .5em;
+}
+
+::-webkit-scrollbar {
+  width: 10px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: rgba(255, 17, 0, 0);
+  border-radius: 3px;
+}
+
+::-webkit-scrollbar-thumb:hover {
+  background: rgba(255, 17, 0, 0);
+}
+/*# sourceMappingURL=main.css.map */

ReallifeGamemode.Client/assets/css/chat/main.css.map

@@ -0,0 +1,9 @@
+{
+    "version": 3,
+    "mappings": "AAAA,AAAA,IAAI,CAAC;EAAE,UAAU,EAAE,UAAU;CAAI;;AACjC,AAAA,CAAC,EAAE,CAAC,AAAA,OAAO,EAAE,CAAC,AAAA,MAAM,CAAC;EAAE,UAAU,EAAE,OAAO;CAAI;;AAG9C,AAAA,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC;EACZ,OAAO,EAAE,CAAC;EACV,MAAM,EAAE,CACV;CAAC;;AAED,AAAA,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC;EACnB,KAAK,EAAE,IACT;CAAC;;AAED,AAAA,IAAI,EAAE,IAAI,CAAC;EACT,sBAAsB,EAAE,WAAW;EACnC,QAAQ,EAAE,MAAM;EAChB,SAAS,EAAE,IAAI;EACf,WAAW,EAAE,IAAI;CAClB;;AAED,AAAA,IAAI,CAAC;EACH,WAAW,EAAE,oIAAoI;EACjJ,SAAS,EAAE,kBAAkB;EAC7B,WAAW,EAAE,GAAG;EAChB,SAAS,EAAE,GAAG;CACf;;AAED,AAAA,CAAC,CAAC;EAAE,eAAe,EAAE,IAAI;CAAI;;AAE7B,AAAA,WAAW,CAAC;EACV,OAAO,EAAE,IAAI;EACb,QAAQ,EAAE,QAAQ;EAClB,KAAK,EAAE,KAAK;EACZ,MAAM,EAAE,KAAK;EACb,OAAO,EAAE,CACX;CAAC;;AAED,AAAA,KAAK,CAAC;EACJ,OAAO,EAAE,KAAK;EACd,OAAO,EAAE,CAAC;EAEV,WAAW,EAAE,IAAI;EACjB,WAAW,EAAE,8EAA8E;EAC3F,cAAc,EAAE,IAAI;EAEpB,UAAU,EAAE,GAAG;EACf,WAAW,EAAE,GAAG;CAsCjB;;AA/CD,AAWE,KAXG,CAWH,EAAE,AAAA,cAAc,CAAC;EACf,MAAM,EAAE,OAAO;EACf,SAAS,EAAE,IAAI;EACf,SAAS,EAAE,iBAAiB;EAC5B,SAAS,EAAE,YAAY;EAEvB,UAAU,EAAE,IAAI;EAChB,UAAU,EAAE,MAAM;EAClB,UAAU,EAAE,SAAS;EAErB,eAAe,EAAE,IAAI;EACrB,aAAa,EAAE,KAAK;CAQrB;;AA9BH,AAwBI,KAxBC,CAWH,EAAE,AAAA,cAAc,GAaX,EAAE,CAAC;EACJ,SAAS,EAAE,YAAY;EACvB,aAAa,EAAE,MAAM;CAGtB;;AA7BL,AA4BM,KA5BD,CAWH,EAAE,AAAA,cAAc,GAaX,EAAE,AAIF,WAAW,CAAC;EAAE,aAAa,EAAE,KAAK;CAAI;;AA5B7C,AAgCE,KAhCG,CAgCH,KAAK,AAAA,SAAS,CAAC;EACb,KAAK,EAAE,IAAI;EACX,OAAO,EAAE,CAAC;EACV,MAAM,EAAE,IAAI;EACZ,aAAa,EAAE,GAAG;EAElB,SAAS,EAAE,OAAO;EAClB,WAAW,EAAE,OAAO;EACpB,WAAW,EAAE,OAAO;EAEpB,KAAK,EAAE,KAAK;EACZ,UAAU,EAAE,kBAAiB;EAE7B,OAAO,EAAE,IAAI;CACd;;AAGH,AAAA,mBAAmB,CAAC;EAClB,KAAK,EAAE,IAAI;CAQZ;;AATD,AAGE,mBAHiB,AAGhB,MAAM,CAAC;EACN,UAAU,EAAE,mBAAmB;EAC/B,aAAa,EAAE,GAAG;CAGnB;;AARH,AAOI,mBAPe,AAGhB,MAAM,AAIJ,MAAM,CAAC;EAAE,UAAU,EAAE,mBAAmB;CAAI",
+    "sources": [
+        "main.scss"
+    ],
+    "names": [],
+    "file": "main.css"
+}

ReallifeGamemode.Client/assets/css/chat/main.scss

@@ -0,0 +1,96 @@
+html { box-sizing: border-box; }
+*, *:before, *:after { box-sizing: inherit; }
+
+
+*, body, html {
+  padding: 0;
+  margin: 0
+}
+
+#chat, a, body, html {
+  color: #fff
+}
+
+body, html {
+  -webkit-font-smoothing: antialiased;
+  overflow: hidden;
+  font-size: 14px;
+  user-select: none;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+  font-size: calc(.75em + .3vw);
+  font-weight: 500;
+  direction: ltr;
+}
+
+a { text-decoration: none; }
+
+.ui_element {
+  display: none;
+  position: absolute;
+  width: 100vw;
+  height: 100vh;
+  z-index: 2
+}
+
+#chat {
+  display: block;
+  z-index: 0;
+
+  line-height: 1.25;
+  text-shadow: 1px 1px 0 #000,-1px -1px 0 #000,1px -1px 0 #000,-1px 1px 0 #000,1px 1px 0 #000;
+  letter-spacing: .4px;
+
+  margin-top: 1em;
+  margin-left: 1em;
+
+  ul#chat_messages {
+    height: 16.45em;
+    min-width: 50ch;
+    max-width: calc(60vw + 10px);
+    transform: rotate(0deg);
+
+    overflow-y: auto;
+    overflow-x: hidden;
+    word-break: break-all;
+
+    list-style-type: none;
+    margin-bottom: .25em;
+  
+    &> li {
+      transform: rotate(0deg);
+      margin-bottom: .125em;
+
+      &:last-child { margin-bottom: .25em; }
+    }
+  }
+
+  input#chat_msg {
+    width: 60vw;
+    outline: 0;
+    border: none;
+    border-radius: 3px;
+
+    font-size: inherit;
+    font-weight: inherit;
+    line-height: inherit;
+    
+    color: white;
+    background: rgba(0, 0, 0, .5);
+    
+    padding: .5em;
+  }
+}
+
+::-webkit-scrollbar {
+  width: 10px;
+
+  &-thumb {
+    background: rgba(255, 17, 0, 0);
+    border-radius: 3px;
+
+    &:hover { background: rgba(255, 17, 0, 0); }
+  }
+}

ReallifeGamemode.Client/assets/css/inputhelper/style.css

@@ -1,122 +1,138 @@
 html {
-    -webkit-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
-    box-sizing: border-box;
+  box-sizing: border-box;
-    user-select: none;
+  user-select: none;
 }
 
 *, *::before, *::after {
-    -webkit-box-sizing: inherit;
+  -webkit-box-sizing: inherit;
-    box-sizing: inherit;
+  box-sizing: inherit;
 }
 
 body {
-    display: -webkit-box;
+  display: -webkit-box;
-    display: -ms-flexbox;
+  display: -ms-flexbox;
-    display: flex;
+  display: flex;
-    -webkit-box-orient: vertical;
+  -webkit-box-orient: vertical;
-    -webkit-box-direction: normal;
+  -webkit-box-direction: normal;
-    -ms-flex-direction: column;
+  -ms-flex-direction: column;
-    flex-direction: column;
+  flex-direction: column;
-    -webkit-box-pack: center;
+  -webkit-box-pack: center;
-    -ms-flex-pack: center;
+  -ms-flex-pack: center;
-    justify-content: center;
+  justify-content: center;
-    height: 100vh;
+  height: 100vh;
-    width: -webkit-fit-content;
+  width: -webkit-fit-content;
-    width: -moz-fit-content;
+  width: -moz-fit-content;
-    width: fit-content;
+  width: fit-content;
-    margin: 0 auto;
+  margin: 0 auto;
-    padding: 1em .5em;
+  padding: 1em .5em;
-    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
-    font-weight: 400;
+  font-weight: 400;
-    color: #FFF;
+  color: #FFF;   
-    
 }
 
 main {
-    height: auto;
+  height: auto;
-    position: relative;
+  max-height: 60vh;
-    min-width: 50ch;
+  position: relative;
-    max-width: 35vw;
+  min-width: 45ch;
-    padding: 1em;
+  max-width: 30vw;
-    border-radius: .25em;
+  padding: 1em;
-    font-size: 1em;
+  border-radius: .25em;
-    line-height: 1.25;
+  font-size: 1em;
-    background-color: rgba(0, 0, 0, 0.5);
+  line-height: 1.25;
-    
+  background-color: rgba(0, 0, 0, 0.5);
 }
 
-    main a#close {
+  main a#close {
-        position: absolute;
+    position: absolute;
-        right: 1em;
+    right: 1em;
-        top: 1em;
+    top: 1em;
-        height: 1em;
+    height: 1em;
-        width: 1em;
+    width: 1em;
-        opacity: 0.25;
+    opacity: 0.25;
+  }
 
+    main a#close:hover {
+      opacity: 1;
     }
 
-        main a#close:hover {
+    main a#close:before, main a#close:after {
-            opacity: 1;
+      content: ' ';
-        }
+      position: absolute;
-
+      left: .5em;
-        main a#close:before, main a#close:after {
+      height: 1em;
-            content: ' ';
+      width: 2px;
-            position: absolute;
+      background-color: #FFF;
-            left: .5em;
+      border-radius: 1px;
-            height: 1em;
-            width: 2px;
-            background-color: #FFF;
-            border-radius: 1px;
-        }
-
-        main a#close:before {
-            -webkit-transform: rotate(45deg);
-            transform: rotate(45deg);
-        }
-
-        main a#close:after {
-            -webkit-transform: rotate(-45deg);
-            transform: rotate(-45deg);
-        }
-
-    main h1, main p {
-        margin: 0;
     }
 
-    main h1 {
+    main a#close:before {
-        font-size: 1.5em;
+      -webkit-transform: rotate(45deg);
-        line-height: 1;
+      transform: rotate(45deg);
-        margin-bottom: .125em;
-        padding-right: 1em;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
     }
 
-    main p {
+    main a#close:after {
-        margin-bottom: 1em;
+      -webkit-transform: rotate(-45deg);
-        line-height: 1.125;
+      transform: rotate(-45deg);
     }
 
-    main .form {
+  main h1, main p {
-        margin-top: .25em;
+    margin: 0;
+  }
+
+  main h1 {
+    font-size: 1.5em;
+    line-height: 1.125;
+    margin-bottom: .25em;
+    padding-right: 1em;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+
+  main p {
+    margin-bottom: .5em;
+    line-height: 1.125;
+    max-height: 12em;
+    overflow-y: auto;
+    padding-right: .5em;
+    word-break: break-word;
+  }
+
+  main p::-webkit-scrollbar {
+    width: 5px;
+  }
+  
+  main p::-webkit-scrollbar-track {
+    background-color: rgba(0, 0, 0, .125);
+    border-radius: 3px;
+  }
+  
+  main p::-webkit-scrollbar-thumb {
+    background-color: rgba(0, 0, 0, .125);
+    border-radius: 3px;
+  }
+
+  main .form {
+    margin-top: .25em;
+  }
+
+    main .form input {
+      width: 100%;
+      padding: .5em;
+      font-family: "Roboto Mono";
+      font-weight: 500;
+      font-size: 1em;
+      border: none;
+      border-radius: 5px;
+      background-color: rgba(0, 0, 0, 0.125);
+      color: inherit;
     }
 
-        main .form input {
+      main .form input:focus {
-            width: 100%;
+        outline-width: 0;
-            padding: .5em;
+      }
-            font-family: "Roboto Mono";
-            font-weight: 500;
-            font-size: 1em;
-            border: none;
-            border-radius: 5px;
-            background-color: rgba(0, 0, 0, 0.125);
-            color: inherit;
-        }
-
-            main .form input:focus {
-                outline-width: 0;
-            }
 
 
 

ReallifeGamemode.Client/assets/css/login/styles.css

@@ -1,8 +1,10 @@
 html {
-    -webkit-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
-    box-sizing: border-box;
+          box-sizing: border-box;
-    user-select: none;
+  -webkit-user-select: none;
-
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
 }
 
 *, *::before, *::after {
@@ -10,7 +12,6 @@ html {
           box-sizing: inherit;
 }
 
-
 a {
   color: inherit;
   font-weight: bold;
@@ -50,7 +51,7 @@ header {
   background-repeat: no-repeat;
   background-position: center;
   background-size: contain;
-  opacity: .3;
+  opacity: .4;
 }
 
 main {
@@ -60,7 +61,7 @@ main {
   border-radius: .25em;
   font-size: 1em;
   line-height: 1.25;
-  background-color: rgba(0, 0, 0, 0.3);
+  background-color: rgba(0, 0, 0, 0.4);
 }
 
 main h1, main p {

ReallifeGamemode.Client/assets/css/login/styles.css.map

@@ -1,6 +1,6 @@
 {
     "version": 3,
-    "mappings": "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",
+    "mappings": "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",
     "sources": [
         "styles.scss"
     ],

ReallifeGamemode.Client/assets/css/login/styles.scss

@@ -1,4 +1,8 @@
-html { box-sizing: border-box; }
+html {
+  box-sizing: border-box;
+  user-select: none;
+}
+
 *, *::before, *::after { box-sizing: inherit; }
 
 a {
@@ -34,7 +38,7 @@ header {
   background-repeat: no-repeat;
   background-position: center;
   background-size: contain;
-  opacity: .3;
+  opacity: .4;
 }
 
 main {
@@ -46,7 +50,7 @@ main {
   
   font-size: 1em;
   line-height: 1.25;
-  background-color: rgba(0, 0, 0, .3);
+  background-color: rgba(0, 0, 0, .4);
 
   h1, p {
     margin: 0;

ReallifeGamemode.Client/assets/css/onlinelist/style.css

@@ -19,7 +19,7 @@ html, body {
 }
 
 body {
-  margin: 10vh auto 0;
+  margin: 15vh auto 0;
   width: 32vw;
   color: white;
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
@@ -54,7 +54,8 @@ h2 {
 }
 
 .wrapper {
-  height: 80vh;
+  min-height: 50vh;
+  max-height: 70vh;
   overflow-y: scroll;
   border-radius: .25em;
   background-color: rgba(0, 0, 0, 0.75);
@@ -88,7 +89,7 @@ table th:last-child {
 }
 
 table th, table td {
-  padding: .75em .5em;
+  padding: .6em .3em;
 }
 
 table th:first-child, table td:first-child {
@@ -119,7 +120,7 @@ table tr td:nth-child(2)::-webkit-scrollbar {
 }
 
 table tr td:nth-child(3) {
-  width: 14ch !important;
+  width: 15ch !important;
 }
 
 table tr td:nth-child(4) {

ReallifeGamemode.Client/assets/css/onlinelist/style.css.map

@@ -1,6 +1,6 @@
 {
     "version": 3,
-    "mappings": "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",
+    "mappings": "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",
     "sources": [
         "style.scss"
     ],

ReallifeGamemode.Client/assets/css/onlinelist/style.scss

@@ -9,7 +9,7 @@ html, body { margin: unset; }
 *, *:before, *:after { box-sizing: inherit; }
 
 body {
-  margin: 10vh auto 0;
+  margin: 15vh auto 0;
 
   width: 32vw;
   color: white;
@@ -35,7 +35,8 @@ h2 { font-size: 1.125em; }
 }
 
 .wrapper {
-  height: 80vh;
+  min-height: 50vh;
+  max-height: 70vh;
   overflow-y: scroll;
   
   border-radius: .25em;
@@ -62,7 +63,7 @@ table {
   }
 
   th, td {
-    padding: .75em .5em;
+    padding: .6em .3em;
 
     &:first-child { padding-left: 1em; }
     &:last-child { padding-right: 1em; }
@@ -81,7 +82,7 @@ table {
         
         &::-webkit-scrollbar { display: none; }
       }
-      &:nth-child(3) { width: 14ch !important; }
+      &:nth-child(3) { width: 15ch !important; }
       &:nth-child(4) { width: 13ch !important; }
     }
 

ReallifeGamemode.Client/assets/html/chat/index.html

@@ -0,0 +1,16 @@
+<html>
+<head>
+    <link rel="stylesheet" type="text/css" href="package://assets/css/chat/checkbox.css" media="screen">
+    <link rel="stylesheet" type="text/css" href="package://assets/css/chat/main.css" media="screen">
+    <meta charset="utf-8" />
+</head>
+
+<body>
+    <div id="chat" class="ui_element">
+        <ul id="chat_messages"></ul>
+    </div>
+
+    <script type="text/javascript" src="package://assets/js/chat/jquery-1.11.3.min.js"></script>
+    <script src="package://assets/js/chat/main.js"></script>
+</body>
+</html>

ReallifeGamemode.Client/assets/html/inputhelper/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="de">
 <head>
     <meta charset="utf-8">
@@ -6,17 +6,20 @@
     <title>Eingabe | Life of German</title>
 
     <link rel="stylesheet" href="package://assets/css/inputhelper/style.css" />
-    <link rel="stylesheet" href="../../font/font-awesome/css/fontawesome.min.css">
+    <link rel="stylesheet" href="package://assets/font/font-awesome/css/fontawesome.min.css">
-    <link rel="stylesheet" href="../../font/font-awesome/css/regular.min.css">
+    <link rel="stylesheet" href="package://assets/font/font-awesome/css/regular.min.css">
-    <link rel="stylesheet" href="../../font/roboto-mono/include_500.css">
+    <link rel="stylesheet" href="package://assets/font/roboto-mono/include_500.css">
 </head>
 
 <body>
 
     <main>
         <div class="input-main">
-            <h1></h1>
+            <h1 id="heading">{{ Überschrift }}</h1>
+
+            <p id="description"></p>
         </div>
+        
         <div id="content" class="form" role="form">
             <input type="text" name="input" id="input-value" autofocus>
         </div>
@@ -45,7 +48,6 @@
             $('.input-main h1').text(title);
         }
     </script>
-    <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"></script>
     <script src="package://assets/js/inputhelper/application.js"></script>
 </body>
 </html>

ReallifeGamemode.Client/assets/html/login/register.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="de">
 <head>
     <meta charset="utf-8">
@@ -6,6 +6,8 @@
     <title>Registrierung | Life of German</title>
 
     <link rel="stylesheet" href="package://assets/css/login/styles.css">
+    <link rel="stylesheet" href="package://assets/font/font-awesome/css/fontawesome.min.css">
+    <link rel="stylesheet" href="package://assets/font/font-awesome/css/regular.min.css">
     <link rel="stylesheet" href="package://assets/font/roboto-mono/include_500.css">
 </head>
 

ReallifeGamemode.Client/assets/html/onlinelist/index.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
-<html lang="de" class="colorblind-mode">
+<html lang="de">
   <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, target-densitydpi=device-dpi, user-scalable=no">
+    <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
     <title>Spielerliste</title>
     <link rel="stylesheet" href="package://assets/css/onlinelist/style.css">
   </head>
@@ -29,24 +29,24 @@
       </table>
 
       <ol class="inline stats">
-        <li><abbr title="Los Santos Police Department" class="group group--1">LSPD</abbr>: <span id="1">0</span></li>
+        <li><span class="group group--1">LSPD</span>: <span id="1">0</span></li>
-        <li><abbr title="Federal Investigation Bureau" class="group group--3">FIB</abbr>: <span id="3">0</span></li>
+        <li><span class="group group--3">FIB</span>: <span id="3">0</span></li>
-        <li><abbr title="Los Santos Emergency Department" class="group group--2">LSED</abbr>: <span id="2">0</span></li>
+        <li><span class="group group--2">LSED</span>: <span id="2">0</span></li>
       </ol>
 
       <ol class="inline stats">
-        <li><abbr title="Grove Street Families" class="group group--7">GSF</abbr>: <span id="7">0</span></li>
+        <li><span class="group group--7">GSF</span>: <span id="7">0</span></li>
-        <li><abbr title="Front Yard Ballas" class="group group--8">FYB</abbr>: <span id="8">0</span></li>
+        <li><span class="group group--8">FYB</span>: <span id="8">0</span></li>
-        <li><abbr title="Los Santos Vagos" class="group group--5">LSV</abbr>: <span id="5">0</span></li>
+        <li><span class="group group--5">LSV</span>: <span id="5">0</span></li>
       </ol>
 
       <ol class="inline stats">
-        <li><abbr title="Weazel News" class="group group--9">NR</abbr>: <span id="9">0</span></li>
+        <li><span class="group group--9">WZN</span>: <span id="9">0</span></li>
-        <li><abbr title="Zivilisten" class="group group--0">Zivilisten</abbr>: <span id="0">0</span></li>
+        <li><span class="group group--0">Zivilisten</span>: <span id="0">0</span></li>
       </ol>
     </div>
 
-    <script src="../../js/jquery-3.3.1.min.js"></script>
+    <script src="package://assets/js/jquery-3.3.1.min.js"></script>
     <script src="package://assets/js/onlinelist/script.js"></script>
   </body>
 </html>

ReallifeGamemode.Client/assets/img/login/source.txt

@@ -1,2 +1,2 @@
 Enter-Icon: https://icons8.com/icons/set/enter-mac-key
-Augen: Icons made by <a href="https://www.flaticon.com/authors/pixel-perfect">Pixel perfect</a> from www.flaticon.com
+Augen: Font Awesome

ReallifeGamemode.Client/assets/js/chat/main.js

@@ -1,4 +1,4 @@
-let chat =
+let chat =
 {
     size: 0,
     history_limit: 50,

ReallifeGamemode.Client/assets/js/inputhelper/application.js

@@ -1,4 +1,4 @@
-let content = document.getElementById('content');
+let content = document.getElementById('content');
 
 let heading = document.getElementById('heading');
 let description = document.getElementById('description');
@@ -6,7 +6,7 @@ let description = document.getElementById('description');
 let input = document.getElementById('input');
 let close = document.getElementById('close');
 
-fzunction setInputFieldType(value) {
+function setInputFieldType(value) {
     if (input.type == value) return;
 
     var field = document.createElement('input');
@@ -21,7 +21,6 @@ fzunction setInputFieldType(value) {
     return field;
 }
 
-
 function setText(heading, description) {
     setHeading(heading);
     setDescription(description);
@@ -53,9 +52,6 @@ close.onclick = function closeWindow() {
     console.log('Fenster geschlossen!');
 }
 
-setInputFieldType('text');
-setText("Überschrift", "Lorem ipsum dolor sit amet consectetur adipisicing elit. Maiores laboriosam atque ut voluptates molestiae ab autem? Est consectetur voluptatem quia, commodi sint a omnis consequuntur. Tempora dolores ullam natus in?");
-
 /* Enter wird im Input-Feld gedrückt */
 input.onkeyup = e => {
     let code = e.keyCode ? e.keyCode : e.which;
@@ -72,3 +68,4 @@ document.onkeyup = e => {
 }
 
 close.onclick = e => { closeWindow(); }
+setInputFieldType('text');

ReallifeGamemode.Client/assets/js/onlinelist/script.js

@@ -12,12 +12,21 @@ setPlayerCount = (factionId, value) => {
     }
 }
 
-function addPlayerEntry(userId, userName, factionId, factionName, userPing) {
+function getFactionNameByFactionId(factionId) {
+  switch (parseInt(factionId)) {
+    case 1: return "LSPD";
+    case 2: return "LSED";
+    case 3: return "FIB";
+    case 4: return "Trucker";
+    case 5: return "Vagos";
+    case 7: return "Grove Street";
+    case 8: return "Ballas";
+    case 9: return "Weazel News";
+    default: return "Zivilisten";
+  }
+}
+
+function addPlayerEntry(userId, userName, factionId, userPing) {
+    var factionName = getFactionNameByFactionId(factionId);
     document.getElementById('players').innerHTML += `<tr><td>${userId}</td> <td>${userName}</td> <td class="group group--${factionId}">${factionName}</td> <td>${userPing}</td></tr>`;
 }
-
-addPlayerEntries = (json) => {
-    JSON.parse(json).forEach(e => {
-
-    });
-}

ReallifeGamemode.Client/dlcpacks/fbigarage/dlc.rpf

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e40413c355d3721e2a483add948aaad408b17c3ed9a0db409b141aa6110dbb6
-size 35840

ReallifeGamemode.Client/index.ts

@@ -39,7 +39,7 @@ game.events.onPlayerCommand((cmd) => {
 mp.game.vehicle.defaultEngineBehaviour = false;
 
 mp.gui.chat.show(false);
-const chatbox = mp.browsers.new("package://assets/chat/index.html");
+const chatbox = mp.browsers.new("package://assets/html/chat/index.html");
 chatbox.markAsChat();
 
 require('./Gui/house');

ReallifeGamemode.Database/Entities/Logs/LogEntry.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text;
+
+namespace ReallifeGamemode.Database.Entities.Logs
+{
+  public class LogEntry
+  {
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public long Id { get; set; }
+
+    public User User { get; set; }
+
+    public int UserId { get; set; }
+
+    public User AffectedBy { get; set; }
+
+    public int? AffectedById { get; set; }
+
+    public Faction AffectedFaction { get; set; }
+
+    public int? AffectedFactionId { get; set; }
+
+    public string Message { get; set; }
+
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public DateTime Time { get; set; }
+  }
+}

ReallifeGamemode.Server/Commands/AdminCommands.cs

@@ -240,6 +240,30 @@ namespace ReallifeGamemode.Server.Commands
             player.SendNotification("~g~[Info]~w~ Connect-Logs werden nun angezeigt.");
           }
           break;
+        case "d":
+          if (player.HasData("togd"))
+          {
+            player.ResetData("togd");
+            player.SendNotification("~g~[Info]~w~ D-Chat wird nun ausgeblendet.");
+          }
+          else
+          {
+            player.SetData("togd", true);
+            player.SendNotification("~g~[Info]~w~ D-Chat wird nun angezeigt.");
+          }
+          break;
+        case "ga":
+          if (player.HasData("togga"))
+          {
+            player.ResetData("togga");
+            player.SendNotification("~g~[Info]~w~ GA-Chat wird nun ausgeblendet.");
+          }
+          else
+          {
+            player.SetData("togga", true);
+            player.SendNotification("~g~[Info]~w~ GA-Chat wird nun angezeigt.");
+          }
+          break;
       }
     }
 
@@ -259,11 +283,13 @@ namespace ReallifeGamemode.Server.Commands
       }
       if (player.GetData<bool>("SAdminduty") == false)
       {
+        player.TriggerEvent("toggleTSupportMode", true);
         player.SetData("SAdminduty", true);
         ChatService.SendMessage(player, "~g~ ** " + "Du befindest dich im T-Support");
       }
       else
       {
+        player.TriggerEvent("toggleTSupportMode", false);
         player.SetData("SAdminduty", false);
         ChatService.SendMessage(player, "!{#ee4d2e}** " + "Du befindest dich nicht mehr im T-Support");
       }
@@ -1442,6 +1468,33 @@ namespace ReallifeGamemode.Server.Commands
       Medic.delReviveTask(target);
     }
 
+    [Command("aunshow", "~m~Benutzung:~s~ /aunshow")]
+    public void CmdAdminUnshow(Player player)
+    {
+      User user = player.GetUser();
+      if (!user.IsAdmin(AdminLevel.HEADADMIN))
+      {
+        ChatService.NotAuthorized(player);
+        return;
+      }
+
+      bool currentStatus = user.GetData<bool>("adminUnshow");
+      currentStatus = !currentStatus;
+      user.SetData("adminUnshow", currentStatus);
+      player.TriggerEvent("toggleAdminUnshowMode", currentStatus);
+
+      user.SetBlipAndNametagColor();
+
+      if(currentStatus)
+      {
+        ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du bist nun Unshow");
+      }
+      else
+      {
+        ChatService.SendMessage(player, "~b~[ADMIN]~s~ Du bist nun nicht mehr Unshow");
+      }
+    }
+
     [Command("setap", "~m~Benutzung: ~s~/setap [Spieler] (Armor)")]
     public void CmdAdminSetAP(Player player, string name, int armor = 100)
     {

ReallifeGamemode.Server/Commands/FactionCommands.cs

@@ -74,7 +74,7 @@ namespace ReallifeGamemode.Server.Commands
 
       User user = player.GetUser(dbContext);
       Faction f = user?.Faction;
-      if ((f == null || !f.GangOwned) && !user.IsAdmin(AdminLevel.ADMIN))
+      if ((f == null || !f.GangOwned) && (!user.IsAdmin(AdminLevel.ADMIN) || !player.HasData("togga")))
       {
         ChatService.NotAuthorized(player);
         return;
@@ -105,7 +105,7 @@ namespace ReallifeGamemode.Server.Commands
       string broadcastMessage = "!{FF0000}** " + rank + " " + player.Name + ": " + message + " **";
       using (var context = new DatabaseContext())
       {
-        ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.GangOwned), true);
+        ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.GangOwned), true, (admin) => admin.HasData("togga"));
       }
     }
 
@@ -154,7 +154,7 @@ namespace ReallifeGamemode.Server.Commands
 
       User user = player.GetUser(dbContext);
       Faction f = user?.Faction;
-      if ((f == null || !f.StateOwned) && !user.IsAdmin(AdminLevel.ADMIN))
+      if ((f == null || !f.StateOwned) && (!user.IsAdmin(AdminLevel.ADMIN) || !player.HasData("todg")))
       {
         ChatService.NotAuthorized(player);
         return;
@@ -185,7 +185,7 @@ namespace ReallifeGamemode.Server.Commands
       string broadcastMessage = "!{CC3333}** " + factionName + " " + player.Name + ": " + message + ", over **";
       using (var context = new DatabaseContext())
       {
-        ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.StateOwned), true);
+        ChatService.BroadcastFaction(broadcastMessage, context.Factions.ToList().FindAll(c => c.StateOwned), true, (admin) => admin.HasData("togd"));
       }
     }
 
@@ -312,7 +312,7 @@ namespace ReallifeGamemode.Server.Commands
       NAPI.Pools.GetAllPlayers().ForEach(p =>
       {
         User pUser = p.GetUser();
-        if ((pUser?.FactionLeader ?? false) || (pUser.IsAdmin(AdminLevel.ADMIN) && !p.HasData("toglc")))
+        if ((pUser?.FactionLeader ?? false) || (pUser.IsAdmin(AdminLevel.ADMIN) && p.HasData("toglc")))
         {
           ChatService.SendMessage(p, broadcastMsg);
         }

ReallifeGamemode.Server/Events/Key.cs

@@ -625,6 +625,15 @@ namespace ReallifeGamemode.Server.Events
         return;
       }
 
+      if(player.GetData<bool>("SellVehicleDecision") == true && player.HasData("VehicleToSell"))
+      {
+        InteractionManager.SellPlayerVehicle(player, player.GetData<int>("VehicleToSell"));
+        player.ResetData("SellVehicleDecision");
+        player.ResetData("VehicleToSell");
+        player.SendNotification("~g~Du hast dein Fahrzeug verkauft");
+        return;
+      }
+
       User u = player.GetUser();
 
       if (u.JobId == null) return;
@@ -780,6 +789,13 @@ namespace ReallifeGamemode.Server.Events
         Medic.MakeHealDecision(player, false);
         return;
       }
+      if (player.GetData<bool>("SellVehicleDecision") == true && player.HasData("VehicleToSell"))
+      {
+        player.ResetData("SellVehicleDecision");
+        player.ResetData("VehicleToSell");
+        player.SendNotification("~r~Du hast den Fahrzeugverkauf abgebrochen");
+        return;
+      }
 
       if (!player.IsInVehicle) return;
       if (player.VehicleSeat != 0) return;

ReallifeGamemode.Server/Events/PlayerEvent.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using GTANetworkAPI;
 using ReallifeGamemode.Server.Extensions;
+using ReallifeGamemode.Server.Services;
 
 namespace ReallifeGamemode.Server.Events
 {

ReallifeGamemode.Server/Extensions/ClientExtension.cs

@@ -345,8 +345,14 @@ namespace ReallifeGamemode.Server.Extensions
       }
 
       bool duty = user.GetData<bool>("duty");
+      bool adminUnshow = user.GetData<bool>("adminUnshow");
 
-      if (player.GetData<bool>("SAdminduty"))
+      if(adminUnshow)
+      {
+        blipColor = -1;
+        nameTagColor = -3;
+      }
+      else if (player.GetData<bool>("SAdminduty"))
       {
         blipColor = 30;
         nameTagColor = -2;

ReallifeGamemode.Server/Factions/BasePoints.cs

@@ -33,7 +33,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
       }
       else if (factionID == 5)
       {
-        client.TriggerEvent("SERVER:Util_setWaypoint", 1157.56, -1518.56); // Terror
+        client.TriggerEvent("SERVER:Util_setWaypoint", -1082.29, -1655.07); // Terror
       }
       else if (factionID == 6)
       {

ReallifeGamemode.Server/Managers/InteractionManager.cs

@@ -473,18 +473,30 @@ namespace ReallifeGamemode.Server.Managers
       {
         var vehPrice = userVehicle.Price;
         var backPrice = (int)(vehPrice * 0.4);
-
+        player.SetData<bool>("SellVehicleDecision", true);
-        user.BankAccount.Balance += backPrice;
+        player.SetData<int>("VehicleToSell", id);
-
+        ChatService.SendMessage(player,"~s~Möchtes du das Fahrzeug ~y~" + veh.DisplayName + " ~s~wirklich für ~g~$" + backPrice + " ~s~verkaufen? Drücke ~g~J~s~ zum Bestätigen oder ~r~N ~s~zum Abbrechen");
-        ChatService.SendMessage(player, $"~b~[INFO]~s~ Du hast durch den Autoverkauf ~g~{backPrice.ToMoneyString()}~s~ erhalten.");
-
-        dbContext.UserVehicles.Remove(userVehicle);
-        dbContext.SaveChanges();
-
-        veh?.Delete();
       }
     }
 
+    public static void SellPlayerVehicle(Player player, int id)
+    {
+      using var dbContext = new DatabaseContext();
+      var user = player.GetUser(dbContext);
+      var userVehicle = dbContext.UserVehicles.Where(v => v.Id == id && v.UserId == user.Id).FirstOrDefault();
+      var vehPrice = userVehicle.Price;
+      var backPrice = (int)(vehPrice * 0.4);
+      GTANetworkAPI.Vehicle veh = VehicleManager.GetVehicleFromServerVehicle(userVehicle);
+      user.BankAccount.Balance += backPrice;
+
+      ChatService.SendMessage(player, $"~b~[INFO]~s~ Du hast durch den Autoverkauf ~g~{backPrice.ToMoneyString()}~s~ erhalten.");
+
+      dbContext.UserVehicles.Remove(userVehicle);
+      dbContext.SaveChanges();
+
+      veh?.Delete();
+    }
+
     [RemoteEvent("CLIENT:InteractionMenu_FactionVehicleInteraction")]
     public void FactionVehicleInteraction(Player player, int id, string selection)
     {

ReallifeGamemode.Server/Services/ChatService.cs

@@ -53,7 +53,7 @@ namespace ReallifeGamemode.Server.Services
     /// </summary>
     /// <param name="message">Die Nachricht, die gesendet werden soll</param>
     /// <param name="factions">Die Liste an Fraktionen, die diese Nachricht bekommen sollen</param>
-    public static void BroadcastFaction(string message, List<Faction> factions, bool toAdmins = false)
+    public static void BroadcastFaction(string message, List<Faction> factions, bool toAdmins = false, Predicate<Player> shouldSendToAdmins = null)
     {
       foreach (Player c in NAPI.Pools.GetAllPlayers())
       {
@@ -63,7 +63,7 @@ namespace ReallifeGamemode.Server.Services
         {
           ChatService.SendMessage(c, message);
         }
-        else if (user.IsAdmin(AdminLevel.ADMIN) && toAdmins)
+        else if (user.IsAdmin(AdminLevel.ADMIN) && (toAdmins && (shouldSendToAdmins == null || shouldSendToAdmins(c))))
         {
           ChatService.SendMessage(c, message);
         }

ReallifeGamemode.Server/WeaponDeal/WeaponDealManager.cs

@@ -17,7 +17,7 @@ namespace ReallifeGamemode.Server.WeaponDeal
 
     public static int[] WEAPON_DEAL_FACTIONS => WEAPON_DEAL_GANG_IDS.Concat(WEAPON_DEAL_STAATSFRAK_IDS).Distinct().ToArray();
 
-    public static readonly VehicleHash WEAPON_DEAL_GANG_VEHICLE_HASH = VehicleHash.Burrito3;
+    public static readonly VehicleHash WEAPON_DEAL_GANG_VEHICLE_HASH = VehicleHash.Gburrito2;
     public static readonly VehicleHash WEAPON_DEAL_STAATSFRAK_VEHICLE_HASH = VehicleHash.Policet;
 
     private const int WEAPON_AMOUNT_GANG = 2;

postbuild.ps1

@@ -1,4 +1,4 @@
-#
+#
 # @author Codename
 # @copyright (c) 2008 - 2019 Life of German
 # @warning Start this script only once, after building server dll
@@ -54,25 +54,6 @@ if (![System.IO.File]::Exists($configPath)) {
             </client>
         </update>
     </local>
-    <remote>
-        <enabled>false</enabled>
-        <ftpServerAddress>127.0.0.1</ftpServerAddress>
-        <ftpServerPort>21</ftpServerPort>
-        <ftpServerUsername>USERNAME</ftpServerUsername>
-        <ftpServerPassword>PASSWORD</ftpServerPassword>
-        <rageMpServerPath>.</rageMpServerPath>
-        <update>
-            <server>
-                <metaXml>false</metaXml>
-                <allDependencies>false</allDependencies>
-            </server>
-            <client>
-                <assets>false</assets>
-                <indexJs>false</indexJs>
-                <dlcPacks>false</dlcPacks>
-            </client>
-        </update>
-    </remote>
 </config>"
 
     # create default content