Merge branch 'oss' into 206-peugeot-but-also-image-for-news

env.cfg-dist

@@ -42,6 +42,7 @@ set mysql_debug true
 # Disable steam login for development usage
 # This will allow you to connect to the server without having a steam account and use the rockstar license field instead
 #set soz_disable_steam_credential true
+#set soz_enable_test_auth true
 
 # Mumble configuration
 # Allow to use an external mumble server

resources/[default]/[system]/baseevents/vehiclechecker.lua

@@ -28,24 +28,28 @@ Citizen.CreateThread(function()
 				isInVehicle = true
 				currentVehicle = GetVehiclePedIsUsing(ped)
 				currentSeat = GetPedVehicleSeat(ped)
-				local model = GetEntityModel(currentVehicle)
-				local name = GetDisplayNameFromVehicleModel()
 				local netId = VehToNet(currentVehicle)
-				TriggerEvent('baseevents:enteredVehicle', currentVehicle, currentSeat, GetDisplayNameFromVehicleModel(GetEntityModel(currentVehicle)), netId)
-				TriggerServerEvent('baseevents:enteredVehicle', currentVehicle, currentSeat, GetDisplayNameFromVehicleModel(GetEntityModel(currentVehicle)), netId)
+				TriggerEvent('baseevents:enteredVehicle', currentVehicle, currentSeat)
+				TriggerServerEvent('baseevents:enteredVehicle', netId, currentSeat)
 			end
 		elseif isInVehicle then
 			if not IsPedInAnyVehicle(ped, false) or IsPlayerDead(PlayerId()) then
-				-- bye, vehicle
-				local model = GetEntityModel(currentVehicle)
-				local name = GetDisplayNameFromVehicleModel()
 				local netId = VehToNet(currentVehicle)
-				TriggerEvent('baseevents:leftVehicle', currentVehicle, currentSeat, GetDisplayNameFromVehicleModel(GetEntityModel(currentVehicle)), netId)
-				TriggerServerEvent('baseevents:leftVehicle', currentVehicle, currentSeat, GetDisplayNameFromVehicleModel(GetEntityModel(currentVehicle)), netId)
+				TriggerEvent('baseevents:leftVehicle', currentVehicle, currentSeat)
+				TriggerServerEvent('baseevents:leftVehicle', netId, currentSeat)
 				isInVehicle = false
 				currentVehicle = 0
 				currentSeat = 0
 			end
+
+            local pedInSeat = GetPedInVehicleSeat(currentVehicle, currentSeat)
+
+            if pedInSeat ~= ped then
+                currentSeat = GetPedVehicleSeat(ped)
+                local netId = VehToNet(currentVehicle)
+                TriggerEvent('baseevents:changedVehicleSeat', currentVehicle, currentSeat)
+                TriggerServerEvent('baseevents:changedVehicleSeat', netId, currentSeat)
+            end
 		end
 		Citizen.Wait(50)
 	end

resources/[mapping]/[mapping-disabled]/soz-bennysscreen/fxmanifest.lua

@@ -0,0 +1,5 @@
+fx_version 'cerulean'
+game 'gta5'
+this_is_a_map 'yes'
+
+data_file 'DLC_ITYP_REQUEST' 'stream/soz_big_screenbenny.ytyp'

resources/[mapping]/[mapping-prod]/soz-drivingmarina/fxmanifest.lua

@@ -1,10 +1,3 @@
 fx_version 'cerulean'
 game 'gta5'
 this_is_a_map 'yes'
-
-files {
-    "interiorproxies.meta"
-}
-
-
-data_file 'INTERIOR_PROXY_ORDER_FILE' 'interiorproxies.meta'

resources/[mapping]/[mapping-prod]/soz-hammerplace/fxmanifest.lua

@@ -0,0 +1,3 @@
+fx_version 'cerulean'
+game 'gta5'
+this_is_a_map 'yes'

resources/[mapping]/[mapping-prod]/soz-lsmc/fxmanifest.lua

@@ -4,9 +4,7 @@ this_is_a_map 'yes'
 
 
 files {
-
-    "interiorproxies.meta"
-
+    "audio/lsmc_game.dat151.rel",
 }
 
-data_file 'INTERIOR_PROXY_ORDER_FILE' 'interiorproxies.meta'
+data_file 'AUDIO_GAMEDATA' 'audio/lsmc_game.dat'

resources/[mapping]/[mapping-prod]/soz-map-dlc2/fxmanifest.lua

@@ -1,10 +1,3 @@
 fx_version 'cerulean'
 game 'gta5'
 this_is_a_map 'yes'
-
-files {
-
-"interiorproxies.meta"
-}
-
-data_file 'INTERIOR_PROXY_ORDER_FILE' 'interiorproxies.meta'

resources/[mapping]/[mapping-prod]/soz-map-pawl/fxmanifest.lua

@@ -1,11 +1,3 @@
 fx_version 'cerulean'
 game 'gta5'
 this_is_a_map 'yes'
-
-files {
-
-    "interiorproxies.meta"
-
-}
-
-data_file 'INTERIOR_PROXY_ORDER_FILE' 'interiorproxies.meta'

resources/[mapping]/[mapping-prod]/soz-map-upw/fxmanifest.lua

@@ -5,9 +5,7 @@ this_is_a_map 'yes'
 files {
     "audio/soz_upw_game.dat151.rel",
     "audio/soz_upw_mix.dat15.rel",
-    "interiorproxies.meta"
 }
 
-data_file 'INTERIOR_PROXY_ORDER_FILE' 'interiorproxies.meta'
 data_file 'AUDIO_GAMEDATA' 'audio/soz_upw_game.dat'
 data_file 'AUDIO_DYNAMIXDATA' 'audio/soz_upw_mix.dat'

resources/[mapping]/[mapping-prod]/soz-stonkdep/fxmanifest.lua

@@ -1,9 +1,3 @@
 fx_version 'cerulean'
 game 'gta5'
 this_is_a_map 'yes'
-
-files {
-    "interiorproxies.meta"
-}
-
-data_file 'INTERIOR_PROXY_ORDER_FILE' 'interiorproxies.meta'

resources/[qb]/progressbar/client/main.lua

@@ -112,17 +112,19 @@ function Process(action, start, tick, finish)
                 end
             end)
         else
-            TriggerEvent("hud:client:DrawNotification", "Une action est déjà en cours !", "error")
+            TriggerEvent("soz-core:client:notification:draw", "Une action est déjà en cours !", "error")
         end
     else
-        TriggerEvent("hud:client:DrawNotification", "Vous ne pouvez réaliser cette action !", "error")
+        TriggerEvent("soz-core:client:notification:draw", "Vous ne pouvez réaliser cette action !", "error")
     end
 end
 
 function ActionStart()
     runProgThread = true
     if not Action.no_inv_busy then
-        LocalPlayer.state:set("inv_busy", true, true) -- Busy
+        exports["soz-core"]:SetPlayerState({
+            isInventoryBusy = true,
+        })
         exports["soz-phone"]:setPhoneVisible(false)
         TriggerEvent("inventory:client:closeInventory")
     end
@@ -227,7 +229,9 @@ end
 function Cancel()
     isDoingAction = false
     wasCancelled = true
-    LocalPlayer.state:set("inv_busy", false, true) -- Not Busy
+    exports["soz-core"]:SetPlayerState({
+        isInventoryBusy = false,
+    })
     ActionCleanup()
 
     SendNUIMessage({
@@ -238,7 +242,9 @@ end
 function Finish()
     isDoingAction = false
     ActionCleanup()
-    LocalPlayer.state:set("inv_busy", false, true) -- Not Busy
+    exports["soz-core"]:SetPlayerState({
+        isInventoryBusy = false,
+    })
 end
 
 function ActionCleanup()

resources/[qb]/qb-core/client/events.lua

@@ -1,20 +1,14 @@
 -- Player load and unload handling
 -- New method for checking if logged in across all scripts (optional)
--- if LocalPlayer.state['isLoggedIn'] then
 RegisterNetEvent('QBCore:Client:OnPlayerLoaded', function()
     ShutdownLoadingScreenNui()
-    LocalPlayer.state:set('isLoggedIn', true, false)
     if QBConfig.Server.pvp then
         SetCanAttackFriendly(PlayerPedId(), true, false)
         NetworkSetFriendlyFireOption(true)
     end
     SetPlayerHealthRechargeMultiplier(PlayerId(), 0)
 end)
 
-RegisterNetEvent('QBCore:Client:OnPlayerUnload', function()
-    LocalPlayer.state:set('isLoggedIn', false, false)
-end)
-
 RegisterNetEvent('QBCore:Client:PvpHasToggled', function(pvp_state)
     SetCanAttackFriendly(PlayerPedId(), pvp_state, false)
     NetworkSetFriendlyFireOption(pvp_state)
@@ -52,50 +46,6 @@ RegisterNetEvent('QBCore:Command:GoToMarker', function()
     end
 end)
 
--- Vehicle Commands
-
-RegisterNetEvent('QBCore:Command:SpawnVehicle', function(vehName)
-    local ped = PlayerPedId()
-    local hash = GetHashKey(vehName)
-    if not IsModelInCdimage(hash) then
-        return
-    end
-    RequestModel(hash)
-    while not HasModelLoaded(hash) do
-        Wait(10)
-    end
-    local vehicle = CreateVehicle(hash, GetEntityCoords(ped), GetEntityHeading(ped), true, false)
-    TaskWarpPedIntoVehicle(ped, vehicle, -1)
-    SetModelAsNoLongerNeeded(hash)
-    TriggerEvent("vehiclekeys:client:SetOwner", QBCore.Functions.GetPlate(vehicle))
-end)
-
-RegisterNetEvent('QBCore:Command:VehicleVariation', function(livery)
-    local ped = PlayerPedId()
-    local veh = GetVehiclePedIsUsing(ped)
-    if veh ~= 0 then
-        SetVehicleLivery(veh, tonumber(livery))
-    end
-end)
-
-RegisterNetEvent('QBCore:Command:DeleteVehicle', function()
-    local ped = PlayerPedId()
-    local veh = GetVehiclePedIsUsing(ped)
-    if veh ~= 0 then
-        SetEntityAsMissionEntity(veh, true, true)
-        DeleteVehicle(veh)
-    else
-        local pcoords = GetEntityCoords(ped)
-        local vehicles = GetGamePool('CVehicle')
-        for k, v in pairs(vehicles) do
-            if #(pcoords - GetEntityCoords(v)) <= 5.0 then
-                SetEntityAsMissionEntity(v, true, true)
-                DeleteVehicle(v)
-            end
-        end
-    end
-end)
-
 -- Other stuff
 
 RegisterNetEvent('QBCore:Client:SetDuty', function()