Merge remote-tracking branch 'darkademic/dev'

Author: Inq8

OpenRA.Mods.CA/Traits/LobbyMissionInfo.cs …Mods.CA/Traits/World/LobbyMissionInfo.csOpenRA.Mods.CA/Traits/LobbyMissionInfo.cs renamed to OpenRA.Mods.CA/Traits/World/LobbyMissionInfo.cs OpenRA.Mods.CA/Traits/LobbyMissionInfo.cs renamed to OpenRA.Mods.CA/Traits/World/LobbyMissionInfo.cs

@@ -10,6 +10,7 @@
  */
 #endregion
 
+using OpenRA.Primitives;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.CA.Traits
@@ -19,11 +20,17 @@ namespace OpenRA.Mods.CA.Traits
 	public class LobbyMissionInfoInfo : TraitInfo
 	{
 		[FieldLoader.Require]
-		[Desc("Info to display in the lobby chat.")]
-		public readonly string Info = "";
+		[Desc("Text to display in the lobby chat.")]
+		public readonly string Text = "";
 
 		[Desc("Prefix to display before the info in the lobby chat.")]
-		public readonly string Prefix = "Mission Info";
+		public readonly string Prefix = null;
+
+		[Desc("Color of the prefix text in the lobby chat.")]
+		public readonly Color PrefixColor = Color.Cyan;
+
+		[Desc("Color of the info text in the lobby chat.")]
+		public readonly Color TextColor = Color.Cyan;
 
 		public override object Create(ActorInitializer init) { return new LobbyMissionInfo(); }
 	}

OpenRA.Mods.CA/Widgets/Logic/Lobby/LobbyMissionInfoLogic.cs

@@ -11,7 +11,6 @@
 using System;
 using OpenRA.Mods.CA.Traits;
 using OpenRA.Network;
-using OpenRA.Primitives;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.CA.Widgets.Logic
@@ -43,14 +42,24 @@ void OnLobbyInfoChanged()
 
 			lastMapUid = mapUid;
 
-			var lobbyMissionInfo = map.WorldActorInfo.TraitInfoOrDefault<LobbyMissionInfoInfo>();
-			if (lobbyMissionInfo == null || string.IsNullOrEmpty(lobbyMissionInfo.Info))
+			var lobbyMissionInfos = map.WorldActorInfo.TraitInfos<LobbyMissionInfoInfo>();
+
+			if (lobbyMissionInfos.Count == 0)
 				return;
 
-			var info = lobbyMissionInfo.Info;
-			var prefix = lobbyMissionInfo.Prefix;
+			Game.RunAfterTick(() => {
+				foreach (var lobbyMissionInfo in lobbyMissionInfos)
+				{
+					var text = lobbyMissionInfo.Text;
+					var prefix = lobbyMissionInfo.Prefix;
+					var prefixColor = lobbyMissionInfo.PrefixColor;
+					var textColor = lobbyMissionInfo.TextColor;
+
+					text = text.Replace("\\n", "\n");
 
-			Game.RunAfterTick(() => TextNotificationsManager.AddChatLine(TextNotificationsManager.SystemClientId, prefix, info, Color.DeepSkyBlue, Color.DeepSkyBlue));
+					TextNotificationsManager.AddChatLine(TextNotificationsManager.SystemClientId, prefix, text, prefixColor, textColor);
+				}
+			});
 		}
 
 		protected override void Dispose(bool disposing)

mods/ca/maps/ceasefire-3v3.oramap

@@ -511,9 +511,6 @@ Actors:
 	PrismSpawn2: waypoint
 		Owner: Neutral
 		Location: 53,62
-	SubPen: spen
-		Owner: USSR
-		Location: 75,74
 	Actor131: ss
 		Owner: USSR
 		Stance: Defend
@@ -571,6 +568,9 @@ Actors:
 	TanyaDest: waypoint
 		Owner: Neutral
 		Location: 63,48
+	SubPen: spen
+		Owner: USSR
+		Location: 75,75
 
 Rules: ca|rules/custom/campaign-rules.yaml, ca|rules/custom/campaign-tooltips.yaml, ca|rules/custom/two-tone-nod.yaml, ca|rules/custom/disable-coalitions.yaml, ca|missions/main-campaign/ca-prologue-01/relativity-rules.yaml, ca|rules/custom/coop-rules.yaml, relativity-coop-rules.yaml
 

mods/ca/maps/ceasefire-4v4.oramap

@@ -1,3 +1,6 @@
 World:
 	LuaScript:
 		Scripts: campaign.lua, coop.lua, ca|missions/main-campaign/ca-prologue-01/relativity.lua, relativity-coop.lua
+	LobbyMissionInfo@InitialObjectives:
+		Prefix: Initial Objectives
+		Text: • Find and rescue Prof. Einstein.

mods/ca/maps/donssacks.oramap

@@ -1,3 +1,6 @@
 World:
 	LuaScript:
 		Scripts: campaign.lua, coop.lua, ca|missions/main-campaign/ca-prologue-02/reprisal.lua, reprisal-coop.lua
+	LobbyMissionInfo@InitialObjectives:
+		Prefix: Initial Objectives
+		Text: • Destroy the village and all its inhabitants.\n• Destroy the Allied base.

mods/ca/maps/frozen_rift_ca.oramap

@@ -1,3 +1,6 @@
 World:
 	LuaScript:
 		Scripts: campaign.lua, coop.lua, ca|missions/main-campaign/ca-prologue-03/detachment.lua, detachment-coop.lua
+	LobbyMissionInfo@InitialObjectives:
+		Prefix: Initial Objectives
+		Text: • Make contact with GDI forces in the area and find a route to safety.