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

Allow Encyclopedia entries to scale the actor preview.

Browse Source
This commit is contained in:
Paul Chote
2024-10-27 14:54:07 +00:00
committed by Gustas
parent 78e47ea70a
commit eff4c66410
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Encyclopedia.cs
View File

@@ -25,6 +25,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Group under this heading.")] [Desc("Group under this heading.")]
public readonly string Category; public readonly string Category;
[Desc("Scale the actor preview.")]
public readonly float Scale = 1f;
public override object Create(ActorInitializer init) { return Encyclopedia.Instance; } public override object Create(ActorInitializer init) { return Encyclopedia.Instance; }
} }

50
OpenRA.Mods.Common/Widgets/Logic/EncyclopediaLogic.cs
View File

@@ -24,6 +24,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ {
readonly World world; readonly World world;
readonly ModData modData; readonly ModData modData;
readonly Dictionary<ActorInfo, EncyclopediaInfo> info = new();
readonly ScrollPanelWidget descriptionPanel; readonly ScrollPanelWidget descriptionPanel;
readonly LabelWidget descriptionLabel; readonly LabelWidget descriptionLabel;
@@ -60,28 +61,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
actorList.RemoveChildren(); actorList.RemoveChildren();
var actorEncyclopediaPair = GetFilteredActorEncyclopediaPairs();
var categories = actorEncyclopediaPair.Select(a => a.Value.Category).Distinct().
OrderBy(string.IsNullOrWhiteSpace).ThenBy(s => s);
foreach (var category in categories)
{
CreateActorGroup(category, actorEncyclopediaPair
.Where(a => a.Value.Category == category)
.OrderBy(a => a.Value.Order)
.Select(a => a.Key));
}
widget.Get<ButtonWidget>("BACK_BUTTON").OnClick = () =>
{
Game.Disconnect();
Ui.CloseWindow();
onExit();
};
}
IReadOnlyCollection<KeyValuePair<ActorInfo, EncyclopediaInfo>> GetFilteredActorEncyclopediaPairs()
{
var actors = new List<KeyValuePair<ActorInfo, EncyclopediaInfo>>();
foreach (var actor in modData.DefaultRules.Actors.Values) foreach (var actor in modData.DefaultRules.Actors.Values)
{ {
if (actor.TraitInfos<IRenderActorPreviewSpritesInfo>().Count == 0) if (actor.TraitInfos<IRenderActorPreviewSpritesInfo>().Count == 0)
@@ -95,10 +74,26 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (encyclopedia == null) if (encyclopedia == null)
continue; continue;
actors.Add(new KeyValuePair<ActorInfo, EncyclopediaInfo>(actor, encyclopedia)); info.Add(actor, encyclopedia);
} }
return actors; var categories = info.Select(a => a.Value.Category).Distinct().
OrderBy(string.IsNullOrWhiteSpace).ThenBy(s => s);
foreach (var category in categories)
{
CreateActorGroup(category, info
.Where(a => a.Value.Category == category)
.OrderBy(a => a.Value.Order)
.Select(a => a.Key));
}
widget.Get<ButtonWidget>("BACK_BUTTON").OnClick = () =>
{
Game.Disconnect();
Ui.CloseWindow();
onExit();
};
} }
void CreateActorGroup(string title, IEnumerable<ActorInfo> actors) void CreateActorGroup(string title, IEnumerable<ActorInfo> actors)
@@ -130,6 +125,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void SelectActor(ActorInfo actor) void SelectActor(ActorInfo actor)
{ {
var selectedInfo = info[actor];
selectedActor = actor; selectedActor = actor;
var typeDictionary = new TypeDictionary() var typeDictionary = new TypeDictionary()
@@ -143,6 +139,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
typeDictionary.Add(inits); typeDictionary.Add(inits);
previewWidget.SetPreview(actor, typeDictionary); previewWidget.SetPreview(actor, typeDictionary);
previewWidget.GetScale = () => selectedInfo.Scale;
var text = ""; var text = "";
@@ -157,9 +154,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
text += $"Requires {prerequisites.JoinWith(", ")}\n\n"; text += $"Requires {prerequisites.JoinWith(", ")}\n\n";
} }
var info = actor.TraitInfoOrDefault<EncyclopediaInfo>(); if (selectedInfo != null && !string.IsNullOrEmpty(selectedInfo.Description))
if (info != null && !string.IsNullOrEmpty(info.Description)) text += WidgetUtils.WrapText(FluentProvider.GetMessage(selectedInfo.Description) + "\n\n", descriptionLabel.Bounds.Width, descriptionFont);
text += WidgetUtils.WrapText(FluentProvider.GetMessage(info.Description) + "\n\n", descriptionLabel.Bounds.Width, descriptionFont);
var height = descriptionFont.Measure(text).Y; var height = descriptionFont.Measure(text).Y;
descriptionLabel.GetText = () => text; descriptionLabel.GetText = () => text;