Merge branch 'development' into Pause-Screen

Author: MaximDude

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

@@ -1081,7 +1081,7 @@ automoverActorFunctions.setupActorWaypointData = function(self, actorData)
 	waypointData.actorReachedTargetInsideAutomoverArea = false;
 	waypointData.actorReachedEndNodeForTargetOutsideAutomoverArea = false;
 	waypointData.teleporterVisualsTimer = Timer(1000);
-	waypointData.delayTimer = Timer(50);
+	waypointData.delayTimer = Timer(30);
 
 	waypointData.endNode = self:findClosestNode(waypointData.targetPosition, waypointData.previousNode, false, waypointData.targetIsInsideAutomoverArea, true, actor.Team);
 	if not waypointData.endNode then
@@ -1317,7 +1317,7 @@ automoverActorFunctions.handleActorThatHasReachedItsEndNode = function(self, act
 				end
 			end
 			waypointData.delayTimer:Reset();
-		elseif waypointData.exitPath ~= nil and #waypointData.exitPath > 0 then
+		elseif waypointData.exitPath ~= nil and #waypointData.exitPath > 0 and waypointData.delayTimer:IsPastSimTimeLimit() then
 			local distanceFromActorToFirstExitPathPosition = SceneMan:ShortestDistance(waypointData.exitPath[1], actor.Pos, self.checkWrapping);
 			if distanceFromActorToFirstExitPathPosition:MagnitudeIsLessThan(20) then
 				table.remove(waypointData.exitPath, 1);
@@ -1329,7 +1329,12 @@ automoverActorFunctions.handleActorThatHasReachedItsEndNode = function(self, act
 
 			local endNodeData = teamNodeTable[waypointData.endNode];
 			if not endNodeData.zoneBox:IsWithinBox(waypointData.exitPath[1]) and (endNodeData.connectedNodeData[actorData.direction] == nil or not endNodeData.connectingAreas[actorData.direction]:IsInside(waypointData.exitPath[1])) then
-				actor.Vel = actor.Vel + (distanceFromActorToFirstExitPathPosition.Normalized:FlipX(true):FlipY(true) * self.movementAcceleration * 10);
+				local velocityToAddToActor = distanceFromActorToFirstExitPathPosition.Normalized:FlipX(true):FlipY(true) * self.movementAcceleration * 10;
+				if math.abs(velocityToAddToActor.X) < 1 and velocityToAddToActor.Y < 0 and SceneMan.GlobalAcc.Y > 0 then
+					velocityToAddToActor.Y = velocityToAddToActor.Y * 2;
+				end
+				actor.Vel = actor.Vel + velocityToAddToActor;
+				
 			end
 			waypointData.delayTimer:Reset();
 		end

Data/Missions.rte/Activities/DecisionDay.lua

@@ -1611,6 +1611,8 @@ function DecisionDay:UpdateAIDecisions()
 					bunkerRegionData.aiRegionDefenseTimer:Reset();
 				end
 			elseif bunkerRegionData.ownerTeam == self.humanTeam then
+				bunkerRegionData.aiRegionDefenseTimer:Reset();
+				
 				humanOwnedBunkerRegions[#humanOwnedBunkerRegions + 1] = bunkerRegionData;
 				if bunkerRegionData.aiRecaptureWeight > 0 and (bunkerRegionForAIToRecapture == nil or bunkerRegionData.aiRecaptureWeight > bunkerRegionForAIToRecapture.aiRecaptureWeight) and bunkerRegionData.aiRegionAttackTimer:IsPastSimTimeLimit() then
 					bunkerRegionForAIToRecapture = bunkerRegionData;

Data/Missions.rte/MissionActivities.ini

@@ -66,9 +66,9 @@ AddActivity = GAScripted
 
 
 AddActivity = GAScripted
-	PresetName = Decision Day
+	PresetName = Decision Day (Beta)
 	SceneName = Decision Day
-	Description = Strike the enemy fortress and destroy its controller unit!
+	Description = Battle through a massive fortress to destroy the enemy's brain and get revenge! NOTE - this mission's performance will be improved in future versions.
 	ScriptPath = Missions.rte/Activities/DecisionDay.lua
 	InCampaignStage = 1
 	LuaClassName = DecisionDay

Data/Ronin.rte/Devices/Misc/Stone/Stone.ini

@@ -6,6 +6,7 @@ AddDevice = ThrownDevice
 	PresetName = Stone
 	Description = Throwable stone.  This is the cheapest weapon in the Ronin arsenal, yet very effective because of its long range.  The stone can be picked up after throwing for another go in case it didn't break.
 	AddToGroup = Bombs
+	AddToGroup = Bombs - Grenades
 	Mass = 1.5
 	RestThreshold = -500
 	HitsMOs = 1
@@ -99,6 +100,7 @@ AddDevice = ThrownDevice
 	PresetName = Stone Bag
 	Description = A handful of throwable stones. These are the cheapest weapon in the Ronin arsenal, but surprisingly effective because of their long range. Stones can be picked up after throwing, if they didn't break on impact.
 	AddToGroup = Bombs
+	AddToGroup = Bombs - Grenades
 	Mass = 8
 	RestThreshold = -500
 	HitsMOs = 1
@@ -115,7 +117,7 @@ AddDevice = ThrownDevice
 	AddCustomValue = NumberValue
 		BandolierMass = 0.5
 	AddCustomValue = NumberValue
-		IsThrownDevice = 1
+		GrenadeIsThrownDevice = 1
 	SpriteFile = ContentFile
 		FilePath = Ronin.rte/Devices/Misc/Stone/Stone.png
 	IconFile = ContentFile