From cf944ae9f17e1fffce32b650afa6bf874bf8d6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 12 Sep 2017 20:52:45 +0200 Subject: [PATCH] Require IntoActor everywhere. --- OpenRA.Mods.Common/Traits/TransformOnCapture.cs | 3 ++- mods/ra/maps/monster-tank-madness/rules.yaml | 2 ++ mods/ra/rules/husks.yaml | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/TransformOnCapture.cs b/OpenRA.Mods.Common/Traits/TransformOnCapture.cs index df762dc5ac..95221faa8c 100644 --- a/OpenRA.Mods.Common/Traits/TransformOnCapture.cs +++ b/OpenRA.Mods.Common/Traits/TransformOnCapture.cs @@ -16,9 +16,10 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { + [Desc("Replaces the captured actor with a new one.")] public class TransformOnCaptureInfo : ITraitInfo { - [ActorReference] public readonly string IntoActor = null; + [ActorReference, FieldLoader.Require] public readonly string IntoActor = null; public readonly int ForceHealthPercentage = 0; public readonly bool SkipMakeAnims = true; diff --git a/mods/ra/maps/monster-tank-madness/rules.yaml b/mods/ra/maps/monster-tank-madness/rules.yaml index 0c953feb89..249475f6d9 100644 --- a/mods/ra/maps/monster-tank-madness/rules.yaml +++ b/mods/ra/maps/monster-tank-madness/rules.yaml @@ -184,6 +184,8 @@ PBOX: HP: 200000 RenderSprites: Image: 4TNK + -Capturable: + -TransformOnCapture: DOME.NoInfiltrate: Inherits: DOME diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml index 856d520ab5..db4d1c3163 100644 --- a/mods/ra/rules/husks.yaml +++ b/mods/ra/rules/husks.yaml @@ -110,6 +110,8 @@ TRAN.Husk1: Name: Husk (Chinook) RenderSprites: Image: tran1husk + -Capturable: + -TransformOnCapture: TRAN.Husk2: Inherits: ^Husk @@ -117,6 +119,8 @@ TRAN.Husk2: Name: Husk (Chinook) RenderSprites: Image: tran2husk + -Capturable: + -TransformOnCapture: BADR.Husk: Inherits: ^PlaneHusk