Skip to content

Commit 24fa05e

Browse files
committed
Update v4.1.3
* Fixed RegisterKeyMapping for Lockpick Hotkey * Some other Bugfixes * Added new translation * Removed unnecessary translations
1 parent da0a772 commit 24fa05e

File tree

5 files changed

+23
-38
lines changed

5 files changed

+23
-38
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1.2
1+
4.1.3

client/client.lua

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ toggleEngine = function(bypass)
3535

3636
if IsVehicleSeatFree(currVehicle, -1) then return end
3737
end
38+
39+
if GetVehicleDamaged(currVehicle) then
40+
return Config.Notification(nil, Translation[Config.Locale]['veh_is_damaged'], 'error')
41+
end
3842

3943
if not bypass then
4044
canToggleEngine = getIsVehicleOrKeyOwner(currVehicle)
@@ -44,11 +48,8 @@ toggleEngine = function(bypass)
4448
return Config.Notification(nil, Translation[Config.Locale]['key_nokey'], 'error')
4549
end
4650

47-
if GetVehicleDamaged(currVehicle) then return end
4851
local isEngineOn = GetIsVehicleEngineRunning(currVehicle)
49-
5052
SetEngineState(currVehicle, not isEngineOn, true)
51-
SetVehicleKeepEngineOnWhenAbandoned(currVehicle, not isEngineOn)
5253

5354
if isEngineOn then
5455
CreateThread(disableDrive)
@@ -71,11 +72,9 @@ AddEventHandler('msk_enginetoggle:enteringVehicle', function(vehicle, plate, sea
7172

7273
if not Config.EngineOnAtEnter then
7374
SetEngineState(vehicle, false, true)
74-
SetVehicleKeepEngineOnWhenAbandoned(vehicle, false)
7575
end
7676
elseif seat == -1 and isEngineOn and (IsThisModelAHeli(vehicleModel) or IsThisModelAPlane(vehicleModel)) then
7777
SetEngineState(vehicle, true, true)
78-
SetVehicleKeepEngineOnWhenAbandoned(vehicle, true)
7978
SetHeliBladesFullSpeed(vehicle)
8079
end
8180
end)
@@ -90,15 +89,12 @@ AddEventHandler('msk_enginetoggle:enteredVehicle', function(vehicle, plate, seat
9089

9190
if not Config.EngineOnAtEnter then
9291
SetEngineState(vehicle, false, true)
93-
SetVehicleKeepEngineOnWhenAbandoned(vehicle, false)
9492
CreateThread(disableDrive)
9593
else
9694
SetEngineState(vehicle, true, true)
97-
SetVehicleKeepEngineOnWhenAbandoned(vehicle, true)
9895
end
9996
elseif seat == -1 and isEngineOn and (IsThisModelAHeli(vehicleModel) or IsThisModelAPlane(vehicleModel)) then
10097
SetEngineState(vehicle, true, true)
101-
SetVehicleKeepEngineOnWhenAbandoned(vehicle, true)
10298
SetHeliBladesFullSpeed(vehicle)
10399
end
104100
end)
@@ -111,7 +107,6 @@ AddEventHandler('msk_enginetoggle:exitedVehicle', function(vehicle, plate, seat,
111107
if seat == -1 and not isEngineOn then
112108
logging('SetVehicleUndriveable')
113109
SetEngineState(vehicle, false, true)
114-
SetVehicleKeepEngineOnWhenAbandoned(vehicle, false)
115110
end
116111
end)
117112

@@ -130,7 +125,6 @@ CreateThread(function()
130125
if (IsThisModelAHeli(vehicleModel) or IsThisModelAPlane(vehicleModel)) then
131126
if GetEngineState(vehicle) then
132127
SetEngineState(vehicle, true, true)
133-
SetVehicleKeepEngineOnWhenAbandoned(vehicle, true)
134128
SetHeliBladesFullSpeed(vehicle)
135129
end
136130
end
@@ -194,9 +188,11 @@ SetEngineState = function(vehicle, state, engine)
194188
currentVehicle.isEngineOn = state
195189
Entity(vehicle).state:set('isEngineOn', state, true)
196190

191+
SetVehicleUndriveable(vehicle, not state)
192+
SetVehicleKeepEngineOnWhenAbandoned(vehicle, state)
193+
197194
if not engine then return end
198195
SetVehicleEngineOn(vehicle, state, false, true)
199-
SetVehicleUndriveable(vehicle, not state)
200196
end
201197
exports('SetEngineState', SetEngineState)
202198

@@ -218,6 +214,7 @@ SetVehicleDamaged = function(vehicle, state)
218214

219215
currentVehicle.isDamaged = state
220216
Entity(vehicle).state:set('isDamaged', state, true)
217+
if state then SetEngineState(vehicle, not state, true) end
221218
end
222219
exports('SetVehicleDamaged', SetVehicleDamaged)
223220
exports('setVehicleDamaged', SetVehicleDamaged) -- Support for old versions

client/client_hotwire.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ if Config.EnableLockpick and Config.LockpickHotkey.enable then
2727
toggleHotwire()
2828
end
2929
end)
30-
RegisterKeyMapping(Config.LockpickHotkey.command, 'Toggle Engine', 'keyboard', Config.LockpickHotkey.key)
30+
RegisterKeyMapping(Config.LockpickHotkey.command, 'Lockpick Vehicle', 'keyboard', Config.LockpickHotkey.key)
3131
end
3232

3333
loadAnimDict = function(dict)

fxmanifest.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ games { 'gta5' }
44
author 'Musiker15 - MSK Scripts'
55
name 'msk_enginetoggle'
66
description 'EngineToggle for Vehicles'
7-
version '4.1.2'
7+
version '4.1.3'
88

99
lua54 'yes'
1010

translation.lua

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,28 @@
1-
Translation = {}
2-
----------------------------------------------------------------
31
Translation = {
42
['de'] = {
53
['engine_start'] = 'Der Motor wurde ~g~gestartet',
64
['engine_stop'] = 'Der Motor wurde ~r~gestoppt',
75
['key_nokey'] = 'Du besitzt ~r~keinen~s~ Schlüssel für dieses Fahrzeug',
8-
['engine_onatenter'] = 'Der Motor wird ~g~gestartet...',
6+
['veh_is_damaged'] = 'Das Fahrzeug kann nicht gestartet werden da es beschädigt ist',
7+
98
['hasno_lockpick'] = 'Du hast keinen Dietrich dabei',
10-
['hotwiring'] = 'Fahrzeug wird geknackt...',
11-
['vehicle_unlocked'] = 'Fahrzeug geknackt',
12-
['hotwiring_failed'] = 'Dietrich ist abgebrochen',
13-
['hotwire_activesearchkey'] = 'Du suchst nach dem Fahrzeugschlüssel...',
9+
['hotwiring'] = 'Fahrzeug wird aufgebrochen...',
10+
['vehicle_unlocked'] = 'Fahrzeug aufgebrochen',
11+
['hotwiring_failed'] = 'Der Dietrich ist abgebrochen',
1412
['hotwiring_foundkey'] = 'Fahrzeugschlüssel gefunden',
1513
['hotwiring_notfoundkey'] = 'Fahrzeugschlüssel nicht gefunden',
16-
['hotwire_searchkey'] = 'Drücke ~r~E~s~ um den Fahrzeugschlüssel zu suchen',
17-
18-
['neonlights_on'] = 'Du hast die Unterbodenbeleuchtung eingeschaltet',
19-
['neonlights_off'] = 'Du hast die Unterbodenbeleuchtung ausgeschaltet',
20-
['neonlights_not_installed'] = 'Du hast keine Unterbodenbeleuchtung',
2114
},
2215
['en'] = {
2316
['engine_start'] = 'The Engine ~g~started',
2417
['engine_stop'] = 'The Engine ~r~stopped',
2518
['key_nokey'] = 'You do ~r~not~s~ have a Key for this Vehicle',
26-
['engine_onatenter'] = 'The Engine is ~g~starting...',
27-
['hasno_lockpick'] = 'Du hast keinen Dietrich dabei',
28-
['hotwiring'] = 'Fahrzeug wird geknackt...',
29-
['vehicle_unlocked'] = 'Fahrzeug geknackt',
30-
['hotwiring_failed'] = 'Dietrich ist abgebrochen',
31-
['hotwire_activesearchkey'] = 'Du suchst nach dem Fahrzeugschlüssel...',
32-
['hotwiring_foundkey'] = 'Fahrzeugschlüssel gefunden',
33-
['hotwiring_notfoundkey'] = 'Fahrzeugschlüssel nicht gefunden',
34-
['hotwire_searchkey'] = 'Drücke ~r~E~s~ um den Fahrzeugschlüssel zu suchen',
19+
['veh_is_damaged'] = 'The vehicle cannot be started because it is damaged',
3520

36-
['neonlights_on'] = 'You turned on the neon lights',
37-
['neonlights_off'] = 'You turned off the neon lights',
38-
['neonlights_not_installed'] = 'You do not have neon lights installed',
21+
['hasno_lockpick'] = 'You don\'t have a lockpick with you',
22+
['hotwiring'] = 'Lockpicking vehicle...',
23+
['vehicle_unlocked'] = 'Vehicle broken into',
24+
['hotwiring_failed'] = 'The lockpick is broken',
25+
['hotwiring_foundkey'] = 'Vehiclekeys found',
26+
['hotwiring_notfoundkey'] = 'Vehiclekeys not found',
3927
},
4028
}

0 commit comments

Comments
 (0)