Merge pull request #62 from cortex-command-community/pre6-last-microsecond-fixes

Skirmish Def, Eruptor, Rocket plummeting fixes

Author: Causeless

Data/Base.rte/AI/RocketAI.lua

@@ -206,8 +206,12 @@ function ThreadedUpdateAI(self)
 					self.burstUp = nil;
 					self.Ctrl:SetState(Controller.MOVE_UP, true);	-- Don't burst when returning to orbit
 				else
-					if change < -3 and not self.burstUp then
+					if change < -2.2 and not self.burstUp then
 						self.burstUp = math.max(9 - change, 2); -- Wait n frames until next burst (lower -> better control)
+						if change < -6 then
+							self.Ctrl:SetState(Controller.MOVE_UP, true);
+							self.burstUp = nil;
+						end
 					elseif change > 20 then
 						self.burstUp = nil;
 						self.Ctrl:SetState(Controller.MOVE_DOWN, true);
@@ -275,7 +279,7 @@ function ThreadedUpdateAI(self)
 		self.burstUp = self.burstUp - SettingsMan.AIUpdateInterval;
 		if self.burstUp < 0 then
 			self.Ctrl:SetState(Controller.MOVE_UP, true);
-			if self.burstUp < -16 then
+			if self.burstUp < -8 then
 				self.burstUp = nil;
 			end
 		end

Data/Browncoats.rte/Devices/Shields/Eruptor/Eruptor.lua

@@ -22,7 +22,7 @@ function Create(self)
 	self:SetOneHanded(true);
 	local rootParent = self:GetRootParent();
 	if IsAHuman(rootParent) then
-		if ToAHuman(rootParent).EquippedItem.UniqueID == self.UniqueID then
+		if ToAHuman(rootParent).EquippedItem and ToAHuman(rootParent).EquippedItem.UniqueID == self.UniqueID then
 			ToAHuman(rootParent):UnequipBGArm();
 			self.equippedInMainHand = true;
 			self:SetOneHanded(false);