Merge pull request #162 from cortex-command-community/jetpack-enhancements

Jetpack Enhancements

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;
@@ -1306,7 +1306,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.JetTimeLeft >= Owner.Jetpack.JetTimeTotal * 0.99 then
 					AI.jump = true;
 				end
 			end
@@ -1761,7 +1761,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;
@@ -1773,13 +1773,13 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 											if AI.flying 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
@@ -1833,13 +1833,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)

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		
+		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;
+	end
+
 	if self.isPlayerOwned then
 		if self.PlayerInterferedTimer:IsPastSimTimeLimit() then
 			-- Tell the coroutines to abort to avoid memory leaks
@@ -580,7 +584,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.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/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

Data/Base.rte/Actors/Shared.ini

@@ -437,7 +437,7 @@ AddLimbPath = LimbPath
 // Jetpacks
 
 
-AddEffect = AEmitter
+AddEffect = AEJetpack
 	PresetName = Jetpack Nozzle
 	Mass = 0
 	HitsMOs = 0
@@ -518,7 +518,7 @@ AddEffect = AEmitter
 	FlashOnlyOnBurst = 0
 
 
-AddEffect = AEmitter
+AddEffect = AEJetpack
 	CopyOf = Jetpack Nozzle
 	PresetName = Jumpjet
 	AddEmission = Emission
@@ -539,7 +539,7 @@ AddEffect = AEmitter
 	BurstSpacing = 900
 
 
-AddEffect = AEmitter
+AddEffect = AEJetpack
 	PresetName = Jump Light
 	Mass = 0
 	HitsMOs = 0
@@ -569,7 +569,7 @@ AddEffect = AEmitter
 	LoudnessOnEmit = 0.1
 
 
-AddEffect = AEmitter
+AddEffect = AEJetpack
 	PresetName = Jetpack
 	Mass = 1
 	HitsMOs = 0
@@ -648,7 +648,7 @@ AddEffect = AEmitter
 	FlashOnlyOnBurst = 0
 
 
-AddEffect = AEmitter
+AddEffect = AEJetpack
 	CopyOf = Jetpack
 	PresetName = Jetpack Robot
 	AddEmission = Emission
@@ -661,7 +661,7 @@ AddEffect = AEmitter
 	BurstSize = 5
 
 
-AddEffect = AEmitter
+AddEffect = AEJetpack
 	CopyOf = Jetpack
 	PresetName = Jetpack Heavy
 	AddEmission = Emission
@@ -677,7 +677,7 @@ AddEffect = AEmitter
 	BurstSpacing = 160
 
 
-AddEffect = AEmitter
+AddEffect = AEJetpack
 	CopyOf = Jetpack
 	PresetName = Jetpack Extra Heavy
 	AddEmission = Emission

Data/Base.rte/Actors/Wildlife/Jumper/Jumper.ini

@@ -229,7 +229,7 @@ AddActor = AHuman
 		ParentOffset = Vector
 			X = -2
 			Y = -3
-	Jetpack = AEmitter
+	Jetpack = AEJetpack
 		CopyOf = Jump Light
 		PresetName = Jumper Hop
 		BurstSize = 6
@@ -238,7 +238,7 @@ AddActor = AHuman
 			X = 0
 			Y = 0
 		DrawAfterParent = 0
-	JumpTime = 0.1
+		JumpTime = 0.1
 	HandGroup = AtomGroup
 		CopyOf = Human Hand
 	FGFootGroup = AtomGroup

Data/Base.rte/Actors/Wildlife/MegaCrab/MegaCrab.ini

@@ -146,9 +146,9 @@ AddEffect = ACrab
 	Perceptiveness = 0
 	CharHeight = 50
 	HUDVisible = 0
-	Jetpack = AEmitter
+	Jetpack = AEJetpack
 		CopyOf = Jump Light
-	JumpTime = 1
+		JumpTime = 1
 	LFGLeg = Leg
 		CopyOf = Big Crab Leg FG A
 		ParentOffset = Vector

Data/Base.rte/Scripts/Global/BiggerJetpacks.lua

@@ -21,6 +21,6 @@ function BiggerJetpacksScript:BuffJetpack(actor)
 	end
 	if actor.Jetpack then
 		actor:SetNumberValue("BiggerJetpacksScript", 1);
-		actor.JetTimeTotal = actor.JetTimeTotal * self.multiplier + 100;
+		actor.Jetpack.JetTimeTotal = actor.Jetpack.JetTimeTotal * self.multiplier + 100;
 	end
 end