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

Add Translations to MapPreview

Browse Source
This commit is contained in:
Gustas
2023-04-13 15:40:11 +03:00
committed by Matthias Mailänder
parent 07e47b6a28
commit efe135e38b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Map/Map.cs
View File

@@ -167,11 +167,11 @@ namespace OpenRA
new MapField("Bounds"), new MapField("Bounds"),
new MapField("Visibility"), new MapField("Visibility"),
new MapField("Categories"), new MapField("Categories"),
new MapField("Translations", required: false, ignoreIfValue: ""),
new MapField("LockPreview", required: false, ignoreIfValue: "False"), new MapField("LockPreview", required: false, ignoreIfValue: "False"),
new MapField("Players", "PlayerDefinitions"), new MapField("Players", "PlayerDefinitions"),
new MapField("Actors", "ActorDefinitions"), new MapField("Actors", "ActorDefinitions"),
new MapField("Rules", "RuleDefinitions", required: false), new MapField("Rules", "RuleDefinitions", required: false),
new MapField("Translations", "TranslationDefinitions", required: false),
new MapField("Sequences", "SequenceDefinitions", required: false), new MapField("Sequences", "SequenceDefinitions", required: false),
new MapField("ModelSequences", "ModelSequenceDefinitions", required: false), new MapField("ModelSequences", "ModelSequenceDefinitions", required: false),
new MapField("Weapons", "WeaponDefinitions", required: false), new MapField("Weapons", "WeaponDefinitions", required: false),
@@ -193,7 +193,6 @@ namespace OpenRA
public Rectangle Bounds; public Rectangle Bounds;
public MapVisibility Visibility = MapVisibility.Lobby; public MapVisibility Visibility = MapVisibility.Lobby;
public string[] Categories = { "Conquest" }; public string[] Categories = { "Conquest" };
public string[] Translations;
public int2 MapSize { get; private set; } public int2 MapSize { get; private set; }
@@ -203,6 +202,7 @@ namespace OpenRA
// Custom map yaml. Public for access by the map importers and lint checks // Custom map yaml. Public for access by the map importers and lint checks
public readonly MiniYaml RuleDefinitions; public readonly MiniYaml RuleDefinitions;
public readonly MiniYaml TranslationDefinitions;
public readonly MiniYaml SequenceDefinitions; public readonly MiniYaml SequenceDefinitions;
public readonly MiniYaml ModelSequenceDefinitions; public readonly MiniYaml ModelSequenceDefinitions;
public readonly MiniYaml WeaponDefinitions; public readonly MiniYaml WeaponDefinitions;
@@ -450,7 +450,8 @@ namespace OpenRA
} }
Sequences = new SequenceSet(this, modData, Tileset, SequenceDefinitions); Sequences = new SequenceSet(this, modData, Tileset, SequenceDefinitions);
Translation = new Translation(Game.Settings.Player.Language, Translations, this); Translation = TranslationDefinitions == null ? null
: new Translation(Game.Settings.Player.Language, FieldLoader.GetValue<string[]>("value", TranslationDefinitions.Value), this);
var tl = new MPos(0, 0).ToCPos(this); var tl = new MPos(0, 0).ToCPos(this);
var br = new MPos(MapSize.X - 1, MapSize.Y - 1).ToCPos(this); var br = new MPos(MapSize.X - 1, MapSize.Y - 1).ToCPos(this);
@@ -1412,7 +1413,7 @@ namespace OpenRA
public string Translate(string key, IDictionary<string, object> args = null) public string Translate(string key, IDictionary<string, object> args = null)
{ {
if (Translation.TryGetString(key, out var message, args)) if (Translation != null && Translation.TryGetString(key, out var message, args))
return message; return message;
return modData.Translation.GetString(key, args); return modData.Translation.GetString(key, args);

6
OpenRA.Game/Map/MapPreview.cs
View File

@@ -90,6 +90,7 @@ namespace OpenRA
public MiniYaml SequenceDefinitions; public MiniYaml SequenceDefinitions;
public MiniYaml ModelSequenceDefinitions; public MiniYaml ModelSequenceDefinitions;
public Translation Translation { get; private set; }
public ActorInfo WorldActorInfo { get; private set; } public ActorInfo WorldActorInfo { get; private set; }
public ActorInfo PlayerActorInfo { get; private set; } public ActorInfo PlayerActorInfo { get; private set; }
@@ -120,6 +121,10 @@ namespace OpenRA
SequenceDefinitions = LoadRuleSection(yaml, "Sequences"); SequenceDefinitions = LoadRuleSection(yaml, "Sequences");
ModelSequenceDefinitions = LoadRuleSection(yaml, "ModelSequences"); ModelSequenceDefinitions = LoadRuleSection(yaml, "ModelSequences");
Translation = yaml.TryGetValue("Translations", out var node) && node != null
? new Translation(Game.Settings.Player.Language, FieldLoader.GetValue<string[]>("value", node.Value), fileSystem)
: null;
try try
{ {
// PERF: Implement a minimal custom loader for custom world and player actors to minimize loading time // PERF: Implement a minimal custom loader for custom world and player actors to minimize loading time
@@ -293,6 +298,7 @@ namespace OpenRA
innerData.SetCustomRules(modData, this, new Dictionary<string, MiniYaml>() innerData.SetCustomRules(modData, this, new Dictionary<string, MiniYaml>()
{ {
{ "Rules", map.RuleDefinitions }, { "Rules", map.RuleDefinitions },
{ "Translations", map.TranslationDefinitions },
{ "Weapons", map.WeaponDefinitions }, { "Weapons", map.WeaponDefinitions },
{ "Voices", map.VoiceDefinitions }, { "Voices", map.VoiceDefinitions },
{ "Music", map.MusicDefinitions }, { "Music", map.MusicDefinitions },