aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lukas Moungos
2021-04-22 19:52:02 +02:00
parent 3b04a0776e 4060ffb7fb
commit 80f851250b
4 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ReallifeGamemode.Client/Player/nodm.ts
View File

@@ -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 fahrschuleVector4 = new mp.Vector3(-832.14087, -1268.561, 4.9827914);
let fahrschuleVector5 = new mp.Vector3(-856.8085, -1286.7786, 6.474576); 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); let pilotAnfaengerVector1 = new mp.Vector3(1763.263, 3292.4204, 41.159176);
const polygon_stadthalle = polygons.add([stadthalleVector1, stadthalleVector2, stadthalleVector3, stadthalleVector4], 15, true, [255, 155, 0, 255], 0); let pilotAnfaengerVector2 = new mp.Vector3(1785.29944, 3230.2786, 42.553444);
const polygon_fahrschule = polygons.add([fahrschuleVector1, fahrschuleVector2, fahrschuleVector3, fahrschuleVector4, fahrschuleVector5], 15, true, [255, 155, 0, 255], 0); 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 let isInAnyNoDMPolygon;
export default function nodmHandler() { export default function nodmHandler() {
mp.events.add('playerEnterPolygon', (polygon) => { mp.events.add('playerEnterPolygon', (polygon) => {
if (listNoDMZones.indexOf(polygon) != -1){
mp.events.call('toggleNoDmZone', true); mp.events.call('toggleNoDmZone', true);
isInAnyNoDMPolygon = true; isInAnyNoDMPolygon = true;
}
}); });
mp.events.add('playerLeavePolygon', (polygon) => { mp.events.add('playerLeavePolygon', (polygon) => {
if (listNoDMZones.indexOf(polygon) != -1) {
mp.events.call('toggleNoDmZone', false); mp.events.call('toggleNoDmZone', false);
isInAnyNoDMPolygon = false; isInAnyNoDMPolygon = false;
}
}); });
} }

2
ReallifeGamemode.Client/util/weapondamage.ts
View File

@@ -26,9 +26,7 @@ export default function weapondamageUtil() {
}); });
mp.events.add('outgoingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => { mp.events.add('outgoingDamage', (sourceEntity, targetEntity, sourcePlayer, weapon, boneIndex, damage) => {
if (isTargetInPolygon(targetEntity.position) || isInAnyNoDMPolygon) { if (isTargetInPolygon(targetEntity.position) || isInAnyNoDMPolygon) {
mp.gui.chat.push("nodm");
return true; return true;
} }
}); });

1
ReallifeGamemode.Server/Managers/BusinessManager.cs
View File

@@ -196,6 +196,7 @@ namespace ReallifeGamemode.Server.Managers
SecondaryColor = 111, SecondaryColor = 111,
Active = true, Active = true,
Price = price, Price = price,
BusinessId = business.Id
}; };
} }
else if (target == "Fraktion") else if (target == "Fraktion")

11
ReallifeGamemode.Server/Managers/JobManager.cs
View File

@@ -202,7 +202,9 @@ namespace ReallifeGamemode.Server.Managers
{ {
JobBase job = GetJob(player.GetUser().JobId ?? -1); 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(job.CheckVehicle(player, veh))
{ {
if (!playerTimersJobVehicleRespawn.ContainsKey(player)) if (!playerTimersJobVehicleRespawn.ContainsKey(player))
return; return;
@@ -210,6 +212,13 @@ namespace ReallifeGamemode.Server.Managers
playerTimersJobVehicleRespawn[player].Stop(); playerTimersJobVehicleRespawn[player].Stop();
playerTimersJobVehicleRespawn.Remove(player); playerTimersJobVehicleRespawn.Remove(player);
} }
else
{
player.StopAnimation();
player.WarpOutOfVehicle();
player.Position = player.Position.Add(new Vector3(0, 0, 2.0f));
}
}
} }
[ServerEvent(Event.PlayerEnterVehicleAttempt)] [ServerEvent(Event.PlayerEnterVehicleAttempt)]