feat(vehreg): Add Make and Year support, fix customData nil bug

sonorancad/configuration/bodycam_config.dist.lua

@@ -0,0 +1,208 @@
+--[[
+    Sonoran Plugins
+
+    Plugin Configuration
+
+    Put all needed configuration in this file.
+
+]]
+local config = {
+    enabled = true,
+    pluginName = "bodycam", -- name your plugin here
+    pluginAuthor = "digitalfire", -- author
+    configVersion = "1.0",
+
+    -- The command name to toggle your body camera on or off.
+    command="bodycam",
+
+    requireUnitDuty = true, -- if true, the player must be onduty in CAD to use the bodycam
+
+    -- Enables or disables animations on start up
+    enableAnimation = true,
+
+    -- Enables or disables the blinking body camera image on screen when enabled.
+    enableOverlay = true,
+
+    --[[
+        The position (corner) of the screen where the body camera image is displayed.
+
+        Options:
+        - top-left
+        - top-right
+        - bottom-left
+        - bottom-right
+    ]]
+    overlayLocation = 'top-right',
+
+    -- Enables or disables the body camera beeping when turned on.
+    enableBeeps = true,
+
+    --[[
+        Type of audio that the beeps use.
+
+        native: GtaV Native Sounds
+
+        nui/custom: Custom Sound File
+    ]]
+    beepType = "nui",
+
+    -- Adjusts the frequency at which unit body camera beeps when turned on(in milliseconds).
+    beepFrequency = 10000,
+
+    -- Adjusts the range at which a person can hear the bodycam beeps
+    beepRange = 19.99,
+
+    -- Adjusts the frequency at which unit body cameras update (in milliseconds).
+    screenshotFrequency=2000,
+
+    -- The default keybind for toggling the bodycam.
+    defaultKeybind="",
+
+    -- Automaticlly enable bodycam when lights are enabled / disabled
+    autoEnableWithLights = true,
+
+    -- Automaticlly enable bodycam when a weapon is drawn.
+    autoEnableWithWeapons = true,
+
+    --[[
+        If you want to use ped/clothing based bodycams, you can add them here.
+
+        Examples:
+        { ped = "s_m_y_cop_01" }
+        {
+            ped = "mp_f_freemode_01",
+            component = 8,
+            drawable = 148,
+        }
+        {
+            ped = "mp_m_freemode_01",
+            component = 8,
+            drawable = 148,
+            textures = {2, 4},
+        }
+
+        ----
+
+        Components:
+            0  - Head
+            1  - Beard
+            2  - Hair
+            3  - Torso
+            4  - Legs
+            5  - Hands
+            6  - Foot
+            7  - Scarfs/Neck Accessories
+            8  - Accessories 1
+            9  - Accessories 2
+            10 - Decals
+            11 - Auxiliary parts for torso
+    ]]
+    clothing = {},
+
+    -- Weapons that when drawn enable bodycam.
+    weapons = {
+        -- Heavy
+        "weapon_snowlauncher"
+        ,"weapon_compactlauncher"
+        ,"weapon_minigun"
+        ,"weapon_grenadelauncher_smoke"
+        ,"weapon_hominglauncher"
+        ,"weapon_railgun"
+        ,"weapon_firework"
+        ,"weapon_grenadelauncher"
+        ,"weapon_rpg"
+        ,"weapon_rayminigun"
+        ,"weapon_emplauncher"
+        ,"weapon_railgunxm3"
+
+        -- Shotguns
+        ,"weapon_combatshotgun"
+        ,"weapon_autoshotgun"
+        ,"weapon_pumpshotgun"
+        ,"weapon_heavyshotgun"
+        ,"weapon_pumpshotgun_mk2"
+        ,"weapon_sawnoffshotgun"
+        ,"weapon_bullpupshotgun"
+        ,"weapon_assaultshotgun"
+        ,"weapon_dbshotgun"
+
+        -- Snipers
+        ,"weapon_heavysniper"
+        ,"weapon_marksmanrifle_mk2"
+        ,"weapon_precisionrifle"
+        ,"weapon_musket"
+        ,"weapon_marksmanrifle"
+
+        -- Thrown
+        ,"weapon_snowball"
+        ,"weapon_ball"
+        ,"weapon_molotov"
+        ,"weapon_stickybomb"
+        ,"weapon_flare"
+        ,"weapon_grenade"
+        ,"weapon_bzgas"
+        ,"weapon_proxmine"
+        ,"weapon_pipebomb"
+        ,"weapon_acidpackage"
+        ,"weapon_smokegrenade"
+
+        -- Pistols
+        ,"weapon_vintagepistol"
+        ,"weapon_pistol"
+        ,"weapon_pistolxm3"
+        ,"weapon_appistol"
+        ,"weapon_ceramicpistol"
+        ,"weapon_flaregun"
+        ,"weapon_gadgetpistol"
+        ,"weapon_combatpistol"
+        ,"weapon_snspistol_mk2"
+        ,"weapon_navyrevolver"
+        ,"weapon_doubleaction"
+        ,"weapon_pistol50"
+        ,"weapon_raypistol"
+        ,"weapon_snspistol"
+        ,"weapon_pistol_mk2"
+        ,"weapon_revolver"
+        ,"weapon_revolver_mk2"
+        ,"weapon_heavypistol"
+        ,"weapon_marksmanpistol"
+
+        ,"weapon_stungun"
+        ,"weapon_stungun_mp"
+
+        -- SMGs
+        ,"weapon_combatpdw"
+        ,"weapon_microsmg"
+        ,"weapon_tecpistol"
+        ,"weapon_smg"
+        ,"weapon_smg_mk2"
+        ,"weapon_minismg"
+        ,"weapon_machinepistol"
+        ,"weapon_assaultsmg"
+
+        -- Rifles
+        ,"weapon_assaultrifle_mk2"
+        ,"weapon_compactrifle"
+        ,"weapon_battlerifle"
+        ,"weapon_bullpuprifle"
+        ,"weapon_carbinerifle"
+        ,"weapon_bullpuprifle_mk2"
+        ,"weapon_specialcarbine_mk2"
+        ,"weapon_militaryrifle"
+        ,"weapon_advancedrifle"
+        ,"weapon_assaultrifle"
+        ,"weapon_specialcarbine"
+        ,"weapon_heavyrifle"
+        ,"weapon_tacticalrifle"
+        ,"weapon_carbinerifle_mk2"
+
+        -- MGs
+        ,"weapon_raycarbine"
+        ,"weapon_gusenberg"
+        ,"weapon_combatmg"
+        ,"weapon_mg"
+        ,"weapon_combatmg_mk2"
+
+    }
+}
+if config.enabled then Config.RegisterPluginConfig(config.pluginName, config) end

sonorancad/configuration/config.CHANGEME.json

@@ -16,13 +16,5 @@
     "forceSetApiId": false,
     "enablePushEventForwarding": false,
     "pushEventForwardUrl": "https://host",
-    "disableOverride": false,
-    "bodycamEnabled": true,
-    "bodycamBeepFrequency": 300000,
-    "bodycamScreenshotFrequency": 2000,
-    "bodycamPlayBeeps": true,
-    "bodycamOverlayEnabled": true,
-    "bodycamOverlayLocation": "top-right",
-    "bodycamCommandToggle": "bodycam",
-    "bodycamCommandChangeFrequncy": "bodycamfreq"
+    "disableOverride": false
 }

sonorancad/configuration/ersintegration_config.dist.lua

@@ -9,9 +9,10 @@ local config = {
     enabled = false,
     pluginName = "ersintegration", -- name your plugin here
     pluginAuthor = "SonoranCAD", -- author
-    configVersion = "1.2",
+    configVersion = "1.3",
     -- put your configuration options below
     DOBFormat = "en", -- Make sure this matches | en: dd/mm/yyyy | us: mm/dd/yyyy | iso: yyyy/mm/dd
+    clearRecordsAfter = 30, -- Clear records after this many minutes (0 = never)
     create911Call = true, -- Create a 911 call when an ERS callout is created
     createEmergencyCall = true, -- Create an emergency call when an ERS callout is accepted
     callPriority = 2, -- Priority of the call created in CAD (1-3) | Only used if createEmergencyCall is true

sonorancad/configuration/vehreg_config.dist.lua

@@ -6,21 +6,22 @@
 
 local config = {
     enabled = false,
-    pluginName = "vehreg", -- name your plugin here
+    pluginName = "vehreg",         -- name your plugin here
     pluginAuthor = "Jordan.#2139", -- author
-	configVersion = "1.2",
+    configVersion = "1.4",
 
-    reigsterCommand = "reg", -- Command to register car
+    reigsterCommand = "reg",         -- Command to register car
     defaultRegExpire = '01/02/2030', -- The default date that all registrations will expire
-    defaultRegStatus = 'VALID', -- The default status that all registrations will have | MUST BE IN CAPS
+    defaultRegStatus = 'VALID',      -- The default status that all registrations will have | MUST BE IN CAPS
 
     language = {
         notInVeh = "Player Not In Vehicle... Please Ensure You're In A Vehicle And Try Again!",
         noApiId = "API ID NOT LINKED TO AN ACCOUNT IN THIS COMMUNITY",
         plateAlrRegisted = "This plate has already been registered to another person",
         helpMsg = 'Register your current vehicle in CAD',
         noCharFound = "No character found. Please ensure you are logged in to a character.",
-        incompleteCharData = "Character data is incomplete. Please ensure you have all required data filled out in CAD. Unable to register vehicle.",
+        incompleteCharData =
+        "Character data is incomplete. Please ensure you have all required data filled out in CAD. Unable to register vehicle.",
         --[[
             Placeholders:
             {{PLATE}} = The plate of the vehicle
@@ -35,8 +36,21 @@ local config = {
         plateUid = "plate",
         typeUid = "type",
         modelUid = "model",
+        makeUid = "make",
+        yearUid = "year",
         statusUid = "status",
         expiresUid = "_imtoih149",
+    },
+    customData = {
+        ["adder"] = {
+            model = "Adder",
+            make = "Truffade",
+            year = 2013
+        },
+        ["blista"] = {
+            spawncode = "blista",
+            model = "Blista",
+        }
     }
 }
 

sonorancad/core/apicheck.lua

@@ -68,41 +68,41 @@ if Config.forceSetApiId then
     AddEventHandler("sonoran:tablet:forceCheckApiId", function()
         local identifier=GetIdentifiers(source)[Config.primaryIdentifier]
         local plid=source
-    
+
         cadApiIdExists(identifier, function(exists)
             if not exists then
-                TriggerClientEvent("sonoran:tablet:apiIdNotFound", plid)
+                TriggerClientEvent("SonoranCAD::Tablet::ApiIdNotLinked", plid)
             else
                 TriggerClientEvent("sonoran:tablet:apiIdFound", plid)
             end
         end)
     end)
-    
-    RegisterNetEvent("sonoran:tablet:setApiId")
-    AddEventHandler("sonoran:tablet:setApiId", function(session,username)
+
+    RegisterNetEvent("SonoranCAD::Tablet::SetApiData")
+    AddEventHandler("SonoranCAD::Tablet::SetApiData", function(session,username)
         local identifier=GetIdentifiers(source)[Config.primaryIdentifier]
         local source = source
         cadApiIdExists(identifier, function(exists)
             if not exists then
-                
+
                 registerApiType("SET_API_ID", "general")
-                
+
                 local data = {{
                         ["apiIds"] = { identifier },
                         ["sessionId"] = session,
                         ["username"] = username
                 }}
-                
+
                 performApiRequest(data, "SET_API_ID", function(res, flag)
                     if (not flag) then
                         TriggerClientEvent("sonoran:tablet:failed", source, res)
                     end
                 end)
-                
+
             end
         end)
-        
-        
+
+
     end)
 
 end