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

ReallifeGamemode.Client/Gui/ahelp.ts

@@ -22,7 +22,6 @@ export default function ahelp(globalData: IGlobalData): void {
             ahelpBrowser = mp.browsers.new('package://assets/html/helpcommand/ahelp.html');
             mp.gui.chat.activate(false);
             mp.gui.cursor.show(true, true);
-
         }
     });
 
@@ -37,7 +36,6 @@ export default function ahelp(globalData: IGlobalData): void {
             globalData.InInput = false;
             mp.gui.cursor.show(false, false);
             mp.gui.chat.activate(true);
-
         }
     });
 

ReallifeGamemode.Client/dlcpacks/Fahrstuhl/dlc.rpf

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

ReallifeGamemode.Client/index.ts

@@ -234,12 +234,14 @@ import bankMenuHandle from './Interaction/bankmenu';
 import InputHelper from './inputhelper';
 bankMenuHandle(globalData);
 
-import Introduction from './Gui/introduction';
-Introduction(globalData);
 
 import ahelp from './Gui/ahelp';
 ahelp(globalData);
 
+import Introduction from './Gui/introduction';
+Introduction(globalData);
+
+
 import userhelp from './Gui/userhelp';
 userhelp(globalData);
 

ReallifeGamemode.Client/util/Gangwar.ts

@@ -263,9 +263,9 @@
                 self.attacker = null;
                 //self.blip.setFlashes(false);
                 mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false);
-                self.blip.destroy();
+                //self.blip.destroy();
                 self.setColor(self.owner);
-                self.blip.setColour(self.color);
+                //self.blip.setColour(self.color);
                 mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color);
                 self.setLeaderColShape();
                 return;

ReallifeGamemode.Client/util/weapondamage.ts

@@ -81,6 +81,14 @@
         mp.game.invoke("0x4A3DC7ECCC321032", player, meelemodifier);
         //mp.gui.chat.push("Modifier: " + modifier + "MeeleModifier: " + meelemodifier);
     });
+
+    mp.events.add("entityStreamIn", (entity) => {
+        if (entity.type === "player") {
+            entity.setSuffersCriticalHits(false);
+        }
+    });
+
+
     /*mp.events.add('playerWeaponShot', (targetPosition, targetEntity) => {
 for (var x in this.weaponAmmo) {
     if (this.weaponAmmo[x].id != this.currentWeapon) {