starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #82 from rex2630/patch-2

Browse Source 
Moved all coords to vector3 types
This commit is contained in:
LazarusOfTheFallen
2021-02-01 17:02:32 -06:00
committed by GitHub
parent 0a6dc54564 77bd7fa334
commit 474cb85691
2 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+4 -4
View File
@@ -89,7 +89,7 @@ end)
Citizen.CreateThread(function()
for k,v in pairs(Config.Zones) do
for i = 1, #v.Pos, 1 do
local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z)
local blip = AddBlipForCoord(v.Pos[i])
SetBlipSprite (blip, 52)
SetBlipScale (blip, 1.0)
@@ -112,10 +112,10 @@ Citizen.CreateThread(function()
for k,v in pairs(Config.Zones) do
for i = 1, #v.Pos, 1 do
local distance = GetDistanceBetweenCoords(playerCoords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true)
local distance = #(playerCoords - v.Pos[i])
if distance < Config.DrawDistance then
DrawMarker(Config.Type, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, nil, nil, false)
DrawMarker(Config.Type, v.Pos[i], 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, nil, nil, false)
letSleep = false
if distance < Config.Size.x then
@@ -162,4 +162,4 @@ Citizen.CreateThread(function()
Citizen.Wait(500)
end
end
end)
end)
config.lua
+30 -33
View File
@@ -1,49 +1,46 @@
Config = {}
Config = {}
Config.DrawDistance = 100
Config.Size = {x = 1.5, y = 1.5, z = 1.5}
Config.Color = {r = 0, g = 128, b = 255}
Config.Type = 1
Config.Locale = 'en'
Config.Size = {x = 1.5, y = 1.5, z = 1.5}
Config.Color = {r = 0, g = 128, b = 255}
Config.Type = 1
Config.Locale = 'fr'
Config.Zones = {
TwentyFourSeven = {
Items = {},
Pos = {
{x = 373.875, y = 325.896, z = 102.566},
{x = 2557.458, y = 382.282, z = 107.622},
{x = -3038.939, y = 585.954, z = 6.908},
{x = -3241.927, y = 1001.462, z = 11.830},
{x = 547.431, y = 2671.710, z = 41.156},
{x = 1961.464, y = 3740.672, z = 31.343},
{x = 2678.916, y = 3280.671, z = 54.241},
{x = 1729.216, y = 6414.131, z = 34.037}
}
},
vector3(373.8, 325.8, 102.5),
vector3(2557.4, 382.2, 107.6),
vector3(-3038.9, 585.9, 6.9),
vector3(-3241.9, 1001.4, 11.8),
vector3(547.4, 2671.7, 41.1),
vector3(1961.4, 3740.6, 31.3),
vector3(2678.9, 3280.6, 54.2),
vector3(1729.2, 6414.1, 34.0)
}},
RobsLiquor = {
Items = {},
Pos = {
{x = 1135.808, y = -982.281, z = 45.415},
{x = -1222.915, y = -906.983, z = 11.326},
{x = -1487.553, y = -379.107, z = 39.163},
{x = -2968.243, y = 390.910, z = 14.043},
{x = 1166.024, y = 2708.930, z = 37.157},
{x = 1392.562, y = 3604.684, z = 33.980},
{x = 127.830, y = -1284.796, z = 28.280}, --StripClub
{x = -1393.409, y = -606.624, z = 29.319}, --Tequila la
{x = -559.906, y = 287.093, z = 81.176} --Bahamamas
}
},
vector3(1135.8, -982.2, 45.4),
vector3(-1222.9, -906.9, 11.3),
vector3(-1487.5, -379.1, 39.1),
vector3(-2968.2, 390.9, 14.0),
vector3(1166.0, 2708.9, 37.1),
vector3(1392.5, 3604.6, 33.9),
vector3(127.8, -1284.7, 28.2), --StripClub
vector3(-1393.4, -606.6, 29.3), --Tequila la
vector3(-559.9, 287.0, 81.1) --Bahamamas
}},
LTDgasoline = {
Items = {},
Pos = {
{x = -48.519, y = -1757.514, z = 28.421},
{x = 1163.373, y = -323.801, z = 68.205},
{x = -707.501, y = -914.260, z = 18.215},
{x = -1820.523, y = 792.518, z = 137.118},
{x = 1698.388, y = 4924.404, z = 41.063}
}
}
vector3(-48.5, -1757.5, 28.4),
vector3(1163.3, -323.8, 68.2),
vector3(-707.5, -914.2, 18.2),
vector3(-1820.5, 792.5, 137.1),
vector3(1698.3, 4924.4, 41.0)
}}
}