mirror of
https://github.com/esx-framework/esx_core.git
synced 2026-08-30 17:58:54 +00:00
Moved all coords to vector3 types
This commit is contained in:
ElPumpo
+14
-14
@@ -412,7 +412,7 @@ function GetAvailableVehicleSpawnPoint(station, partNum)
|
||||
local found, foundSpawnPoint = false, nil
|
||||
|
||||
for i=1, #spawnPoints, 1 do
|
||||
if ESX.Game.IsSpawnPointClear(spawnPoints[i], spawnPoints[i].radius) then
|
||||
if ESX.Game.IsSpawnPointClear(spawnPoints[i].coords, spawnPoints[i].radius) then
|
||||
found, foundSpawnPoint = true, spawnPoints[i]
|
||||
break
|
||||
end
|
||||
@@ -1315,7 +1315,7 @@ AddEventHandler('esx_policejob:hasEnteredMarker', function(station, part, partNu
|
||||
|
||||
local helicopters = Config.PoliceStations[station].Helicopters
|
||||
|
||||
if not IsAnyVehicleNearPoint(helicopters[partNum].SpawnPoint.x, helicopters[partNum].SpawnPoint.y, helicopters[partNum].SpawnPoint.z, 3.0) then
|
||||
if not IsAnyVehicleNearPoint(helicopters[partNum].SpawnPoint, 3.0) then
|
||||
ESX.Game.SpawnVehicle('polmav', helicopters[partNum].SpawnPoint, helicopters[partNum].Heading, function(vehicle)
|
||||
SetVehicleModKit(vehicle, 0)
|
||||
SetVehicleLivery(vehicle, 0)
|
||||
@@ -1604,7 +1604,7 @@ end)
|
||||
Citizen.CreateThread(function()
|
||||
|
||||
for k,v in pairs(Config.PoliceStations) do
|
||||
local blip = AddBlipForCoord(v.Blip.Pos.x, v.Blip.Pos.y, v.Blip.Pos.z)
|
||||
local blip = AddBlipForCoord(v.Blip.Pos)
|
||||
|
||||
SetBlipSprite (blip, v.Blip.Sprite)
|
||||
SetBlipDisplay(blip, v.Blip.Display)
|
||||
@@ -1635,10 +1635,10 @@ Citizen.CreateThread(function()
|
||||
for k,v in pairs(Config.PoliceStations) do
|
||||
|
||||
for i=1, #v.Cloakrooms, 1 do
|
||||
local distance = GetDistanceBetweenCoords(coords, v.Cloakrooms[i].x, v.Cloakrooms[i].y, v.Cloakrooms[i].z, true)
|
||||
local distance = GetDistanceBetweenCoords(coords, v.Cloakrooms[i], true)
|
||||
|
||||
if distance < Config.DrawDistance then
|
||||
DrawMarker(20, v.Cloakrooms[i].x, v.Cloakrooms[i].y, v.Cloakrooms[i].z + 1, 0.0, 0.0, 0.0, 0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
|
||||
DrawMarker(20, v.Cloakrooms[i] + 1, 0.0, 0.0, 0.0, 0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
|
||||
end
|
||||
|
||||
if distance < Config.MarkerSize.x then
|
||||
@@ -1647,10 +1647,10 @@ Citizen.CreateThread(function()
|
||||
end
|
||||
|
||||
for i=1, #v.Armories, 1 do
|
||||
local distance = GetDistanceBetweenCoords(coords, v.Armories[i].x, v.Armories[i].y, v.Armories[i].z, true)
|
||||
local distance = GetDistanceBetweenCoords(coords, v.Armories[i], true)
|
||||
|
||||
if distance < Config.DrawDistance then
|
||||
DrawMarker(21, v.Armories[i].x, v.Armories[i].y, v.Armories[i].z + 1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.5, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
|
||||
DrawMarker(21, v.Armories[i] + 1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5, 0.5, 0.5, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
|
||||
end
|
||||
|
||||
if distance < Config.MarkerSize.x then
|
||||
@@ -1659,10 +1659,10 @@ Citizen.CreateThread(function()
|
||||
end
|
||||
|
||||
for i=1, #v.Vehicles, 1 do
|
||||
local distance = GetDistanceBetweenCoords(coords, v.Vehicles[i].Spawner.x, v.Vehicles[i].Spawner.y, v.Vehicles[i].Spawner.z, true)
|
||||
local distance = GetDistanceBetweenCoords(coords, v.Vehicles[i].Spawner, true)
|
||||
|
||||
if distance < Config.DrawDistance then
|
||||
DrawMarker(36, v.Vehicles[i].Spawner.x, v.Vehicles[i].Spawner.y, v.Vehicles[i].Spawner.z + 1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
|
||||
DrawMarker(36, v.Vehicles[i].Spawner + 1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
|
||||
end
|
||||
|
||||
if distance < Config.MarkerSize.x then
|
||||
@@ -1671,7 +1671,7 @@ Citizen.CreateThread(function()
|
||||
end
|
||||
|
||||
for i=1, #v.Helicopters, 1 do
|
||||
local distance = GetDistanceBetweenCoords(coords, v.Helicopters[i].Spawner.x, v.Helicopters[i].Spawner.y, v.Helicopters[i].Spawner.z, true)
|
||||
local distance = GetDistanceBetweenCoords(coords, v.Helicopters[i].Spawner, true)
|
||||
|
||||
if distance < Config.MarkerSize.x then
|
||||
isInMarker, currentStation, currentPart, currentPartNum = true, k, 'HelicopterSpawner', i
|
||||
@@ -1679,10 +1679,10 @@ Citizen.CreateThread(function()
|
||||
end
|
||||
|
||||
for i=1, #v.VehicleDeleters, 1 do
|
||||
local distance = GetDistanceBetweenCoords(coords, v.VehicleDeleters[i].x, v.VehicleDeleters[i].y, v.VehicleDeleters[i].z, true)
|
||||
local distance = GetDistanceBetweenCoords(coords, v.VehicleDeleters[i], true)
|
||||
|
||||
if distance < Config.DrawDistance then
|
||||
DrawMarker(Config.MarkerType, v.VehicleDeleters[i].x, v.VehicleDeleters[i].y, v.VehicleDeleters[i].z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false)
|
||||
DrawMarker(Config.MarkerType, v.VehicleDeleters[i], 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.MarkerSize.x, Config.MarkerSize.y, Config.MarkerSize.z, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, false, false, false)
|
||||
end
|
||||
|
||||
if distance < Config.MarkerSize.x then
|
||||
@@ -1692,10 +1692,10 @@ Citizen.CreateThread(function()
|
||||
|
||||
if Config.EnablePlayerManagement and PlayerData.job.grade_name == 'boss' then
|
||||
for i=1, #v.BossActions, 1 do
|
||||
local distance = GetDistanceBetweenCoords(coords, v.BossActions[i].x, v.BossActions[i].y, v.BossActions[i].z, true)
|
||||
local distance = GetDistanceBetweenCoords(coords, v.BossActions[i], true)
|
||||
|
||||
if distance < Config.DrawDistance then
|
||||
DrawMarker(22, v.BossActions[i].x, v.BossActions[i].y, v.BossActions[i].z + 1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
|
||||
DrawMarker(22, v.BossActions[i] + 1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, true, false, false, false)
|
||||
end
|
||||
|
||||
if distance < Config.MarkerSize.x then
|
||||
|
||||
+19
-19
@@ -25,7 +25,7 @@ Config.PoliceStations = {
|
||||
LSPD = {
|
||||
|
||||
Blip = {
|
||||
Pos = { x = 425.130, y = -979.558, z = 30.711 },
|
||||
Coords = vector3(425.1, -979.5, 30.7),
|
||||
Sprite = 60,
|
||||
Display = 4,
|
||||
Scale = 1.2,
|
||||
@@ -33,52 +33,52 @@ Config.PoliceStations = {
|
||||
},
|
||||
|
||||
Cloakrooms = {
|
||||
{ x = 452.6, y = -992.8, z = 29.7 },
|
||||
vector3(452.6, -992.8, 29.7)
|
||||
},
|
||||
|
||||
Armories = {
|
||||
{ x = 451.699, y = -980.356, z = 29.689 },
|
||||
vector3(451.6, -980.3, 29.6)
|
||||
},
|
||||
|
||||
Vehicles = {
|
||||
{
|
||||
Spawner = { x = 454.69, y = -1017.40, z = 27.43 },
|
||||
Spawner = vector3(454.6, -1017.4, 27.4),
|
||||
SpawnPoints = {
|
||||
{ x = 438.42, y = -1018.30, z = 27.75, heading = 90.0, radius = 6.0 },
|
||||
{ x = 441.08, y = -1024.23, z = 28.30, heading = 90.0, radius = 6.0 },
|
||||
{ x = 453.53, y = -1022.20, z = 28.02, heading = 90.0, radius = 6.0 },
|
||||
{ x = 450.97, y = -1016.55, z = 28.10, heading = 90.0, radius = 6.0 }
|
||||
{ coords = vector3(438.4, -1018.3, 27.7), heading = 90.0, radius = 6.0 },
|
||||
{ coords = vector3(441.0, -1024.2, 28.3), heading = 90.0, radius = 6.0 },
|
||||
{ coords = vector3(453.5, -1022.2, 28.0), heading = 90.0, radius = 6.0 },
|
||||
{ coords = vector3(450.9, -1016.5, 28.1), heading = 90.0, radius = 6.0 }
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
Spawner = { x = 473.38, y = -1018.43, z = 27.00 },
|
||||
Spawner = { x = 473.38, y = -1018.43, z = 27.00 },
|
||||
SpawnPoints = {
|
||||
{ x = 475.98, y = -1021.65, z = 28.06, heading = 276.11, radius = 6.0 },
|
||||
{ x = 484.10, y = -1023.19, z = 27.57, heading = 302.54, radius = 6.0 }
|
||||
{ x = 475.9, y = -1021.6, z = 28.0, heading = 276.1, radius = 6.0 },
|
||||
{ x = 484.1, y = -1023.1, z = 27.5, heading = 302.5, radius = 6.0 }
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Helicopters = {
|
||||
{
|
||||
Spawner = { x = 466.477, y = -982.819, z = 42.691 },
|
||||
SpawnPoint = { x = 450.04, y = -981.14, z = 42.691 },
|
||||
Spawner = vector3(466.4, -982.8, 42.6),
|
||||
SpawnPoint = vector3(450.0, -981.1, 42.6),
|
||||
Heading = 0.0
|
||||
}
|
||||
},
|
||||
|
||||
VehicleDeleters = {
|
||||
{ x = 462.74, y = -1014.4, z = 27.065 },
|
||||
{ x = 462.40, y = -1019.7, z = 27.104 },
|
||||
{ x = 469.12, y = -1024.52, z = 27.20 }
|
||||
vector3(462.7, -1014.4, 27.0),
|
||||
vector3(462.4, -1019.7, 27.1),
|
||||
vector3(469.1, -1024.5, 27.2)
|
||||
},
|
||||
|
||||
BossActions = {
|
||||
{ x = 448.417, y = -973.208, z = 29.689 }
|
||||
},
|
||||
vector3(448.4, -973.2, 29.6)
|
||||
}
|
||||
|
||||
},
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user