From 1ea722d5bf0a10969689af0531de8e7191866ac2 Mon Sep 17 00:00:00 2001 From: KingMcDonalds Date: Wed, 4 May 2022 11:40:42 -0700 Subject: [PATCH] fix e450 ambo and add new livery for it , fix lights --- hypnonema.db | Bin 28672 -> 28672 bytes resources/RealisticVehicleFailure/client.lua | 30 ++++++------------ .../data/e450ambo/carvariations.meta | 2 +- .../stream/e450ambo/e450ambo.ytd | 4 +-- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/hypnonema.db b/hypnonema.db index a2e65974b43ab1e5aa46321268efb0810f9d7234..1e5565b6aa6d4804b2c6b4d2a021aa87ebbe742a 100644 GIT binary patch delta 23 dcmZp8z}WDBae^tkHN$@(V4K*exiNKiJ^+D<3nu^o delta 23 dcmZp8z}WDBae^tk1H*qHV4K*exiNKiJ^+Ew3oHNt diff --git a/resources/RealisticVehicleFailure/client.lua b/resources/RealisticVehicleFailure/client.lua index 945beb064..478f46e00 100644 --- a/resources/RealisticVehicleFailure/client.lua +++ b/resources/RealisticVehicleFailure/client.lua @@ -179,8 +179,7 @@ AddEventHandler('iens:repair', function() healthEngineLast=1000.0 healthPetrolTankLast=1000.0 SetVehicleEngineOn(vehicle, true, false ) - exports['EGRP-Notifications']:CaptionIcon("Vehicle System", "Mechanic has repaired your vehicle!", "top", 3000, "dark", "", true, "mdi-wrench") - --notification("~g~The mechanic repaired your car!") + notification("~g~The mechanic repaired your car!") return end if GetVehicleEngineHealth(vehicle) < cfg.cascadingFailureThreshold + 5 then @@ -192,23 +191,19 @@ AddEventHandler('iens:repair', function() healthPetrolTankLast=750.0 SetVehicleEngineOn(vehicle, true, false ) SetVehicleOilLevel(vehicle,(GetVehicleOilLevel(vehicle)/3)-0.5) - exports['EGRP-Notifications']:CaptionIcon("Vehicle System", ""..repairCfg.fixMessages[fixMessagePos]..", now get to a mechanic!", "top", 3000, "dark", "", true, "mdi-wrench") - --notification("~g~" .. repairCfg.fixMessages[fixMessagePos] .. ", now get to a mechanic!") + notification("~g~" .. repairCfg.fixMessages[fixMessagePos] .. ", now get to a mechanic!") fixMessagePos = fixMessagePos + 1 if fixMessagePos > repairCfg.fixMessageCount then fixMessagePos = 1 end else - exports['EGRP-Notifications']:Negative("System", "Vehicle too badly damaged, unable to repair!", "top", 3000, true) - --notification("~r~Your vehicle was too badly damaged. Unable to repair!") + notification("~r~Your vehicle was too badly damaged. Unable to repair!") end else - exports['EGRP-Notifications']:Warning("System", ""..repairCfg.noFixMessages[noFixMessagePos].."!", "top", 3000, true) - --notification("~y~" .. repairCfg.noFixMessages[noFixMessagePos] ) + notification("~y~" .. repairCfg.noFixMessages[noFixMessagePos] ) noFixMessagePos = noFixMessagePos + 1 if noFixMessagePos > repairCfg.noFixMessageCount then noFixMessagePos = 1 end end else - exports['EGRP-Notifications']:Negative("System", "You must be in a vehicle to repair it!", "top", 3000, true) - --notification("~y~You must be in a vehicle to be able to repair it") + notification("~y~You must be in a vehicle to be able to repair it") end end) @@ -224,8 +219,7 @@ AddEventHandler('iens:fix', function() healthEngineLast=1000.0 healthPetrolTankLast=1000.0 SetVehicleEngineOn(vehicle, true, false ) - exports['EGRP-Notifications']:CaptionIcon("Vehicle System", "Mechanic has repaired your vehicle!", "top", 3000, "dark", "", true, "mdi-wrench") - --notification("~g~The mechanic repaired your car!") + notification("~g~The mechanic repaired your car!") return end if GetVehicleEngineHealth(vehicle) < cfg.cascadingFailureThreshold + 5 then @@ -237,23 +231,19 @@ AddEventHandler('iens:fix', function() healthPetrolTankLast=750.0 SetVehicleEngineOn(vehicle, true, false ) SetVehicleOilLevel(vehicle,(GetVehicleOilLevel(vehicle)/3)-0.5) - exports['EGRP-Notifications']:CaptionIcon("Vehicle System", ""..repairCfg.fixMessages[fixMessagePos]..", now get to a mechanic!", "top", 3000, "dark", "", true, "mdi-wrench") - --notification("~g~" .. repairCfg.fixMessages[fixMessagePos] .. ", now get to a mechanic!") + notification("~g~" .. repairCfg.fixMessages[fixMessagePos] .. ", now get to a mechanic!") fixMessagePos = fixMessagePos + 1 if fixMessagePos > repairCfg.fixMessageCount then fixMessagePos = 1 end else - exports['EGRP-Notifications']:Negative("System", "Vehicle too badly damaged, unable to repair!", "top", 3000, true) - --notification("~r~Your vehicle was too badly damaged. Unable to repair!") + notification("~r~Your vehicle was too badly damaged. Unable to repair!") end else - exports['EGRP-Notifications']:Warning("System", ""..repairCfg.noFixMessages[noFixMessagePos].."!", "top", 3000, true) - --notification("~y~" .. repairCfg.noFixMessages[noFixMessagePos] ) + notification("~y~" .. repairCfg.noFixMessages[noFixMessagePos] ) noFixMessagePos = noFixMessagePos + 1 if noFixMessagePos > repairCfg.noFixMessageCount then noFixMessagePos = 1 end end else - exports['EGRP-Notifications']:Negative("System", "You must be in a vehicle to repair it!", "top", 3000, true) - --notification("~y~You must be in a vehicle to be able to repair it") + notification("~y~You must be in a vehicle to be able to repair it") end end) diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/e450ambo/carvariations.meta b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/e450ambo/carvariations.meta index 1f79491d6..5f8e3e1ba 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/data/e450ambo/carvariations.meta +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/data/e450ambo/carvariations.meta @@ -520,7 +520,7 @@ - + \ No newline at end of file diff --git a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/e450ambo/e450ambo.ytd b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/e450ambo/e450ambo.ytd index b466a39bd..b8c022e0b 100644 --- a/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/e450ambo/e450ambo.ytd +++ b/resources/[EGRP-CarPacks]/EGRP-Emergency/stream/e450ambo/e450ambo.ytd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c1b19af27f72e6c3d463306334ac1d793c0f51c954060d4999a5050b2597dbe -size 10972985 +oid sha256:142fe23d300d902d97cc53961cb636bdd31189d1322e5c872fca7158cec8db11 +size 9936078