epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing PlayerReferences in D2k map import

Browse Source
This commit is contained in:
penev92
2022-03-14 02:38:49 +02:00
committed by Matthias Mailänder
parent 8e19463450
commit 2866342522
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenRA.Mods.D2k/UtilityCommands/D2kMapImporter.cs
View File

@@ -22,6 +22,20 @@ namespace OpenRA.Mods.D2k.UtilityCommands
{ {
const int MapCordonWidth = 2; const int MapCordonWidth = 2;
// PlayerReference colors in D2k missions only affect chat text and minimap colors because actors use specific palette colors.
// So using the colors from the original game's minimap.
public static Dictionary<string, (string Faction, Color Color)> PlayerReferenceDataByPlayerName = new Dictionary<string, (string, Color)>
{
{ "Neutral", ("Random", Color.White) },
{ "Atreides", ("atreides", Color.FromArgb(90, 115, 148)) },
{ "Harkonnen", ("harkonnen", Color.FromArgb(214, 74, 66)) },
{ "Ordos", ("ordos", Color.FromArgb(90, 148, 115)) },
{ "Corrino", ("corrino", Color.FromArgb(115, 0, 123)) },
{ "Fremen", ("fremen", Color.FromArgb(132, 132, 132)) },
{ "Smugglers", ("smuggler", Color.FromArgb(123, 41, 16)) },
{ "Mercenaries", ("mercenary", Color.FromArgb(156, 132, 8)) }
};
public static Dictionary<int, (string Actor, string Owner)> ActorDataByActorCode = new Dictionary<int, (string, string)> public static Dictionary<int, (string Actor, string Owner)> ActorDataByActorCode = new Dictionary<int, (string, string)>
{ {
{ 20, ("wormspawner", "Creeps") }, { 20, ("wormspawner", "Creeps") },
@@ -367,6 +381,22 @@ namespace OpenRA.Mods.D2k.UtilityCommands
map.ActorDefinitions.Add(new MiniYamlNode("Actor" + map.ActorDefinitions.Count, a.Save())); map.ActorDefinitions.Add(new MiniYamlNode("Actor" + map.ActorDefinitions.Count, a.Save()));
if (map.PlayerDefinitions.All(x => x.Value.Nodes.Single(y => y.Key == "Name").Value.Value != kvp.Owner))
{
var playerInfo = PlayerReferenceDataByPlayerName[kvp.Owner];
var playerReference = new PlayerReference
{
Name = kvp.Owner,
OwnsWorld = kvp.Owner == "Neutral",
NonCombatant = kvp.Owner == "Neutral",
Faction = playerInfo.Faction,
Color = playerInfo.Color
};
var node = new MiniYamlNode($"{nameof(PlayerReference)}@{kvp.Owner}", FieldSaver.SaveDifferences(playerReference, new PlayerReference()));
map.PlayerDefinitions.Add(node);
}
if (kvp.Actor == "mpspawn") if (kvp.Actor == "mpspawn")
playerCount++; playerCount++;
} }