1.3.4

Author: Sharp-Shark

Dam Defense/Lua/Autorun/main.lua

@@ -245,7 +245,7 @@ DD.thinkFunctions.main = function ()
 		[DD.eventDeathSquad.tbl.name] = true,
 	}
 	for event in DD.eventDirector.events do
-		if set[event.name] and event.started and not event.finished then print('test') return end
+		if set[event.name] and event.started and not event.finished then return end
 	end
 
 	-- End round if everyone is dead

Dam Defense/Lua/DD/events/mercs.lua

@@ -18,7 +18,8 @@ end, {
 	onStart = function (self)
 		if self.mercs == nil then
 			for client in DD.arrShuffle(Client.ClientList) do
-				if (not DD.isClientCharacterAlive(client)) and client.InGame and DD.lateJoinBlacklistSet[client.AccountId.StringRepresentation] then
+				if (not DD.isClientCharacterAlive(client)) and client.InGame and DD.lateJoinBlacklistSet[client.AccountId.StringRepresentation] and
+				(not DD.isClientBannedFromJob(client, 'captain')) then
 					self.mercs = client
 					break
 				end

Dam Defense/Lua/DD/events/revolution.lua

@@ -202,7 +202,7 @@ end, {
 			for client in Client.ClientList do
 				if rebelsSet[client] then
 					DD.messageClient(client, DD.stringLocalize('revolutionMessageRebels', {timer = DD.numberToTime(self.parent.rebelsDoxTimer)}), {preset = 'crit'})
-				elseif (client.Character ~= nil) and DD.isCharacterAntagSafe(client) then
+				elseif (client.Character ~= nil) and DD.isCharacterAntagSafe(client.Character) then
 					-- Sec message
 					DD.messageClient(client, DD.stringLocalize('revolutionMessageSecurity', {timer = DD.numberToTime(self.parent.rebelsDoxTimer)}), {preset = 'crit'})
 				else

Dam Defense/Lua/DD/spawning.lua

@@ -1,5 +1,3 @@
-DD.jobBans = {}
-
 if CLIENT then return end
 
 DD.lateJoinBlacklistSet = {}
@@ -13,11 +11,6 @@ DD.roundEndFunctions.spawning = function ()
 	DD.clientJob = {}
 end
 
-DD.isClientBannedFromJob = function (client, job)
-	if DD.jobBans[client.AccountId.StringRepresentation] == nil then return false end
-	return DD.jobBans[client.AccountId.StringRepresentation][job]
-end
-
 DD.autoJob = function ()
 	if #Client.ClientList == 0 then return {} end
 

Dam Defense/Lua/DD/utilities.lua

@@ -82,6 +82,13 @@ DD.clientLogName = function (client)
 	return text
 end
 
+-- Job ban
+DD.jobBans = {}
+DD.isClientBannedFromJob = function (client, job)
+	if DD.jobBans[client.AccountId.StringRepresentation] == nil then return false end
+	return DD.jobBans[client.AccountId.StringRepresentation][job]
+end
+
 -- Categories
 DD.entityCategories = {
 	structure = 0,

Dam Defense/filelist.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<contentpackage name="Dam Defense" modversion="1.3.3" corepackage="False" steamworkshopid="3146664815" gameversion="1.9.8.0">
+<contentpackage name="Dam Defense" modversion="1.3.4" corepackage="False" steamworkshopid="3146664815" gameversion="1.9.8.0">
   <Other file="%ModDir%/CSharp/Client/DamDefense.cs" />
   <Text file="%ModDir%/Localizations/english.xml" />
   <Item file="%ModDir%/Items/Jerry.xml" />

README.md

@@ -1,4 +1,4 @@
-# Dam Defense v1.3.3
+# Dam Defense v1.3.4
 
 Read me? How about I read you instead?