1.3.3

Author: Sharp-Shark

Dam Defense/Items/Boomboxes.xml

@@ -28,7 +28,7 @@
 			<StatusEffect type="Always" targettype="Contained" Condition="-0.1">
 				<RequiredItem items="mobilebattery" type="Contained" />
 				<Conditional condition="gt 0.0" />
-				<sound file="%ModDir%/Sounds/sweethomealabama.ogg" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
+				<sound file="%ModDir%/Sounds/sweethomealabama.ogg" stream="true" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
 			</StatusEffect>
 			<!-- zap when in water -->
 			<StatusEffect type="InWater" targettype="Contained" Condition="0" setvalue="true" disabledeltatime="true" comparison="and" >
@@ -99,7 +99,7 @@
 			<!-- music -->
 			<StatusEffect type="Always" targettype="Contained" Condition="-0.1">
 				<RequiredItem items="mobilebattery" type="Contained" />
-				<sound file="%ModDir%/Sounds/virtualinsanity.ogg" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
+				<sound file="%ModDir%/Sounds/virtualinsanity.ogg" stream="true" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
 				<Conditional condition="gt 0.0" />
 			</StatusEffect>
 		</ItemComponent>
@@ -122,7 +122,7 @@
 			<!-- music -->
 			<StatusEffect type="Always" targettype="Contained" Condition="-0.1">
 				<RequiredItem items="mobilebattery" type="Contained" />
-				<sound file="%ModDir%/Sounds/entersandman.ogg" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
+				<sound file="%ModDir%/Sounds/entersandman.ogg" stream="true" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
 				<Conditional condition="gt 0.0" />
 			</StatusEffect>
 		</ItemComponent>
@@ -146,7 +146,7 @@
 			<!-- music -->
 			<StatusEffect type="Always" targettype="Contained" Condition="-0.1">
 				<RequiredItem items="mobilebattery" type="Contained" />
-				<sound file="%ModDir%/Sounds/banditradio.ogg" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
+				<sound file="%ModDir%/Sounds/banditradio.ogg" stream="true" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
 				<Conditional condition="gt 0.0" />
 			</StatusEffect>
 		</ItemComponent>
@@ -170,7 +170,7 @@
 			<!-- music -->
 			<StatusEffect type="Always" targettype="Contained" Condition="-0.1">
 				<RequiredItem items="mobilebattery" type="Contained" />
-				<sound file="%ModDir%/Sounds/title3.ogg" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
+				<sound file="%ModDir%/Sounds/title3.ogg" stream="true" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
 				<Conditional condition="gt 0.0" />
 			</StatusEffect>
 		</ItemComponent>
@@ -193,7 +193,7 @@
 			<!-- music -->
 			<StatusEffect type="Always" targettype="Contained" Condition="-0.1">
 				<RequiredItem items="mobilebattery" type="Contained" />
-				<sound file="%ModDir%/Sounds/comeoutandplay.ogg" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
+				<sound file="%ModDir%/Sounds/comeoutandplay.ogg" stream="true" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
 				<Conditional condition="gt 0.0" />
 			</StatusEffect>
 		</ItemComponent>
@@ -217,7 +217,7 @@
 			<!-- music -->
 			<StatusEffect type="Always" targettype="Contained" Condition="-0.1">
 				<RequiredItem items="mobilebattery" type="Contained" />
-				<sound file="%ModDir%/Sounds/drunkensailor.ogg" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
+				<sound file="%ModDir%/Sounds/drunkensailor.ogg" stream="true" volume="1.5" selectionmode="CharacterSpecific" range="900" loop="true" />
 				<Conditional condition="gt 0.0" />
 			</StatusEffect>
 		</ItemComponent>

Dam Defense/Items/Items.xml

@@ -1188,7 +1188,7 @@
       <Wearable slots="Bag" msg="ItemMsgEquipSelect" canbeselected="false" canbepicked="true" pickkey="Select">
         <sprite texture="jetshotgun.png" canbehiddenbyotherwearables="false" rotation="90" inheritlimbdepth="false" depth="0.6" sourcerect="0,0,216,60" limb="Torso" ignorelimbscale="true" scale="0.5" origin="0.45,0.88" />
       </Wearable>
-      <RangedWeapon barrelpos="70,12" spread="0.1" unskilledspread="3" combatPriority="80" reload="1" drawhudwhenequipped="true" crosshairscale="0.2">
+      <RangedWeapon barrelpos="70,12" spread="0.1" unskilledspread="3" combatPriority="80" reload="0.9" drawhudwhenequipped="true" crosshairscale="0.2">
         <Crosshair texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,256,256,256" />
         <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="256,256,256,256" />
         <ParticleEmitter particle="muzzleflash" particleamount="1" velocitymin="0" velocitymax="0" />
@@ -1249,7 +1249,7 @@
       <Wearable slots="Bag" msg="ItemMsgEquipSelect" canbeselected="false" canbepicked="true" pickkey="Select">
         <sprite texture="Content/Items/Weapons/weapons_new.png" sourcerect="262,70,184,51" canbehiddenbyotherwearables="false" rotation="85" inheritlimbdepth="false" depth="0.6" limb="Torso" ignorelimbscale="true" scale="0.5" origin="0.45,1.0" />
       </Wearable>
-      <RangedWeapon barrelpos="85,10" spread="1" unskilledspread="4" combatPriority="80" reload="0.1" drawhudwhenequipped="true" crosshairscale="0.2">
+      <RangedWeapon barrelpos="85,10" weapondamagemodifier="0.8" spread="1" unskilledspread="4" combatPriority="80" reload="0.1" drawhudwhenequipped="true" crosshairscale="0.2">
         <Crosshair texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,256,256,256" />
         <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="256,256,256,256" />
         <ParticleEmitter particle="muzzleflash" particleamount="1" velocitymin="0" velocitymax="0" />
@@ -1262,8 +1262,8 @@
           <Explosion range="150.0" force="3" shockwave="false" smoke="false" flash="true" sparks="false" flames="false" underwaterbubble="false" camerashake="6.0" />
         </StatusEffect>
         <!-- only 2 shots can be fired at the 0.1 interval, after that you need to wait 1 second -->
-        <StatusEffect type="OnUse" target="This" reload="1.5" setvalue="true" delay="0.05" />
-        <StatusEffect type="OnUse" target="This" reload="0.1" setvalue="true" delay="1.5" />
+        <StatusEffect type="OnUse" target="This" reload="2.0" setvalue="true" delay="0.05" />
+        <StatusEffect type="OnUse" target="This" reload="0.1" setvalue="true" delay="2.0" />
         <!-- Cocking sound, delayed by 1.0 seconds. -->
         <StatusEffect type="OnUse" target="This" delay="0.8">
           <Sound file="Content/Items/Weapons/ShotgunLoad1.ogg" type="OnUse" range="500" selectionmode="Random" />
@@ -4816,7 +4816,7 @@
     <Sprite texture="foldableshotgun.png" sourcerect="0,0,220,56" depth="0.55" origin="0.5,0.25" />
     <Body width="180" height="30" density="25" />
     <Holdable slots="Any,RightHand+LeftHand" controlpose="true" holdpos="40,-10" aimpos="55,-8" handle1="-40,-18" handle2="25,0" holdangle="-40" msg="ItemMsgPickUpSelect" />
-    <RangedWeapon barrelpos="80,-15" spread="0.1" unskilledspread="3" combatPriority="80" weapondamagemodifier="1.2" reload="1.2" drawhudwhenequipped="true" crosshairscale="0.2">
+    <RangedWeapon barrelpos="80,-15" spread="0.1" unskilledspread="3" combatPriority="80" weapondamagemodifier="1.15" reload="1" drawhudwhenequipped="true" crosshairscale="0.2">
       <Crosshair texture="Content/Items/Weapons/Crosshairs.png" sourcerect="0,256,256,256" />
       <CrosshairPointer texture="Content/Items/Weapons/Crosshairs.png" sourcerect="256,256,256,256" />
       <ParticleEmitter particle="muzzleflash" particleamount="1" velocitymin="0" velocitymax="0" />
@@ -5456,7 +5456,7 @@
     <Body width="28" height="40" density="25" />
     <ItemContainer hideitems="true" capacity="1" drawinventory="false" canbeselected="false" ShowConditionInContainedStateIndicator="true" SpawnWithId="pistolround" removecontaineditemsondeconstruct="true" containedstateindicatorstyle="bullet">
       <Containable items="pistolround" />
-      <StatusEffect type="OnUse" target="This" condition="-1.65" disabledeltatime="true">
+      <StatusEffect type="OnUse" target="This" condition="-2" disabledeltatime="true">
         <SpawnItem identifiers="pistolround" spawnposition="ThisInventory" />
       </StatusEffect>
     </ItemContainer>

Dam Defense/Localizations/english.lua

@@ -4,6 +4,7 @@ return {
 	deathMessage = 'You have died! You can type /possess in chat to control a creature. Do /freecam to go back to spectating. If you want a full list of commands, do /help in chat.',
 	matchHasGoneOnForTooLong = 'The match has gone on for too long and respawning has been automatically disabled.',
 	allTheCrewIsDead = 'All of the crew is dead! Round ending in 10 seconds.',
+	allReactorsAreBroken = 'The dam has been destroyed! Round ending in 10 seconds.',
 	commandHelp = 'List of chat commands:\n{list}',
 	commandHelpMisspell = '"{command}" is not a valid chat command. Do "/help" for a list of chat commands.',
 	commandHelpInvalid = '"{command}" is a valid chat command, but it is unusable by you in the current context. Do "/help" for a list of chat commands.',

Dam Defense/Localizations/english.xml

@@ -335,7 +335,7 @@
   <entityname.tommygun>Tommy Gun</entityname.tommygun>
   <entitydescription.tommygun>A 9mm convertion of an antique submachine gun usually associated with the mafia or any other lavish criminals. Bolsters an impressive rate of fire and fine finish.</entitydescription.tommygun>
   <entityname.pistoldrum>Tommy Gun Drum</entityname.pistoldrum>
-  <entitydescription.pistoldrum>A magazine for the tommy gun containing 60 rounds of 9mm.</entitydescription.pistoldrum>
+  <entitydescription.pistoldrum>A magazine for the tommy gun containing 50 rounds of 9mm.</entitydescription.pistoldrum>
   <!-- UZI -->
   <entityname.uzi>UZI</entityname.uzi>
   <entitydescription.uzi>Only craftable by gang members. A very light 9mm submachine gun with a foldable stock. This bullet hose fires faster than you can count.</entitydescription.uzi>

Dam Defense/Lua/Autorun/main.lua

@@ -74,6 +74,13 @@ DD.roundStartFunctions.main = function ()
 			-- lock sub
 			Submarine.MainSub.LockX = true
 			Submarine.MainSub.LockY = true
+			-- find reactors
+			DD.reactors = {}
+			for item in Submarine.MainSub.GetItems(false) do
+				if item.HasTag('reactor') then
+					table.insert(DD.reactors, item)
+				end
+			end
 		end
 
 		-- automations for sub editor
@@ -232,6 +239,15 @@ DD.thinkFunctions.main = function ()
 
 	if #Client.ClientList == 1 then return end
 
+	-- Skip round end checks if certain events are happening
+	local set = {
+		[DD.eventNukies.tbl.name] = true,
+		[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
+	end
+	
 	-- End round if everyone is dead
 	local anyHumanAlive = false
 	for client in Client.ClientList do
@@ -246,6 +262,23 @@ DD.thinkFunctions.main = function ()
 		Timer.Wait(function ()
 			Game.EndGame()
 		end, 10 * 1000)
+		return
+	end
+	-- End round if all reactors are broken
+	local anyReactorIsUnbroken = false
+	for reactor in DD.reactors do
+		if reactor.Condition > 0 then
+			anyReactorIsUnbroken = true
+			break
+		end
+	end
+	if not anyReactorIsUnbroken then
+		DD.messageAllClients(DD.stringLocalize('allReactorsAreBroken'), {preset = 'crit'})
+		DD.roundData.roundEnding = true
+		Timer.Wait(function ()
+			Game.EndGame()
+		end, 10 * 1000)
+		return
 	end
 end
 
@@ -765,34 +798,28 @@ Hook.Add("character.giveJobItems", "DD.onGiveJobItems", function (character)
 		end)
 	end
 	-- Give Talents
+	local jobTalents = {
+		captain = {'drunkensailor'},
+		diver = {'daringdolphin', 'ballastdenizen'},
+		securityofficer = {'physicalconditioning'},
+		foreman = {'daringdolphin', 'ballastdenizen', 'unstoppablecuriosity', 'engineeringknowledge'},
+		engineer = {'daringdolphin', 'ballastdenizen', 'unstoppablecuriosity', 'engineeringknowledge'},
+		researcher = {'dontdieonme', 'firemanscarry'},
+		medicaldoctor = {'dontdieonme', 'firemanscarry'},
+		janitor = {'janitorialknowledge', 'greenthumb', 'firemanscarry'},
+		mechanic = {'unlockallrecipes', 'miner'},
+		clown = {'unlockallrecipes', 'skedaddle'},
+		assistant = {'unlockallrecipes', 'skedaddle'},
+		-- event jobs
+		gangster = {'drunkensailor', 'gangknowledge'},
+		jet = {'daringdolphin', 'ballastdenizen', 'rebelknowledge'},
+		mercs = {'daringdolphin', 'ballastdenizen'},
+		mercsevil = {'daringdolphin', 'ballastdenizen'},
+	}
 	if character.SpeciesName == 'human' then
 		Timer.Wait(function ()
-			if (character.JobIdentifier == 'mechanic') or (character.JobIdentifier == 'clown') or (character.JobIdentifier == 'assistant') then
-				character.GiveTalent('unlockallrecipes', true)
-			end
-			if (character.JobIdentifier == 'janitor') then
-				character.GiveTalent('janitorialknowledge', true)
-				character.GiveTalent('greenthumb', true)
-			end
-			if (character.JobIdentifier == 'engineer') or (character.JobIdentifier == 'foreman') then
-				character.GiveTalent('unstoppablecuriosity', true)
-				character.GiveTalent('engineeringknowledge', true)
-			end
-			if (character.JobIdentifier == 'captain') or (character.JobIdentifier == 'gangster') or (character.JobIdentifier == 'assistant') then
-				character.GiveTalent('drunkensailor', true)
-			end
-			if DD.isCharacterMedical(character) or (character.JobIdentifier == 'janitor') or (character.JobIdentifier == 'assistant') then
-				character.GiveTalent('firemanscarry', true)
-			end
-			if (character.JobIdentifier == 'diver') or (character.JobIdentifier == 'engineer') or (character.JobIdentifier == 'foreman') or (character.JobIdentifier == 'jet') or (character.JobIdentifier == 'mercsevil') or (character.JobIdentifier == 'assistant') then
-				character.GiveTalent('daringdolphin', true)
-				character.GiveTalent('ballastdenizen', true)
-			end
-			if character.JobIdentifier == 'jet' then
-				character.GiveTalent('rebelknowledge', true)
-			end
-			if character.JobIdentifier == 'gangster' then
-				character.GiveTalent('gangknowledge', true)
+			for talent in jobTalents[tostring(character.JobIdentifier)] do
+				character.GiveTalent(talent, true)
 			end
 		end, 1000)
 	end

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

@@ -12,7 +12,7 @@ end, {
 	cooldown = 60 * 3,
 	weight = 2,
 	goodness = -4,
-	minimunDeadPercentage = 0.05,
+	minimunDeadPercentage = 0.01,
 	minimunTimeElapsed = 5 * 60,
 
 	onStart = function (self)

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

@@ -14,7 +14,7 @@ end, {
 	cooldown = 60 * 6,
 	weight = 4,
 	goodness = -5,
-	minimunDeadPercentage  = 0.2,
+	minimunDeadPercentage  = 0.1,
 	minimunTimeElapsed = 20 * 60,
 
 	lateJoinBlacklistSet = {},
@@ -36,14 +36,6 @@ end, {
 
 	onStart = function (self)
 		self.nukiesWon = false
-	
-		-- Find reactors
-		self.reactors = {}
-		for item in Submarine.MainSub.GetItems(false) do
-			if item.HasTag('reactor') then
-				table.insert(self.reactors, item)
-			end
-		end
 
 		-- Pick nukies
 		if self.nukies == nil then
@@ -86,7 +78,7 @@ end, {
 
 		-- See if any reactor is unbroken
 		local anyReactorIsUnbroken = false
-		for reactor in self.reactors do
+		for reactor in DD.reactors do
 			if reactor.Condition > 0 then
 				anyReactorIsUnbroken = true
 				break

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

@@ -11,7 +11,7 @@ end, {
 	cooldown = 60 * 4,
 	weight = 2,
 	goodness = -2,
-	minimunDeadPercentage = 0.05,
+	minimunDeadPercentage = 0.01,
 
 	removeClientFromGang = function (self, client, treason)
 		-- remove from gang
@@ -58,6 +58,13 @@ end, {
 		-- message recruited client
 		DD.messageClient(client, DD.stringLocalize('gangGangsterInfo', {bossName = self.bossName, gangName = self.gangName}), {preset = 'crit'})
 
+		-- do gang effect
+		Timer.Wait(function ()
+			if DD.isClientCharacterAlive(client) then
+				DD.giveAfflictionCharacter(character, 'gangfx', 999)
+			end
+		end, 1000)
+		
 		-- reset pulmonary emphysema
 		local affliction = client.Character.CharacterHealth.GetAffliction('pulmonaryemphysema', true)
 		if affliction ~= nil then

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

@@ -14,7 +14,7 @@ end, {
 	cooldown = 60 * 6,
 	weight = 3,
 	goodness = -5,
-	minimunDeadPercentage  = 0.2,
+	minimunDeadPercentage  = 0.1,
 	minimunTimeElapsed = 20 * 60,
 
 	lateJoinSpawn = function (self, client)

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

@@ -12,7 +12,7 @@ end, {
 	cooldown = 60 * 2,
 	weight = 2,
 	goodness = 3,
-	minimunDeadPercentage = 0.1,
+	minimunDeadPercentage = 0.01,
 	minimunTimeElapsed = 12 * 60,
 
 	onStart = function (self)