1.3.0 (EXPERIMENTAL #1)

Author: Sharp-Shark

Dam Defense/Items/Items.xml

@@ -324,7 +324,7 @@
   <entitydescription.762round>A round of 7x62x39mm.</entitydescription.762round>
   <!-- Marksmen Rifle -->
   <entityname.marksmanrifle>Marksmen Rifle</entityname.marksmanrifle>
-  <entitydescription.marksmanrifle>Only craftable by rebel leaders. Precision 7.62x39mm semi-automatic rifle. The right arm of the free world.</entitydescription.marksmanrifle>
+  <entitydescription.marksmanrifle>Only craftable by rebel leaders. Precision 7.62x39mm semi-automatic rifle that comes with a scope attached. The right arm of the free world.</entitydescription.marksmanrifle>
   <!-- Tommy Gun -->
   <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>

Dam Defense/Localizations/english.xml

@@ -714,28 +714,45 @@ Hook.Add("character.giveJobItems", "DD.onGiveJobItems", function (character)
 	if client ~= nil then
 		DD.messageClient(client, JobPrefab.Get(character.JobIdentifier).Description, {preset = 'info'})
 	end
-	-- Event related jobs
+	-- Items to be locked (to be made non interactable)
+	local lockedJobItems = {
+		captain = {
+			[DD.invSlots.innerclothes] = {captainsuniform1 = true, captainsuniform3 = true}
+		},
+		diver = {
+			[DD.invSlots.innerclothes] = {securityuniform2 = true}
+		},
+		securityofficer = {
+			[DD.invSlots.innerclothes] = {securityuniform1 = true}
+		},
+		foreman = {
+			[DD.invSlots.innerclothes] = {orangejumpsuit2 = true}
+		},
+		-- event jobs
+		wizard = {
+			[DD.invSlots.head] = {merasmushat = true},
+		},
+		gangster = {
+			[DD.invSlots.head] = {bosshat = true},
+			[DD.invSlots.innerclothes] = {bossclothes = true},
+		},
+	}
+	local lockedItems = lockedJobItems[tostring(character.JobIdentifier)]
+	if lockedItems ~= nil then
+		for slot, itemSet in pairs(lockedItems) do
+			local item = character.Inventory.GetItemAt(slot)
+			if itemSet[tostring(item.Prefab.Identifier)] then
+				item.NonInteractable = true
+				if SERVER then
+					local nonInteractable = item.SerializableProperties[Identifier("NonInteractable")]
+					Networking.CreateEntityEvent(item, Item.ChangePropertyEventData(nonInteractable, item))
+				end
+			end
+		end
+	end
+	-- Event related job
 	if character.JobIdentifier == 'wizard' then
 		DD.giveAfflictionCharacter(character, 'wizard', 1)
-		local item = character.Inventory.GetItemAt(DD.invSlots.head)
-		item.NonInteractable = true
-		if SERVER then
-			local nonInteractable = item.SerializableProperties[Identifier("NonInteractable")]
-			Networking.CreateEntityEvent(item, Item.ChangePropertyEventData(nonInteractable, item))
-		end
-	elseif character.JobIdentifier == 'gangster' then
-		local item = character.Inventory.GetItemAt(DD.invSlots.head)
-		item.NonInteractable = true
-		if SERVER then
-			local nonInteractable = item.SerializableProperties[Identifier("NonInteractable")]
-			Networking.CreateEntityEvent(item, Item.ChangePropertyEventData(nonInteractable, item))
-		end
-		local item = character.Inventory.GetItemAt(DD.invSlots.innerclothes)
-		item.NonInteractable = true
-		if SERVER then
-			local nonInteractable = item.SerializableProperties[Identifier("NonInteractable")]
-			Networking.CreateEntityEvent(item, Item.ChangePropertyEventData(nonInteractable, item))
-		end
 	elseif character.JobIdentifier == 'assistant' then
 		Entity.Spawner.AddItemToSpawnQueue(ItemPrefab.GetItemPrefab('handcuffs'), character.Inventory, nil, nil, function (spawnedItem)
 			spawnedItem.Condition = spawnedItem.Condition / 10

Dam Defense/Lua/Autorun/main.lua

@@ -1275,6 +1275,7 @@ Hook.Add("DD.fuelrod.decay", "DD.fuelrod.decay", function(effect, deltaTime, ite
 	if item.Prefab.Identifier == 'skyholderartifact' then
 		maxAmount = 300
 	end
+	if maxAmount <= 0 then return end
 	maxAmount = maxAmount * multiplier
 	local minDistance = 50
 	local maxDistance = math.sqrt(maxAmount / 0.005)

Dam Defense/Lua/DD/luahooks.lua

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<contentpackage name="Dam Defense" modversion="1.2.18" corepackage="False" steamworkshopid="3146664815" gameversion="1.8.8.1">
+<contentpackage name="Dam Defense" modversion="1.2.32" corepackage="False" steamworkshopid="3146664815" gameversion="1.9.7.0">
   <Other file="%ModDir%/CSharp/Client/DamDefense.cs" />
   <Text file="%ModDir%/Localizations/english.xml" />
   <Item file="%ModDir%/Items/Jerry.xml" />
@@ -23,8 +23,8 @@
   <Jobs file="%ModDir%/Misc/Jobs.xml" />
   <Afflictions file="%ModDir%/Misc/Afflictions.xml" />
   <Submarine file="%ModDir%/Submarines/DD Demo.sub" />
-  <Submarine file="%ModDir%/Submarines/DD Olde Towne.sub" />
   <Submarine file="%ModDir%/Submarines/DD Cliffhanger.sub" />
   <Submarine file="%ModDir%/Submarines/DD Pioneer Point.sub" />
-  <Submarine file="%ModDir%/Submarines/DD Dimidium.sub" />
+  <Submarine file="%ModDir%/Submarines/DD Olde Towne.sub" />
+  <Submarine file="%ModDir%/Submarines/DD Rising Tide.sub" />
 </contentpackage>