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

.gitlab-ci.yml

@@ -7,13 +7,13 @@ before_script:
   - "git submodule sync --recursive"
   - "git submodule update --init --recursive"
 
-build:
+build:develop:
   stage: build
   only:
     - develop@log-gtav/reallife-gamemode
   script:
     - "dotnet restore"
-    - "../gm_database_password.sh"
+    - "../gm_dev_database_password.sh"
     - "cd ReallifeGamemode.Server/"
     - "dotnet build -c Release"
     - "cd ../ReallifeGamemode.Client/"
@@ -22,4 +22,21 @@ build:
     - "cd ../ReallifeGamemode.DataService"
     - "dotnet publish -c Release -r linux-x64"
     - "cd ../"
-    - "sudo ../gm_copy_build_files.sh"
+    - "sudo ../gm_dev_copy_build_files.sh"
+
+build:master:
+  stage: build
+  only:
+    - web
+  script:
+    - "dotnet restore"
+    - "../gm_live_database_password.sh"
+    - "cd ReallifeGamemode.Server/"
+    - "dotnet build -c Release"
+    - "cd ../ReallifeGamemode.Client/"
+    - "npm ci"
+    - "npm run build:server"
+    - "cd ../ReallifeGamemode.DataService"
+    - "dotnet publish -c Release -r linux-x64"
+    - "cd ../"
+    - "sudo ../gm_live_copy_build_files.sh"

ReallifeGamemode.Client/util/weapondamage.ts

@@ -32,7 +32,7 @@
                 meelemodifier = 1;
                 break;
             case 0x83BF0278: //Cabinerifle
-                modifier = 0.25;
+                modifier = 0.2;
                 meelemodifier = 1;
                 break;
             case 0x624FE830: //Compactrifle

ReallifeGamemode.Server/Commands/FactionCommands.cs

@@ -475,7 +475,7 @@ namespace ReallifeGamemode.Server.Commands
 
     #endregion Staatsfraktionen (LSPD / FBI) Commands
     #region Weazel News
-    [Command("eventchat", "~m~Benutzung: ~s~/eventchat [Typ = ~g~on~s~, ~g~off~s~", GreedyArg = true)]
+    [Command("eventchat", "~m~Benutzung: ~s~/eventchat [Typ = ~g~on~s~, ~g~off~s~]", GreedyArg = true)]
     public void CmdFactionNREventchat(Player player, string onoff)
     {
 

ReallifeGamemode.Server/Commands/UserCommands.cs

@@ -88,7 +88,7 @@ namespace ReallifeGamemode.Server.Commands
       player.PlayAnimation("mp_am_hold_up", "handsup_base", (int)(AnimationFlags.Loop | AnimationFlags.OnlyAnimateUpperBody | AnimationFlags.AllowPlayerControl | AnimationFlags.Cancellable));
     }
 
-    [Command("event", "~m~Benutzung: ~s~/eventchat [Nachricht]", GreedyArg = true)]
+    [Command("event", "~m~Benutzung: ~s~/event [Nachricht]", GreedyArg = true)]
     public void CmdFactionNREventchat(Player player, string msg)
     {
       if (player.HasData("eventAllowed") == false)

ReallifeGamemode.Server/Wanted/Jail.cs

@@ -206,7 +206,7 @@ namespace ReallifeGamemode.Server.Wanted
           if (user.JailTime <= 0)
           {
             Jailtime.Remove(user.Id);
-            player.Position = new Vector3(461.7256, -988.6035, 24.91487);
+            player.Position = new Vector3(427.879, -984.65, 30.71);
             player.TriggerEvent("jailTime", 0);
             return;
           }
@@ -273,7 +273,7 @@ namespace ReallifeGamemode.Server.Wanted
           dbContext.SaveChanges();
         }
         target.Health = 100;
-        target.Position = new Vector3(461.7256, -988.6035, 24.91487);
+        target.Position = new Vector3(427.879, -984.65, 30.71);
 
         ChatService.HQMessage(" Admin " + admin.Name + " hat " + user.Name + " aus dem Knast entlassen.");
         ChatService.SendMessage(target, "!{#8181E9}Admin " + admin.Name + " hat dich aus dem Knast entlassen");