Added device subgroup Tools - Breaching which will mark the device to be used against doors at a close range.

Author: fourZK

Base.rte/AI/HumanBehaviors.lua

@@ -2629,6 +2629,7 @@ function HumanBehaviors.ShootTarget(AI, Owner, Abort)
 end
 
 -- throw a grenade at the selected target
+--TODO: This behavior should effectively have the actor close in on the target if out of range!
 function HumanBehaviors.ThrowTarget(AI, Owner, Abort)
 	local ThrowTimer = Timer()
 	local aimTime = Owner.ThrowPrepTime
@@ -2839,25 +2840,18 @@ function HumanBehaviors.AttackTarget(AI, Owner, Abort)
 		end
 		-- use following sequence to attack either with a suited melee weapon or arms
 		local meleeDist = 0
-		local startPos = Vector(Owner.EyePos.X, Owner.EyePos.Y)
 
-		if Owner:EquipDeviceInGroup("Tools - Diggers", true) or Owner:EquipDeviceInGroup("Weapons - Melee", true) then
-			meleeDist = Owner.IndividualRadius + 25
-			startPos = Vector(Owner.EquippedItem.Pos.X, Owner.EquippedItem.Pos.Y)
-		elseif Owner.armSway then
-			local arm = Owner.FGArm or Owner.BGArm
-			if arm then
-				meleeDist = arm.Radius + arm.Radius
-				startPos = arm.Pos
-			end
+		if Owner:EquipDeviceInGroup("Tools - Diggers", true) or Owner:EquipDeviceInGroup("Weapons - Melee", true) or Owner:EquipDeviceInGroup("Tools - Breaching", true) then
+			meleeDist = Owner.IndividualRadius + (IsThrownDevice(Owner.EquippedItem) and 50 or 25)
 		end
 		if meleeDist > 0 then
+			local startPos = Vector(Owner.EquippedItem.Pos.X, Owner.EquippedItem.Pos.Y)
 			local attackPos = (AI.Target.ClassName == "ADoor" and ToADoor(AI.Target).Door and ToADoor(AI.Target).Door:IsAttached()) and ToADoor(AI.Target).Door.Pos or AI.Target.Pos
 			local dist = SceneMan:ShortestDistance(startPos, attackPos, false)
 			if dist.Magnitude < meleeDist then
 				AI.lateralMoveState = Actor.LAT_STILL
 				AI.Ctrl.AnalogAim = SceneMan:ShortestDistance(Owner.EyePos, attackPos, false).Normalized
-				AI.fire = true
+				AI.fire = not (AI.fire and IsThrownDevice(Owner.EquippedItem) and Owner.ThrowProgress == 1)
 			else
 				AI.fire = false
 			end

Base.rte/AI/NativeHumanAI.lua

@@ -727,12 +727,10 @@ function NativeHumanAI:CreateAttackBehavior(Owner)
 	local dist = SceneMan:ShortestDistance(Owner.Pos, self.Target.Pos, false).Magnitude
 
 	if IsADoor(self.Target) then 
-		if Owner:EquipNamedDevice("Heavy Digger", true) then
+		--TODO: Include other explosive weapons with varying effective ranges!
+		if Owner:EquipDeviceInGroup("Tools - Breaching", true) then
 			self.NextBehavior = coroutine.create(HumanBehaviors.AttackTarget)
 			self.NextBehaviorName = "AttackTarget"
-		elseif dist < 50 and (Owner:EquipNamedDevice("Remote Explosive", true) or Owner:EquipNamedDevice("Timed Explosive", true)) then
-			self.NextBehavior = coroutine.create(HumanBehaviors.ThrowTarget)
-			self.NextBehaviorName = "ThrowTarget"
 		elseif Owner.FirearmIsReady and HumanBehaviors.GetProjectileData(Owner).pen * 0.9 > (self.Target.Door or self.Target).Material.StructuralIntegrity then
 			self.NextBehavior = coroutine.create(HumanBehaviors.ShootTarget)
 			self.NextBehaviorName = "ShootTarget"

Base.rte/Devices/Explosives/RemoteExplosive/RemoteExplosive.ini

@@ -229,6 +229,7 @@ AddMOSRotating = MOSRotating
 AddDevice = TDExplosive
 	PresetName = Remote Explosive
 	AddToGroup = Bombs
+	AddToGroup = Tools - Breaching
 	Description = Manually placed C4 explosives that are automatically set to operate on your team's frequency. Place the explosive against the target surface and detonate using the detonator tool. Excellent for destroying doors!
 	Mass = 3
 	HitsMOs = 1

Base.rte/Devices/Tools/Digger/Digger.ini

@@ -593,6 +593,7 @@ AddDevice = HDFirearm
 	PresetName = Heavy Digger
 	AddToGroup = Tools
 	AddToGroup = Tools - Diggers
+	AddToGroup = Tools - Breaching
 	Description = Heaviest and the most powerful of them all. Eats concrete with great hunger and allows you to penetrate bunker doors and walls.
 	Mass = 10
 	HitsMOs = 0

Browncoats.rte/Devices/Tools/Blowtorch/Blowtorch.ini

@@ -118,6 +118,7 @@ AddDevice = HDFirearm
 	PresetName = DG-1000 Blowtorch
 	AddToGroup = Tools
 	AddToGroup = Tools - Diggers
+	AddToGroup = Tools - Breaching
 	Description = Incredibly light but powerful digging device. Not the best at collecting gold, but excellent for breaching bunkers.
 	Mass = 4.5
 	HitsMOs = 0

Coalition.rte/Devices/Explosives/TimedExplosive/TimedExplosive.ini

@@ -124,6 +124,7 @@ AddEffect = MOSRotating
 AddDevice = TDExplosive
 	PresetName = Timed Explosive
 	AddToGroup = Bombs
+	AddToGroup = Tools - Breaching
 	Description = Destructive plantable explosive charge.  After planting, run for your life, as it explodes after 10 seconds. Excellent for destroying doors!
 	Mass = 5
 	RestThreshold = -1

Techion.rte/Devices/Tools/Nanolyzer/Nanolyzer.ini

@@ -234,6 +234,7 @@ AddAmmo = Magazine
 AddDevice = HDFirearm
 	PresetName = Nanolyzer
 	AddToGroup = Tools
+	AddToGroup = Tools - Breaching
 	Description = This tool analyzes materials and destabilizes them into a gray goo, making it extremely easy to dig through. It performs at the same rate on any substance, but is slow and incapable of retrieving gold, making it ideal for breaking bunkers, but not for mining.
 	Mass = 6
 	HitsMOs = 0

Techion.rte/Devices/Tools/Nanolyzer/Nanolyzer.lua

@@ -69,7 +69,7 @@ function Update(self)
 				local targetMO = MovableMan:GetMOFromID(ToMOSRotating(initMO).RootID);
 				local dustTarget;
 
-				if targetMO and targetMO.ClassName ~= "ADoor" then
+				if targetMO then
 					local resistance = math.sqrt(targetMO.Radius + math.abs(targetMO.Mass) + targetMO.Material.StructuralIntegrity + 1);
 					if IsActor(targetMO) then
 						local actor = ToActor(targetMO);