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-10 17:26:44 +02:00
commit 6d90da2841
4 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
resources/[carscripts]/mh_garage/client/stored.lua
View file

@ -20,7 +20,7 @@ AddEventHandler('mh_garage:storeVehicle', function()
icon = "car",
onSelect = function()
print(CurrentZone.price)
if CurrentZone.price ~= false then
if CurrentZone.price ~= nil then
lib.hideContext("StoredVehicles")
lib.registerContext({
@ -62,7 +62,18 @@ AddEventHandler('mh_garage:storeVehicle', function()
lib.showContext("thisVehicle")
else
StoredVehicle(vehicles[i], CurrentZone)
QBCore.Functions.TriggerCallback('mh_garage:storedVehicle', function(cb)
if cb.status then
TriggerServerEvent('mh_Parking:deleteVehicle', mods.plate, NetworkGetNetworkIdFromEntity(vehicles[i]))
--DeleteVehicle(vehicles[i])
Notification(cb.text, cb.type, CurrentZone.name)
else
if cb.police and Config.EnabledPolice then
exports["roadphone"]:sendDispatch("Hier hat grade jemand versucht, ein Fahrzeug einzuparken.\nDas Zündschloss sah Beschädigt aus.\nKennzeichen: "..veh.plate, 'police', nil)
end
Notification(cb.text, cb.type)
end
end, mods, CurrentZone)
end
end
})

4
resources/[carscripts]/mh_garage/config/config.lua
View file

@ -7,7 +7,7 @@ Config.PriceModel = false
Config.CallKeyVehicles = true
Config.Verwaltung = {
garage = true,
garage = false,
garage_change = 1000, -- Kosten um das Fahrzeug in einer anderen Garage zu versetzen.
garage_time = 10, -- Zeit in Minuten bis das Fahrzeug in der neuen Garage ist!
@ -23,7 +23,7 @@ Config.Verwaltung = {
Config.Zonen = {
{
name = "Meetingpoint",
price = 10, --pro FZ
price = nil, --pro FZ
NPC = {
spawn = vector4(236.1599, -798.8522, 29.3653, 181.7547),
model = "s_m_m_security_01",

9
resources/[creator]/jobs_creator/_modules/banking/example/sh_banking.lua
View file

@ -10,18 +10,21 @@ table.insert(Integrations.modules[moduleType], moduleName)
-- This is just an EXAMPLE, so you have to edit it to make it work
Integrations[moduleType][moduleName].getSocietyMoney = function(societyName)
local money = exports['example-banking']:getMoney(societyName)
--local money = exports['example-banking']:getMoney(societyName)
local money = exports['okokBanking']:GetAccount(societyName)
return money
end
-- This is just an EXAMPLE, so you have to edit it to make it work
Integrations[moduleType][moduleName].giveMoneyToSociety = function(societyName, amount)
local success = exports['example-banking']:giveMoney(societyName, amount)
--local success = exports['example-banking']:giveMoney(societyName, amount)
local success = exports['okokBanking']:AddMoney(societyName, amount)
return success -- Return true if success, false if not
end
-- This is just an EXAMPLE, so you have to edit it to make it work
Integrations[moduleType][moduleName].removeMoneyFromSociety = function(societyName, amount)
local success = exports['example-banking']:removeMoney(societyName, amount)
--local success = exports['example-banking']:removeMoney(societyName, amount)
local success = exports['okokBanking']:RemoveMoney(societyName, amount)
return success -- Return true if success, false if not
end

20
resources/[tools]/RxBilling/config.lua
View file

@ -1,5 +1,5 @@
--[[
BY RX Scripts © rxscripts.xyz
BY RX Scripts <EFBFBD> rxscripts.xyz
--]]
Config = {}
@ -12,8 +12,8 @@ Config.ReceiveMoney = {
}
Config.PlayerInvoices = {
enabled = true, -- Spieler können anderen Spielern Rechnungen senden
maxInvoices = 5, -- Maximal ausstehende Rechnungen pro Spieler
enabled = true, -- Spieler k<EFBFBD>nnen anderen Spielern Rechnungen senden
maxInvoices = 5000, -- Maximal ausstehende Rechnungen pro Spieler
}
Config.JobInvoices = {
@ -21,11 +21,11 @@ Config.JobInvoices = {
label = 'Polizei',
requiredGrade = 2,
presetInvoices = {
{ name = 'Rotes Licht überfahren', amount = 250, reason = 'Rotes Licht überfahren' },
{ name = 'Rotes Licht <EFBFBD>berfahren', amount = 250, reason = 'Rotes Licht <EFBFBD>berfahren' },
{ name = 'Falsches Parken', amount = 150, reason = 'Falsches Parken' },
{ name = 'Zu schnelles Fahren', amount = 300, reason = 'Zu schnelles Fahren' },
{ name = 'Gefährliches Fahren', amount = 500, reason = 'Gefährliches Fahren' },
{ name = 'Körperverletzung', amount = 1000, reason = 'Körperverletzung' },
{ name = 'Gef<EFBFBD>hrliches Fahren', amount = 500, reason = 'Gef<EFBFBD>hrliches Fahren' },
{ name = 'K<EFBFBD>rperverletzung', amount = 1000, reason = 'K<EFBFBD>rperverletzung' },
}
},
['ambulance'] = {
@ -47,17 +47,17 @@ Config.JobInvoices = {
}
Config.AutoPay = {
enabled = true, -- Automatisches Bezahlen nach bestimmter Zeit
enabled = false, -- Automatisches Bezahlen nach bestimmter Zeit
hours = 24, -- Nach wie vielen Stunden eine Rechnung automatisch bezahlt wird
feePercentagePerHour = 0.05 -- Aufschlag pro Stunde (0.05 = 5 %)
}
Config.Commands = {
openBilling = 'billing', -- /billing öffnet das Rechnungsmenü
openBilling = 'billing', -- /billing <EFBFBD>ffnet das Rechnungsmen<65>
}
Config.Keybinds = {
openBilling = 'F7', -- Taste zum Öffnen des Rechnungsmenüs (false = deaktivieren)
openBilling = 'F7', -- Taste zum <EFBFBD>ffnen des Rechnungsmen<65>s (false = deaktivieren)
}
Config.UI = {
@ -79,7 +79,7 @@ Config.UI = {
}
--[[
Passe diesen Teil nur an, wenn du die Namen der Ressourcen geändert hast
Passe diesen Teil nur an, wenn du die Namen der Ressourcen ge<EFBFBD>ndert hast
--]]
Resources = {
FM = { name = 'fmLib', export = 'new' },