From 165e8714766edafb01792b6ba5ef1ca86bf00e70 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Thu, 1 Apr 2021 19:24:24 +0200 Subject: [PATCH 1/3] edit weapondamage carbinrifle & other unjail position & fix tog command --- ReallifeGamemode.Client/util/weapondamage.ts | 2 +- ReallifeGamemode.Server/Commands/AdminCommands.cs | 6 +++--- ReallifeGamemode.Server/Commands/FactionCommands.cs | 2 +- ReallifeGamemode.Server/Commands/UserCommands.cs | 2 +- ReallifeGamemode.Server/Wanted/Jail.cs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts index 40c70f6b..49a7abe4 100644 --- a/ReallifeGamemode.Client/util/weapondamage.ts +++ b/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 diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 05bc5f0a..5e9fdb60 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -236,7 +236,7 @@ namespace ReallifeGamemode.Server.Commands case "ip": if(player.HasData("togip")) { - player.SetData("togip", false); + player.ResetData("togip"); player.SendNotification("~g~[Info]~w~ Ip´s werden nun ausgeblendet."); } else @@ -249,7 +249,7 @@ namespace ReallifeGamemode.Server.Commands case "deathlogs": if (player.HasData("togdeath")) { - player.SetData("togdeath", false); + player.ResetData("togdeath"); player.SendNotification("~g~[Info]~w~ Deathlogs werden nun ausgeblendet."); } else @@ -261,7 +261,7 @@ namespace ReallifeGamemode.Server.Commands case "lc": if (player.HasData("toglc")) { - player.SetData("toglc", false); + player.ResetData("toglc"); player.SendNotification("~g~[Info]~w~ Leaderchat wird nun ausgeblendet."); } else diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs index 5302e4d4..6a75bf9c 100644 --- a/ReallifeGamemode.Server/Commands/FactionCommands.cs +++ b/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) { diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index 1f3c9bbd..e7fc06b7 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/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) diff --git a/ReallifeGamemode.Server/Wanted/Jail.cs b/ReallifeGamemode.Server/Wanted/Jail.cs index a26673f2..54239222 100644 --- a/ReallifeGamemode.Server/Wanted/Jail.cs +++ b/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"); From 062c84a1ff61a4e76c52b7f1b5809a5159e99fa2 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 1 Apr 2021 19:35:21 +0000 Subject: [PATCH 2/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c81b65a..f946f9da 100644 --- a/.gitlab-ci.yml +++ b/.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" \ No newline at end of file + - "sudo ../gm_dev_copy_build_files.sh" + +build:master: + stage: build + only: + - master@log-gtav/reallife-gamemode + 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" From ba5f34449cf284693e5584c7bc8cce1d15bb7ae7 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 1 Apr 2021 19:39:45 +0000 Subject: [PATCH 3/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f946f9da..e3755c6b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ build:develop: build:master: stage: build only: - - master@log-gtav/reallife-gamemode + - web script: - "dotnet restore" - "../gm_live_database_password.sh"