Nordi/Main
1
0
Fork 0
forked from Simnation/Main
Code Pull requests Activity

Merge branch 'master' of https://git.evolution-state-life.de/Evolution-State-Life/Main

Browse source
This commit is contained in:
Nordi98 2025-06-12 13:48:55 +02:00
commit 0301d63283
4 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/[cars]/rs666/data/vehicles.meta
View file

@ -15,7 +15,7 @@
<animConvRoofName>null</animConvRoofName>
<animConvRoofWindowsAffected />
<ptfxAssetName>null</ptfxAssetName>
<audioNameHash>audr8tteng</audioNameHash>
<audioNameHash>taaud40v8</audioNameHash>
<layout>LAYOUT_STANDARD</layout>
<coverBoundOffsets>SCHAFTER_COVER_OFFSET_INFO</coverBoundOffsets>
<explosionInfo>EXPLOSION_INFO_DEFAULT</explosionInfo>

22
resources/[carscripts]/mh_garage/client/retrieve.lua
View file

@ -9,16 +9,18 @@ AddEventHandler('mh_garage:retrieveVehicle', function()
QBCore.Functions.TriggerCallback('mh_garage:CallVehicles', function(cb)
Debug(json.encode(cb))
for i = 1, #cb, 1 do
local mods = json.decode(cb[i].mods)
table.insert(opt, {
title = cb[i].name,
description = "Kennzeichen: "..cb[i].plate.."\nTankinhalt: "..math.round(mods.fuelLevel, 2).."%",
icon = "car",
onSelect = function()
cb[i].mods = mods
SpawnThisVehicle(cb[i])
end
})
if cb[i].garage ~= "OUT" then
local mods = json.decode(cb[i].mods)
table.insert(opt, {
title = cb[i].name,
description = "Kennzeichen: "..cb[i].plate.."\nTankinhalt: "..math.round(mods.fuelLevel, 2).."%",
icon = "car",
onSelect = function()
cb[i].mods = mods
SpawnThisVehicle(cb[i])
end
})
end
end
lib.registerContext({

6
resources/[carscripts]/mh_garage/server/server.lua
View file

@ -31,7 +31,7 @@ QBCore.Functions.CreateCallback('mh_garage:storedVehicle', function(source, cb,
if Player.Functions.GetMoney('bank', zone.price) then
MySQL.query("SELECT * FROM player_vehicles WHERE citizenid = ? AND plate = ?", {Player.PlayerData.citizenid, veh.plate}, function(rs)
if rs[1] ~= nil then
MySQL.query("UPDATE player_vehicles SET garage = ?, parking = ?, mods = ? WHERE plate = ?", {zone.name, true, json.encode(veh), veh.plate})
MySQL.query("UPDATE player_vehicles SET garage = ?, mods = ? WHERE plate = ?", {zone.name, json.encode(veh), veh.plate})
DelVehParking(veh.plate)
cb({
status = true,
@ -43,7 +43,7 @@ QBCore.Functions.CreateCallback('mh_garage:storedVehicle', function(source, cb,
else
MySQL.query("SELECT * FROM vehicle_keys WHERE owner = ? AND plate = ?", {Player.PlayerData.citizenid, veh.plate}, function(rs)
if rs[1] ~= nil then
MySQL.query("UPDATE player_vehicles SET garage = ?, parking = ? WHERE plate = ?", {zone.name, true, veh.plate})
MySQL.query("UPDATE player_vehicles SET garage = ?, mods = ? WHERE plate = ?", {zone.name, json.encode(veh), veh.plate})
--TriggerEvent('mh_Parking:removeVehicle', source, veh.plate)
--DelVehParking(veh.plate)
cb({
@ -147,5 +147,5 @@ end)
RegisterServerEvent('mh_garage:spawnedVehicle')
AddEventHandler('mh_garage:spawnedVehicle', function(netID, plate)
MySQL.query("UPDATE player_vehicles SET parking = ? WHERE plate = ?", {0, plate})
MySQL.query("UPDATE player_vehicles SET garage = ? WHERE plate = ?", {"OUT", plate})
end)

5
resources/[carscripts]/sn_vehicleKey/client.lua
View file

@ -803,5 +803,8 @@ local entityEnumerator = {
RegisterKeyMapping("vehicleLock", "Vehicle Lock", "keyboard", "PAGEUP")
RegisterCommand("vehicleLock", function()
TriggerEvent("VKC:toggleLockOnPlayer")
local vehicle = GetClosestVehicle(GetEntityCoords(PlayerPedId()), 10.0)
if (DoesEntityExist(vehicle) and IsVehicleOrKeyOwner(vehicle)) then
ToggleLock(vehicle, GetVehicleDoorLockStatus(vehicle) ~= LockStatus.Locked)
end
end, false)