Merge pull request #121 from cortex-command-community/pre4-testing

Getting ready for pre4

Author: garethyr

Base.rte/AI.ini

@@ -17,66 +17,19 @@ AddActor = AHuman
 	Health = 100
 	AimDistance = 0
 	Perceptiveness = 0
-	CharHeight = 0
 	HUDVisible = 0
 	Head = Attachable
-		PresetName = Null Head
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
-	FGArm = Arm
-		PresetName = Null Arm FG
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
-		Hand = ContentFile
-			FilePath = Base.rte/Null.png
-		MaxLength = 0
-	BGArm = Arm
-		PresetName = Null Arm BG
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
-		Hand = ContentFile
-			FilePath = Base.rte/Null.png
-		MaxLength = 0
+		CopyOf = Null Attachable
 	FGLeg = Leg
-		PresetName = Null Leg FG
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
+		CopyOf = Null Leg
 	BGLeg = Leg
-		PresetName = Null Leg BG
-		Mass = 0
-		HitsMOs = 0
-		GetsHitByMOs = 0
-		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.png
-		AtomGroup = AtomGroup
-			CopyOf = Null AtomGroup
+		CopyOf = Null Leg
 	HandGroup = AtomGroup
-		PresetName = NullGroup
-		AutoGenerate = 1
+		CopyOf = Null AtomGroup
 	FGFootGroup = AtomGroup
-		CopyOf = NullGroup
+		CopyOf = Null AtomGroup
 	BGFootGroup = AtomGroup
-		CopyOf = NullGroup
+		CopyOf = Null AtomGroup
 
 
 AddDevice = TDExplosive
@@ -97,34 +50,12 @@ AddDevice = TDExplosive
 
 
 AddDevice = TDExplosive
+	CopyOf = Alert Device 1
 	PresetName = Alert Device 2
-	Mass = 0
-	RestThreshold = -500
-	AirResistance = 1
-	GlobalAccScalar = 0
-	HitsMOs = 0
-	GetsHitByMOs = 0
-	SpriteFile = ContentFile
-		FilePath = Base.rte/Null.png
-	Buyable = 0
-	AtomGroup = AtomGroup
-		CopyOf = Null AtomGroup
 	TriggerDelay = 450
-	ActivatesWhenReleased = 1
 
 
 AddDevice = TDExplosive
+	CopyOf = Alert Device 1
 	PresetName = Alert Device 3
-	Mass = 0
-	RestThreshold = -500
-	AirResistance = 1
-	GlobalAccScalar = 0
-	HitsMOs = 0
-	GetsHitByMOs = 0
-	SpriteFile = ContentFile
-		FilePath = Base.rte/Null.png
-	Buyable = 0
-	AtomGroup = AtomGroup
-		CopyOf = Null AtomGroup
-	TriggerDelay = 600
-	ActivatesWhenReleased = 1
+	TriggerDelay = 600

Base.rte/AI/HumanAI.lua

@@ -1,33 +1,8 @@
 dofile("Base.rte/Constants.lua")
 require("AI/NativeHumanAI")
-require("AI/HumanFunctions")
 
 function Create(self)
 	self.AI = NativeHumanAI:Create(self);
-	--You can turn features on and off here
-	self.armSway = true;
-	self.alternativeGib = true;
-	self.visibleInventory = false;
-end
-function Update(self)
-	self.controller = self:GetController();
-	--Order the AI of this actor to stop running around if selected by player
-	if self.AI.scatter and self:IsPlayerControlled() then
-		self.AIMode = Actor.AIMODE_SENTRY;
-		self.AI.scatter = false;
-	end
-	if self.alternativeGib then
-		HumanFunctions.DoAlternativeGib(self);
-	end
-	if self.automaticEquip then
-		HumanFunctions.DoAutomaticEquip(self);
-	end
-	if self.armSway then
-		HumanFunctions.DoArmSway(self, (self.Health/self.MaxHealth));	--Argument: shove strength
-	end
-	if self.visibleInventory then
-		HumanFunctions.DoVisibleInventory(self, false);	--Argument: whether to show all items
-	end
 end
 function UpdateAI(self)
 	self.AI:Update(self);

Base.rte/AI/HumanBehaviors.lua

@@ -155,7 +155,7 @@ function HumanBehaviors.CalculateThreatLevel(MO, Owner)
 			priority = priority + 0.3
 		end
 	elseif MO.ClassName == "ADoor" then
-		priority = priority * 0.5
+		priority = priority * 0.3
 	end
 
 	return priority - MO.Health / 500	-- prioritize damaged targets
@@ -168,24 +168,25 @@ function HumanBehaviors.ProcessAlarmEvent(AI, Owner)
 	local canSupress = not AI.flying and Owner.FirearmIsReady and Owner.EquippedItem:HasObjectInGroup("Weapons - Explosive")
 	for Event in MovableMan.AlarmEvents do
 		if Event.Team ~= Owner.Team then	-- caused by some other team's activities - alarming!
-			loudness = Owner.AimDistance + FrameMan.PlayerScreenWidth * 0.6 * Owner.Perceptiveness * Event.Range	-- adjust the audible range to the screen resolution
+			loudness = Owner.AimDistance + Owner.Perceptiveness * Event.Range
 			AlarmVec = SceneMan:ShortestDistance(Owner.EyePos, Event.ScenePos, false)	-- see how far away the alarm situation is
 			if AlarmVec.Largest < loudness then	-- only react if the alarm is within hearing range
 				-- if our relative position to the alarm location is the same, don't repeat the signal
 				-- check if we have line of sight to the alarm point
-				if (not AI.LastAlarmVec or SceneMan:ShortestDistance(AI.LastAlarmVec, AlarmVec, false).Largest > 10) then
+				if (not AI.LastAlarmVec or SceneMan:ShortestDistance(AI.LastAlarmVec, AlarmVec, false).Magnitude > 25) then
 					AI.LastAlarmVec = AlarmVec
 
 					if AlarmVec.Largest < 100 then
 						-- check more carfully at close range, and allow hearing of partially blocked alarm events
 						if SceneMan:CastStrengthSumRay(Owner.EyePos, Event.ScenePos, 4, rte.grassID) < 100 then
 							AI.AlarmPos = Vector(Event.ScenePos.X, Event.ScenePos.Y)
 						end
-					elseif not SceneMan:CastStrengthRay(Owner.EyePos, AlarmVec, 6, Vector(), 8, rte.grassID, true)	then
+					elseif not SceneMan:CastStrengthRay(Owner.EyePos, AlarmVec, 6, Vector(), 8, rte.grassID, true) then
 						AI.AlarmPos = Vector(Event.ScenePos.X, Event.ScenePos.Y)
 					end
 
 					if AI.AlarmPos then
+						Owner:SetAlarmPoint(AI.AlarmPos)
 						AI:CreateFaceAlarmBehavior(Owner)
 						return true
 					end
@@ -935,10 +936,7 @@ function HumanBehaviors.WeaponSearch(AI, Owner, Abort)
 	local itemsFound = 0
 	for Item in MovableMan.Items do	-- store all HeldDevices of the correct type and within a certain range in a table
 		local HD = ToHeldDevice(Item)
-		if HD and not HD:IsActivated() and HD.Vel.Largest < 3 and
-			SceneMan:ShortestDistance(Owner.Pos, HD.Pos, false).Largest < minDist and
-			not SceneMan:IsUnseen(HD.Pos.X, HD.Pos.Y, Owner.Team)
-		then
+		if HD and HD:IsPickupableBy(Owner) and not HD:IsActivated() and HD.Vel.Largest < 3 and SceneMan:ShortestDistance(Owner.Pos, HD.Pos, SceneMan.SceneWrapsX).Largest < minDist and not SceneMan:IsUnseen(HD.Pos.X, HD.Pos.Y, Owner.Team) then
 			table.insert(Devices, HD)
 			itemsFound = itemsFound + 1
 		end
@@ -1176,7 +1174,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 	local Facings = {{aim=0, facing=0}, {aim=1.4, facing=1.4}, {aim=1.4, facing=math.pi-1.4}, {aim=0, facing=math.pi}}
 
 	while true do
-		if Owner.Vel.Largest > 2 then
+		if (Owner.Vel + Owner.PrevVel).Magnitude > 3 then
 			StuckTimer:Reset()
 		end
 
@@ -1221,6 +1219,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 			Waypoint = nil
 			WptList = nil -- update the path
 		elseif StuckTimer:IsPastSimTimeLimit() then	-- dislodge
+			StuckTimer:Reset()
 			if AI.jump then
 				if Owner.Jetpack and Owner.JetTimeLeft < AI.minBurstTime then	-- out of fuel
 					AI.jump = false
@@ -1238,11 +1237,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 				end
 			else
 				if PosRand() < 0.2 then
-					if AI.lateralMoveState == Actor.LAT_LEFT then
-						nextLatMove = Actor.LAT_RIGHT
-					else
-						nextLatMove = Actor.LAT_LEFT
-					end
+					nextLatMove = AI.lateralMoveState == Actor.LAT_LEFT and Actor.LAT_RIGHT or Actor.LAT_LEFT
 				end
 
 				-- refuelling done
@@ -1669,21 +1664,21 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 
 							if Waypoint then	-- move towards the waypoint
 								-- control horizontal movement
-								if Owner.FGLeg or Owner.BGLeg then
-									if not AI.flying then
-										if CurrDist.X < -3 then
-											nextLatMove = Actor.LAT_LEFT
-										elseif CurrDist.X > 3 then
-											nextLatMove = Actor.LAT_RIGHT
-										else
-											nextLatMove = Actor.LAT_STILL
+								if not AI.flying then
+									if CurrDist.X < -3 then
+										nextLatMove = Actor.LAT_LEFT
+									elseif CurrDist.X > 3 then
+										nextLatMove = Actor.LAT_RIGHT
+									else
+										nextLatMove = Actor.LAT_STILL
+									end
+									if not (Owner.FGLeg and Owner.BGLeg) then
+										if CurrDist.X * Owner.FlipFactor > 5 and -CurrDist.Y > math.abs(CurrDist.X) then
+											AI.flying = true
+										elseif not AI.jump then
+											AI.proneState = AHuman.GOPRONE
 										end
 									end
-								elseif ((CurrDist.X < -5 and Owner.HFlipped) or (CurrDist.X > 5 and not Owner.HFlipped)) and math.abs(Owner.Vel.X) < 1 then
-									-- no legs, jump forward
-									AI.jump = true
-								elseif not AI.jump then
-									AI.proneState = AHuman.GOPRONE
 								end
 
 								if Waypoint.Type == "right" then
@@ -2126,25 +2121,21 @@ end
 
 -- get the projectile properties from the magazine
 function HumanBehaviors.GetProjectileData(Owner)
-	local Weapon, Round, Projectile, PrjDat
+	local PrjDat = {MagazineName = ""}
+	local Weapon, Round, Projectile
 	if Owner.EquippedItem and IsHDFirearm(Owner.EquippedItem) then
 		Weapon = ToHDFirearm(Owner.EquippedItem)
 		if Weapon.Magazine then
 			Round = Weapon.Magazine.NextRound
 			Projectile = Round.NextParticle
-			PrjDat = {MagazineName=Weapon.Magazine.PresetName}
+			PrjDat.MagazineName = Weapon.Magazine.PresetName
 		end
 	end
 	if Round == nil or Round.IsEmpty then	-- set default values if there is no particle
 		PrjDat.g = 0
 		PrjDat.vel = 100
 		PrjDat.rng = math.huge
 	else
-		PrjDat.blast = Weapon:GetAIBlastRadius() -- check if this weapon have a blast radius
-		if PrjDat.blast > 0 then
-			PrjDat.exp = true	-- set this for legacy reasons
-		end
-		
 		-- find muzzle velocity
 		PrjDat.vel = Weapon:GetAIFireVel()
 		-- half of the theoretical upper limit for the total amount of material strength this weapon can destroy in 250ms
@@ -2156,6 +2147,12 @@ function HumanBehaviors.GetProjectileData(Owner)
 		PrjDat.thr = math.min(Projectile.AirThreshold, PrjDat.vel)
 		PrjDat.pen = (Projectile.Mass * Projectile.Sharpness * PrjDat.vel) * PrjDat.drg
 
+		PrjDat.blast = Weapon:GetAIBlastRadius()
+		if PrjDat.blast > 0 or Weapon:IsInGroup("Weapons - Explosive") then
+			PrjDat.exp = true	-- set this for legacy reasons
+			PrjDat.pen = PrjDat.pen + 100
+		end
+		
 		-- estimate theoretical max range with ...
 		local lifeTime = Weapon:GetAIBulletLifeTime()
 		if lifeTime < 1 then	-- infinite life time
@@ -2632,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
@@ -2842,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