Merge branch 'development' into bugfix/Supportable-SupportOffsetReloading

Author: Alejandroibo

CHANGELOG.md

@@ -10,9 +10,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed Constructor auto-cancelling build mode if you actively selected the "Order Construction" pie menu option.
 
-- Fixed issue where the off hand wouldn't default to the `IdleOffset` of it's arm when the current held device had `Supportable = 0`.
+- Fixed issue where the offhand wouldn't default to the `IdleOffset` of it's arm when the current held device had `Supportable = 0`.
 
-- Fixed edge case where having a device with `UseSupportOffsetWhileReloading = 1` and `Supportable = 0/1` depending on if it was reloading or not would result in the gun not being held by the support hand when reloading.
+- Fixed edge case where having a device with `UseSupportOffsetWhileReloading = 1`, and `Supportable = 0/1` depending on if it was reloading or not, would result in the gun not being held by the support hand when reloading.
+
+- Fixed regression introduced in v6.2.0 preventing Massacre, One-Man Army, One-Man Army (Diggers Only), and Survival from spawning enemies at all.  
 
 </details>
 

Data/Base.rte/Activities/Massacre.lua

@@ -301,7 +301,7 @@ function Massacre:UpdateActivity()
 					for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
 						if self:PlayerActive(player) and self:PlayerHuman(player) then
 							local sceneChunk = SceneMan.SceneWidth / 3;
-							local checkPos = self:GetPlayerBrain(i - 1).Pos.X + (SceneMan.SceneWidth/2) + ( (sceneChunk/2) - (math.random()*sceneChunk) );
+							local checkPos = self:GetPlayerBrain(player).Pos.X + (SceneMan.SceneWidth/2) + ( (sceneChunk/2) - (math.random()*sceneChunk) );
 							if checkPos > SceneMan.SceneWidth then
 								checkPos = checkPos - SceneMan.SceneWidth;
 							elseif checkPos < 0 then

Data/Base.rte/Activities/OneManArmy.lua

@@ -382,7 +382,7 @@ function OneManArmy:UpdateActivity()
 					for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
 						if self:PlayerActive(player) and self:PlayerHuman(player) then
 							local sceneChunk = SceneMan.SceneWidth * 0.3;
-							local checkPos = self:GetPlayerBrain(i - 1).Pos.X + (SceneMan.SceneWidth * 0.5) + ((sceneChunk * 0.5) - (math.random() * sceneChunk));
+							local checkPos = self:GetPlayerBrain(player).Pos.X + (SceneMan.SceneWidth * 0.5) + ((sceneChunk * 0.5) - (math.random() * sceneChunk));
 							if checkPos > SceneMan.SceneWidth then
 								checkPos = checkPos - SceneMan.SceneWidth;
 							elseif checkPos < 0 then

Data/Base.rte/Activities/OneManArmyDiggers.lua

@@ -325,7 +325,7 @@ function OneManArmy:UpdateActivity()
 					for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
 						if self:PlayerActive(player) and self:PlayerHuman(player) then
 							local sceneChunk = SceneMan.SceneWidth / 3;
-							local checkPos = self:GetPlayerBrain(i - 1).Pos.X + (SceneMan.SceneWidth/2) + ( (sceneChunk/2) - (math.random()*sceneChunk) );
+							local checkPos = self:GetPlayerBrain(player).Pos.X + (SceneMan.SceneWidth/2) + ( (sceneChunk/2) - (math.random()*sceneChunk) );
 							if checkPos > SceneMan.SceneWidth then
 								checkPos = checkPos - SceneMan.SceneWidth;
 							elseif checkPos < 0 then

Data/Base.rte/Activities/Survival.lua

@@ -279,7 +279,7 @@ function Survival:UpdateActivity()
 					for player = Activity.PLAYER_1, Activity.MAXPLAYERCOUNT - 1 do
 						if self:PlayerActive(player) and self:PlayerHuman(player) then
 							local sceneChunk = SceneMan.SceneWidth / 3;
-							local checkPos = self:GetPlayerBrain(i - 1).Pos.X + (SceneMan.SceneWidth/2) + ( (sceneChunk/2) - (math.random()*sceneChunk) );
+							local checkPos = self:GetPlayerBrain(player).Pos.X + (SceneMan.SceneWidth/2) + ( (sceneChunk/2) - (math.random()*sceneChunk) );
 							if checkPos > SceneMan.SceneWidth then
 								checkPos = checkPos - SceneMan.SceneWidth;
 							elseif checkPos < 0 then