Update engine for new mod content and Fluent changes.

OpenRA.Mods.Mobius/FileSystem/RemasterFileSystemLoader.cs

@@ -12,6 +12,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.FileSystem;
 using OpenRA.Mods.Common.Installer;
 
@@ -21,7 +22,7 @@ public class RemasterFileSystemLoader : IFileSystemLoader, IFileSystemExternalCo
 	{
 		[FieldLoader.Require]
 		public readonly string RemasterDataMount = null;
-		public readonly string InstallPromptMod = "cnccontent";
+		public readonly string InstallPromptMod = "remaster-content";
 		public readonly Dictionary<string, string> Packages = null;
 		public readonly Dictionary<string, string> RemasterPackages = null;
 
@@ -33,7 +34,7 @@ static object LoadSources(MiniYaml yaml)
 			var ret = new Dictionary<string, ModContent.ModSource>();
 			var sourcesNode = yaml.Nodes.Single(n => n.Key == "Sources");
 			foreach (var s in sourcesNode.Value.Nodes)
-				ret.Add(s.Key, new ModContent.ModSource(s.Value, null));
+				ret.Add(s.Key, new ModContent.ModSource(s.Value));
 
 			return ret;
 		}

OpenRA.Mods.Mobius/RemasterContentPromptLogic.cs

@@ -18,7 +18,6 @@ public class RemasterContentPromptLogic : ChromeLogic
 		[ObjectCreator.UseCtor]
 		public RemasterContentPromptLogic(Widget widget, ModData modData)
 		{
-			widget.Get<LabelWidget>("VERSION_LABEL").Text = modData.Manifest.Metadata.Version;
 			widget.Get<ButtonWidget>("QUIT_BUTTON").OnClick = Game.Exit;
 		}
 	}

mod.config

@@ -9,7 +9,7 @@
 MOD_ID="cnc"
 
 # The OpenRA engine version to use for this project.
-ENGINE_VERSION="78e02a7f9e"
+ENGINE_VERSION="85fd77f6be"
 
 ##############################################################################
 # Packaging

mods/cnc/languages/campaign/en.ftl → mods/cnc/fluent/campaign.ftl

@@ -1,13 +1,17 @@
 ## world
 dropdown-difficulty =
     .label = Difficulty
-    .description = The difficulty of the mission
+    .description = The difficulty of the mission.
 
 options-difficulty =
     .easy = Easy
     .normal = Normal
     .hard = Hard
 
+## player
+bot-campaign-ai =
+   .name = Campaign Player AI
+
 ## campaign-maprules.yaml
 actor-moneycrate-name = Money Crate
 

mods/cnc/languages/lua/en.ftl → mods/cnc/fluent/lua.ftl

@@ -1,12 +1,12 @@
 ## campaign
-objective-failed = Objective failed
-objective-completed = Objective completed
+objective-failed = Objective Failed
+objective-completed = Objective Completed
 
 primary = Primary
 secondary = Secondary
 
-new-primary-objective = New primary objective
-new-secondary-objective = New secondary objective
+new-primary-objective = New Primary Objective
+new-secondary-objective = New Secondary Objective
 
 # cnc64gdi01
 destroy-obelisk-sams = Destroy the SAM sites protecting the Obelisk.
@@ -59,7 +59,7 @@ destroy-nod-force = Destroy the Nod strike force.
 ## gdi08b
 protect-mobius = Protect Dr. Mobius.
 protect-hospital = Protect the Hospital.
-keep-civilians-alive = Keep at least { $civilians } out of 14 Civilians alive.
+keep-civilians-alive = Keep at least { $civilians } out of 14 civilians alive.
 destroy-nod-bases = Destroy the Nod bases.
 
 ## gdi09
@@ -105,8 +105,8 @@ destroy-gdi-supporter-houses = Destroy the houses of the GDI supporters
     in the village.
 
 ## nod06c
-infiltrate-barracks-factory-conyard = Infiltrate the barracks, weapon factory and
-    the construction yard.
+infiltrate-barracks-factory-conyard = Infiltrate the barracks, weapons factory and
+    construction yard.
 
 ## nod07a
 find-nod-base = Find the Nod base.
@@ -116,9 +116,9 @@ eliminate-gdi-forces = Eliminate all GDI forces in the area.
 
 ## nod07c
 capture-gdi-helipad = Capture the GDI helipad.
-dont-capture-or-destroy = Don't capture or destroy any other
+do-not-capture-or-destroy = Do not capture or destroy any other
     GDI main building.
-orca-wreak-havoc = Use the GDI orca to wreak havoc at the village.
+orca-wreak-havoc = Use the GDI Orca to wreak havoc in the village.
 distract-guards = Distract the guards by attacking the
     main entrance with your vehicles.
 
@@ -134,29 +134,24 @@ secure-second-landing-zone = Secure the second landing zone.
 
 ## nod10a
 kill-gdi-scientist = Kill the GDI scientist.
-destroy-tech-center = Destroy the GDI R&D center.
+destroy-tech-center = Destroy the GDI Research Base.
 
 ## nod10b
 destroy-capture-warfactory = Destroy or capture the Weapons Factory.
-destroy-mammoth-tanks = Destroy the Mammoth tanks in the R&D base.
+destroy-mammoth-tanks = Destroy the Mammoth tanks in the Research Base.
 keep-commando-alive = Keep your Commando alive.
 
 ## eviction-notice
-take-civilians-money-crates = Find all the civilians' money.
-    They won't need it anymore.
-quickly-destroy-ion-cannon = Disable GDI Ion Cannon before
-    it fires two times.
+take-civilians-money-crates = Find all the civilians' money; they won't be needing it anymore.
+quickly-destroy-ion-cannon = Disable the GDI Ion Cannon before it fires twice.
 nod-soldier = Nod Soldier
-civilians-runs = Hey, those civilians... where are they going?
-destroy-ion-cannon-advise = The GDI are preparing their ion cannon. Don't let them get used to it.
-village-destruction-warning = Be careful, commander. The GDI won't stand still while we burn the entire village.
+civilians-running = Hey, those civilians... where are they going?
+destroy-ion-cannon-advice = The GDI are preparing their Ion Cannon. Don't let them get comfortable using it.
+village-destruction-warning = Be careful, commander. The GDI won't stay idle while we burn the entire village.
 
 ## twist-of-fate
-clear-path = Repel the ambush and clear the way
-    for our MCV.
-recover-old-base = Capture the Construction Yard in our recon
-    post to regain control.
-air-strikes-intel-report = Nod airstrikes are being directed by a Communications Center, located northwest. We may gain useful information from its capture.
-capture-nod-communications-center = Capture the Nod Communications Center to
-    the northwest.
+clear-path = Repel the ambush and clear the way for our MCV.
+recover-old-base = Capture the Construction Yard at our recon post to regain control.
+air-strikes-intel-report = Nod airstrikes are being directed by a Communications Center to the northwest. We may gain useful information from its capture.
+capture-nod-communications-center = Capture the Nod Communications Center to the northwest.
 communications-center-captured-sams-located = Our engineers located Nod SAM sites. They also disarmed an unusual trap on the Construction Yard to the south.

mods/cnc/mod.yaml

@@ -3,7 +3,7 @@ Metadata:
 	Version: {DEV_VERSION}
 	Website: https://www.openra.net
 	WebIcon32: https://www.openra.net/images/icons/cnc_32x32.png
-	WindowTitle: OpenRA - Tiberian Dawn
+	WindowTitle: OpenRA - Tiberian Dawn HD
 
 PackageFormats: Mix, MegV3, ZipFile
 
@@ -118,7 +118,6 @@ Assemblies: OpenRA.Mods.Common.dll, OpenRA.Mods.Cnc.dll, OpenRA.Mods.Mobius.dll
 
 ChromeLayout:
 	base|chrome/mainmenu.yaml
-	cnc|chrome/mainmenu-prerelease-notification.yaml
 	base|chrome/mainmenu-prompts.yaml
 	base|chrome/playerprofile.yaml
 	base|chrome/encyclopedia.yaml
@@ -168,14 +167,16 @@ ChromeLayout:
 	base|chrome/editor.yaml
 	common|chrome/text-notifications.yaml
 
-Translations:
-	common|languages/en.ftl
-	common|languages/rules/en.ftl
-	base|languages/chrome/en.ftl
-	base|languages/rules/en.ftl
-	cnc|languages/overrides/en.ftl
+FluentMessages:
+	common|fluent/common.ftl
+	common|fluent/hotkeys.ftl
+	common|fluent/rules.ftl
+	base|fluent/cnc.ftl
+	base|fluent/chrome.ftl
+	base|fluent/hotkeys.ftl
+	base|fluent/rules.ftl
 
-AllowUnusedTranslationsInExternalPackages: false
+AllowUnusedFluentMessagesInExternalPackages: false
 
 Voices:
 	cnc|audio/voices.yaml
@@ -190,7 +191,6 @@ Hotkeys:
 	common|hotkeys/game.yaml
 	common|hotkeys/observer.yaml
 	common|hotkeys/production-common.yaml
-	common|hotkeys/production-peractor.yaml
 	common|hotkeys/supportpowers.yaml
 	common|hotkeys/viewport.yaml
 	common|hotkeys/chat.yaml
@@ -202,7 +202,6 @@ LoadScreen: CncLoadScreen
 	Image: base|uibits/chrome.png
 	Image2x: base|uibits/chrome-2x.png
 	Image3x: base|uibits/chrome-3x.png
-	Text: Loading
 
 ServerTraits:
 	LobbyCommands
@@ -268,7 +267,7 @@ SoundFormats: Aud, Wav
 
 SpriteFormats: Tga, ShpTD, TmpTD, ShpTS, TmpRA, ShpRemastered, Dds, PngSheet
 
-VideoFormats: Vqa
+VideoFormats: Vqa, Wsa
 
 TerrainFormat: RemasterTerrain
 

mods/cnc/rules/overrides.yaml

@@ -7,10 +7,6 @@
 		FogVariants: fog-typea, fog-typeb, fog-typec, fog-typed
 		OverrideFullFog: fog-full
 
-World:
-	LoadWidgetAtGameStart:
-		ShellmapRoot: MAINMENU_PRERELEASE_NOTIFICATION
-
 V19:
 	RenderSprites:
 		PlayerPalette: derrick