From 57c2933168fc549b88f8754bd877ad185ca85421 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 22 Apr 2021 19:42:27 +0200 Subject: [PATCH 1/4] nodmzonen bei pilotjobs --- ReallifeGamemode.Client/Player/nodm.ts | 34 ++++++++++++++++++++------ 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/ReallifeGamemode.Client/Player/nodm.ts b/ReallifeGamemode.Client/Player/nodm.ts index 70481b6e..aa8333de 100644 --- a/ReallifeGamemode.Client/Player/nodm.ts +++ b/ReallifeGamemode.Client/Player/nodm.ts @@ -16,22 +16,40 @@ let fahrschuleVector3 = new mp.Vector3(-757.4177, -1279.31, 5.1093183); let fahrschuleVector4 = new mp.Vector3(-832.14087, -1268.561, 4.9827914); let fahrschuleVector5 = new mp.Vector3(-856.8085, -1286.7786, 6.474576); -const polygon_busbase = polygons.add([busbaseVector1, busbaseVector2, busbaseVector3, busbaseVector4], 15, true, [255, 155, 0, 255], 0); -const polygon_stadthalle = polygons.add([stadthalleVector1, stadthalleVector2, stadthalleVector3, stadthalleVector4], 15, true, [255, 155, 0, 255], 0); -const polygon_fahrschule = polygons.add([fahrschuleVector1, fahrschuleVector2, fahrschuleVector3, fahrschuleVector4, fahrschuleVector5], 15, true, [255, 155, 0, 255], 0); +let pilotAnfaengerVector1 = new mp.Vector3(1763.263, 3292.4204, 41.159176); +let pilotAnfaengerVector2 = new mp.Vector3(1785.29944, 3230.2786, 42.553444); +let pilotAnfaengerVector3 = new mp.Vector3(1655.139, 3198.6257, 42.723602); +let pilotAnfaengerVector4 = new mp.Vector3(1639.2759, 3256.5574, 40.966084); -export let listNoDMZones = [polygon_busbase, polygon_stadthalle, polygon_fahrschule]; +let pilotProfiVector1 = new mp.Vector3(-1595.5433, -3130.2798, 13.944942); +let pilotProfiVector2 = new mp.Vector3(-1679.6715, -3082.12, 13.948778); +let pilotProfiVector3 = new mp.Vector3(-1728.0858, -3164.9736, 14.055883); +let pilotProfiVector4 = new mp.Vector3(-1640.4034, -3213.0503, 13.8741665); + +const polygon_busbase = polygons.add([busbaseVector1, busbaseVector2, busbaseVector3, busbaseVector4], 15, false, [255, 155, 0, 255], 0); +const polygon_stadthalle = polygons.add([stadthalleVector1, stadthalleVector2, stadthalleVector3, stadthalleVector4], 15, false, [255, 155, 0, 255], 0); +const polygon_fahrschule = polygons.add([fahrschuleVector1, fahrschuleVector2, fahrschuleVector3, fahrschuleVector4, fahrschuleVector5], 15, false, [255, 155, 0, 255], 0); +const polygon_pilotAnfaenger = polygons.add([pilotAnfaengerVector1, pilotAnfaengerVector2, pilotAnfaengerVector3, pilotAnfaengerVector4], 15, false, [255, 155, 0, 255], 0); +const polygon_pilotProfi = polygons.add([pilotProfiVector1, pilotProfiVector2, pilotProfiVector3, pilotProfiVector4], 15, false, [255, 155, 0, 255], 0); + +export let listNoDMZones = [polygon_busbase, polygon_stadthalle, polygon_fahrschule, polygon_pilotAnfaenger, polygon_pilotProfi]; export let isInAnyNoDMPolygon; export default function nodmHandler() { mp.events.add('playerEnterPolygon', (polygon) => { - mp.events.call('toggleNoDmZone', true); - isInAnyNoDMPolygon = true; + + if (listNoDMZones.indexOf(polygon) != -1){ + mp.events.call('toggleNoDmZone', true); + isInAnyNoDMPolygon = true; + } }); mp.events.add('playerLeavePolygon', (polygon) => { - mp.events.call('toggleNoDmZone', false); - isInAnyNoDMPolygon = false; + + if (listNoDMZones.indexOf(polygon) != -1) { + mp.events.call('toggleNoDmZone', false); + isInAnyNoDMPolygon = false; + } }); } From 2e6f315309a21fed632515b39670dccd6d09ea22 Mon Sep 17 00:00:00 2001 From: Fabian Date: Thu, 22 Apr 2021 19:43:49 +0200 Subject: [PATCH 2/4] debug meldung entfernt --- ReallifeGamemode.Client/util/weapondamage.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/ReallifeGamemode.Client/util/weapondamage.ts b/ReallifeGamemode.Client/util/weapondamage.ts index c706d07c..d187e703 100644 --- a/ReallifeGamemode.Client/util/weapondamage.ts +++ b/ReallifeGamemode.Client/util/weapondamage.ts @@ -26,9 +26,7 @@ export default function weapondamageUtil() { }); mp.events.add('outgoingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => { - if (isTargetInPolygon(targetEntity.position) || isInAnyNoDMPolygon) { - mp.gui.chat.push("nodm"); return true; } }); From 9eb42b09ed7bd0521eef460962ae977eb4ddf399 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 22 Apr 2021 19:49:27 +0200 Subject: [PATCH 3/4] Busfahrer fix ANDERES AUTO BITTE FUNKTIONIER --- .../Managers/JobManager.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index 63abaff8..af5de97d 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -202,13 +202,22 @@ namespace ReallifeGamemode.Server.Managers { JobBase job = GetJob(player.GetUser().JobId ?? -1); - if (job != null && job.GetUsersInJob().Contains(player) && job.CheckVehicle(player, veh) && seat == 0) + if (job != null && job.GetUsersInJob().Contains(player) && seat == 0) { - if (!playerTimersJobVehicleRespawn.ContainsKey(player)) - return; + if(job.CheckVehicle(player, veh)) + { + if (!playerTimersJobVehicleRespawn.ContainsKey(player)) + return; - playerTimersJobVehicleRespawn[player].Stop(); - playerTimersJobVehicleRespawn.Remove(player); + playerTimersJobVehicleRespawn[player].Stop(); + playerTimersJobVehicleRespawn.Remove(player); + } + else + { + player.StopAnimation(); + player.WarpOutOfVehicle(); + player.Position = player.Position.Add(new Vector3(0, 0, 2.0f)); + } } } From 4060ffb7fb110747487a02f5d686045056b68806 Mon Sep 17 00:00:00 2001 From: hydrant Date: Thu, 22 Apr 2021 19:49:47 +0200 Subject: [PATCH 4/4] Userfahrzeug kaufen: Business Id setzen --- ReallifeGamemode.Server/Managers/BusinessManager.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ReallifeGamemode.Server/Managers/BusinessManager.cs b/ReallifeGamemode.Server/Managers/BusinessManager.cs index e55a250e..6507ea0b 100644 --- a/ReallifeGamemode.Server/Managers/BusinessManager.cs +++ b/ReallifeGamemode.Server/Managers/BusinessManager.cs @@ -196,6 +196,7 @@ namespace ReallifeGamemode.Server.Managers SecondaryColor = 111, Active = true, Price = price, + BusinessId = business.Id }; } else if (target == "Fraktion")