diff --git a/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs b/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs index 77c71cfe24..3b9e954570 100644 --- a/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs +++ b/OpenRA.Mods.Cnc/Traits/Infiltration/Infiltrates.cs @@ -23,9 +23,10 @@ namespace OpenRA.Mods.Cnc.Traits { public class InfiltratesInfo : ConditionalTraitInfo { - public readonly BitSet Types; + public readonly BitSet Types = default(BitSet); - [VoiceReference] public readonly string Voice = "Action"; + [VoiceReference] + public readonly string Voice = "Action"; [Desc("What diplomatic stances can be infiltrated by this actor.")] public readonly Stance ValidStances = Stance.Neutral | Stance.Enemy; @@ -36,7 +37,7 @@ namespace OpenRA.Mods.Cnc.Traits [NotificationReference("Speech")] [Desc("Notification to play when a building is infiltrated.")] - public readonly string Notification = "BuildingInfiltrated"; + public readonly string Notification = null; [Desc("Experience to grant to the infiltrating player.")] public readonly int PlayerExperience = 0; diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/20180923/DefineNotificationDefaults.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20180923/DefineNotificationDefaults.cs index 56717105ae..d274a5a112 100644 --- a/OpenRA.Mods.Common/UpdateRules/Rules/20180923/DefineNotificationDefaults.cs +++ b/OpenRA.Mods.Common/UpdateRules/Rules/20180923/DefineNotificationDefaults.cs @@ -76,6 +76,9 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules }), new TraitWrapper("PowerManager", new Dictionary { { "SpeechNotification", "LowPower" } + }), + new TraitWrapper("Infiltrates", new Dictionary { + { "Notification", "BuildingInfiltrated" } }) }; diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 0fa7414fa2..7191108412 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -289,6 +289,7 @@ SPY: DisguisedCondition: disguise Infiltrates: Types: SpyInfiltrate + Notification: BuildingInfiltrated PlayerExperience: 50 AutoTarget: InitialStance: HoldFire @@ -525,6 +526,7 @@ THF: Passenger: PipType: Blue Infiltrates: + Notification: BuildingInfiltrated PlayerExperience: 50 Voiced: VoiceSet: ThiefVoice diff --git a/mods/ts/rules/civilian-infantry.yaml b/mods/ts/rules/civilian-infantry.yaml index cedde3fe75..0b6047673c 100644 --- a/mods/ts/rules/civilian-infantry.yaml +++ b/mods/ts/rules/civilian-infantry.yaml @@ -79,6 +79,7 @@ CHAMSPY: RequiresCondition: disguise Infiltrates: Types: SpyInfiltrate + Notification: BuildingInfiltrated -WithInfantryBody: WithDisguisingInfantryBody: IdleSequences: idle1,idle2