1.2.10

Sharp-Shark · Sharp-Shark · commit ccf7d14cf2d8 · 2025-04-12T03:47:24.000-03:00
diff --git a/Dam Defense/Items/Machines.xml b/Dam Defense/Items/Machines.xml
@@ -279,7 +279,7 @@
     </Reactor>
     <LightComponent range="300.0" lightcolor="255,186,152,119" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false">
       <IsActive targetitemcomponent="Reactor" temperature="gt 2" />
-      <sprite texture="Content/Map/Outposts/Art/GenericAssets2.png" depth="0.025" sourcerect="649,336,575,849" alphablend="false" origin="0.5,0.5" alpha="1.0" />
+      <sprite texture="Content/Map/Outposts/Art/GenericAssets2.png" depth="0.025" sourcerect="649,761,575,425" alphablend="false" origin="0.5,0.0" alpha="1.0" />
     </LightComponent>
     <LightComponent range="400" lightcolor="255,0,0,250" powerconsumption="0" IsOn="false" castshadows="false" allowingameediting="false" blinkfrequency="1">
       <IsActive targetitemcomponent="Reactor" temperaturecritical="eq true" />
diff --git a/Dam Defense/Lua/DD/eventDirector.lua b/Dam Defense/Lua/DD/eventDirector.lua
@@ -368,7 +368,7 @@ DD.thinkFunctions.eventDirector = function ()
 	end
 	
 	if (DD.eventDirector.mainEvent ~= nil) and DD.eventDirector.mainEvent.finished then
-		DD.eventDirector.cooldown = DD.eventDirector.mainEvent.cooldown / 2
+		DD.eventDirector.cooldown = 60 * 2
 		DD.eventDirector.mainEventCooldown = DD.eventDirector.mainEvent.cooldown
 		DD.eventDirector.mainEvent = nil
 	end
@@ -393,11 +393,11 @@ end
 
 -- Called at round start
 DD.roundStartFunctions.eventDirector = function ()
-	DD.eventDirector.goodness = 0
+	DD.eventDirector.goodness = -3 -- negative goodness means lots of bad events happened, and thus event director will favour good events
 	DD.eventDirector.mainEvent = nil
 	DD.eventDirector.events = {}
-	DD.eventDirector.cooldown = 60 * 1
-	DD.eventDirector.mainEventCooldown = 60 * 4
+	DD.eventDirector.cooldown = 60 * 4
+	DD.eventDirector.mainEventCooldown = 60 * 8
 end
 
 -- Lists to the message sender all of the publicly known events
diff --git a/Dam Defense/Lua/DD/events/affliction.lua b/Dam Defense/Lua/DD/events/affliction.lua
@@ -37,9 +37,9 @@ DD.eventAffliction = DD.class(DD.eventBase, nil, {
 DD.eventAfflictionFlu = DD.class(DD.eventAffliction, nil, {
 	name = 'afflictionFlu',
 	isMainEvent = false,
-	cooldown = 60 * 1.5,
-	weight = 0.4,
-	goodness = -0.5,
+	cooldown = 60 * 2,
+	weight = 0.3,
+	goodness = -1,
 	
 	identifier = 'fluinfection',
 	minamount = 1,
@@ -51,9 +51,9 @@ DD.eventAfflictionFlu = DD.class(DD.eventAffliction, nil, {
 DD.eventAfflictionTB = DD.class(DD.eventAffliction, nil, {
 	name = 'afflictionTB',
 	isMainEvent = false,
-	cooldown = 60 * 1.5,
-	weight = 0.3,
-	goodness = -1.5,
+	cooldown = 60 * 2,
+	weight = 0.2,
+	goodness = -2,
 	
 	identifier = 'tbinfection',
 	minamount = 1,
diff --git a/Dam Defense/Lua/DD/events/airdrop.lua b/Dam Defense/Lua/DD/events/airdrop.lua
@@ -7,9 +7,9 @@ DD.eventAirdrop = DD.class(DD.eventBase, function (self, spawnPosition, items, m
 end, {
 	name = 'airdrop',
 	isMainEvent = false,
-	cooldown = 60 * 2,
-	weight = 2.5,
-	goodness = 1,
+	cooldown = 60 * 1,
+	weight = 3,
+	goodness = 1.5,
 	
 	spawnPosition = 'dd_airdrop',
 	crateIdentifier = 'metalcrate',
diff --git a/Dam Defense/Lua/DD/events/blackout.lua b/Dam Defense/Lua/DD/events/blackout.lua
@@ -2,7 +2,7 @@
 DD.eventBlackout = DD.class(DD.eventWithStartBase, nil, {
 	name = 'blackout',
 	isMainEvent = false,
-	cooldown = 60 * 2,
+	cooldown = 60 * 3,
 	weight = 0.5,
 	goodness = -0.5,
 	
diff --git a/Dam Defense/Lua/DD/events/bloodCult.lua b/Dam Defense/Lua/DD/events/bloodCult.lua
@@ -11,7 +11,7 @@ end, {
 	
 	name = 'bloodCult',
 	isMainEvent = true,
-	cooldown = 60 * 6,
+	cooldown = 60 * 8,
 	weight = 1.5,
 	goodness = -1.5,
 	minimunAlivePercentage = 1.0,
diff --git a/Dam Defense/Lua/DD/events/deathSquad.lua b/Dam Defense/Lua/DD/events/deathSquad.lua
@@ -11,7 +11,7 @@ end, {
 	
 	name = 'deathSquad',
 	isMainEvent = true,
-	cooldown = 60 * 3,
+	cooldown = 60 * 4,
 	weight = 0.5,
 	goodness = -2.0,
 	minimunDeadPercentage  = 0.4,
diff --git a/Dam Defense/Lua/DD/events/election.lua b/Dam Defense/Lua/DD/events/election.lua
@@ -2,7 +2,7 @@
 DD.eventElection = DD.class(DD.eventBase, nil, {
 	name = 'election',
 	isMainEvent = false,
-	cooldown = 60 * 5,
+	cooldown = 60 * 3,
 	weight = 1.5,
 	goodness = -1,
 	
diff --git a/Dam Defense/Lua/DD/events/fish.lua b/Dam Defense/Lua/DD/events/fish.lua
@@ -2,7 +2,7 @@
 DD.eventFish = DD.class(DD.eventBase, nil, {
 	name = 'fish',
 	isMainEvent = false,
-	cooldown = 60 * 1.5,
+	cooldown = 60 * 2,
 	weight = 2.5,
 	goodness = -1,
 	
diff --git a/Dam Defense/Lua/DD/events/gang.lua b/Dam Defense/Lua/DD/events/gang.lua
@@ -137,17 +137,16 @@ end, {
 			return
 		end
 		
-		-- set goons table (initially empty)
-		self.goons = {}
-		self.goonsSet = {}
-		self.gangsters = {self.boss}
-		self.gangstersSet = {[self.boss] = true}
-		
 		-- event requires 5 or more players
 		if (self.boss == nil) or ((not ignorePlayerCount) and (DD.tableSize(Client.ClientList) <= 4)) then
 			self.fail('conditions to start could not be met')
 			return
 		else
+			-- set goons table (initially empty)
+			self.goons = {}
+			self.goonsSet = {}
+			self.gangsters = {self.boss}
+			self.gangstersSet = {[self.boss] = true}
 			-- Remove color and name from available list
 			for key, color in pairs(DD.roundData.gangEventAvailableColors) do
 				if self.gangColor == color then
diff --git a/Dam Defense/Lua/DD/events/greenskins.lua b/Dam Defense/Lua/DD/events/greenskins.lua
@@ -11,7 +11,7 @@ end, {
 	
 	name = 'greenskins',
 	isMainEvent = true,
-	cooldown = 60 * 2,
+	cooldown = 60 * 4,
 	weight = 1.0,
 	goodness = -1.5,
 	minimunDeadPercentage  = 0.4,
diff --git a/Dam Defense/Lua/DD/events/mercs.lua b/Dam Defense/Lua/DD/events/mercs.lua
@@ -9,7 +9,7 @@ end, {
 	name = 'mercs',
 	instanceCap = 1,
 	isMainEvent = false,
-	cooldown = 60 * 1,
+	cooldown = 60 * 3,
 	weight = 1.0,
 	goodness = 2.0,
 	minimunDeadPercentage  = 0.3,
diff --git a/Dam Defense/Lua/DD/events/nukies.lua b/Dam Defense/Lua/DD/events/nukies.lua
@@ -10,7 +10,7 @@ end, {
 	
 	name = 'nukies',
 	isMainEvent = true,
-	cooldown = 60 * 2,
+	cooldown = 60 * 4,
 	weight = 3,
 	goodness = -1.5,
 	minimunDeadPercentage  = 0.2,
diff --git a/Dam Defense/Lua/DD/events/revolution.lua b/Dam Defense/Lua/DD/events/revolution.lua
@@ -8,7 +8,7 @@ end, {
 	
 	name = 'revolution',
 	isMainEvent = true,
-	cooldown = 60 * 6,
+	cooldown = 60 * 8,
 	weight = 2,
 	goodness = -1,
 	minimunAlivePercentage = 1.0,
diff --git a/Dam Defense/Lua/DD/events/serialKiller.lua b/Dam Defense/Lua/DD/events/serialKiller.lua
@@ -8,7 +8,7 @@ end, {
 	
 	name = 'serialKiller',
 	isMainEvent = true,
-	cooldown = 60 * 5,
+	cooldown = 60 * 4,
 	weight = 1,
 	goodness = -0.5,
 	minimunAlivePercentage = 1.0,
diff --git a/Dam Defense/Lua/DD/gui/gui.lua b/Dam Defense/Lua/DD/gui/gui.lua
@@ -894,6 +894,7 @@ local guiCharacterInfoTextColorTable = {
 	target = GUI.GUIStyle.Yellow,
 	cultist = Color(160, 120, 200),
 	rebel = GUI.GUIStyle.Orange,
+	serialkiller = Color(160, 120, 200),
 	wizard = Color(120, 200, 160),
 	wanted = GUI.GUIStyle.Orange,
 	bodyguard = Color.SkyBlue,
diff --git a/Dam Defense/Lua/DD/luahooks.lua b/Dam Defense/Lua/DD/luahooks.lua
@@ -421,8 +421,11 @@ end)
 -- whaling gun uses powder when fired
 Hook.Add("DD.whalinggun.use", "DD.whalinggun.use", function(effect, deltaTime, item, targets, worldPosition)
 	local powder = targets[#targets]
-	if powder.HasTag('whalinggunpowder') or powder.HasTag('munition_propulsion') then
-		powder.Condition = powder.Condition - 50
+	for target in targets do
+		if (LuaUserData.TypeOf(target) == 'Barotrauma.Item') and (target.HasTag('whalinggunpowder') or target.HasTag('munition_propulsion')) then
+			target.Condition = target.Condition - 50
+			break
+		end
 	end
 end)
 
@@ -1294,8 +1297,10 @@ end)
 local vote = function (bool, targets)
 	local count = 0
 	for target in targets do
-		count = count + 1
-		Entity.Spawner.AddItemToRemoveQueue(target)
+		if (LuaUserData.TypeOf(target) == 'Barotrauma.Item') and (target.HasTag('money')) then
+			count = count + 1
+			Entity.Spawner.AddItemToRemoveQueue(target)
+		end
 	end
 	if count == 0 then return end
 	
diff --git a/Dam Defense/Lua/DD/nature.lua b/Dam Defense/Lua/DD/nature.lua
@@ -17,7 +17,7 @@ DD.speciesData = {
 	mudraptor_hatchling = {initialGrowTimer = 120, grownIdentifier = 'mudraptor_unarmored', populationName = 'mudraptor'},
 	
 	husk_prowler = {populationName = 'husk'},
-	husk = {initialGrowTimer = 180, grownIdentifier = 'husk_prowler', populationName = 'husk'},
+	husk = {initialGrowTimer = 240, grownIdentifier = 'husk_prowler', populationName = 'husk'},
 }
 
 DD.plantData = {
diff --git a/Dam Defense/Lua/DD/networking/server.lua b/Dam Defense/Lua/DD/networking/server.lua
@@ -68,6 +68,7 @@ end)
 Networking.Receive("requestUpdateGUICharacterRole", function (message, client)
 	local characterRole = {}
 	local assignClientRole = function (client, role)
+		if client == nil then return end
 		if not DD.isClientCharacterAlive(client) then return end
 		if characterRole[tostring(client.Character.ID)] == nil then characterRole[tostring(client.Character.ID)] = {} end
 		characterRole[tostring(client.Character.ID)][role] = true
diff --git a/Dam Defense/Misc/Afflictions.xml b/Dam Defense/Misc/Afflictions.xml
@@ -627,15 +627,15 @@
 	  resistancefor="damage,bleeding,bloodloss,stun"
 	  minresistance="0.35"
 	  maxresistance="0.35">
-      <StatusEffect target="Character" interval="0.1" disabledeltatime="true">
+      <StatusEffect target="Character">
         <ReduceAffliction type="stun" strength="0.2"/>
-        <ReduceAffliction type="damage" strength="0.2"/>
+        <ReduceAffliction type="damage" strength="0.5"/>
         <ReduceAffliction type="poison" strength="1"/>
         <ReduceAffliction type="infection" strength="1"/>
-        <ReduceAffliction identifier="drunk" strength="0.2"/>
-        <ReduceAffliction identifier="bacterialgangrene" strength="0.2"/>
-        <ReduceAffliction identifier="bloodloss" strength="0.2"/>
-        <ReduceAffliction identifier="bleeding" strength="0.2"/>
+        <ReduceAffliction identifier="drunk" strength="0.5"/>
+        <ReduceAffliction identifier="bacterialgangrene" strength="0.5"/>
+        <ReduceAffliction identifier="bloodloss" strength="0.5"/>
+        <ReduceAffliction identifier="bleeding" strength="0.5"/>
         <ReduceAffliction identifier="oxygenlow" strength="15.0"/>
       </StatusEffect>
       <StatValue stattype="MeleeAttackMultiplier" value="2.0" />
diff --git a/Dam Defense/filelist.xml b/Dam Defense/filelist.xml
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
-<contentpackage name="Dam Defense" modversion="1.2.9" corepackage="False" steamworkshopid="3146664815" gameversion="1.8.6.2">
+<contentpackage name="Dam Defense" modversion="1.2.10" corepackage="False" steamworkshopid="3146664815" gameversion="1.8.6.2">
   <Other file="%ModDir%/CSharp/Client/DamDefense.cs" />
   <Text file="%ModDir%/Localizations/english.xml" />
   <Item file="%ModDir%/Items/Jerry.xml" />
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Dam Defense v1.2.9
+# Dam Defense v1.2.10
 
 Read me? How about I read you instead?
 
