From b792e3eecfc11938d98b83d02682486988fdf0d0 Mon Sep 17 00:00:00 2001 From: atlimit8 Date: Sun, 20 Apr 2025 08:10:11 -0500 Subject: [PATCH] add update rule for replacing BaseAttackNotifier --- .../20250330/ReplaceBaseAttackNotitifer.cs | 63 +++++++++++++++++++ OpenRA.Mods.Common/UpdateRules/UpdatePath.cs | 11 ++-- 2 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 OpenRA.Mods.Common/UpdateRules/Rules/20250330/ReplaceBaseAttackNotitifer.cs diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/20250330/ReplaceBaseAttackNotitifer.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20250330/ReplaceBaseAttackNotitifer.cs new file mode 100644 index 0000000000..7329f392cc --- /dev/null +++ b/OpenRA.Mods.Common/UpdateRules/Rules/20250330/ReplaceBaseAttackNotitifer.cs @@ -0,0 +1,63 @@ +#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; + +namespace OpenRA.Mods.Common.UpdateRules.Rules +{ + /// + /// Replaces the BaseAttackNotifier with a new AttackNotifier that uses the + /// new attack system. + /// + public class ReplaceBaseAttackNotifier : UpdateRule, IBeforeUpdateActors + { + public override string Name => "Replace BaseAttackNotifier with DamageNotifier"; + public override string Description => "Replaces the BaseAttackNotifier with a new DamageNotifier that uses BaseBuilding target type."; + + bool any = false; + readonly HashSet definedNotifications = []; + + IEnumerable IBeforeUpdateActors.BeforeUpdateActors(ModData modData, List resolvedActors) + { + any = false; + foreach (var actor in resolvedActors) + foreach (var notifier in actor.ChildrenMatching("BaseAttackNotifier")) + if (notifier.LastChildMatching("Notification", false) != null) + definedNotifications.Add(actor.Key + ":" + notifier.Key); + + yield break; + } + + public override IEnumerable UpdateActorNode(ModData modData, MiniYamlNodeBuilder actorNode) + { + foreach (var notifier in actorNode.ChildrenMatching("BaseAttackNotifier")) + { + any = true; + notifier.AddNode("ValidTargets", "BaseBuilding"); + if (!definedNotifications.Contains(actorNode.Key + ":" + notifier.Key)) + notifier.AddNode("Notification", "BaseAttack"); + + notifier.RenameKey("DamageNotifier"); + } + + yield break; + } + + public override IEnumerable AfterUpdate(ModData modData) + { + if (!any) + yield break; + + yield return "BaseAttackNotifier has been replaced by DamageNotifier with ValidTargets: BaseBuilding" + + "\nPlease replace the target type or add it to actor types as needed."; + } + } +} diff --git a/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs b/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs index f171be8f7d..efc8a5bd4c 100644 --- a/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs +++ b/OpenRA.Mods.Common/UpdateRules/UpdatePath.cs @@ -78,10 +78,7 @@ namespace OpenRA.Mods.Common.UpdateRules new RemoveNegativeSequenceLength(), ]), - new("release-20231010", - [ - - // bleed only changes here. + new("release-20231010", "release-20250303", [ new RemoveValidRelationsFromCapturable(), new ExtractResourceStorageFromHarvester(), new ReplacePaletteModifiers(), @@ -98,6 +95,12 @@ namespace OpenRA.Mods.Common.UpdateRules new ReplaceCloakPalette(), new AbstractDocking(), ]), + new("release-20250303", "release-20250330", []), + new("release-20250330", [ + + // bleed only changes here. + new ReplaceBaseAttackNotifier(), + ]), ]; public static IReadOnlyCollection FromSource(ObjectCreator objectCreator, string source, bool chain = true)