feat: add new "zone" tracker method

Author: swkeep

interactionMenu/lua/client/interact.lua

@@ -255,17 +255,26 @@ CreateThread(function()
 
         if isPauseMenuState == 0 and isNuiFocused ~= 1 then
             if not closestEntity then
-                local playerPosition = GetEntityCoords(playerPed)
                 local model = 0
                 local entityType = 0
+                local playerPosition = GetEntityCoords(playerPed)
                 -- #TODO: Give onPosition priority?!
                 -- It's going to lower resource usage, BUT if we have two colliding menus, we might not be able to detect them.
                 -- reason: when the player is inside the `entity detector`, we won't be able to use rayCast to detect other menus.
 
                 local hitPosition, playerDistance, entity
-                if closestZoneId == nil and (not StateManager.get("disableRayCast") or isInVehicle ~= 1) then
+                if not StateManager.get("disableRayCast") and isInVehicle == false then
                     hitPosition, entity, playerDistance = Util.rayCast(10, playerPed)
 
+                    if hitPosition and not StateManager.get("disableZoneRayCast") then
+                        for key, value in pairs(Container.zones) do
+                            if value.tracker == "hit" and value:isPointInside(hitPosition) then
+                                closestZoneId = value.name
+                                break
+                            end
+                        end
+                    end
+
                     if entity then
                         entityType = GetEntityType(entity)
                         if entityType ~= 0 then
@@ -313,8 +322,10 @@ end)
 
 AddEventHandler("interactionMenu:zoneTracker", function(zone_name, state)
     if zone_name and state then
+        StateManager.set("disableZoneRayCast", true)
         closestZoneId = zone_name
     else
+        StateManager.set("disableZoneRayCast", false)
         closestZoneId = nil
     end
 end)
@@ -489,22 +500,33 @@ function Render.onZone(currentMenuId)
     local rotation = data.rotation
     if not position then return end
 
+    local validateSlow
+    if data.tracker == "hit" then
+        validateSlow = function()
+            local hitPosition, entity, playerDistance = Util.rayCast(10, PlayerPedId())
+            return Container.zones[currentMenuId]:isPointInside(hitPosition)
+        end
+    end
+
     Render.generic(data, metadata, {
         onEnter = function()
             StateManager.set('disableRayCast', true)
             scaleform.setForwardVectorLock(false)
             scaleform.setPosition(position)
 
             if rotation then
-                scaleform.setRotation(rotation)
                 scaleform.set3d(true)
+                scaleform.setRotation(rotation)
                 scaleform.setScale(data.scale or 1)
+            else
+                scaleform.set3d(false)
             end
             return true
         end,
         validate = function()
             return StateManager.get('id') == currentMenuId
         end,
+        validateSlow = validateSlow,
         onExit = function()
             StateManager.set('disableRayCast', false)
         end

interactionMenu/lua/client/menuContainer.lua

@@ -203,13 +203,17 @@ local function buildOption(data, instance)
             job = option.job and transformRestrictions(option.job),
             gang = option.gang and transformRestrictions(option.gang),
 
+            tts_api = option.tts_api,
+            tts_voice = option.tts_voice,
+
             flags = {
                 dynamic = option.dynamic,
                 disable = false,
                 action = nil,
                 event = nil,
                 hide = option.hide or false,
                 subMenu = option.subMenu or false,
+                dialogue = option.dialogue or false,
             }
         }
 
@@ -395,14 +399,18 @@ function Container.create(t)
                 z = t.position.z,
                 id = id
             }
-
             instance.rotation = t.rotation
             instance.zone = t.zone
             instance.scale = t.scale
+            instance.tracker = t.tracker or "collision" -- (presence or collision), hit
 
             if instance.zone then
                 t.zone.name = id
+                t.zone.tracker = instance.tracker
                 Container.zones[id] = Util.addZone(t.zone)
+                if instance.tracker == "hit" then
+                    Container.zones[id].tracker = instance.tracker
+                end
                 if not Container.zones[id] then
                     return
                 end
@@ -663,6 +671,7 @@ function Container.getMenu(model, entity, menuId)
         if menuId then
             local menuRef = Container.get(menuId)
             if menuRef.type == 'zone' then
+                container.tracker = menuRef.tracker
                 combinedIds = Util.table_merge(combinedIds, Container.indexes.globals.zones or {})
             end
         end
@@ -812,7 +821,8 @@ end
 function Container.triggerInteraction(menuId, optionId, ...)
     if not Container.data[menuId] or not Container.data[menuId].interactions[optionId] then return end
     local func = Container.data[menuId].interactions[optionId].func
-    if not func or type(func) ~= 'function' then return end
+
+    if not func and func["__cfx_functionReference"] then return end
     return func(...)
 end