examples update

Example/Lua/traitormod/autorun/traitormod.lua

@@ -4,19 +4,20 @@ traitormod.peoplePercentages = {}
 traitormod.roundtraitors = {}
 traitormod.selectedCodeResponses = {}
 traitormod.selectedCodePhrases = {}
+traitormod.gamemodes = {}
 
-traitormod.enabled = true
+traitormod.disableRadioChat = false
-traitormod.roundGamemode = ""
 
 local traitorAssignDelay = 0
 local traitorsAssigned = true
 local warningClients = {}
 
-Game.OverrideTraitors(true) -- shutup old traitors
-
 local config = dofile("lua/traitormod/traitorconfig.lua")
 local util = dofile("lua/traitormod/util.lua")
 
+Game.OverrideTraitors(config.enableTraitors) -- shutup old traitors
+Game.AllowWifiChat(config.enableWifiChat)
+
 traitormod.config = config
 
 traitormod.setPercentage = function(client, amount)
@@ -25,31 +26,35 @@ traitormod.setPercentage = function(client, amount)
     if traitormod.peoplePercentages[client.SteamID] == nil then
         traitormod.peoplePercentages[client.SteamID] = {}
         traitormod.peoplePercentages[client.SteamID].penalty = 1
-        traitormod.peoplePercentages[client.SteamID].p = config.firstJoinPercentage
+        traitormod.peoplePercentages[client.SteamID].p =
+            config.firstJoinPercentage
     end
 
     traitormod.peoplePercentages[client.SteamID].p = amount
 end
 
-traitormod.addPenalty = function (client, amount)
+traitormod.addPenalty = function(client, amount)
     if client == nil then return end
 
     if traitormod.peoplePercentages[client.SteamID] == nil then
         traitormod.peoplePercentages[client.SteamID] = {}
         traitormod.peoplePercentages[client.SteamID].penalty = 1
-        traitormod.peoplePercentages[client.SteamID].p = config.firstJoinPercentage
+        traitormod.peoplePercentages[client.SteamID].p =
+            config.firstJoinPercentage
     end
 
-    traitormod.peoplePercentages[client.SteamID].penalty = traitormod.peoplePercentages[client.SteamID].penalty + amount
+    traitormod.peoplePercentages[client.SteamID].penalty =
+        traitormod.peoplePercentages[client.SteamID].penalty + amount
 end
 
-traitormod.getPenalty = function (client)
+traitormod.getPenalty = function(client)
-    if client == nil then return end
+    if client == nil then return 0 end
 
     if traitormod.peoplePercentages[client.SteamID] == nil then
         traitormod.peoplePercentages[client.SteamID] = {}
         traitormod.peoplePercentages[client.SteamID].penalty = 1
-        traitormod.peoplePercentages[client.SteamID].p = config.firstJoinPercentage
+        traitormod.peoplePercentages[client.SteamID].p =
+            config.firstJoinPercentage
     end
 
     return traitormod.peoplePercentages[client.SteamID].penalty
@@ -61,19 +66,22 @@ traitormod.addPercentage = function(client, amount)
     if traitormod.peoplePercentages[client.SteamID] == nil then
         traitormod.peoplePercentages[client.SteamID] = {}
         traitormod.peoplePercentages[client.SteamID].penalty = 1
-        traitormod.peoplePercentages[client.SteamID].p = config.firstJoinPercentage
+        traitormod.peoplePercentages[client.SteamID].p =
+            config.firstJoinPercentage
     end
 
-    traitormod.peoplePercentages[client.SteamID].p = traitormod.peoplePercentages[client.SteamID].p + amount
+    traitormod.peoplePercentages[client.SteamID].p =
+        traitormod.peoplePercentages[client.SteamID].p + amount
 end
 
-traitormod.getPercentage = function (client)
+traitormod.getPercentage = function(client)
-    if client == nil then return end
+    if client == nil then return 0 end
 
     if traitormod.peoplePercentages[client.SteamID] == nil then
         traitormod.peoplePercentages[client.SteamID] = {}
         traitormod.peoplePercentages[client.SteamID].penalty = 1
-        traitormod.peoplePercentages[client.SteamID].p = config.firstJoinPercentage
+        traitormod.peoplePercentages[client.SteamID].p =
+            config.firstJoinPercentage
     end
 
     return traitormod.peoplePercentages[client.SteamID].p
@@ -104,9 +112,7 @@ traitormod.selectPlayerPercentages = function(ignore)
 
     for i = 1, #players, 1 do
         for key, value in pairs(ignore) do
-            if players[i] == value then
+            if players[i] == value then table.remove(players, i) end
-                table.remove(players, i)
-            end
         end
     end
 
@@ -236,7 +242,10 @@ traitormod.chooseNextObjective = function(key, value)
 end
 
 Hook.Add("roundStart", "traitor_start", function()
-    if not traitormod.enabled then return end
+
+    Game.SendMessage(
+        "We are using Custom Traitors Plugin by EvilFactory (https://steamcommunity.com/id/evilfactory/)\n Join discord.gg/f9zvNNuxu9",
+        3)
 
     local players = util.GetValidPlayersNoBots()
 
@@ -247,18 +256,21 @@ Hook.Add("roundStart", "traitor_start", function()
             traitormod.addPenalty(client, -1)
         end
 
-        traitormod.addPercentage(client, config.roundEndPercentageIncrease / traitormod.getPenalty(client))
+        traitormod.addPercentage(client, config.roundEndPercentageIncrease /
+                                     traitormod.getPenalty(client))
     end
 
     traitormod.chooseCodes()
 
+    if config.enableTraitors then
+
         local rng = Random.Range(0, 100)
 
         if rng < config.traitorShipChance and config.traitorShipEnabled == true then
             local amount = config.getAmountShipTraitors(#util.GetValidPlayers())
 
-        Game.Log("Infiltraiton Gamemode selected, Random = " .. rng, 6)
+            Game.Log("Infiltraition Gamemode selected, Random = " .. rng, 6)
-        traitormod.roundGamemode = "Infiltraiton"
+            table.insert(traitormod.gamemodes, "Infiltraition")
 
             traitormod.traitorShipRoundStart(amount)
         else
@@ -266,24 +278,52 @@ Hook.Add("roundStart", "traitor_start", function()
             traitorAssignDelay = Timer.GetTime() + config.traitorSpawnDelay
 
             Game.Log("Assasination Gamemode was selected, Random = " .. rng, 6)
-        traitormod.roundGamemode = "Assasination"
+            table.insert(traitormod.gamemodes, "Assasination")
 
             if config.traitorShipEnabled then
                 traitormod.spawnTraitorShipAndHide()
             end
         end
 
-    for key, value in pairs(Player.GetAllClients()) do
+        if config.enableCommunicationsOffline then
-        Game.SendTraitorMessage(value, 'traitor', 'traitor', TraitorMessageType.Objective) -- enable everyone to sabotage
+            rng = Random.Range(0, 100)
-    end
+
+            if rng < config.communicationsOfflineChance then
+                table.insert(traitormod.gamemodes, "Offline Communications")
+                traitormod.disableRadioChat = true
 
                 Game.SendMessage(
-        "We are using Custom Traitors Plugin by EvilFactory (https://steamcommunity.com/id/evilfactory/)\n Join discord.gg/f9zvNNuxu9",
+                    "—-radiation closing in on our location, comms down!", 11)
-        3)
+
+                Game.SendMessage(
+                    "—-radiation closing in on our location, comms down!", 3)
+
+                for key, value in pairs(Player.GetAllCharacters()) do
+                    if value.IsHuman then
+                        Player.SetRadioRange(value, 0)
+                    end
+                end
+            end
+        end
+
+    end
+
+    if config.enableSabotage then
+        for key, value in pairs(Player.GetAllClients()) do
+            
+            if value.Character then
+                value.Character.IsTraitor = true 
+            end
+            
+            Game.SendTraitorMessage(value, 'traitor', 'traitor',
+                                    TraitorMessageType.Objective) -- enable everyone to sabotage
+        end
+    end
+
 end)
 
 Hook.Add("roundEnd", "traitor_end", function()
-    if not traitormod.enabled then return end
+    if config.enableTraitors then
 
         local msg = "Traitors of the round: "
 
@@ -291,7 +331,11 @@ Hook.Add("roundEnd", "traitor_end", function()
             msg = msg .. "\"" .. key.name .. "\" "
         end
 
-    msg = msg .. "\n\nGamemode: " .. traitormod.roundGamemode
+        msg = msg .. "\n\nGamemodes:"
+
+        for key, value in pairs(traitormod.gamemodes) do
+            msg = msg .. " \"" .. value .. "\""
+        end
 
         Game.SendMessage(msg, 1)
 
@@ -301,15 +345,16 @@ Hook.Add("roundEnd", "traitor_end", function()
             traitormod.addPenalty(c, config.traitorPenalty)
         end
 
+    end
+
     traitormod.roundtraitors = {}
     traitormod.selectedCodeResponses = {}
     traitormod.selectedCodePhrases = {}
+    traitormod.gamemodes = {}
     warningClients = {}
 end)
 
 Hook.Add("think", "traitor_think", function()
-    if not traitormod.enabled then return end
-
     if not traitorsAssigned and traitorAssignDelay < Timer.GetTime() then
         local amount = config.getAmountTraitors(#util.GetValidPlayers())
         traitormod.assignNormalTraitors(amount)
@@ -371,21 +416,6 @@ end)
 Hook.Add("chatMessage", "chatcommands", function(msg, client)
 
     if bit32.band(client.Permissions, 0x40) == 0x40 then
-        if msg == "!toggletraitormod" then
-            traitormod.enabled = not traitormod.enabled
-
-            if traitormod.enabled then
-                Game.SendDirectChatMessage("", "TraitorMod Enabled", nil, 1,
-                                           client)
-            else
-                Game.SendDirectChatMessage("", "TraitorMod Disabled", nil, 1,
-                                           client)
-            end
-
-            Game.OverrideTraitors(traitormod.enabled)
-
-            return true
-        end
 
         if msg == "!toggletraitorship" then
             config.traitorShipEnabled = not config.traitorShipEnabled
@@ -419,18 +449,16 @@ Hook.Add("chatMessage", "chatcommands", function(msg, client)
             local num = 0
 
             for key, value in pairs(traitormod.roundtraitors) do
-                if key.IsDead == false then
+                if key.IsDead == false then num = num + 1 end
-                    num = num + 1
-                end
             end
 
             if num > 0 then
-                traitormod.sendTraitorMessage("There are traitors alive.", client)
+                traitormod.sendTraitorMessage("There are traitors alive.",
+                                              client)
             else
                 traitormod.sendTraitorMessage("All traitors are dead!", client)
             end
 
-
             return true
         end
 
@@ -451,7 +479,8 @@ Hook.Add("chatMessage", "chatcommands", function(msg, client)
     if msg == "!percentage" then
 
         traitormod.sendTraitorMessage("You have " ..
-                                          math.floor(traitormod.getPercentage(client)) ..
+                                          math.floor(
+                                              traitormod.getPercentage(client)) ..
                                           "% of being traitor", client)
 
         return true

Example/Lua/traitormod/traitorconfig.lua

@@ -8,15 +8,23 @@ local codewords = {
 	"tire", "trunk", "blow sticks", "thrashers"
 }
 
+config.enableTraitors = true
+
 config.codewords = codewords
 config.amountCodewords = 2
 config.traitorSpawnDelay = 60
 config.nextMissionDelay = 60
 
 config.traitorShipEnabled = true -- set this to false for the respawn shuttles to work
-config.traitorShipChance = 15
+config.traitorShipChance = 18
 config.traitorShipGodModeDistance = 4000
 
+config.enableCommunicationsOffline = true
+config.communicationsOfflineChance = 20
+
+-- Gameplay Options
+config.enableSabotage = true -- allow everyone to sabotage
+config.enableWifiChat = true -- allow people to wire wifi components to the chat ingame
 
 -- Traitor Selection Options
 config.roundEndPercentageIncrease = 10