Update engine to latest bleed.

OpenRA · Aug 2, 2024 · b92d1cf · b92d1cf
1 parent d49b897
commit b92d1cf
Show file tree

Hide file tree

Showing 16 changed files with 87 additions and 321 deletions.
diff --git a/OpenRA.Mods.Mobius/RemasterSpriteSequence.cs b/OpenRA.Mods.Mobius/RemasterSpriteSequence.cs
@@ -67,8 +67,6 @@ public class RemasterSpriteSequence : ClassicTilesetSpecificSpriteSequence
 		[Desc("Sprite data is already pre-multiplied by alpha channel.")]
 		protected static readonly SpriteSequenceField<bool> RemasteredPremultiplied = new(nameof(RemasteredPremultiplied), true);
 
-		static readonly int[] FirstFrame = { 0 };
-
 		bool hasRemasteredSprite = true;
 
 		IEnumerable<ReservationInfo> ParseRemasterFilenames(ModData modData, string tileset, int[] frames, MiniYaml data, MiniYaml defaults)
@@ -195,7 +193,7 @@ public override void ReserveSprites(ModData modData, string tileset, SpriteCache
 			var combineNode = data.Nodes.FirstOrDefault(n => n.Key == Combine.Key);
 			if (combineNode != null)
 			{
-				for (var i = 0; i < combineNode.Value.Nodes.Count; i++)
+				for (var i = 0; i < combineNode.Value.Nodes.Length; i++)
 				{
 					var subData = combineNode.Value.Nodes[i].Value;
 					var subOffset = LoadField(Offset, subData, NoData);
@@ -210,7 +208,7 @@ public override void ReserveSprites(ModData modData, string tileset, SpriteCache
 						if (remasteredMaskToken != null)
 							token = cache.ReserveFrames(f.Filename, f.LoadFrames, f.Location);
 						else
-							token = cache.ReserveSprites(f.Filename, f.LoadFrames, f.Location, hasRemasteredSprite && premultiplied);
+							token = cache.ReserveSprites(f.Filename, f.LoadFrames, f.Location, premultiplied: hasRemasteredSprite && premultiplied);
 
 						spritesToLoad.Add(new SpriteReservation
 						{
@@ -233,7 +231,7 @@ public override void ReserveSprites(ModData modData, string tileset, SpriteCache
 					if (remasteredMaskToken != null)
 						token = cache.ReserveFrames(f.Filename, f.LoadFrames, f.Location);
 					else
-						token = cache.ReserveSprites(f.Filename, f.LoadFrames, f.Location, hasRemasteredSprite && premultiplied);
+						token = cache.ReserveSprites(f.Filename, f.LoadFrames, f.Location, premultiplied: hasRemasteredSprite && premultiplied);
 
 					spritesToLoad.Add(new SpriteReservation
 					{

diff --git a/OpenRA.Mods.Mobius/Terrain/RemasterTileCache.cs b/OpenRA.Mods.Mobius/Terrain/RemasterTileCache.cs
@@ -37,7 +37,7 @@ public RemasterTileCache(RemasterTerrain terrainInfo)
 				var templateInfo = (RemasterTerrainTemplateInfo)t.Value;
 				var templateTokens = new Dictionary<int, int[]>();
 
-				if (templateInfo.RemasteredFilenames?.Any() ?? false)
+				if ((templateInfo.RemasteredFilenames?.Count ?? 0) > 0)
 				{
 					foreach (var kv in templateInfo.RemasteredFilenames)
 						templateTokens[kv.Key] = kv.Value

diff --git a/OpenRA.Mods.Mobius/Traits/Palettes/ColorPickerColorShift.cs b/OpenRA.Mods.Mobius/Traits/Palettes/ColorPickerColorShift.cs
diff --git a/OpenRA.Mods.Mobius/Traits/Palettes/FixedColorShift.cs b/OpenRA.Mods.Mobius/Traits/Palettes/FixedColorShift.cs
diff --git a/OpenRA.Mods.Mobius/Traits/Palettes/FixedPlayerColorShift.cs b/OpenRA.Mods.Mobius/Traits/Palettes/FixedPlayerColorShift.cs
diff --git a/OpenRA.Mods.Mobius/Traits/Palettes/PlayerColorShift.cs b/OpenRA.Mods.Mobius/Traits/Palettes/PlayerColorShift.cs
diff --git a/OpenRA.Mods.Mobius/UtilityCommands/RemasterTilesetConverter.cs b/OpenRA.Mods.Mobius/UtilityCommands/RemasterTilesetConverter.cs
@@ -35,7 +35,7 @@ void IUtilityCommand.Run(Utility utility, string[] args)
 			Game.ModData = utility.ModData;
 
 			var tileset = MiniYaml.FromFile(args[1], discardCommentsAndWhitespace: false);
-			var templates = tileset.First(n => n.Key == "Templates");
+			var templates = new MiniYamlBuilder(tileset.First(n => n.Key == "Templates").Value);
 
 			var mapping = new XmlDocument();
 			using (var ffs = new FileStream(args[2], FileMode.Open))
@@ -47,7 +47,7 @@ void IUtilityCommand.Run(Utility utility, string[] args)
 			}
 
 			var rootTexturePath = mapping.SelectSingleNode("//RootTexturePath").InnerText.ToUpperInvariant();
-			foreach (var template in templates.Value.Nodes)
+			foreach (var template in templates.Nodes)
 			{
 				var legacy = template.LastChildMatching("Images").Value.Value;
 				var code = Path.GetFileNameWithoutExtension(legacy).ToUpperInvariant();
@@ -62,7 +62,7 @@ void IUtilityCommand.Run(Utility utility, string[] args)
 
 				template.RemoveNodes("Frames");
 				template.RenameChildrenMatching("Images", "Filename");
-				var imageNode = new MiniYamlNode("RemasteredFilenames", "");
+				var imageNode = new MiniYamlNodeBuilder("RemasteredFilenames", "");
 				foreach (var t in tileNodes)
 				{
 					var tileNode = (XmlNode)t;
@@ -77,7 +77,7 @@ void IUtilityCommand.Run(Utility utility, string[] args)
 					imageNode.AddNode(index, FieldSaver.FormatValue(frames));
 				}
 
-				if (imageNode.Value.Nodes.Any())
+				if (imageNode.Value.Nodes.Count > 0)
 					template.AddNode(imageNode);
 			}
 

diff --git a/mod.config b/mod.config
@@ -9,7 +9,7 @@
 MOD_ID="cnc"
 
 # The OpenRA engine version to use for this project.
-ENGINE_VERSION="ea55ca256d60f210e409055fc7b3a4c717023125"
+ENGINE_VERSION="c91c66dbea"
 
 ##############################################################################
 # Packaging