Bug Fix

Bug fix for crate timing out

.gitignore

@@ -0,0 +1,3 @@
+*.iml
+.idea/encodings.xml
+*.xml

CTLD.lua

@@ -16,7 +16,10 @@
 	    - jmontleon - https://github.com/jmontleon
 	    - emilianomolina - https://github.com/emilianomolina
 
-    Version: 1.70 - 25/06/2017
+    Version: 1.72 - 18/02/2018
+      - Bug fix for crate spam
+      - Improved JTAC Performance - priority & targeting
+      - Added JTAC report for in view
       - Added ability to set maximum group size that can be carried
       - Added new sling load crates
       - Fixed bug where crates and / or groups would disappear
@@ -1581,7 +1584,7 @@ function ctld.spawnCrate(_arguments)
             local _position = _heli:getPosition()
 
             -- check crate spam
-            if _heli:getPlayerName() ~= nil and ctld.crateWait[_heli:getPlayerName()] and  ctld.crateWait[_heli:getPlayerName()] < timer.getTime() then
+            if _heli:getPlayerName() ~= nil and ctld.crateWait[_heli:getPlayerName()] and  ctld.crateWait[_heli:getPlayerName()] > timer.getTime() then
 
                 ctld.displayMessageToGroup(_heli,"Sorry you must wait "..(ctld.crateWait[_heli:getPlayerName()]  - timer.getTime()).. " seconds before you can get another crate", 20)
                 return
@@ -5213,144 +5216,153 @@ end
 -- Find nearest enemy to JTAC that isn't blocked by terrain
 function ctld.findNearestVisibleEnemy(_jtacUnit, _targetType,_distance)
 
+    --local startTime = os.clock()
+
     local _maxDistance = _distance or ctld.JTAC_maxDistance
-    local _x = 1
-    local _i = 1
 
-    local _units = nil
-    local _groupName = nil
-
-    local _nearestUnit = nil
     local _nearestDistance = _maxDistance
 
-    local _enemyGroups
+    local _jtacPoint = _jtacUnit:getPoint()
+    local _coa =    _jtacUnit:getCoalition()
 
-    if _jtacUnit:getCoalition() == 1 then
+    local _offsetJTACPos = { x = _jtacPoint.x, y = _jtacPoint.y + 2.0, z = _jtacPoint.z }
-        _enemyGroups = coalition.getGroups(2, Group.Category.GROUND)
+
-    else
+    local _volume = {
-        _enemyGroups = coalition.getGroups(1, Group.Category.GROUND)
+        id = world.VolumeType.SPHERE,
+        params = {
+            point = _offsetJTACPos,
+            radius = _maxDistance
+        }
+    }
+
+    local _unitList = {}
+
+
+    local _search = function(_unit, _coa)
+        pcall(function()
+
+            if _unit ~= nil
+                    and _unit:getLife() > 0
+                    and _unit:isActive()
+                    and _unit:getCoalition() ~= _coa
+                    and not _unit:inAir()
+                    and not ctld.alreadyTarget(_jtacUnit,_unit) then
+
+                local _tempPoint = _unit:getPoint()
+                local _offsetEnemyPos = { x = _tempPoint.x, y = _tempPoint.y + 2.0, z = _tempPoint.z }
+
+                if land.isVisible(_offsetJTACPos,_offsetEnemyPos ) then
+
+                    local _dist = ctld.getDistance(_offsetJTACPos, _offsetEnemyPos)
+
+                    if _dist < _maxDistance then
+                        table.insert(_unitList,{unit=_unit, dist=_dist})
+
+                    end
+                end
+            end
+        end)
+
+        return true
     end
 
+    world.searchObjects(Object.Category.UNIT, _volume, _search, _coa)
+
+    --log.info(string.format("JTAC Search elapsed time: %.4f\n", os.clock() - startTime))
+
+    -- generate list order by distance & visible
+
+    -- first check
+    -- hpriority
+    -- priority
+    -- vehicle
+    -- unit
+
+    local _sort = function( a,b ) return a.dist < b.dist end
+    table.sort(_unitList,_sort)
+    -- sort list
+
+    -- check for hpriority
+    for _, _enemyUnit in ipairs(_unitList) do
+        local _enemyName = _enemyUnit.unit:getName()
+
+        if string.match(_enemyName, "hpriority") then
+            return _enemyUnit.unit
+        end
+    end
+
+    for _, _enemyUnit in ipairs(_unitList) do
+        local _enemyName = _enemyUnit.unit:getName()
+
+        if string.match(_enemyName, "priority") then
+            return _enemyUnit.unit
+        end
+    end
+
+    for _, _enemyUnit in ipairs(_unitList) do
+        local _enemyName = _enemyUnit.unit:getName()
+
+        if (_targetType == "vehicle" and ctld.isVehicle(_enemyUnit.unit)) or _targetType == "all" then
+            return _enemyUnit.unit
+
+        elseif (_targetType == "troop" and ctld.isInfantry(_enemyUnit.unit)) or _targetType == "all" then
+            return _enemyUnit.unit
+        end
+    end
+
+    return nil
+
+end
+
+
+function ctld.listNearbyEnemies(_jtacUnit)
+
+    local _maxDistance =  ctld.JTAC_maxDistance
+
     local _jtacPoint = _jtacUnit:getPoint()
-    local _jtacPosition = _jtacUnit:getPosition()
+    local _coa =    _jtacUnit:getCoalition()
 
-    local _tempPoint = nil
+    local _offsetJTACPos = { x = _jtacPoint.x, y = _jtacPoint.y + 2.0, z = _jtacPoint.z }
-    local _tempPosition = nil
 
-    local _tempDist = nil
+    local _volume = {
+        id = world.VolumeType.SPHERE,
+        params = {
+            point = _offsetJTACPos,
+            radius = _maxDistance
+        }
+    }
+    local _enemies = nil
 
-    -- finish this function
+    local _search = function(_unit, _coa)
-    local _vhpriority = false
+        pcall(function()
-    local _vpriority = false
+
-    local _thpriority = false
+            if _unit ~= nil
-    local _tpriority = false
+                    and _unit:getLife() > 0
-    for _i = 1, #_enemyGroups do
+                    and _unit:isActive()
-        if _enemyGroups[_i] ~= nil then
+                    and _unit:getCoalition() ~= _coa
-            _groupName = _enemyGroups[_i]:getName()
+                    and not _unit:inAir() then
-            _units = ctld.getGroup(_groupName)
+
-            if #_units > 0 then
+                local _tempPoint = _unit:getPoint()
-                for _y = 1, #_units do
+                local _offsetEnemyPos = { x = _tempPoint.x, y = _tempPoint.y + 2.0, z = _tempPoint.z }
-                    local _targeted = false
+
-                    if not _distance then
+                if land.isVisible(_offsetJTACPos,_offsetEnemyPos ) then
-                        _targeted = ctld.alreadyTarget(_jtacUnit, _units[_x])
+
+                    if not _enemies then
+                        _enemies = {}
                     end
 
-                    -- calc distance
+                    _enemies[_unit:getTypeName()] = _unit:getTypeName()
-                    _tempPoint = _units[_y]:getPoint()
-                    _tempDist = ctld.getDistance(_tempPoint, _jtacPoint)
 
-                    if _tempDist < _maxDistance and _tempDist < _nearestDistance then
-
-                        local _offsetEnemyPos = { x = _tempPoint.x, y = _tempPoint.y + 2.0, z = _tempPoint.z }
-                        local _offsetJTACPos = { x = _jtacPoint.x, y = _jtacPoint.y + 2.0, z = _jtacPoint.z }
-                        -- calc visible
-
-                        if land.isVisible(_offsetEnemyPos, _offsetJTACPos) and _targeted == false then
-                            if (string.match(_units[_y]:getName(), "hpriority") ~= nil) and ctld.isVehicle(_units[_y]) then
-                                _vhpriority = true
-                            elseif (string.match(_units[_y]:getName(), "priority") ~= nil) and ctld.isVehicle(_units[_y]) then
-                                _vpriority = true
-                            elseif (string.match(_units[_y]:getName(), "hpriority") ~= nil) and ctld.isInfantry(_units[_y]) then
-                                _thpriority = true
-                            elseif (string.match(_units[_y]:getName(), "priority") ~= nil) and ctld.isInfantry(_units[_y]) then
-                                _tpriority = true
-                            end
-                        end
-                    end
                 end
             end
-        end
+        end)
+
+        return true
     end
 
-    for _i = 1, #_enemyGroups do
+    world.searchObjects(Object.Category.UNIT, _volume, _search, _coa)
-        if _enemyGroups[_i] ~= nil then
-            _groupName = _enemyGroups[_i]:getName()
-            _units = ctld.getGroup(_groupName)
-            if #_units > 0 then
 
-                for _x = 1, #_units do
+    return _enemies
-
-                    --check to see if a JTAC has already targeted this unit only if a distance
-                    --wasnt passed in
-                    local _targeted = false
-                    if not _distance then
-                        _targeted = ctld.alreadyTarget(_jtacUnit, _units[_x])
-                    end
-
-
-                    local _allowedTarget = true
-
-                    if _targetType == "vehicle" and _vhpriority == true then
-                        _allowedTarget = (string.match(_units[_x]:getName(), "hpriority") ~= nil) and ctld.isVehicle(_units[_x])
-                    elseif _targetType == "vehicle" and _vpriority == true then
-                        _allowedTarget = (string.match(_units[_x]:getName(), "priority") ~= nil) and ctld.isVehicle(_units[_x])
-                    elseif _targetType == "vehicle" then
-                        _allowedTarget = ctld.isVehicle(_units[_x])
-                    elseif _targetType == "troop" and _thpriority == true then
-                        _allowedTarget = (string.match(_units[_x]:getName(), "hpriority") ~= nil) and ctld.isInfantry(_units[_x])
-                    elseif _targetType == "troop" and _tpriority == true then
-                        _allowedTarget = (string.match(_units[_x]:getName(), "priority") ~= nil) and ctld.isInfantry(_units[_x])
-                    elseif _targetType == "troop" then
-                        _allowedTarget = ctld.isInfantry(_units[_x])
-                    elseif _vhpriority == true or _thpriority == true then
-                        _allowedTarget = (string.match(_units[_x]:getName(), "hpriority") ~= nil)
-                    elseif _vpriority == true or _tpriority == true then
-                        _allowedTarget = (string.match(_units[_x]:getName(), "priority") ~= nil)
-                    else
-                        _allowedTarget = true
-                    end
-
-                    if _units[_x]:isActive() == true and _targeted == false and _allowedTarget == true then
-
-                        -- calc distance
-                        _tempPoint = _units[_x]:getPoint()
-                        _tempDist = ctld.getDistance(_tempPoint, _jtacPoint)
-
-                        if _tempDist < _maxDistance and _tempDist < _nearestDistance then
-
-                            local _offsetEnemyPos = { x = _tempPoint.x, y = _tempPoint.y + 2.0, z = _tempPoint.z }
-                            local _offsetJTACPos = { x = _jtacPoint.x, y = _jtacPoint.y + 2.0, z = _jtacPoint.z }
-
-
-                            -- calc visible
-                            if land.isVisible(_offsetEnemyPos, _offsetJTACPos) then
-
-                                _nearestDistance = _tempDist
-                                _nearestUnit = _units[_x]
-                            end
-                        end
-                    end
-                end
-            end
-        end
-    end
-
-    if _nearestUnit == nil then
-        return nil
-    end
-
-
-    return _nearestUnit
 end
 
 -- tests whether the unit is targeted by another JTAC
@@ -5439,6 +5451,18 @@ function ctld.getJTACStatus(_args)
 
             if _enemyUnit ~= nil and _enemyUnit:getLife() > 0 and _enemyUnit:isActive() == true then
                 _message = _message .. "" .. _jtacGroupName .. " targeting " .. _enemyUnit:getTypeName() .. " CODE: " .. _laserCode .. ctld.getPositionString(_enemyUnit) .. "\n"
+
+                local _list = ctld.listNearbyEnemies(_jtacUnit)
+
+                if _list then
+                    _message = _message.."Visual On: "
+
+                    for _,_type in pairs(_list) do
+                        _message = _message.._type.." "
+                    end
+                    _message = _message.."\n"
+                end
+
             else
                 _message = _message .. "" .. _jtacGroupName .. " searching for targets" .. ctld.getPositionString(_jtacUnit) .. "\n"
             end