Michatec/wk_wars2x
1
1
Fork 0
mirror of https://github.com/Michatec/wk_wars2x.git synced 2026-04-01 08:26:27 +02:00
Code Issues Packages Projects Releases Activity

Speed lock beep, testing out no radar stages

Browse Source
This commit is contained in:
Dan
2019-12-02 19:46:37 +00:00
parent d7b5aef587
commit 3373d57410
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cl_radar.lua
View File

@@ -597,6 +597,8 @@ function RADAR:SetAntennaSpeedLock( ant, speed, dir )
self.vars.antennas[ant].lockedDir = dir self.vars.antennas[ant].lockedDir = dir
self:SetAntennaSpeedIsLocked( ant, true ) self:SetAntennaSpeedIsLocked( ant, true )
SendNUIMessage( { _type = "audio", name = "beep", vol = RADAR:GetSettingValue( "beep" ) } )
end end
end end
@@ -633,6 +635,8 @@ function RADAR:ResetAntenna( ant )
-- be transmitting, this is the only way to reset the values -- be transmitting, this is the only way to reset the values
self.vars.antennas[ant].xmit = false self.vars.antennas[ant].xmit = false
self.vars.antennas[ant].mode = 0 self.vars.antennas[ant].mode = 0
self:ResetAntennaSpeedLock( ant )
end end
@@ -830,12 +834,12 @@ function RADAR:RunControlManager()
end end
-- 'Num8' key, locks speed from front antenna -- 'Num8' key, locks speed from front antenna
if ( IsDisabledControlJustPressed( 1, 111 ) ) then if ( IsDisabledControlJustReleased( 1, 111 ) ) then
self:LockAntennaSpeed( "front" ) self:LockAntennaSpeed( "front" )
end end
-- 'Num5' key, locks speed from rear antenna -- 'Num5' key, locks speed from rear antenna
if ( IsDisabledControlJustPressed( 1, 112 ) ) then if ( IsDisabledControlJustReleased( 1, 112 ) ) then
self:LockAntennaSpeed( "rear" ) self:LockAntennaSpeed( "rear" )
end end
end end
@@ -899,7 +903,7 @@ function RADAR:Main()
local plyVehPos = GetEntityCoords( PLY.veh ) local plyVehPos = GetEntityCoords( PLY.veh )
-- First stage of the radar - get all of the vehicles hit by the radar -- First stage of the radar - get all of the vehicles hit by the radar
if ( self:GetRadarStage() == 0 ) then --if ( self:GetRadarStage() == 0 ) then
if ( self:GetRayTraceState() == 0 ) then if ( self:GetRayTraceState() == 0 ) then
local vehs = self:GetVehiclePool() local vehs = self:GetVehiclePool()
@@ -908,8 +912,8 @@ function RADAR:Main()
self:CreateRayThreads( PLY.veh, vehs ) self:CreateRayThreads( PLY.veh, vehs )
elseif ( self:GetRayTraceState() == self:GetNumOfRays() ) then elseif ( self:GetRayTraceState() == self:GetNumOfRays() ) then
self:IncreaseRadarStage() self:IncreaseRadarStage()
end --end
elseif ( self:GetRadarStage() == 1 ) then --elseif ( self:GetRadarStage() == 1 ) then
local data = {} local data = {}
-- Get the player's vehicle speed -- Get the player's vehicle speed
@@ -926,7 +930,7 @@ function RADAR:Main()
if ( not UTIL:IsTableEmpty( self:GetCapturedVehicles() ) ) then if ( not UTIL:IsTableEmpty( self:GetCapturedVehicles() ) ) then
local vehsForDisplay = self:GetVehiclesForAntenna() local vehsForDisplay = self:GetVehiclesForAntenna()
self:SetActiveVehicles( vehsForDisplay ) -- not really any point in setting this self:SetActiveVehicles( vehsForDisplay )
else else
self:SetActiveVehicles( { ["front"] = { nil, nil }, ["rear"] = { nil, nil } } ) self:SetActiveVehicles( { ["front"] = { nil, nil }, ["rear"] = { nil, nil } } )
end end
@@ -1037,7 +1041,7 @@ end )
------------------------------ DEBUG ------------------------------ ------------------------------ DEBUG ------------------------------
Citizen.CreateThread( function() --[[ Citizen.CreateThread( function()
while ( true ) do while ( true ) do
-- Ray line drawing -- Ray line drawing
-- local veh = GetVehiclePedIsIn( PlayerPedId(), false ) -- local veh = GetVehiclePedIsIn( PlayerPedId(), false )
@@ -1068,4 +1072,4 @@ Citizen.CreateThread( function()
Citizen.Wait( 0 ) Citizen.Wait( 0 )
end end
end ) end ) ]]