From 04e4e9dc8603d5477bd74ce07252580b4f7accf7 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Fri, 2 Apr 2021 15:38:46 +0200 Subject: [PATCH 1/9] =?UTF-8?q?*Fix=20M=C3=BCllmann=20/=20*Load=20Casino?= =?UTF-8?q?=20IPL=20/=20*Fix=20GangwarTakeover?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReallifeGamemode.Client/util/Gangwar.ts | 2 +- ReallifeGamemode.Server/Events/Key.cs | 49 +++++----- .../Job/RefuseCollectorJob.cs | 94 ++++++++++--------- ReallifeGamemode.Server/Main.cs | 3 + 4 files changed, 75 insertions(+), 73 deletions(-) diff --git a/ReallifeGamemode.Client/util/Gangwar.ts b/ReallifeGamemode.Client/util/Gangwar.ts index ba7bd552..efb498fc 100644 --- a/ReallifeGamemode.Client/util/Gangwar.ts +++ b/ReallifeGamemode.Client/util/Gangwar.ts @@ -263,7 +263,7 @@ 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); mp.game.invoke(Natives.SET_BLIP_COLOUR, self.blip, self.color); diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 97c73d91..ed77f397 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -546,8 +546,7 @@ namespace ReallifeGamemode.Server.Events player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'."); return; } - }else - { + } else { player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); return; } @@ -569,40 +568,38 @@ namespace ReallifeGamemode.Server.Events player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); return; } - }else - { - player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); - return; - } - - if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300) - { - if (job.GetUsersInJob().Contains(player)) - { - player.SetData("PilotenBase", 2); - jobb.StopJob(player); - return; - } - if (!job.GetUsersInJob().Contains(player)) - { - player.SetData("PilotenBase", 2); - jobb.StartJobEvent(player); - player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); - return; - } } else { - player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); + player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); return; } - }else + + if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300) { - player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); + if (job.GetUsersInJob().Contains(player)) + { + player.SetData("PilotenBase", 2); + jobb.StopJob(player); + return; + } + if (!job.GetUsersInJob().Contains(player)) + { + player.SetData("PilotenBase", 2); + jobb.StartJobEvent(player); + player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); + return; + } + } else { + player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); return; } + } else { + player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); + return; } } + } [RemoteEvent("keyPress:I")] public void KeyPressI(Player player) diff --git a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs index 10e3e038..8fab42e2 100644 --- a/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs +++ b/ReallifeGamemode.Server/Job/RefuseCollectorJob.cs @@ -220,18 +220,18 @@ namespace ReallifeGamemode.Server.Job { return; } - - foreach (var data in muellmanData) + using (var dbContext = new DatabaseContext()) { - if (data.getDataFromClient(player) == null) continue; - Player target = data.getPartnerClient(player); - User user1 = player.GetUser(); - User user2 = target.GetUser(); - using (var dbContext = new DatabaseContext()) + foreach (var data in muellmanData) { - user1 = player.GetUser(dbContext); - user2 = target.GetUser(dbContext); - user1.trashcount += 1; + if (data.getDataFromClient(player) == null) continue; + Player target = data.getPartnerClient(player); + User user1 = player.GetUser(dbContext); + User user2 = target.GetUser(dbContext); + + //user1 = player.GetUser(dbContext); + //user2 = target.GetUser(dbContext); + /*user1.trashcount += 1; if (user1.trashcount == 20) { @@ -249,11 +249,12 @@ namespace ReallifeGamemode.Server.Job target.SendChatMessage("~y~Dies ist dein 20ter Müllsack."); } } + dbContext.SaveChanges(); - } - player.AddAttachment("binbag", true); - if (target != null) - if (player.GetUser().trashcount >= 20) + player.AddAttachment("binbag", true); + */ + + if (player.GetUser(dbContext).trashcount >= 20) { ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!"); if (target != null) @@ -265,23 +266,20 @@ namespace ReallifeGamemode.Server.Job } else { - using (var dbContext = new DatabaseContext()) + //user1 = player.GetUser(dbContext); + //user2 = target.GetUser(dbContext); + user1.trashcount += 1; + player.SendNotification("Müllsack: " + user1.trashcount + " von 20."); + if (target != null) { - user1 = player.GetUser(dbContext); - user2 = target.GetUser(dbContext); - user1.trashcount += 1; - player.SendNotification("Müllsack: " + user1.trashcount + " von 20."); - if (target != null) - { - target.SendNotification("Müllsack: " + user2.trashcount + " von 20."); - user2.trashcount += 1; - } - dbContext.SaveChanges(); + target.SendNotification("Müllsack: " + user2.trashcount + " von 20."); + user2.trashcount += 1; } + dbContext.SaveChanges(); } - player.AddAttachment("binbag", true); - if (target != null) - if (player.GetUser().trashcount >= 20) + player.AddAttachment("binbag", true); + + if (player.GetUser(dbContext).trashcount >= 20) { ChatService.SendMessage((Player)player, "~y~Job: ~s~Der Müllwagen ist voll. Fahre nun zurück zur Recyclinganlage!"); if (target != null) @@ -293,17 +291,22 @@ namespace ReallifeGamemode.Server.Job } else { + //user1 = player.GetUser(dbContext); + //user2 = target.GetUser(dbContext); + if (target != null) { - player.GetUser().Wage += 10; - target.GetUser().Wage += 10; + user1.Wage += 10; + user2.Wage += 10; } else { - player.GetUser().Wage += 20; + user1.Wage += 20; } + dbContext.SaveChanges(); } + } return; } } @@ -321,25 +324,24 @@ namespace ReallifeGamemode.Server.Job if (target != null) ChatService.SendMessage((Player)target, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {target.GetUser().trashcount}"); ChatService.SendMessage((Player)player, $"~y~Job: ~s~Fahrzeug wurde entleert. Säcke: {player.GetUser().trashcount}"); //bonus pro sack - if (target != null) - { - player.GetUser().Wage += 100; - target.GetUser().Wage += 100; - } - else - { - player.GetUser().Wage += 200; - } - User user1 = player.GetUser(); - User user2 = target.GetUser(); using (var dbContext = new DatabaseContext()) { - user1 = player.GetUser(dbContext); - user2 = target.GetUser(dbContext); + User user1 = player.GetUser(dbContext); + User user2 = target.GetUser(dbContext); - user1.trashcount -= user1.trashcount; if (target != null) - user2.trashcount -= user2.trashcount; + { + user1.Wage += 100; + user2.Wage += 100; + } + else + { + user1.Wage += 200; + } + + user1.trashcount -= user1.trashcount; + if (target != null) user2.trashcount -= user2.trashcount; + dbContext.SaveChanges(); } Console.WriteLine($"[DATA DEBUG] vehicle: {data.vehicle.DisplayName} | Players: {data.getClientsFromData().Count} | Säcke: {data.getTrashCount()}"); diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs index f21fe826..dcb7cfe2 100644 --- a/ReallifeGamemode.Server/Main.cs +++ b/ReallifeGamemode.Server/Main.cs @@ -169,6 +169,9 @@ namespace ReallifeGamemode.Server { user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); }; + + //IPLS + NAPI.World.RequestIpl("vw_casino_garage"); } [RemoteEvent("CLIENT:Event")] From 2cb74a3da98828b00ede8ab5d05844917dd463db Mon Sep 17 00:00:00 2001 From: VegaZ Date: Fri, 2 Apr 2021 16:34:03 +0200 Subject: [PATCH 2/9] Fix Pilot-Job, Fix GangWar --- ReallifeGamemode.Client/util/Gangwar.ts | 2 +- ReallifeGamemode.Server/Events/Key.cs | 54 ++++++++++++------------- ReallifeGamemode.Server/Main.cs | 2 +- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/ReallifeGamemode.Client/util/Gangwar.ts b/ReallifeGamemode.Client/util/Gangwar.ts index efb498fc..d0d49ff2 100644 --- a/ReallifeGamemode.Client/util/Gangwar.ts +++ b/ReallifeGamemode.Client/util/Gangwar.ts @@ -265,7 +265,7 @@ mp.game.invoke(Natives.SET_BLIP_FLASHES, self.blip, false); //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; diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index ed77f397..25f6ce51 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -546,12 +546,7 @@ namespace ReallifeGamemode.Server.Events player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Fahrzeuge und starte den Motor mit der Taste 'N'."); return; } - } else { - player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); - return; - } - - if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3) + } else if (nearestJobPoint.jobId == 3 && player.GetUser().JobId == 3) { if (nearestJobPoint.Skill < 300 && player.GetUser().PilotSkill >= 0) { @@ -571,35 +566,38 @@ namespace ReallifeGamemode.Server.Events } else { - player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); + player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); return; } - - if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300) + if (nearestJobPoint.Skill >= 300 && player.GetUser().PilotSkill >= 300) + { + if (job.GetUsersInJob().Contains(player)) + { + player.SetData("PilotenBase", 2); + jobb.StopJob(player); + return; + } + if (!job.GetUsersInJob().Contains(player)) + { + player.SetData("PilotenBase", 2); + jobb.StartJobEvent(player); + player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); + return; + } + } + else + { + player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); + return; + } + } + else { - if (job.GetUsersInJob().Contains(player)) - { - player.SetData("PilotenBase", 2); - jobb.StopJob(player); - return; - } - if (!job.GetUsersInJob().Contains(player)) - { - player.SetData("PilotenBase", 2); - jobb.StartJobEvent(player); - player.TriggerEvent("renderTextOnScreen", "Steige nun in eines der Flugzeuge und starte den Motor mit der Taste 'N'."); - return; - } - } else { - player.SendChatMessage("~y~[JOB] ~r~Dein Skilllevel ist noch zu niedrig."); + player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); return; } - } else { - player.SendNotification("~r~[Fehler] ~w~ Du hast diesen Job nicht angenommen."); - return; } } - } [RemoteEvent("keyPress:I")] public void KeyPressI(Player player) diff --git a/ReallifeGamemode.Server/Main.cs b/ReallifeGamemode.Server/Main.cs index dcb7cfe2..c77b5c36 100644 --- a/ReallifeGamemode.Server/Main.cs +++ b/ReallifeGamemode.Server/Main.cs @@ -164,7 +164,7 @@ namespace ReallifeGamemode.Server PlayerService.GetPlayerByNameOrId(user).TriggerEvent("updateMoney", account.Balance); } }; - + User.HandMoneyChanged += (user) => { user.Player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney); From 0d8f76df3e0dd2b0bfa8462e59b6524ff0c1c1b4 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Fri, 2 Apr 2021 16:47:49 +0200 Subject: [PATCH 3/9] add fahrschule --- ReallifeGamemode.Client/Gui/ahelp.ts | 2 -- ReallifeGamemode.Client/dlcpacks/Fahrstuhl/dlc.rpf | 3 +++ ReallifeGamemode.Client/index.ts | 6 ++++-- ReallifeGamemode.Server/Commands/AdminCommands.cs | 2 +- ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs | 4 ++-- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 ReallifeGamemode.Client/dlcpacks/Fahrstuhl/dlc.rpf diff --git a/ReallifeGamemode.Client/Gui/ahelp.ts b/ReallifeGamemode.Client/Gui/ahelp.ts index 81d6720f..22025441 100644 --- a/ReallifeGamemode.Client/Gui/ahelp.ts +++ b/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); - } }); diff --git a/ReallifeGamemode.Client/dlcpacks/Fahrstuhl/dlc.rpf b/ReallifeGamemode.Client/dlcpacks/Fahrstuhl/dlc.rpf new file mode 100644 index 00000000..ea2643a3 --- /dev/null +++ b/ReallifeGamemode.Client/dlcpacks/Fahrstuhl/dlc.rpf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f1478ada7534b954caaec991bb2a3a24767b978de82533965e0c21c3d02831f +size 8491 diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts index 1ee4852f..6dfdafee 100644 --- a/ReallifeGamemode.Client/index.ts +++ b/ReallifeGamemode.Client/index.ts @@ -233,12 +233,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); diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 5e9fdb60..38e6b022 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -222,7 +222,7 @@ namespace ReallifeGamemode.Server.Commands #region Support - [Command("tog", "~m~Benutzung: ~s~/tog [Typ = ~g~ip~s~, ~g~deathlogs~s~, ~g~lc~s~", GreedyArg = true)] + [Command("tog", "~m~Benutzung: ~s~/tog [Typ = ~g~IP~s~, ~g~deathlogs~s~, ~g~LC~s~]", GreedyArg = true)] public void CmdTog(Player player, string typ, string option1 = null, string option2 = null) { if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) diff --git a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs index a3c4a794..d88b8ce9 100644 --- a/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs +++ b/ReallifeGamemode.Server/DrivingSchool/DrivingSchool.cs @@ -190,7 +190,7 @@ namespace ReallifeGamemode.Server.DrivingSchool veh.Position = sVeh.Position; veh.Rotation = new Vector3(0, 0, sVeh.Heading); - user.Position = new Vector3(-813.17, -1354.5, 4.14); + user.Position = new Vector3(-814.39, -1336.76, 5.15); } [RemoteEvent("drivingSchoolEvent")] @@ -304,7 +304,7 @@ namespace ReallifeGamemode.Server.DrivingSchool veh.Position = sVeh.Position; veh.Rotation = new Vector3(0, 0, sVeh.Heading); - user.Position = new Vector3(-813.17, -1354.5, 4.14); + user.Position = new Vector3(-814.39, -1336.76, 5.15); } [RemoteEvent("bikeSchoolEvent")] From e6112394af4678e497f49b1ee738a39bdb3f35cb Mon Sep 17 00:00:00 2001 From: VegaZ Date: Fri, 2 Apr 2021 16:54:07 +0200 Subject: [PATCH 4/9] Fix onlineList --- ReallifeGamemode.Server/Events/Key.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 25f6ce51..e1631956 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -612,13 +612,22 @@ namespace ReallifeGamemode.Server.Events { if (!player.IsLoggedIn()) return; List players = NAPI.Pools.GetAllPlayers(); + + foreach(var lPlayer in players) + { + if(!lPlayer.IsLoggedIn()) + { + players.Remove(lPlayer); + } + } + var listPlayers = players.Select(p => new { Id = p.Handle.Value, p.Name, p.Ping, FactionName = p.GetUser().Faction?.Name ?? "Zivilist", - }) ; + }); player.TriggerEvent("showPlayerlist", JsonConvert.SerializeObject(listPlayers)); } From d213369d70bac5c13ff4a5304c8d9132d06142a0 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Fri, 2 Apr 2021 17:12:09 +0200 Subject: [PATCH 5/9] Fix OnlineListe 2 --- ReallifeGamemode.Server/Events/Key.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index e1631956..0cc8b7cb 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -615,7 +615,7 @@ namespace ReallifeGamemode.Server.Events foreach(var lPlayer in players) { - if(!lPlayer.IsLoggedIn()) + if(lPlayer.GetUser() == null) { players.Remove(lPlayer); } From e42170575a149013072bb4c9cb2db0e98373cba0 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Fri, 2 Apr 2021 17:20:05 +0200 Subject: [PATCH 6/9] Fix OnlineListe 3 --- ReallifeGamemode.Server/Events/Key.cs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 0cc8b7cb..cbc5e9e6 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -611,15 +611,7 @@ namespace ReallifeGamemode.Server.Events public void KeyPressO(Player player) { if (!player.IsLoggedIn()) return; - List players = NAPI.Pools.GetAllPlayers(); - - foreach(var lPlayer in players) - { - if(lPlayer.GetUser() == null) - { - players.Remove(lPlayer); - } - } + List players = NAPI.Pools.GetAllPlayers().Where(p => p.IsLoggedIn() == true).ToList(); var listPlayers = players.Select(p => new { From abd8576a9ba30ffa4a1d2bdb2e3b306327476815 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Fri, 2 Apr 2021 18:38:25 +0200 Subject: [PATCH 7/9] Fix GW-Verteidigung gibt kein Geld --- ReallifeGamemode.Server/Gangwar/Turf.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Server/Gangwar/Turf.cs b/ReallifeGamemode.Server/Gangwar/Turf.cs index bf6dd5cc..97850e87 100644 --- a/ReallifeGamemode.Server/Gangwar/Turf.cs +++ b/ReallifeGamemode.Server/Gangwar/Turf.cs @@ -288,9 +288,9 @@ namespace ReallifeGamemode.Server.Gangwar dbContext.Factions.Include(f => f.BankAccount).Where(f => f.Name == getOwner()).First().BankAccount.Balance += 10000; Turfs turf = dbContext.Turfs.Where(t => t.Id == getId()).FirstOrDefault(); turf.Owner = this.Owner; - turf.FactionId = dbContext.Factions.Where(f => f.Name == this.Owner).FirstOrDefault().Id; - dbContext.SaveChanges(); + turf.FactionId = dbContext.Factions.Where(f => f.Name == this.Owner).FirstOrDefault().Id; } + dbContext.SaveChanges(); } this.Attacker = null; foreach (var c in playerInGangwar) From 32577eecf7c2f80c6592d1fc5d7f2b63b807a520 Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Fri, 2 Apr 2021 19:53:24 +0200 Subject: [PATCH 8/9] adminShop --- .../Business/AdminDealerBusiness.cs | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 ReallifeGamemode.Server/Business/AdminDealerBusiness.cs diff --git a/ReallifeGamemode.Server/Business/AdminDealerBusiness.cs b/ReallifeGamemode.Server/Business/AdminDealerBusiness.cs new file mode 100644 index 00000000..21db1742 --- /dev/null +++ b/ReallifeGamemode.Server/Business/AdminDealerBusiness.cs @@ -0,0 +1,23 @@ +using GTANetworkAPI; + +namespace ReallifeGamemode.Server.Business +{ + internal class AdminDealerBusiness : CarDealerBusinessBase + { + public override int Id => 12; + + public override string Name => "Admin Carshop"; + + public override Vector3 Position => new Vector3(1295.3, 264.76,-49.05); + + public override Vector3 CarSpawnPositon => new Vector3(1266.38, 230.3, -48.67); + + public override float CarSpawnHeading => 176.6f; + + public override int? BlipSprite => 225; + + public override void Load() + { + } + } +} From 5364ddff59fd67f381f10d3bae33b2271ea9110e Mon Sep 17 00:00:00 2001 From: "michael.reiswich" Date: Fri, 2 Apr 2021 20:34:14 +0200 Subject: [PATCH 9/9] headshot raus? --- ReallifeGamemode.Client/util/weapondamage.ts | 8 ++++++++ ReallifeGamemode.Server/Business/AdminDealerBusiness.cs | 1 + ReallifeGamemode.Server/Events/Login.cs | 1 + 3 files changed, 10 insertions(+) diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts index 49a7abe4..63877970 100644 --- a/ReallifeGamemode.Client/util/weapondamage.ts +++ b/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) { diff --git a/ReallifeGamemode.Server/Business/AdminDealerBusiness.cs b/ReallifeGamemode.Server/Business/AdminDealerBusiness.cs index 21db1742..1800af8a 100644 --- a/ReallifeGamemode.Server/Business/AdminDealerBusiness.cs +++ b/ReallifeGamemode.Server/Business/AdminDealerBusiness.cs @@ -16,6 +16,7 @@ namespace ReallifeGamemode.Server.Business public override int? BlipSprite => 225; + public override void Load() { } diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs index 7f4951a5..9db87c76 100644 --- a/ReallifeGamemode.Server/Events/Login.cs +++ b/ReallifeGamemode.Server/Events/Login.cs @@ -63,6 +63,7 @@ namespace ReallifeGamemode.Server.Events player.SetData("duty", false); player.SetData("Adminduty", false); player.TriggerEvent("SERVER:SET_HANDMONEY", user.Handmoney, 0); + player.TriggerEvent("headshotoff"); Gangwar.Gangwar.loadPlayer(player); if (user.FactionLeader) {