diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/DropPodsPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/DropPodsPower.cs index cd709e2b13..e74a28e921 100644 --- a/OpenRA.Mods.Cnc/Traits/SupportPowers/DropPodsPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/DropPodsPower.cs @@ -40,7 +40,7 @@ namespace OpenRA.Mods.Cnc.Traits public readonly string EntryEffect = "podring"; [Desc("Effect sequence to display in the air.")] - [SequenceReference("Effect")] + [SequenceReference("EntryEffect")] public readonly string EntryEffectSequence = "idle"; [PaletteReference] diff --git a/OpenRA.Mods.Common/Traits/GainsExperience.cs b/OpenRA.Mods.Common/Traits/GainsExperience.cs index 7e177709db..149a09a8fb 100644 --- a/OpenRA.Mods.Common/Traits/GainsExperience.cs +++ b/OpenRA.Mods.Common/Traits/GainsExperience.cs @@ -32,8 +32,8 @@ namespace OpenRA.Mods.Common.Traits [Desc("Image for the level up sprite.")] public readonly string LevelUpImage = null; - [SequenceReference("Image")] - [Desc("Sequence for the level up sprite. Needs to be present on Image.")] + [SequenceReference("LevelUpImage")] + [Desc("Sequence for the level up sprite. Needs to be present on LevelUpImage.")] public readonly string LevelUpSequence = "levelup"; [PaletteReference] diff --git a/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs b/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs index fe54c38460..814c95a185 100644 --- a/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs +++ b/OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs @@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Chance (out of 100) the unit has to enter panic mode when attacking.")] public readonly int AttackPanicChance = 20; - [SequenceReference(null, true)] + [SequenceReference(prefix: true)] public readonly string PanicSequencePrefix = "panic-"; public override object Create(ActorInitializer init) { return new ScaredyCat(init.Self, this); } diff --git a/OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs b/OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs index 0af1bb351c..de47497494 100644 --- a/OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs +++ b/OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs @@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Muzzle offset modifier to apply while prone.")] public readonly WVec ProneOffset = new WVec(500, 0, 0); - [SequenceReference(null, true)] + [SequenceReference(prefix: true)] [Desc("Sequence prefix to apply while prone.")] public readonly string ProneSequencePrefix = "prone-"; diff --git a/OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs b/OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs index e4f887fcb1..744130990b 100644 --- a/OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs +++ b/OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs @@ -20,6 +20,7 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("Renders a sprite effect when leaving a cell.")] public class LeavesTrailsInfo : ConditionalTraitInfo { + [FieldLoader.Require] public readonly string Image = null; [SequenceReference("Image")] diff --git a/OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs index 2bbda9e378..7c6ff20e1c 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithDeathAnimation.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("This actor has a death animation.")] public class WithDeathAnimationInfo : ConditionalTraitInfo, Requires { - [SequenceReference(null, true)] + [SequenceReference(prefix: true)] [Desc("Sequence prefix to play when this actor is killed by a warhead.")] public readonly string DeathSequence = "die"; diff --git a/OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs index a4717f5c07..26c3578dac 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithRepairOverlay.cs @@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("Displays an overlay when the building is being repaired by the player.")] public class WithRepairOverlayInfo : PausableConditionalTraitInfo, Requires, Requires { - [SequenceReference("Image")] + [SequenceReference] [Desc("Sequence to use upon repair beginning.")] public readonly string StartSequence = null; @@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("Sequence name to play once during repair intervals or repeatedly if a start sequence is set.")] public readonly string Sequence = "active"; - [SequenceReference("Image")] + [SequenceReference] [Desc("Sequence to use after repairing has finished.")] public readonly string EndSequence = null;