Merge pull request #181 from cortex-command-community/browncoat-lmg

Browncoat Campaign Mission

Author: Causeless

.gitignore

@@ -45,6 +45,9 @@ luac.out
 CortexCommand
 CortexCommand_debug
 
+# Debug databases
+*.pdb
+
 # Manifest files
 *.manifest
 

Data/Base.rte/AI/CrabAI.lua

@@ -1,10 +1,10 @@
-require("AI/NativeCrabAI"); --dofile("Base.rte/Actors/AI/NativeCrabAI.lua")
+require("AI/NativeCrabAI");
 
 function Create(self)
 	self.AI = NativeCrabAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 

Data/Base.rte/AI/CrabBehaviors.lua

@@ -358,7 +358,7 @@ function CrabBehaviors.GoToWpt(AI, Owner, Abort)
 					Waypoint = table.remove(WptList, 1);
 					if WptList[1] then
 						Owner:RemoveMovePathBeginning();
-					elseif not Owner.MOMoveTarget and SceneMan:ShortestDistance(Owner.Pos, Waypoint.Pos, false).X < 10 then	-- the last waypoint
+					elseif not Owner.MOMoveTarget and SceneMan:ShortestDistance(Owner.Pos, Waypoint.Pos, false):MagnitudeIsLessThan(Owner.MoveProximityLimit) then	-- the last waypoint
 						Owner:ClearMovePath();
 						WptList = nil;
 						Waypoint = nil;
@@ -371,7 +371,9 @@ function CrabBehaviors.GoToWpt(AI, Owner, Abort)
 						AI.lateralMoveState = Actor.LAT_LEFT;
 					elseif CurrDist.X > 3 then
 						AI.lateralMoveState = Actor.LAT_RIGHT;
-					else
+					end
+
+					if CurrDist:MagnitudeIsLessThan(Owner.MoveProximityLimit) then
 						Waypoint = nil;
 					end
 				end

Data/Base.rte/AI/DropShipAI.lua

@@ -1,9 +1,9 @@
-require("AI/NativeDropShipAI"); --dofile("Base.rte/Actors/AI/NativeDropShipAI.lua");
+require("AI/NativeDropShipAI");
 
 function Create(self)
 	self.AI = NativeDropShipAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end

Data/Base.rte/AI/HumanAI.lua

@@ -3,7 +3,7 @@ require("AI/NativeHumanAI");
 function Create(self)
 	self.AI = NativeHumanAI:Create(self);
 end
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 function Destroy(self)

Data/Base.rte/AI/HumanBehaviors.lua

@@ -2,10 +2,13 @@
 HumanBehaviors = {};
 
 function HumanBehaviors.GetTeamShootingSkill(team)
-	local skill = 50;
+	local skill = 80;
 	local Activ = ActivityMan:GetActivity();
 	if Activ then
-		skill = Activ:GetTeamAISkill(team);
+		-- i am fancy mathematician, doing fancy mathematics
+		-- this weigh actor skill heavily towards 100
+		local num = (Activ:GetTeamAISkill(team)/100);
+		skill = (1 - math.pow(1 - num, 3)) * 100;
 	end
 
 	local aimSpeed, aimSkill;
@@ -52,14 +55,14 @@ end
 function HumanBehaviors.CheckEnemyLOS(AI, Owner, Skill)
 	if not AI.Enemies then	-- add all enemy actors on our screen to a table and check LOS to them, one per frame
 		AI.Enemies = {};
-		for Act in MovableMan.Actors do
-			if Act.Team ~= Owner.Team then
-				if not AI.isPlayerOwned or not SceneMan:IsUnseen(Act.Pos.X, Act.Pos.Y, Owner.Team) then	-- AI-teams ignore the fog
-					local Dist = SceneMan:ShortestDistance(Owner.ViewPoint, Act.Pos, false);
-					if (math.abs(Dist.X) - Act.Diameter < FrameMan.PlayerScreenWidth * (0.4 + Skill * 0.005)) and (math.abs(Dist.Y) - Act.Diameter < FrameMan.PlayerScreenHeight * (0.4 + Skill * 0.005)) then
-						table.insert(AI.Enemies, Act);
-					end
-				end
+		local box = Box();
+		local skillFactor = (0.4 + Skill * 0.005);
+		box.Corner = Vector(Owner.ViewPoint.X - (FrameMan.PlayerScreenWidth/2) * skillFactor, Owner.ViewPoint.Y - (FrameMan.PlayerScreenHeight/2) * skillFactor);
+		box.Width = FrameMan.PlayerScreenWidth * skillFactor;
+		box.Height = FrameMan.PlayerScreenHeight * skillFactor;
+		for Act in MovableMan:GetMOsInBox(box, Owner.Team, true) do
+			if IsActor(Act) and not AI.isPlayerOwned or not SceneMan:IsUnseen(Act.Pos.X, Act.Pos.Y, Owner.Team) then	-- AI-teams ignore the fog
+				table.insert(AI.Enemies, Act);
 			end
 		end
 
@@ -1267,7 +1270,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 				AI.jump = false;
 				AI.lateralMoveState = Actor.LAT_STILL;
 			end
-		elseif not AI.flying and UpdatePathTimer:IsPastSimTimeLimit() then
+		elseif UpdatePathTimer:IsPastSimTimeLimit() then
 			UpdatePathTimer:Reset();
 
 			AI.deviceState = AHuman.STILL;
@@ -1366,9 +1369,6 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 								CornerPos = (NextWptPos + Free) / 2; -- compensate for obstacles
 							end
 
-							local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-							if _abrt then return true end
-
 							-- check if we have LOS
 							Dist = SceneMan:ShortestDistance(Owner.Pos, CornerPos, false);
 							if 0 <= SceneMan:CastObstacleRay(Owner.Pos, Dist, Vector(), Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 2) then
@@ -1377,9 +1377,6 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 								cornerType = "air";
 							end
 
-							local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-							if _abrt then return true end
-
 							Waypoint = {Pos=CornerPos, Type=cornerType};
 							if WptList[2] and not WptList[1].Type then	-- remove the waypoint after the corner if possible
 								table.remove(WptList, 1);
@@ -1460,7 +1457,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 						elseif Waypoint.Type == "last" then
 							ArrivedTimer:SetSimTimeLimitMS(600);
 						else	-- air or corner wpt
-							ArrivedTimer:SetSimTimeLimitMS(25);
+							ArrivedTimer:SetSimTimeLimitMS(0);
 						end
 					end
 				elseif WptList[2] then	-- check if some other waypoint is closer
@@ -1485,11 +1482,6 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 									end
 								end
 							end
-
-							if not AI.jump and not AI.flying then
-								local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-								if _abrt then return true end
-							end
 						end
 					end
 				end
@@ -1520,9 +1512,6 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 												WptList = nil; -- update the path
 												break;
 											end
-
-											local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-											if _abrt then return true end
 										else -- MOMoveTarget gone
 											return true;
 										end
@@ -1637,9 +1626,6 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 														Waypoint = nil;
 													end
 												end
-
-												local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-												if _abrt then return true end
 											elseif Owner.AIMode == Actor.AIMODE_GOLDDIG then
 												Waypoint.Pos = SceneMan:MovePointToGround(Waypoint.Pos, Owner.Height*0.2, 4);
 											end
@@ -1659,7 +1645,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 							end
 
 							-- Scan for obstacles
-							local Trace = Vector(Owner.Diameter*0.85, 0):RadRotate(scanAng);
+							local Trace = Vector(Owner.Radius*0.75, 0):RadRotate(scanAng);
 							local Free = Vector();
 							local index = math.floor(scanAng*2.5+2.01);
 							if SceneMan:CastObstacleRay(Owner.Pos, Trace, Vector(), Free, Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 3) > -1 then
@@ -1682,12 +1668,12 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 								end
 							end
 
-							if not AI.jump and not AI.flying then
-								local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-								if _abrt then return true end
+							local tolerance = Owner.MoveProximityLimit;
+							if AI.jump then
+								tolerance = tolerance * 2;
 							end
 
-							if CurrDist:MagnitudeIsGreaterThan(Owner.Height * 0.4) then	-- not close enough to the waypoint
+							if CurrDist:MagnitudeIsGreaterThan(tolerance) then	-- not close enough to the waypoint
 								ArrivedTimer:Reset();
 
 								-- check if we have LOS to the waypoint
@@ -1702,11 +1688,6 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 										return true; -- end this behavior and look for gold again
 									end
 								end
-
-								if not AI.jump and not AI.flying then
-									local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-									if _abrt then return true end
-								end
 							elseif ArrivedTimer:IsPastSimTimeLimit() then	-- only remove a waypoint if we have been close to it for a while
 								if Waypoint.Type == "last" then
 									if not AI.flying and Owner.Vel.Largest < 5 then
@@ -1742,13 +1723,6 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 									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
 								end
 
 								if Waypoint.Type == "right" then
@@ -2097,7 +2071,7 @@ end
 
 -- go prone if we can shoot from the prone position and return the result
 function HumanBehaviors.GoProne(AI, Owner, TargetPos, targetID)
-	if not Owner.Head or AI.proneState == AHuman.PRONE then
+	if (not Owner.Head or AI.proneState == AHuman.PRONE) or (Owner:NumberValueExists("AIDisableProne")) then
 		return false;
 	end
 
@@ -2700,8 +2674,8 @@ function HumanBehaviors.ThrowTarget(AI, Owner, Abort)
 				end
 
 				ID = rte.NoMOID;
-				if Owner:IsWithinRange(Vector(AimPoint.X, AimPoint.Y)) then	-- TODO: use grenade properties to decide this
-				--if true then
+				--if Owner:IsWithinRange(Vector(AimPoint.X, AimPoint.Y)) then	-- TODO: use grenade properties to decide this
+				if true then
 					Dist = SceneMan:ShortestDistance(Owner.EyePos, AimPoint, false);
 					ID = SceneMan:CastMORay(Owner.EyePos, Dist, Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, false, 3);
 					if ID < 1 or ID == rte.NoMOID then	-- not found, look for any head or legs

Data/Base.rte/AI/NativeCrabAI.lua

@@ -1,4 +1,4 @@
-
+require("Constants")
 require("AI/HumanBehaviors");
 require("AI/CrabBehaviors");