Merge branch 'development' into pre611-minor-fixes

Author: Causeless

CHANGELOG.md

@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Massacre now displays the remaining kill count to each player's screen instead of just the first one.
 
+- Slightly nerfed the Imperatus combat robot jetpack.
+
 </details>
 
 <details><summary><b>Fixed</b></summary>
@@ -28,6 +30,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed an issue where sometimes doors were owned by the wrong team in Bunker Breach and Survival activities.
 
+- Fixed an issue where a mission-only item was being bought by the AI.
+
 </details>
 
 ## [Release v6.1.0] - 2024/02/15

Data/Base.rte/Scenes/Objects/Bunkers/BunkerSystems/Automovers/Controller/Controller.lua

@@ -910,6 +910,13 @@ automoverActorFunctions.addActorToAutomoverTable = function(self, actor)
 		waypointData = nil,
 	};
 
+	if not actor:NumberValueExists("Automover_OldMoveProximityLimit") then
+		actor:SetNumberValue("Automover_OldMoveProximityLimit", actor.MoveProximityLimit);
+	end
+
+	-- Make move proximity much lower so we don't get caught on corners
+	actor.MoveProximityLimit = 2;
+
 	self.affectedActorsCount = self.affectedActorsCount + 1;
 
 	actor.PieMenu:AddPieSliceIfPresetNameIsUnique(self.leaveAutomoverNetworkPieSlice, self);
@@ -924,6 +931,11 @@ automoverActorFunctions.removeActorFromAutomoverTable = function(self, actor, op
 	end
 
 	if MovableMan:ValidMO(actor) then
+		if actor:NumberValueExists("Automover_OldMoveProximityLimit") then
+			actor.MoveProximityLimit = actor:GetNumberValue("Automover_OldMoveProximityLimit");
+			actor:RemoveNumberValue("Automover_OldMoveProximityLimit");
+		end
+
 		actor.PieMenu:RemovePieSlicesByPresetName(self.leaveAutomoverNetworkPieSlice.PresetName);
 		actor.PieMenu:RemovePieSlicesByPresetName(self.chooseTeleporterPieSlice.PresetName);
 

Data/Techion.rte/Devices/Weapons/Nucleo/NucleoShot.lua

@@ -43,10 +43,10 @@ function OnMessage(self, message, context)
 		self.detDelay = 4000/math.sqrt(math.max(1, #self.connectableParticles));
 		self.Vel = Vector(self.Vel.X, self.Vel.Y):DegRotate(#self.connectableParticles * RangeRand(-1, 1));
 		for k, particle in pairs(self.connectableParticles) do
-			particle:SendMessage("Nucleo_NewConnectableParticle", self);
+			particle:SendMessage("Nucleo_NewConnectableParticle", self.UniqueID);
 		end
 	elseif message == "Nucleo_NewConnectableParticle" then
-		table.insert(self.connectableParticles, context);
+		table.insert(self.connectableParticles, MovableMan:FindObjectByUniqueID(context));
 	elseif message == "Nucleo_Explode" then
 		Explode(self);
 	end

Source/Entities/MovableObject.cpp

@@ -347,7 +347,7 @@ int MovableObject::ReadProperty(const std::string_view& propName, Reader& reader
 	MatchProperty("RandomizeEffectRotAngle", { reader >> m_RandomizeEffectRotAngle; });
 	MatchProperty("RandomizeEffectRotAngleEveryFrame", { reader >> m_RandomizeEffectRotAngleEveryFrame; });
 	MatchProperty("EffectStopTime", {
-		reader >> m_EffectStopTime; 
+		reader >> m_EffectStopTime;
 		m_EffectStopTime = std::max(m_EffectStopTime, static_cast<int>(g_TimerMan.GetDeltaTimeMS()) + 1);
 	});
 	MatchProperty("EffectStartStrength", {