Merge branch 'development' into 4zk-content

Author: Gacyr

Base.rte/Scenes/Objects/Bunkers/BunkerBackgrounds/TutShaft-RBG.bmp

@@ -383,6 +383,7 @@ AddTerrainObject = TerrainObject
 
 AddTerrainObject = TerrainObject
 	PresetName = Metal Block
+	AddToGroup = Bunker Bits
 	GoldValue = 40
 	FGColorFile = ContentFile
 		FilePath = Base.rte/Scenes/Objects/Bunkers/BunkerBits/MetalBlockFG.bmp
@@ -397,6 +398,7 @@ AddTerrainObject = TerrainObject
 
 AddTerrainObject = TerrainObject
 	PresetName = Concrete Block
+	AddToGroup = Bunker Bits
 	GoldValue = 20
 	FGColorFile = ContentFile
 		FilePath = Base.rte/Scenes/Objects/Bunkers/BunkerBits/ConcreteBlockFG.bmp

Base.rte/Scenes/Objects/Bunkers/BunkerBits/BunkerBits.ini

@@ -61,6 +61,10 @@ function MaginotMission:StartActivity()
 			local brain = CreateAHuman("Brain Robot", "Base.rte")
 			--Move the brain to the right spot.
 			brain.Pos = Vector(2328 + player * 24,1240)
+			--If the brain area is provided, use that instead.
+			if SceneMan.Scene:HasArea("Brain") then
+				brain.Pos = SceneMan.Scene:GetOptionalArea("Brain"):GetCenterPoint()
+			end
 			--Store this position.
 			self.spawnPos[player] = brain.Pos
 			--Equip the brain with a pistol.