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

Remove PARENT_TOP and PARENT_LEFT from integer expressions for widgets

Browse Source 
PARENT_TOP and PARENT_LEFT should be 0 so they are not very useful substitutions. They are replaced with 0 or removed if that was the whole value for a field.
This commit is contained in:
Ivaylo Draganov
2024-10-03 17:43:16 +03:00
committed by Gustas
parent c0839d4521
commit a69ea79d83
5 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
OpenRA.Mods.Common/UpdateRules/Rules/20231010/RemoveParentTopParentLeftSubstitutions.cs Normal file
View File

@@ -0,0 +1,51 @@
#region Copyright & License Information
/*
* Copyright (c) The OpenRA Developers and Contributors
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Collections.Generic;
using System.Linq;
namespace OpenRA.Mods.Common.UpdateRules.Rules
{
public class RemoveParentTopParentLeftSubstitutions : UpdateRule
{
public override string Name => "Remove PARENT_TOP and PARENT_LEFT from integer expressions for widgets.";
public override string Description =>
"PARENT_TOP is replaced with 0 and PARENT_LEFT is replaced with 0 in integer expressions for width, hegiht and position.";
public override IEnumerable<string> UpdateChromeNode(ModData modData, MiniYamlNodeBuilder chromeNode)
{
var dimensionFields =
chromeNode.ChildrenMatching("Width")
.Concat(chromeNode.ChildrenMatching("Height"))
.Concat(chromeNode.ChildrenMatching("X"))
.Concat(chromeNode.ChildrenMatching("Y")).ToArray();
foreach (var field in dimensionFields)
{
if (field.Value.Value == "PARENT_TOP" || field.Value.Value == "PARENT_LEFT")
{
chromeNode.RemoveNode(field);
}
else if (field.Value.Value.Contains("PARENT_TOP"))
{
field.ReplaceValue(field.Value.Value.Replace("PARENT_TOP", "0"));
}
else if (field.Value.Value.Contains("PARENT_LEFT"))
{
field.ReplaceValue(field.Value.Value.Replace("PARENT_LEFT", "0"));
}
}
yield break;
}
}
}

1
OpenRA.Mods.Common/UpdateRules/UpdatePath.cs
View File

@@ -90,6 +90,7 @@ namespace OpenRA.Mods.Common.UpdateRules
new AddSupportPowerBlockedCursor(),
new MovePreviewFacing(),
new RenameOnDeath(),
new RemoveParentTopParentLeftSubstitutions(),
// Execute these rules last to avoid premature yaml merge crashes.
new ReplaceCloakPalette(),

2
OpenRA.Mods.Common/Widgets/Logic/Settings/DisplaySettingsLogic.cs
View File

@@ -520,8 +520,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
{ "WINDOW_RIGHT", Game.Renderer.Resolution.Width },
{ "WINDOW_BOTTOM", Game.Renderer.Resolution.Height },
{ "PARENT_RIGHT", parentBounds.Width },
{ "PARENT_LEFT", parentBounds.Left },
{ "PARENT_TOP", parentBounds.Top },
{ "PARENT_BOTTOM", parentBounds.Height }
};