From 104413b8fa4a3aa369cf732bbc654729432bd1ba Mon Sep 17 00:00:00 2001 From: KingMcDonalds Date: Sun, 26 Jan 2025 04:16:46 -0800 Subject: [PATCH] fixing siren --- .../Discord-VehRestriction/config.lua | 592 +++++++++++++----- .../lvc/PLUGINS/extra_controls/SETTINGS.lua | 34 +- resources/lvc/SIRENS.lua | 7 + 3 files changed, 475 insertions(+), 158 deletions(-) diff --git a/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua b/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua index 0d20858a1..3772a1923 100644 --- a/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua +++ b/resources/[EGRP-Discord-Integration]/Discord-VehRestriction/config.lua @@ -63,11 +63,141 @@ Config.VehicleRestrictions = { "Staff-Buggy", "Staff-DMLEOF82", "Staff-kgbearcat", - "Staff-EGRPghoul", + "Staff-EGRPghoul", + "hpbearcat", "chargfire", - "18gscrb", + "18gscrb", "21gscbb", "caddys", + "chargfire", + "fedrange", + "dhsgt350", + "policeatvrb", + "hpsrtcat18", + "hpvic11", + "Polmrambb23", + "18gscrb", + "c322prdurangok9", + "c322prtahoe", + "Dicygt3mq", + "skcharger", + "flfa", + "nqsrt", + "drehellcatdurango", + "23silvumbb", + "20Maxfdramsquad", + "22nali", + "2025MAXcat", + "B737800", + "b737800C", + "bubbadenali", + "CadesFord6.7", + "cl415", + "famg1", + "fct4v", + "freebovenomgt", + "hpbearcat", + "hpcmd21", + "max2lighting", + "max4runner", + "max14ram", + "MAX-cat21", + "Maxpursuit", + "maxpurtahoek9", + "MAXseahawk", + "BCSOMaxcharger", + "maxc322prfpiu", + "maxcamaro19", + "maxfedv", + "maxkhellwb", + "PD23Suburban", + "swat1", + "zr1RB", + "18gscrb", + "21durangowb", + "21gscbb", + "21shelby", + "23silvumbb", + "2019rtr", + "agerars", + "aperta", + "bccat140", + "bccat430", + "bcsspd", + "c3lib18chgrb", + "c3rampddual", + "c322prdurangok9", + "c322prtahoe", + "chartrxleo", + "csdot18sier", + "csdot3500bed", + "csdotbigtex40", + "csdoteagerbeaver", + "csdotf350", + "csfdmedic3", + "ctt55vv", + "dhstransit", + "dill23tundra", + "f15021", + "independent389", + "jw_23tundraintb", + "m4cg83mp", + "m8gc", + "mrap", + "mxxraprb", + "MAX_dbs770", + "MAX2bmw550", + "max13gt", + "MAX15CHARG", + "max745", + "MAX2019zrr19", + "maxamg", + "maxhurpd", + "maxm8", + "MAXMGTSPED", + "maxsr34", + "Maxzr2bison", + "monkey01cobra", + "navigatorleo", + "nforce24mustangS", + "23gmcleoslick", + "23gmcleo", + "oycbcgt", + "rw24aev", + "nxsmods22jeep", + "nxsmods21yukon", + "nxsmods21tah", + "nxsmods21sierra", + "s6318", + "Staff-gtwinturbocobra", + "velocityextendo", + "Dicygt3mq", + "skcharger", + "nqsrt", + "ghibli21", + "drehellcatdurango", + "22ct5vbw", + "vanzwbchev", + "vanzwbchevy", + "csdotboxlongtr", + "csdotp579", + "socalchev", + "hpcmd21", + "max2lighting", + "max4runner", + "max14ram", + "MAX-cat21", + "Maxpursuit", + "maxpurtahoek9", + "MAXseahawk", + "BCSOMaxcharger", + "maxc322prfpiu", + "maxcamaro19", + "maxfedv", + "maxkhellwb", + "PD23Suburban", + "swat1", + "zr1RB" }, ['EG | Sr. Moderator'] = { "Staff-EGRP21expd", @@ -76,14 +206,144 @@ Config.VehicleRestrictions = { "staff-rs518", "staff-22gscrb", "Staff-23gsbb", + "mrap", + "mxxraprb", "Staff-Buggy", "Staff-DMLEOF82", "Staff-kgbearcat", - "Staff-EGRPghoul", + "Staff-EGRPghoul", + "hpbearcat", "chargfire", - "18gscrb", + "18gscrb", "21gscbb", "caddys", + "chargfire", + "fedrange", + "dhsgt350", + "policeatvrb", + "hpsrtcat18", + "hpvic11", + "Polmrambb23", + "18gscrb", + "c322prdurangok9", + "c322prtahoe", + "Dicygt3mq", + "skcharger", + "flfa", + "nqsrt", + "drehellcatdurango", + "23silvumbb", + "20Maxfdramsquad", + "22nali", + "2025MAXcat", + "B737800", + "b737800C", + "bubbadenali", + "CadesFord6.7", + "cl415", + "famg1", + "fct4v", + "freebovenomgt", + "hpbearcat", + "hpcmd21", + "max2lighting", + "max4runner", + "max14ram", + "MAX-cat21", + "Maxpursuit", + "maxpurtahoek9", + "MAXseahawk", + "BCSOMaxcharger", + "maxc322prfpiu", + "maxcamaro19", + "maxfedv", + "maxkhellwb", + "PD23Suburban", + "swat1", + "zr1RB", + "18gscrb", + "21durangowb", + "21gscbb", + "21shelby", + "23silvumbb", + "2019rtr", + "agerars", + "aperta", + "bccat140", + "bccat430", + "bcsspd", + "c3lib18chgrb", + "c3rampddual", + "c322prdurangok9", + "nxsmods22jeep", + "nxsmods21yukon", + "nxsmods21tah", + "nxsmods21sierra", + "c322prtahoe", + "chartrxleo", + "csdot18sier", + "csdot3500bed", + "csdotbigtex40", + "csdoteagerbeaver", + "csdotf350", + "csfdmedic3", + "ctt55vv", + "dhstransit", + "dill23tundra", + "f15021", + "independent389", + "jw_23tundraintb", + "m4cg83mp", + "m8gc", + "MAX_dbs770", + "MAX2bmw550", + "max13gt", + "MAX15CHARG", + "max745", + "MAX2019zrr19", + "maxamg", + "maxhurpd", + "maxm8", + "MAXMGTSPED", + "maxsr34", + "Maxzr2bison", + "monkey01cobra", + "navigatorleo", + "nforce24mustangS", + "23gmcleoslick", + "23gmcleo", + "oycbcgt", + "rw24aev", + "s6318", + "Staff-gtwinturbocobra", + "velocityextendo", + "Dicygt3mq", + "skcharger", + "nqsrt", + "ghibli21", + "drehellcatdurango", + "22ct5vbw", + "vanzwbchev", + "vanzwbchevy", + "csdotboxlongtr", + "csdotp579", + "socalchev", + "hpcmd21", + "max2lighting", + "max4runner", + "max14ram", + "MAX-cat21", + "Maxpursuit", + "maxpurtahoek9", + "MAXseahawk", + "BCSOMaxcharger", + "maxc322prfpiu", + "maxcamaro19", + "maxfedv", + "maxkhellwb", + "PD23Suburban", + "swat1", + "zr1RB" }, ['EG | Admin'] = { "Staff-EGRP21expd", @@ -96,6 +356,8 @@ Config.VehicleRestrictions = { "hpbearcat", "chargfire", "18gscrb", + "mrap", + "mxxraprb", "21gscbb", "caddys", "chargfire", @@ -207,6 +469,10 @@ Config.VehicleRestrictions = { "socalchev", "hpcmd21", "max2lighting", + "nxsmods22jeep", + "nxsmods21yukon", + "nxsmods21tah", + "nxsmods21sierra", "max4runner", "max14ram", "MAX-cat21", @@ -240,10 +506,12 @@ Config.VehicleRestrictions = { "Staff-Buggy", "Staff-DMLEOF82", "Staff-kgbearcat", - "Staff-EGRPghoul", + "Staff-EGRPghoul", "hpbearcat", "chargfire", "18gscrb", + "mrap", + "mxxraprb", "21gscbb", "caddys", "chargfire", @@ -340,6 +608,10 @@ Config.VehicleRestrictions = { "oycbcgt", "rw24aev", "s6318", + "nxsmods22jeep", + "nxsmods21yukon", + "nxsmods21tah", + "nxsmods21sierra", "Staff-gtwinturbocobra", "velocityextendo", "Dicygt3mq", @@ -368,159 +640,9 @@ Config.VehicleRestrictions = { "maxkhellwb", "PD23Suburban", "swat1", - "zr1RB", - "chargfire", - "18gscrb", - "21gscbb", - "caddys", - "Staff-gtwinturbocobra", + "zr1RB" }, ['EG | Head of Staff'] = { - "Staff-EGRP21expd", - "Staff-EGRPescal21", - "Staff-EGRPf350su", - "staff-rs518", - "staff-22gscrb", - "Staff-23gsbb", - "hpbearcat", - "chargfire", - "18gscrb", - "21gscbb", - "caddys", - "chargfire", - "fedrange", - "dhsgt350", - "policeatvrb", - "hpsrtcat18", - "hpvic11", - "Polmrambb23", - "18gscrb", - "c322prdurangok9", - "c322prtahoe", - "Dicygt3mq", - "skcharger", - "flfa", - "nqsrt", - "drehellcatdurango", - "23silvumbb", - "20Maxfdramsquad", - "22nali", - "2025MAXcat", - "B737800", - "b737800C", - "bubbadenali", - "CadesFord6.7", - "cl415", - "famg1", - "fct4v", - "freebovenomgt", - "hpbearcat", - "hpcmd21", - "max2lighting", - "max4runner", - "max14ram", - "MAX-cat21", - "Maxpursuit", - "maxpurtahoek9", - "MAXseahawk", - "BCSOMaxcharger", - "maxc322prfpiu", - "maxcamaro19", - "maxfedv", - "maxkhellwb", - "PD23Suburban", - "swat1", - "zr1RB", - "18gscrb", - "21durangowb", - "21gscbb", - "21shelby", - "23silvumbb", - "2019rtr", - "agerars", - "aperta", - "bccat140", - "bccat430", - "bcsspd", - "c3lib18chgrb", - "c3rampddual", - "c322prdurangok9", - "c322prtahoe", - "chartrxleo", - "csdot18sier", - "csdot3500bed", - "csdotbigtex40", - "csdoteagerbeaver", - "csdotf350", - "csfdmedic3", - "ctt55vv", - "dhstransit", - "dill23tundra", - "f15021", - "independent389", - "jw_23tundraintb", - "m4cg83mp", - "m8gc", - "MAX_dbs770", - "MAX2bmw550", - "max13gt", - "MAX15CHARG", - "max745", - "MAX2019zrr19", - "maxamg", - "maxhurpd", - "maxm8", - "MAXMGTSPED", - "maxsr34", - "Maxzr2bison", - "monkey01cobra", - "navigatorleo", - "nforce24mustangS", - "23gmcleoslick", - "23gmcleo", - "oycbcgt", - "rw24aev", - "s6318", - "Staff-gtwinturbocobra", - "velocityextendo", - "Dicygt3mq", - "skcharger", - "nqsrt", - "ghibli21", - "drehellcatdurango", - "22ct5vbw", - "vanzwbchev", - "vanzwbchevy", - "csdotboxlongtr", - "csdotp579", - "socalchev", - "hpcmd21", - "max2lighting", - "max4runner", - "max14ram", - "MAX-cat21", - "Maxpursuit", - "maxpurtahoek9", - "MAXseahawk", - "BCSOMaxcharger", - "maxc322prfpiu", - "maxcamaro19", - "maxfedv", - "maxkhellwb", - "PD23Suburban", - "swat1", - "zr1RB", - - "Staff-Buggy", - "Staff-DMLEOF82", - "Staff-kgbearcat", - "Staff-EGRPghoul", - "chargfire", - "18gscrb", - "21gscbb", - "caddys", - }, - ['EG | Server Developer'] = { "Staff-EGRP21expd", "Staff-EGRPescal21", "Staff-EGRPf350su", @@ -536,6 +658,8 @@ Config.VehicleRestrictions = { "18gscrb", "21gscbb", "caddys", + "mrap", + "mxxraprb", "chargfire", "fedrange", "dhsgt350", @@ -615,6 +739,156 @@ Config.VehicleRestrictions = { "max13gt", "MAX15CHARG", "max745", + "nxsmods22jeep", + "nxsmods21yukon", + "nxsmods21tah", + "nxsmods21sierra", + "MAX2019zrr19", + "maxamg", + "maxhurpd", + "maxm8", + "MAXMGTSPED", + "maxsr34", + "Maxzr2bison", + "monkey01cobra", + "navigatorleo", + "nforce24mustangS", + "23gmcleoslick", + "23gmcleo", + "oycbcgt", + "rw24aev", + "s6318", + "Staff-gtwinturbocobra", + "velocityextendo", + "Dicygt3mq", + "skcharger", + "nqsrt", + "ghibli21", + "drehellcatdurango", + "22ct5vbw", + "vanzwbchev", + "vanzwbchevy", + "csdotboxlongtr", + "csdotp579", + "socalchev", + "hpcmd21", + "max2lighting", + "max4runner", + "max14ram", + "MAX-cat21", + "Maxpursuit", + "maxpurtahoek9", + "MAXseahawk", + "BCSOMaxcharger", + "maxc322prfpiu", + "maxcamaro19", + "maxfedv", + "maxkhellwb", + "PD23Suburban", + "swat1", + "zr1RB" + }, + ['EG | Server Developer'] = { + "Staff-EGRP21expd", + "Staff-EGRPescal21", + "Staff-EGRPf350su", + "staff-rs518", + "staff-22gscrb", + "Staff-23gsbb", + "Staff-Buggy", + "Staff-DMLEOF82", + "Staff-kgbearcat", + "Staff-EGRPghoul", + "mrap", + "mxxraprb", + "hpbearcat", + "chargfire", + "18gscrb", + "21gscbb", + "caddys", + "chargfire", + "fedrange", + "dhsgt350", + "nxsmods22jeep", + "nxsmods21yukon", + "nxsmods21tah", + "nxsmods21sierra", + "policeatvrb", + "hpsrtcat18", + "hpvic11", + "Polmrambb23", + "18gscrb", + "c322prdurangok9", + "c322prtahoe", + "Dicygt3mq", + "skcharger", + "flfa", + "nqsrt", + "drehellcatdurango", + "23silvumbb", + "20Maxfdramsquad", + "22nali", + "2025MAXcat", + "B737800", + "b737800C", + "bubbadenali", + "CadesFord6.7", + "cl415", + "famg1", + "fct4v", + "freebovenomgt", + "hpbearcat", + "hpcmd21", + "max2lighting", + "max4runner", + "max14ram", + "MAX-cat21", + "Maxpursuit", + "maxpurtahoek9", + "MAXseahawk", + "BCSOMaxcharger", + "maxc322prfpiu", + "maxcamaro19", + "maxfedv", + "maxkhellwb", + "PD23Suburban", + "swat1", + "zr1RB", + "18gscrb", + "21durangowb", + "21gscbb", + "21shelby", + "23silvumbb", + "2019rtr", + "agerars", + "aperta", + "bccat140", + "bccat430", + "bcsspd", + "c3lib18chgrb", + "c3rampddual", + "c322prdurangok9", + "c322prtahoe", + "chartrxleo", + "csdot18sier", + "csdot3500bed", + "csdotbigtex40", + "csdoteagerbeaver", + "csdotf350", + "csfdmedic3", + "ctt55vv", + "dhstransit", + "dill23tundra", + "f15021", + "independent389", + "jw_23tundraintb", + "m4cg83mp", + "m8gc", + "MAX_dbs770", + "MAX2bmw550", + "max13gt", + "MAX15CHARG", + "max745", "MAX2019zrr19", "maxamg", "maxhurpd", @@ -670,9 +944,15 @@ Config.VehicleRestrictions = { "Staff-Buggy", "Staff-DMLEOF82", "Staff-kgbearcat", + "mrap", + "mxxraprb", "Staff-EGRPghoul", "chargfire", "fedrange", + "nxsmods22jeep", + "nxsmods21yukon", + "nxsmods21tah", + "nxsmods21sierra", "dhsgt350", "policeatvrb", "hpsrtcat18", diff --git a/resources/lvc/PLUGINS/extra_controls/SETTINGS.lua b/resources/lvc/PLUGINS/extra_controls/SETTINGS.lua index b2989bec5..829554944 100644 --- a/resources/lvc/PLUGINS/extra_controls/SETTINGS.lua +++ b/resources/lvc/PLUGINS/extra_controls/SETTINGS.lua @@ -6,9 +6,39 @@ allow_custom_controls = true --[[ Documentation / Wiki: https://github.com/TrevorBarns/luxart-vehicle-control/wiki/Extra-Controls ]] EXTRA_CONTROLS = { - ['DEFAULT'] = { - -- { '', Extras = {}, Combo = , Key = , (opt.) Audio = < button soundFX> } + ['DEFAULT'] = { }, + ['enladder'] = { + -- { '', Extras = {}, Combo = , Key = , (opt.) Audio = < button soundFX> } + { Name = 'Front Cut', Extras = {add = 8, remove = 9, repair = true}, Combo = 155, Key = 20, Audio = true }, + { Name = 'Scene Lights', Extras = {toggle = 9, repair = true}, Combo = 349, Key = 20, Audio = true }, + { Name = 'Pass. Spot Light', Extras = {add = 3, remove = 4, repair = true}, Combo = 326, Key = 20, Audio = false }, }, + ['engine6'] = { + -- { '', Extras = {}, Combo = , Key = , (opt.) Audio = < button soundFX> } + { Name = 'Test', Extras = {add = 4, remove = 9, repair = true}, Combo = 155, Key = 20, Audio = true }, + { Name = 'Test2', Extras = {toggle = 5, repair = true}, Combo = 349, Key = 20, Audio = true }, + { Name = 'Test3', Extras = {add = 6, remove = 7, repair = true}, Combo = 326, Key = 20, Audio = false }, + }, + ['engine6a'] = { + -- { '', Extras = {}, Combo = , Key = , (opt.) Audio = < button soundFX> } + { Name = 'Test', Extras = {add = 4, remove = 9, repair = true}, Combo = 155, Key = 20, Audio = true }, + { Name = 'Test2', Extras = {toggle = 5, repair = true}, Combo = 349, Key = 20, Audio = true }, + { Name = 'Test3', Extras = {add = 6, remove = 7, repair = true}, Combo = 326, Key = 20, Audio = false }, + }, + ['engine6d'] = { + -- { '', Extras = {}, Combo = , Key = , (opt.) Audio = < button soundFX> } + { Name = 'Test', Extras = {add = 4, remove = 9, repair = true}, Combo = 155, Key = 20, Audio = true }, + { Name = 'Test2', Extras = {toggle = 5, repair = true}, Combo = 349, Key = 20, Audio = true }, + { Name = 'Test3', Extras = {add = 6, remove = 7, repair = true}, Combo = 326, Key = 20, Audio = false }, + }, + ['rescue6'] = { + -- { '', Extras = {}, Combo = , Key = , (opt.) Audio = < button soundFX> } + { Name = 'Test', Extras = {add = 4, remove = 9, repair = true}, Combo = 155, Key = 20, Audio = true }, + { Name = 'Test2', Extras = {toggle = 5, repair = true}, Combo = 349, Key = 20, Audio = true }, + { Name = 'Test3', Extras = {add = 6, remove = 7, repair = true}, Combo = 326, Key = 20, Audio = false }, +}, + + } CONTROLS = { diff --git a/resources/lvc/SIRENS.lua b/resources/lvc/SIRENS.lua index b2c5cf4a3..3edfda0cc 100644 --- a/resources/lvc/SIRENS.lua +++ b/resources/lvc/SIRENS.lua @@ -117,6 +117,13 @@ SIREN_ASSIGNMENTS = { ['14tahoe'] = { 45, 16,19, 18, 48, 31 }, ['rescue11'] = { 45, 48, 13, 50, 47, 46 }, ['pierce1'] = { 45, 48, 13, 50, 47, 46 }, + ['24sub'] = { 45, 48, 44, 50, 47, 46 }, + ['24ramambo'] = { 45, 48, 44, 50, 47, 46 }, + ['xt1'] = { 45, 48, 44, 50, 47, 46 }, + ['f550super6'] = { 45, 48, 44, 50, 47, 46 }, + ['24rampumper'] = { 45, 48, 44, 50, 47, 46 }, + ['23sierrafire'] = { 45, 48, 44, 50, 47, 46 }, + ['2025MAXcat'] = { 45, 48, 44, 50, 47, 46 }, ['minivan69'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, ['ram3500'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 }, ['onebeast'] = { 27, 16, 17, 26, 23, 34, 29, 18, 42, 31 },