Ready for testing

csarSlotBlockGameGUI.lua

@@ -19,49 +19,61 @@ csarSlotBlock.version = "1.9.0"
 -- Logic for determining if player is allowed in a slot
 function csarSlotBlock.shouldAllowSlot(_playerID, _slotID) -- _slotID == Unit ID unless its multi aircraft in which case slotID is unitId_seatID
 
-    if csarSlotBlock.csarSlotBlockEnabled() then
+if csarSlotBlock.csarSlotBlockEnabled() then
 
-        local _unitId = csarSlotBlock.getUnitId(_slotID);
+    local _unitId = csarSlotBlock.getUnitId(_slotID);
 
-        local _mode = csarSlotBlock.csarMode()
+    local _mode = csarSlotBlock.csarMode()
 
-        if _mode == 1  then
-            -- disable aircraft for ALL pilots
+    if _mode == 1  then
+        -- disable aircraft for ALL pilots
 
-            local _flag = csarSlotBlock.getFlagValue("CSAR_AIRCRAFT".._unitId)
+        local _flag = csarSlotBlock.getFlagValue("CSAR_AIRCRAFT".._unitId)
+
+        if _flag == 100 then
+            return false
+        end
+
+        return true
 
 
-        elseif _mode == 2 then
-            -- disable aircraft for a certain player
+    elseif _mode == 2 then
+        -- disable aircraft for a certain player
 
-            local _playerName = net.get_player_info(_playerID, 'name')
+        local _playerName = net.get_player_info(_playerID, 'name')
 
-            if _playerName == nil then
-                return true
-            end
+        if _playerName == nil then
+            return true
+        end
 
-            local _flag = csarSlotBlock.getFlagValue("CSAR_AIRCRAFT".._playerName:gsub('%W','').."_".._unitId)
+        local _flag = csarSlotBlock.getFlagValue("CSAR_AIRCRAFT".._playerName:gsub('%W','').."_".._unitId)
 
-        elseif _mode == 3 then
-            -- global lives limit
+        if _flag == 100 then
+            return false
+        end
 
-            local _playerName = net.get_player_info(_playerID, 'name')
+        return true
 
-            if _playerName == nil then
-                return true
-            end
+    elseif _mode == 3 then
+        -- global lives limit
 
-            local _flag = csarSlotBlock.getFlagValue("CSAR_PILOT".._playerName:gsub('%W',''))
+        local _playerName = net.get_player_info(_playerID, 'name')
 
-            if _flag == 1 then
-                return false
-            else
-                return true
-            end
+        if _playerName == nil then
+            return true
+        end
 
+        local _flag = csarSlotBlock.getFlagValue("CSAR_PILOT".._playerName:gsub('%W',''))
+
+        if _flag == 1 then
+            return false
+        else
+            return true
         end
 
     end
+end
+    return true
 
 end
 
@@ -111,29 +123,29 @@ end
 --
 csarSlotBlock.onGameEvent = function(eventName,playerID,arg2,arg3,arg4) -- This stops the user flying again after crashing or other events
 
-if  DCS.isServer() and DCS.isMultiplayer() then
-    if DCS.getModelTime() > 1 then  -- must check this to prevent a possible CTD by using a_do_script before the game is ready to use a_do_script. -- Source GRIMES :)
+    if  DCS.isServer() and DCS.isMultiplayer() then
+        if DCS.getModelTime() > 1 then  -- must check this to prevent a possible CTD by using a_do_script before the game is ready to use a_do_script. -- Source GRIMES :)
 
-    if eventName ~= "connect"
-            and eventName ~= "disconnect"
-            and eventName ~= "mission_end"
-            and eventName ~=  "change_slot" then
+            if eventName == "self_kill"
+                    or eventName == "crash"
+                    or eventName == "eject"
+                    or eventName ==  "pilot_death" then
 
-        -- is player in a slot and valid?
-        local _playerDetails = net.get_player_info(playerID)
+                -- is player in a slot and valid?
+                local _playerDetails = net.get_player_info(playerID)
 
-        if _playerDetails ~=nil and _playerDetails.side ~= 0 and _playerDetails.slot ~= "" and _playerDetails.slot ~= nil then
+                if _playerDetails ~=nil and _playerDetails.side ~= 0 and _playerDetails.slot ~= "" and _playerDetails.slot ~= nil then
 
-            local _allow = csarSlotBlock.shouldAllowSlot(playerID, _playerDetails.slot)
+                    local _allow = csarSlotBlock.shouldAllowSlot(playerID, _playerDetails.slot)
 
-            if not _allow then
-                csarSlotBlock.rejectPlayer(playerID)
+                    if not _allow then
+                        csarSlotBlock.rejectPlayer(playerID)
+                    end
+
+                end
             end
-
         end
     end
-    end
-end
 end
 
 csarSlotBlock.onPlayerTryChangeSlot = function(playerID, side, slotID)
@@ -152,7 +164,7 @@ csarSlotBlock.onPlayerTryChangeSlot = function(playerID, side, slotID)
                 local _playerName = net.get_player_info(playerID, 'name')
 
                 if _playerName ~= nil and csarSlotBlock.showEnabledMessage and
-                        csarSlotBlock.csarSlotBlockEnabled() then
+                        csarSlotBlock.csarSlotBlockEnabled() and csarSlotBlock.csarMode() > 0 then
                     --Disable chat message to user
                     local _chatMessage = string.format("*** %s - Aircraft Enabled! If you will need to be rescued by CSAR. Make sure you eject and Protect the Helis! ***",_playerName)
                     net.send_chat_to(_chatMessage, playerID)
@@ -160,9 +172,9 @@ csarSlotBlock.onPlayerTryChangeSlot = function(playerID, side, slotID)
 
             end
 
-        end
+            net.log("CSAR - allowing -  playerid: "..playerID.." side:"..side.." slot: "..slotID)
 
-        net.log("CSAR - allowing -  playerid: "..playerID.." side:"..side.." slot: "..slotID)
+        end
     end
 
     return true