diff --git a/OpenRA.Mods.Cnc/Projectiles/TeslaZap.cs b/OpenRA.Mods.Cnc/Projectiles/TeslaZap.cs index c15e5ac269..b53257fcb6 100644 --- a/OpenRA.Mods.Cnc/Projectiles/TeslaZap.cs +++ b/OpenRA.Mods.Cnc/Projectiles/TeslaZap.cs @@ -21,10 +21,10 @@ namespace OpenRA.Mods.Cnc.Projectiles { public readonly string Image = "litning"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] public readonly string BrightSequence = "bright"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] public readonly string DimSequence = "dim"; [PaletteReference] diff --git a/OpenRA.Mods.Cnc/Traits/GpsDot.cs b/OpenRA.Mods.Cnc/Traits/GpsDot.cs index 8253e4434a..e825482d65 100644 --- a/OpenRA.Mods.Cnc/Traits/GpsDot.cs +++ b/OpenRA.Mods.Cnc/Traits/GpsDot.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.Cnc.Traits [Desc("Sprite collection for symbols.")] public readonly string Image = "gpsdot"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sprite used for this actor.")] public readonly string String = "Infantry"; diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs index 9ed724cd96..db8a113213 100644 --- a/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs @@ -37,13 +37,13 @@ namespace OpenRA.Mods.Cnc.Traits public readonly string FootprintImage = "overlay"; - [SequenceReference("FootprintImage", prefix: true)] + [SequenceReference(nameof(FootprintImage), prefix: true)] public readonly string ValidFootprintSequence = "target-valid"; - [SequenceReference("FootprintImage")] + [SequenceReference(nameof(FootprintImage))] public readonly string InvalidFootprintSequence = "target-invalid"; - [SequenceReference("FootprintImage")] + [SequenceReference(nameof(FootprintImage))] public readonly string SourceFootprintSequence = "target-select"; public readonly bool KillCargo = true; diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/DropPodsPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/DropPodsPower.cs index e74a28e921..ca15dba5db 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("EntryEffect")] + [SequenceReference(nameof(EntryEffect))] public readonly string EntryEffectSequence = "idle"; [PaletteReference] diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/GpsPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/GpsPower.cs index 3365477bc8..e2da6d75e2 100644 --- a/OpenRA.Mods.Cnc/Traits/SupportPowers/GpsPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/GpsPower.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.Cnc.Traits public readonly string DoorImage = "atek"; - [SequenceReference("DoorImage")] + [SequenceReference(nameof(DoorImage))] public readonly string DoorSequence = "active"; [PaletteReference(nameof(DoorPaletteIsPlayerPalette))] @@ -37,7 +37,7 @@ namespace OpenRA.Mods.Cnc.Traits public readonly string SatelliteImage = "sputnik"; - [SequenceReference("SatelliteImage")] + [SequenceReference(nameof(SatelliteImage))] public readonly string SatelliteSequence = "idle"; [PaletteReference(nameof(SatellitePaletteIsPlayerPalette))] diff --git a/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs b/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs index 58a0cd213c..909b90fb10 100644 --- a/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs +++ b/OpenRA.Mods.Cnc/Traits/SupportPowers/IonCannonPower.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.Cnc.Traits [Desc("Effect sequence sprite image")] public readonly string Effect = "ionsfx"; - [SequenceReference("Effect")] + [SequenceReference(nameof(Effect))] [Desc("Effect sequence to display")] public readonly string EffectSequence = "idle"; diff --git a/OpenRA.Mods.Common/Projectiles/Bullet.cs b/OpenRA.Mods.Common/Projectiles/Bullet.cs index f248d883ca..27f610b5d6 100644 --- a/OpenRA.Mods.Common/Projectiles/Bullet.cs +++ b/OpenRA.Mods.Common/Projectiles/Bullet.cs @@ -36,7 +36,7 @@ namespace OpenRA.Mods.Common.Projectiles [Desc("Image to display.")] public readonly string Image = null; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Loop a randomly chosen sequence of Image from this list while this projectile is moving.")] public readonly string[] Sequences = { "idle" }; @@ -57,7 +57,7 @@ namespace OpenRA.Mods.Common.Projectiles [Desc("Trail animation.")] public readonly string TrailImage = null; - [SequenceReference("TrailImage", allowNullImage: true)] + [SequenceReference(nameof(TrailImage), allowNullImage: true)] [Desc("Loop a randomly chosen sequence of TrailImage from this list while this projectile is moving.")] public readonly string[] TrailSequences = { "idle" }; diff --git a/OpenRA.Mods.Common/Projectiles/GravityBomb.cs b/OpenRA.Mods.Common/Projectiles/GravityBomb.cs index c8b362f5f7..2280d2ccd9 100644 --- a/OpenRA.Mods.Common/Projectiles/GravityBomb.cs +++ b/OpenRA.Mods.Common/Projectiles/GravityBomb.cs @@ -20,11 +20,11 @@ namespace OpenRA.Mods.Common.Projectiles { public readonly string Image = null; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Loop a randomly chosen sequence of Image from this list while falling.")] public readonly string[] Sequences = { "idle" }; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Sequence to play when launched. Skipped if null or empty.")] public readonly string OpenSequence = null; diff --git a/OpenRA.Mods.Common/Projectiles/LaserZap.cs b/OpenRA.Mods.Common/Projectiles/LaserZap.cs index d6bb100332..d6cf8cd707 100644 --- a/OpenRA.Mods.Common/Projectiles/LaserZap.cs +++ b/OpenRA.Mods.Common/Projectiles/LaserZap.cs @@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Projectiles [Desc("Impact animation.")] public readonly string HitAnim = null; - [SequenceReference("HitAnim", allowNullImage: true)] + [SequenceReference(nameof(HitAnim), allowNullImage: true)] [Desc("Sequence of impact animation to use.")] public readonly string HitAnimSequence = "idle"; @@ -88,7 +88,7 @@ namespace OpenRA.Mods.Common.Projectiles [Desc("Image containing launch effect sequence.")] public readonly string LaunchEffectImage = null; - [SequenceReference("LaunchEffectImage", allowNullImage: true)] + [SequenceReference(nameof(LaunchEffectImage), allowNullImage: true)] [Desc("Launch effect sequence to play.")] public readonly string LaunchEffectSequence = null; diff --git a/OpenRA.Mods.Common/Projectiles/Missile.cs b/OpenRA.Mods.Common/Projectiles/Missile.cs index e3ec9285e8..44993dc2fc 100644 --- a/OpenRA.Mods.Common/Projectiles/Missile.cs +++ b/OpenRA.Mods.Common/Projectiles/Missile.cs @@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Projectiles [Desc("Name of the image containing the projectile sequence.")] public readonly string Image = null; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Loop a randomly chosen sequence of Image from this list while this projectile is moving.")] public readonly string[] Sequences = { "idle" }; @@ -109,7 +109,7 @@ namespace OpenRA.Mods.Common.Projectiles [Desc("Image that contains the trail animation.")] public readonly string TrailImage = null; - [SequenceReference("TrailImage", allowNullImage: true)] + [SequenceReference(nameof(TrailImage), allowNullImage: true)] [Desc("Loop a randomly chosen sequence of TrailImage from this list while this projectile is moving.")] public readonly string[] TrailSequences = { "idle" }; diff --git a/OpenRA.Mods.Common/Projectiles/Railgun.cs b/OpenRA.Mods.Common/Projectiles/Railgun.cs index e5db4cb73d..d0227b0925 100644 --- a/OpenRA.Mods.Common/Projectiles/Railgun.cs +++ b/OpenRA.Mods.Common/Projectiles/Railgun.cs @@ -87,7 +87,7 @@ namespace OpenRA.Mods.Common.Projectiles public readonly string HitAnim = null; [Desc("Sequence of impact animation to use.")] - [SequenceReference("HitAnim", allowNullImage: true)] + [SequenceReference(nameof(HitAnim), allowNullImage: true)] public readonly string HitAnimSequence = "idle"; [PaletteReference] diff --git a/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs b/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs index 5613c570e5..b3f1915738 100644 --- a/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs +++ b/OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs @@ -24,10 +24,10 @@ namespace OpenRA.Mods.Common.Traits [Desc("Width (in pixels) of the rallypoint line.")] public readonly int LineWidth = 1; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] public readonly string FlagSequence = "flag"; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] public readonly string CirclesSequence = "circles"; [Desc("Cursor to display when rally point can be set.")] diff --git a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnSubterraneanLayer.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnSubterraneanLayer.cs index b3fa468ea0..058f4c7941 100644 --- a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnSubterraneanLayer.cs +++ b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnSubterraneanLayer.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Dig animation image to play when transitioning.")] public readonly string SubterraneanTransitionImage = null; - [SequenceReference("SubterraneanTransitionImage")] + [SequenceReference(nameof(SubterraneanTransitionImage))] [Desc("Dig animation sequence to play when transitioning.")] public readonly string SubterraneanTransitionSequence = null; diff --git a/OpenRA.Mods.Common/Traits/Crates/CrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/CrateAction.cs index 6d1581bff2..8054ef3be0 100644 --- a/OpenRA.Mods.Common/Traits/Crates/CrateAction.cs +++ b/OpenRA.Mods.Common/Traits/Crates/CrateAction.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Image containing the crate effect animation sequence.")] public readonly string Image = "crate-effects"; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Animation sequence played when collected. Leave empty for no effect.")] public readonly string Sequence = null; diff --git a/OpenRA.Mods.Common/Traits/GainsExperience.cs b/OpenRA.Mods.Common/Traits/GainsExperience.cs index 875d862eb5..18e1dbd5c9 100644 --- a/OpenRA.Mods.Common/Traits/GainsExperience.cs +++ b/OpenRA.Mods.Common/Traits/GainsExperience.cs @@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Image for the level up sprite.")] public readonly string LevelUpImage = null; - [SequenceReference("LevelUpImage", allowNullImage: true)] + [SequenceReference(nameof(LevelUpImage), allowNullImage: true)] [Desc("Sequence for the level up sprite. Needs to be present on LevelUpImage.")] public readonly string LevelUpSequence = "levelup"; diff --git a/OpenRA.Mods.Common/Traits/Parachutable.cs b/OpenRA.Mods.Common/Traits/Parachutable.cs index cbc43a8f82..82b70eef21 100644 --- a/OpenRA.Mods.Common/Traits/Parachutable.cs +++ b/OpenRA.Mods.Common/Traits/Parachutable.cs @@ -29,7 +29,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Image where Ground/WaterCorpseSequence is looked up.")] public readonly string Image = "explosion"; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] public readonly string GroundCorpseSequence = null; [PaletteReference] @@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.Traits public readonly string GroundImpactSound = null; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] public readonly string WaterCorpseSequence = null; [PaletteReference] diff --git a/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs b/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs index e2065a3de9..44f57ed710 100644 --- a/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs +++ b/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs @@ -31,13 +31,13 @@ namespace OpenRA.Mods.Common.Traits public readonly string BeaconImage = "beacon"; - [SequenceReference("BeaconImage")] + [SequenceReference(nameof(BeaconImage))] public readonly string BeaconSequence = null; - [SequenceReference("BeaconImage")] + [SequenceReference(nameof(BeaconImage))] public readonly string ArrowSequence = "arrow"; - [SequenceReference("BeaconImage")] + [SequenceReference(nameof(BeaconImage))] public readonly string CircleSequence = "circles"; public override object Create(ActorInitializer init) { return new PlaceBeacon(init.Self, this); } diff --git a/OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs b/OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs index 744130990b..5bf1ed5964 100644 --- a/OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs +++ b/OpenRA.Mods.Common/Traits/Render/LeavesTrails.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits.Render [FieldLoader.Require] public readonly string Image = null; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] public readonly string[] Sequences = { "idle" }; [PaletteReference] diff --git a/OpenRA.Mods.Common/Traits/Render/VeteranProductionIconOverlay.cs b/OpenRA.Mods.Common/Traits/Render/VeteranProductionIconOverlay.cs index 1a833da2ef..4cc1d24af7 100644 --- a/OpenRA.Mods.Common/Traits/Render/VeteranProductionIconOverlay.cs +++ b/OpenRA.Mods.Common/Traits/Render/VeteranProductionIconOverlay.cs @@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("Image used for the overlay.")] public readonly string Image = null; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence used for the overlay (cannot be animated).")] public readonly string Sequence = null; diff --git a/OpenRA.Mods.Common/Traits/Render/WithAmmoPipsDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithAmmoPipsDecoration.cs index cfd40c322e..31149f9bee 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithAmmoPipsDecoration.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithAmmoPipsDecoration.cs @@ -27,11 +27,11 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("Image that defines the pip sequences.")] public readonly string Image = "pips"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence used for empty pips.")] public readonly string EmptySequence = "pip-empty"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence used for full pips.")] public readonly string FullSequence = "pip-green"; diff --git a/OpenRA.Mods.Common/Traits/Render/WithCargoPipsDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithCargoPipsDecoration.cs index a7e95e4126..757eb4c8f0 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithCargoPipsDecoration.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithCargoPipsDecoration.cs @@ -26,15 +26,15 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("Image that defines the pip sequences.")] public readonly string Image = "pips"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence used for empty pips.")] public readonly string EmptySequence = "pip-empty"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence used for full pips that aren't defined in CustomPipSequences.")] public readonly string FullSequence = "pip-green"; - [SequenceReference("Image", dictionaryReference: LintDictionaryReference.Values)] + [SequenceReference(nameof(Image), dictionaryReference: LintDictionaryReference.Values)] [Desc("Pip sequence to use for specific passenger actors.")] public readonly Dictionary CustomPipSequences = new Dictionary(); diff --git a/OpenRA.Mods.Common/Traits/Render/WithDamageOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithDamageOverlay.cs index de1eec68ee..ff37fc5bca 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithDamageOverlay.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithDamageOverlay.cs @@ -20,13 +20,13 @@ namespace OpenRA.Mods.Common.Traits.Render { public readonly string Image = "smoke_m"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] public readonly string IdleSequence = "idle"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] public readonly string LoopSequence = "loop"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] public readonly string EndSequence = "end"; [PaletteReference(nameof(IsPlayerPalette))] diff --git a/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs index 80c04e8629..2a60dcf72a 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithDecoration.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.Common.Traits.Render public readonly string Image = null; [FieldLoader.Require] - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Sequence used for this decoration (can be animated).")] public readonly string Sequence = null; diff --git a/OpenRA.Mods.Common/Traits/Render/WithHarvesterPipsDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithHarvesterPipsDecoration.cs index 6f707d323a..f473830f69 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithHarvesterPipsDecoration.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithHarvesterPipsDecoration.cs @@ -27,15 +27,15 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("Image that defines the pip sequences.")] public readonly string Image = "pips"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence used for empty pips.")] public readonly string EmptySequence = "pip-empty"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence used for full pips that aren't defined in ResourceSequences.")] public readonly string FullSequence = "pip-green"; - [SequenceReference("Image", dictionaryReference: LintDictionaryReference.Values)] + [SequenceReference(nameof(Image), dictionaryReference: LintDictionaryReference.Values)] [Desc("Pip sequence to use for specific resource types.")] public readonly Dictionary ResourceSequences = new Dictionary(); diff --git a/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs index 5452b2b533..4c97469060 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs @@ -23,11 +23,11 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("Image used for this decoration. Defaults to the actor's type.")] public readonly string Image = null; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Animation to play when the actor is created.")] public readonly string StartSequence = null; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Sequence name to use")] public readonly string Sequence = "idle-overlay"; diff --git a/OpenRA.Mods.Common/Traits/Render/WithParachute.cs b/OpenRA.Mods.Common/Traits/Render/WithParachute.cs index 50f61e476a..7b0d36f212 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithParachute.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithParachute.cs @@ -25,15 +25,15 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("The image that contains the parachute sequences.")] public readonly string Image = null; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Parachute opening sequence.")] public readonly string OpeningSequence = null; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Parachute idle sequence.")] public readonly string Sequence = null; - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("Parachute closing sequence. Defaults to opening sequence played backwards.")] public readonly string ClosingSequence = null; @@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("The image that contains the shadow sequence for the paradropped unit.")] public readonly string ShadowImage = null; - [SequenceReference("ShadowImage", allowNullImage: true)] + [SequenceReference(nameof(ShadowImage), allowNullImage: true)] [Desc("Paradropped unit's shadow sequence.")] public readonly string ShadowSequence = null; diff --git a/OpenRA.Mods.Common/Traits/Render/WithResourceStoragePipsDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithResourceStoragePipsDecoration.cs index 95e0181723..adea5a5036 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithResourceStoragePipsDecoration.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithResourceStoragePipsDecoration.cs @@ -27,11 +27,11 @@ namespace OpenRA.Mods.Common.Traits.Render [Desc("Image that defines the pip sequences.")] public readonly string Image = "pips"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence used for empty pips.")] public readonly string EmptySequence = "pip-empty"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence used for full pips.")] public readonly string FullSequence = "pip-green"; diff --git a/OpenRA.Mods.Common/Traits/Render/WithSpriteControlGroupDecoration.cs b/OpenRA.Mods.Common/Traits/Render/WithSpriteControlGroupDecoration.cs index a88172d222..cc3cec3bbb 100644 --- a/OpenRA.Mods.Common/Traits/Render/WithSpriteControlGroupDecoration.cs +++ b/OpenRA.Mods.Common/Traits/Render/WithSpriteControlGroupDecoration.cs @@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Traits.Render public readonly string Image = "pips"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sprite sequence used to render the control group 0-9 numbers.")] public readonly string GroupSequence = "groups"; diff --git a/OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs b/OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs index 4349b6b8cb..98e60175cb 100644 --- a/OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs +++ b/OpenRA.Mods.Common/Traits/SmokeTrailWhenDamaged.cs @@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Traits public readonly string Sprite = "smokey"; - [SequenceReference("Sprite")] + [SequenceReference(nameof(Sprite))] public readonly string Sequence = "idle"; public readonly string Palette = "effect"; diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs index 9b72954bd0..dc427e93e4 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs @@ -27,11 +27,11 @@ namespace OpenRA.Mods.Common.Traits [Desc("Delay (in ticks) after launch until the missile is spawned.")] public readonly int MissileDelay = 0; - [SequenceReference("MissileWeapon")] + [SequenceReference(nameof(MissileWeapon))] [Desc("Sprite sequence for the ascending missile.")] public readonly string MissileUp = "up"; - [SequenceReference("MissileWeapon")] + [SequenceReference(nameof(MissileWeapon))] [Desc("Sprite sequence for the descending missile.")] public readonly string MissileDown = "down"; @@ -55,7 +55,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Trail animation.")] public readonly string TrailImage = null; - [SequenceReference("TrailImage", allowNullImage: true)] + [SequenceReference(nameof(TrailImage), allowNullImage: true)] [Desc("Loop a randomly chosen sequence of TrailImage from this list while this projectile is moving.")] public readonly string[] TrailSequences = { }; diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SpawnActorPower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SpawnActorPower.cs index a642366785..bc429356be 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/SpawnActorPower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/SpawnActorPower.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Traits public readonly string EffectImage = null; - [SequenceReference("EffectImage")] + [SequenceReference(nameof(EffectImage))] public readonly string EffectSequence = null; [PaletteReference] diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs index 8b8ea98da9..e9b44b2bed 100644 --- a/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs +++ b/OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs @@ -21,7 +21,7 @@ namespace OpenRA.Mods.Common.Traits public readonly string IconImage = "icon"; - [SequenceReference("IconImage")] + [SequenceReference(nameof(IconImage))] [Desc("Icon sprite displayed in the support power palette.")] public readonly string Icon = null; @@ -89,22 +89,22 @@ namespace OpenRA.Mods.Common.Traits public readonly string BeaconImage = "beacon"; - [SequenceReference("BeaconImage")] + [SequenceReference(nameof(BeaconImage))] public readonly string BeaconPoster = null; [PaletteReference] public readonly string BeaconPosterPalette = "chrome"; - [SequenceReference("BeaconImage")] + [SequenceReference(nameof(BeaconImage))] public readonly string ClockSequence = null; - [SequenceReference("BeaconImage")] + [SequenceReference(nameof(BeaconImage))] public readonly string BeaconSequence = null; - [SequenceReference("BeaconImage")] + [SequenceReference(nameof(BeaconImage))] public readonly string ArrowSequence = null; - [SequenceReference("BeaconImage")] + [SequenceReference(nameof(BeaconImage))] public readonly string CircleSequence = null; [Desc("Delay after launch, measured in ticks.")] diff --git a/OpenRA.Mods.Common/Traits/World/EditorSelectionLayer.cs b/OpenRA.Mods.Common/Traits/World/EditorSelectionLayer.cs index 71418061d1..6fe1fb3122 100644 --- a/OpenRA.Mods.Common/Traits/World/EditorSelectionLayer.cs +++ b/OpenRA.Mods.Common/Traits/World/EditorSelectionLayer.cs @@ -25,11 +25,11 @@ namespace OpenRA.Mods.Common.Traits [Desc("Sequence image where the selection overlay types are defined.")] public readonly string Image = "editor-overlay"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence to use for the copy overlay.")] public readonly string CopySequence = "copy"; - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Sequence to use for the paste overlay.")] public readonly string PasteSequence = "paste"; diff --git a/OpenRA.Mods.Common/Traits/World/ResourceType.cs b/OpenRA.Mods.Common/Traits/World/ResourceType.cs index 51fc8b23c7..e08bb0352a 100644 --- a/OpenRA.Mods.Common/Traits/World/ResourceType.cs +++ b/OpenRA.Mods.Common/Traits/World/ResourceType.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Traits public readonly string Image = "resources"; [FieldLoader.Require] - [SequenceReference("Image")] + [SequenceReference(nameof(Image))] [Desc("Randomly chosen image sequences.")] public readonly string[] Sequences = { }; diff --git a/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs index b9b2676fad..50c2e47cbb 100644 --- a/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs +++ b/OpenRA.Mods.Common/Traits/World/ShroudRenderer.cs @@ -21,10 +21,10 @@ namespace OpenRA.Mods.Common.Traits public class ShroudRendererInfo : TraitInfo { public readonly string Sequence = "shroud"; - [SequenceReference("Sequence")] + [SequenceReference(nameof(Sequence))] public readonly string[] ShroudVariants = { "shroud" }; - [SequenceReference("Sequence")] + [SequenceReference(nameof(Sequence))] public readonly string[] FogVariants = { "fog" }; [PaletteReference] @@ -40,13 +40,13 @@ namespace OpenRA.Mods.Common.Traits [Desc("Use the upper four bits when calculating frame")] public readonly bool UseExtendedIndex = false; - [SequenceReference("Sequence")] + [SequenceReference(nameof(Sequence))] [Desc("Override for source art that doesn't define a fully shrouded tile")] public readonly string OverrideFullShroud = null; public readonly int OverrideShroudIndex = 15; - [SequenceReference("Sequence")] + [SequenceReference(nameof(Sequence))] [Desc("Override for source art that doesn't define a fully fogged tile")] public readonly string OverrideFullFog = null; diff --git a/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs b/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs index a65a0f90b2..efa61a1e07 100644 --- a/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs +++ b/OpenRA.Mods.Common/Traits/World/SmudgeLayer.cs @@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Sprite sequence name")] public readonly string SmokeType = "smoke_m"; - [SequenceReference("SmokeType")] + [SequenceReference(nameof(SmokeType))] public readonly string SmokeSequence = "idle"; [PaletteReference] diff --git a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs index 0b49e5a002..a09419cce8 100644 --- a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs @@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Warheads { public class CreateEffectWarhead : Warhead { - [SequenceReference("Image", allowNullImage: true)] + [SequenceReference(nameof(Image), allowNullImage: true)] [Desc("List of explosion sequences that can be used.")] public readonly string[] Explosions = new string[0];