Merge branch 'development' into balance-improvements

Author: Causeless

Data/Base.rte/AI/HumanBehaviors.lua

@@ -1261,7 +1261,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 
 		if AI.refuel and Owner.Jetpack then
 			-- if jetpack is full or we are falling we can stop refuelling
-			if Owner.JetTimeLeft > Owner.JetTimeTotal * 0.98 or (AI.flying and Owner.Vel.Y < -3 and Owner.JetTimeLeft > AI.minBurstTime*2) then
+			if Owner.Jetpack.JetTimeLeft > Owner.Jetpack.JetTimeTotal * 0.98 or (AI.flying and Owner.Vel.Y < -3 and Owner.Jetpack.JetTimeLeft > AI.minBurstTime*2) then
 				AI.refuel = false;
 			elseif not AI.flying then
 				AI.jump = false;
@@ -1279,7 +1279,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 			WptList = nil; -- update the path
 		elseif StuckTimer:IsPastSimTimeLimit() then	-- dislodge
 			if AI.jump then
-				if Owner.Jetpack and Owner.JetTimeLeft < AI.minBurstTime then	-- out of fuel
+				if Owner.Jetpack and Owner.Jetpack.JetTimeLeft < AI.minBurstTime then	-- out of fuel
 					AI.jump = false;
 					AI.refuel = true;
 					nextLatMove = Actor.LAT_STILL;
@@ -1295,6 +1295,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 				end
 			else
 				local updateInterval = SettingsMan.AIUpdateInterval;
+
 				-- Try swapping direction, with a 15% random chance per tick while we're stuck
 				if PosRand() > (1 - 0.15) / updateInterval then
 					nextLatMove = AI.lateralMoveState == Actor.LAT_LEFT and Actor.LAT_RIGHT or Actor.LAT_LEFT;
@@ -1306,7 +1307,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 				end
 
 				-- refuelling done
-				if AI.refuel and Owner.Jetpack and Owner.JetTimeLeft >= Owner.JetTimeTotal * 0.99 then
+				if AI.refuel and Owner.Jetpack and Owner.Jetpack.JetpackType == AEJetpack.Standard and Owner.Jetpack.JetTimeLeft >= Owner.Jetpack.JetTimeTotal * 0.99 then
 					AI.jump = true;
 				end
 			end
@@ -1761,7 +1762,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 								end
 
 								if Owner.Jetpack and Owner.Head and Owner.Head:IsAttached() then
-									if Owner.JetTimeLeft < AI.minBurstTime then
+									if Owner.Jetpack.JetTimeLeft < AI.minBurstTime then
 										AI.jump = false; -- not enough fuel left, no point in jumping yet
 										if not AI.flying or Owner.Vel.Y > 1 then
 											AI.refuel = true;
@@ -1770,16 +1771,16 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 										-- do we have a target we want to shoot at?
 										if (AI.Target and AI.canHitTarget and AI.BehaviorName ~= "AttackTarget") then
 											-- are we also flying
-											if AI.flying then
+											if AI.flying and Owner.Jetpack.JetpackType == AEJetpack.Standard then
 												-- predict jetpack movement when jumping and there is a target (check one direction)
 												local jetStrength = AI.jetImpulseFactor / Owner.Mass;
-												local t = math.min(0.4, Owner.JetTimeLeft*0.001);
+												local t = math.min(0.4, Owner.Jetpack.JetTimeLeft*0.001);
 												local PixelVel = Owner.Vel * (GetPPM() * t);
 												local Accel = SceneMan.GlobalAcc * GetPPM();
 
 												-- a burst use 10x more fuel
 												if Owner.Jetpack:CanTriggerBurst() then
-													t = math.max(math.min(0.4, Owner.JetTimeLeft*0.001-TimerMan.AIDeltaTimeSecs*10), TimerMan.AIDeltaTimeSecs);
+													t = math.max(math.min(0.4, Owner.Jetpack.JetTimeLeft*0.001-TimerMan.AIDeltaTimeSecs*10), TimerMan.AIDeltaTimeSecs);
 												end
 
 												-- test jumping
@@ -1816,7 +1817,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 												AI.jump = false;
 											end
 										else
-											if Waypoint.Type ~= "drop" and not Lower(Waypoint, Owner, 20) then
+											if Waypoint.Type ~= "drop" and not Lower(Waypoint, Owner, 20) and Owner.Jetpack.JetpackType == AEJetpack.Standard then
 												-- jump over low obstacles unless we want to jump off a ledge
 												if nextLatMove == Actor.LAT_RIGHT and (Obstacles[Obst.R_LOW] or Obstacles[Obst.R_FRONT]) and not Obstacles[Obst.R_UP] then
 													AI.jump = true;
@@ -1833,13 +1834,13 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 
 											-- predict jetpack movement...
 											local jetStrength = AI.jetImpulseFactor / Owner.Mass;
-											local t = math.min(0.4, Owner.JetTimeLeft*0.001);
+											local t = math.min(0.4, Owner.Jetpack.JetTimeLeft*0.001);
 											local PixelVel = Owner.Vel * (GetPPM() * t);
 											local Accel = SceneMan.GlobalAcc * GetPPM();
 
 											-- a burst use 10x more fuel
 											if Owner.Jetpack:CanTriggerBurst() then
-												t = math.max(math.min(0.4, Owner.JetTimeLeft*0.001-TimerMan.AIDeltaTimeSecs*10), TimerMan.AIDeltaTimeSecs);
+												t = math.max(math.min(0.4, Owner.Jetpack.JetTimeLeft*0.001-TimerMan.AIDeltaTimeSecs*10), TimerMan.AIDeltaTimeSecs);
 											end
 
 											-- when jumping (check four directions)
@@ -1872,11 +1873,16 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 											local Trace = SceneMan:ShortestDistance(Owner.Head.Pos, FallPos, false);
 											SceneMan:CastObstacleRay(Owner.Head.Pos, Trace, FallPos, Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 3);
 
+											local deltaToJump = 25;
+											if Owner.Jetpack.JetpackType == AEJetpack.JumpPack then
+												deltaToJump = deltaToJump * 1.4;
+											end
+
 											table.sort(Facings, function(A, B) return A.range < B.range end);
 											local delta = SceneMan:ShortestDistance(Waypoint.Pos, FallPos, false).Magnitude - Facings[1].range;
 											if delta < 1 then
 												AI.jump = false;
-											elseif AI.flying or delta > 25 then
+											elseif delta > deltaToJump or (AI.flying and Owner.Jetpack.JetpackType == AEJetpack.Standard) then
 												AI.jump = true;
 												nextAimAngle = Owner:GetAimAngle(false) * 0.5 + Facings[1].aim * 0.5; -- adjust jetpack nozzle direction
 												nextLatMove = Actor.LAT_STILL;

Data/Base.rte/AI/NativeHumanAI.lua

@@ -51,12 +51,10 @@ function NativeHumanAI:Create(Owner)
 	-- the native AI assume the jetpack cannot be destroyed
 	if Owner.Jetpack then
 		if not Members.isPlayerOwned then
-			Owner.Jetpack.Throttle = Owner.Jetpack.Throttle + 0.15	-- increase jetpack strength slightly to compensate for AI ineptitude
+			Owner.Jetpack.JetTimeTotal = Owner.Jetpack.JetTimeTotal * 1.2;	-- increase jetpack fuel to compensate for extra fuel spend
 		end
 
-		Members.jetImpulseFactor = Owner.Jetpack:EstimateImpulse(false) * GetPPM() / TimerMan.DeltaTimeSecs;
-		Members.jetBurstFactor = (Owner.Jetpack:EstimateImpulse(true) * GetPPM() / TimerMan.DeltaTimeSecs - Members.jetImpulseFactor) * math.pow(TimerMan.DeltaTimeSecs, 2) * 0.5;
-		Members.minBurstTime = math.min(Owner.Jetpack.BurstSpacing*2, Owner.JetTimeTotal*0.99); -- in milliseconds
+		Members.minBurstTime = math.min(Owner.Jetpack.BurstSpacing*2, Owner.Jetpack.JetTimeTotal*0.99); -- in milliseconds
 	end
 
 	setmetatable(Members, self);
@@ -67,6 +65,12 @@ end
 function NativeHumanAI:Update(Owner)
 	self.Ctrl = Owner:GetController();
 
+	-- Our jetpack might have thrust balancing enabled, so update for our current mass
+	if Owner.Jetpack then		
+		self.jetImpulseFactor = Owner.Jetpack:EstimateImpulse(false) * GetPPM() / TimerMan.DeltaTimeSecs;
+		self.jetBurstFactor = (Owner.Jetpack:EstimateImpulse(true) * GetPPM() / TimerMan.DeltaTimeSecs - self.jetImpulseFactor) * math.pow(TimerMan.DeltaTimeSecs, 2) * 0.5;
+	end
+
 	if self.isPlayerOwned then
 		if self.PlayerInterferedTimer:IsPastSimTimeLimit() then
 			-- Tell the coroutines to abort to avoid memory leaks
@@ -216,7 +220,7 @@ function NativeHumanAI:Update(Owner)
 
 
 	-- check if the feet reach the ground
-	if self.AirTimer:IsPastSimMS(120) then
+	if self.AirTimer:IsPastSimMS(250) then
 		self.AirTimer:Reset();
 
 		local Origin = {};
@@ -455,7 +459,12 @@ function NativeHumanAI:Update(Owner)
 				end
 			end
 		elseif self.flying then	-- avoid falling damage
-			if (not self.jump and Owner.Vel.Y > 9) or (self.jump and Owner.Vel.Y > 6) then
+			local jumpThreshold = 9;
+			if Owner.Jetpack and Owner.Jetpack.JetpackType == AEJetpack.JumpPack then
+				jumpThreshold = jumpThreshold * 3;
+			end
+
+			if (not self.jump and Owner.Vel.Y > jumpThreshold) or (self.jump and Owner.Vel.Y > jumpThreshold * 0.66) then
 				self.jump = true;
 
 				-- try falling straight down
@@ -580,7 +589,7 @@ function NativeHumanAI:Update(Owner)
 	if (not self.jump and Owner.Vel.Y > 18) then
 		self.jump = true;
 	end
-	if self.jump and Owner.JetTimeLeft > TimerMan.AIDeltaTimeMS then
+	if self.jump and Owner.Jetpack and Owner.Jetpack.JetTimeLeft > TimerMan.AIDeltaTimeMS then
 		if self.jumpState == AHuman.PREJUMP then
 			self.jumpState = AHuman.UPJUMP;
 		elseif self.jumpState ~= AHuman.UPJUMP then	-- the jetpack is off

Data/Base.rte/Activities.ini

@@ -38,7 +38,7 @@ AddActivity = GAScripted
 	LuaClassName = BrainvsBrain
 	Team1Name = Red Team
 	Team2Name = Green Team
-	MinTeamsRequired = 1
+	MinTeamsRequired = 2
 	DefaultRequireClearPathToOrbit = 1
 
 
@@ -108,7 +108,6 @@ AddActivity = GAScripted
 	ScriptPath = Base.rte/Activities/OneManArmy.lua
 	TeamOfPlayer1 = 0
 	CPUTeam = 1
-	MaxPlayerSupport = 1
 	LuaClassName = OneManArmy
 	DeployUnitsSwitchEnabled = 1
 	DefaultDeployUnits = 0
@@ -121,7 +120,6 @@ AddActivity = GAScripted
 	ScriptPath = Base.rte/Activities/OneManArmyDiggers.lua
 	TeamOfPlayer1 = 0
 	CPUTeam = 1
-	MaxPlayerSupport = 1
 	LuaClassName = OneManArmy
 	DeployUnitsSwitchEnabled = 1
 	DefaultDeployUnits = 0
@@ -134,7 +132,6 @@ AddActivity = GAScripted
 	ScriptPath = Base.rte/Activities/OneManArmyZeroG.lua
 	TeamOfPlayer1 = 0
 	CPUTeam = 1
-	MaxPlayerSupport = 1
 	LuaClassName = OneManArmyZeroG
 	SceneName = Zero-G Battle
 	DeployUnitsSwitchEnabled = 1
@@ -148,7 +145,6 @@ AddActivity = GAScripted
 	ScriptPath = Base.rte/Activities/OneManArmyZeroG.lua
 	TeamOfPlayer1 = 0
 	CPUTeam = 1
-	MaxPlayerSupport = 1
 	LuaClassName = OneManArmyZeroG
 	SceneName = Zero-G Battle
 	DeployUnitsSwitchEnabled = 1

Data/Base.rte/Activities/LandingZoneMap.lua

@@ -483,25 +483,31 @@ function LandingZoneMap.SearchForLZ(self, team, Destination, digStrenght)
 		end
 	end
 
-	coroutine.yield(); -- wait until next frame
+	local pathRequestsCompleted = 0;
+	local completedPathRequests = {};
 
 	-- measure the distance to the destination
 	for k, LZ in pairs(GoodLZs) do
-		if SceneMan.Scene:CalculatePath(Vector(LZ.X, LZ.Y), Destination, false, digStrenght, team) > -1 then
-			local Path = {};
-			for Wpt in SceneMan.Scene:GetScenePath() do
-				table.insert(Path, Wpt);
-			end
+		SceneMan.Scene:CalculatePathAsync(
+			function(pathRequest)
+				pathRequestsCompleted = pathRequestsCompleted + 1;
+				completedPathRequests[k] = pathRequest;
+			end, 
+			Vector(LZ.X, LZ.Y), Destination, false, digStrenght, team);
+	end
 
-			coroutine.yield(); -- wait until the next frame
+	while pathRequestsCompleted ~= #GoodLZs do
+		coroutine.yield(); -- wait until all paths are complete
+	end
 
+	for k, LZ in pairs(GoodLZs) do
+		pathRequest = completedPathRequests[k];
+		if pathRequest.PathLength > -1 then
 			local NextWpt, PrevWpt, deltaY;
 			local height = 0;
-			local pathLength = 0;
 			local pathObstMaxHeight = 0;
 
-			for _, Wpt in pairs(Path) do
-				pathLength = pathLength + 1;
+			for Wpt in pathRequest.Path do
 				NextWpt = SceneMan:MovePointToGround(Wpt, 20, 12);
 
 				if PrevWpt then
@@ -519,36 +525,27 @@ function LandingZoneMap.SearchForLZ(self, team, Destination, digStrenght)
 				end
 
 				PrevWpt = NextWpt;
-				if pathLength % 17 == 0 then
-					coroutine.yield(); -- wait until the next frame
-				end
 			end
 
 			GoodLZs[k].terrainScore = LZ.score;
-			GoodLZs[k].pathLength = pathLength;
+			GoodLZs[k].pathLength = pathRequest.PathLength;
 			GoodLZs[k].pathObstMaxHeight = pathObstMaxHeight;
-			GoodLZs[k].score = LZ.score - (pathLength * 0.2 + math.floor(pathObstMaxHeight/15) * 12); -- recalculate the score so we can find a safe LZ that has an easy path to the destination
+			GoodLZs[k].score = LZ.score - (pathRequest.PathLength * 0.2 + math.floor(pathObstMaxHeight/15) * 12); -- recalculate the score so we can find a safe LZ that has an easy path to the destination
 		else
 			-- unknown path
 			GoodLZs[k].terrainScore = LZ.score;
 			GoodLZs[k].pathLength = 200;
 			GoodLZs[k].pathObstMaxHeight = 200;
 			GoodLZs[k].score = LZ.score - 100;
 		end
-
-		coroutine.yield(); -- wait until the next frame
 	end
 
-	coroutine.yield(); -- wait until the next frame
-
 	table.sort(GoodLZs, function(A, B) return A.score > B.score end); -- the best LZ first
 	local MobilityLZ, selected_index = self:SelectLZ(GoodLZs, 12);
 	if selected_index then
 		table.remove(GoodLZs, selected_index); -- don't select this LZ again
 	end
 
-	coroutine.yield(); -- wait until the next frame
-
 	-- recalculate the score so we can find a safe LZ that is close to the destination
 	for k, LZ in pairs(GoodLZs) do
 		GoodLZs[k].score = LZ.terrainScore - (LZ.pathLength * 0.7 + math.floor(LZ.pathObstMaxHeight/20) * 8);

Data/Base.rte/Actors/Brains/Brainbot/Brainbot.ini

@@ -636,14 +636,14 @@ AddActor = AHuman
 			X = 1
 			Y = -5
 	LookToAimRatio = 0.2
-	Jetpack = AEmitter
+	Jetpack = AEJetpack
 		CopyOf = Jetpack Robot
 		ParentOffset = Vector
 			X = -4
 			Y = 6
 		DrawAfterParent = 0
-	JumpTime = 2.5
-	JumpReplenishRate = 1.5
+		JumpTime = 2.5
+		JumpReplenishRate = 1.5
 	FGArm = Arm
 		CopyOf = Brainbot Arm FG
 		ParentOffset = Vector

Data/Base.rte/Actors/Infantry/GreenDummy/GreenDummy.ini

@@ -664,15 +664,15 @@ AddActor = AHuman
 		ParentOffset = Vector
 			X = -1
 			Y = -13
-	Jetpack = AEmitter
+	Jetpack = AEJetpack
 		CopyOf = Jetpack
 		ParentOffset = Vector
 			X = -6
 			Y = -1
 		ParticlesPerMinute = 8400
-	JumpTime = 1.5
-	JumpReplenishRate = 1.5
-	JumpAngleRange = 0.2
+		JumpTime = 1.5
+		JumpReplenishRate = 1.5
+		JumpAngleRange = 0.2
 	FGArm = Arm
 		CopyOf = Green Dummy Arm FG
 		ParentOffset = Vector

Data/Base.rte/Actors/Mecha/AIBox/AIBox.ini

@@ -234,14 +234,14 @@ AddActor = ACrab
 		ParentOffset = Vector
 			X = 0
 			Y = -5
-	Jetpack = AEmitter
+	Jetpack = AEJetpack
 		CopyOf = Jump Light
 		BurstSpacing = 1100
 		ParentOffset = Vector
 			X = 0
 			Y = 0
 		DrawAfterParent = 0
-	JumpTime = 1
+		JumpTime = 1
 	LFGLeg = Leg
 		CopyOf = AI Box Leg FG
 		ParentOffset = Vector

Data/Base.rte/Actors/Mecha/Medic/MedicDrone.ini

@@ -232,14 +232,14 @@ AddActor = ACrab
 		ParentOffset = Vector
 			X = 0
 			Y = -3
-	Jetpack = AEmitter
+	Jetpack = AEJetpack
 		CopyOf = Jump Light
 		BurstSpacing = 1100
 		ParentOffset = Vector
 			X = 0
 			Y = 0
 		DrawAfterParent = 0
-	JumpTime = 1
+		JumpTime = 1
 	LFGLeg = Leg
 		CopyOf = Medic Drone Leg FG
 		ParentOffset = Vector