epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace AnnounceOnBuild with VoiceAnnouncement.

Browse Source
This commit is contained in:
Paul Chote
2018-10-27 13:57:07 +00:00
committed by abcdefg30
parent 78a2d9aa23
commit 1b9f23eca0
6 changed files with 77 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -509,7 +509,7 @@
<Compile Include="Traits\SmokeTrailWhenDamaged.cs" />
<Compile Include="Traits\Sound\ActorLostNotification.cs" />
<Compile Include="Traits\Sound\AmbientSound.cs" />
<Compile Include="Traits\Sound\AnnounceOnBuild.cs" />
<Compile Include="Traits\Sound\VoiceAnnouncement.cs" />
<Compile Include="Traits\Sound\AnnounceOnKill.cs" />
<Compile Include="Traits\Sound\AnnounceOnSeen.cs" />
<Compile Include="Traits\Sound\CaptureNotification.cs" />

52
OpenRA.Mods.Common/Traits/Sound/AnnounceOnBuild.cs
View File

@@ -1,52 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
* 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 OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits.Sound
{
[Desc("Play the Build voice of this actor when trained.")]
public class AnnounceOnBuildInfo : ITraitInfo
{
[Desc("Voice to use when built/trained.")]
[VoiceReference] public readonly string Voice = "Build";
[Desc("Player stances who can hear this voice.")]
public readonly Stance ValidStances = Stance.Ally | Stance.Neutral | Stance.Enemy;
[Desc("Play the voice to the owning player even if Stance.Ally is not included in ValidStances")]
public readonly bool PlayToOwner = true;
public object Create(ActorInitializer init) { return new AnnounceOnBuild(init.Self, this); }
}
public class AnnounceOnBuild : INotifyBuildComplete
{
readonly AnnounceOnBuildInfo info;
public AnnounceOnBuild(Actor self, AnnounceOnBuildInfo info)
{
this.info = info;
}
void INotifyBuildComplete.BuildingComplete(Actor self)
{
var player = self.World.LocalPlayer ?? self.World.RenderPlayer;
if (player == null)
return;
if (info.ValidStances.HasStance(self.Owner.Stances[player]))
self.PlayVoice(info.Voice);
else if (info.PlayToOwner && self.Owner == player)
self.PlayVoice(info.Voice);
}
}
}

61
OpenRA.Mods.Common/Traits/Sound/VoiceAnnouncement.cs Normal file
View File

@@ -0,0 +1,61 @@
#region Copyright & License Information
/*
* Copyright 2007-2018 The OpenRA Developers (see AUTHORS)
* 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 OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits.Sound
{
[Desc("Plays a voice clip when the trait is enabled.")]
public class VoiceAnnouncementInfo : ConditionalTraitInfo
{
[FieldLoader.Require]
[Desc("Voice to play.")]
[VoiceReference] public readonly string Voice = null;
[Desc("Player stances who can hear this voice.")]
public readonly Stance ValidStances = Stance.Ally | Stance.Neutral | Stance.Enemy;
[Desc("Play the voice to the owning player even if Stance.Ally is not included in ValidStances.")]
public readonly bool PlayToOwner = true;
[Desc("Disable the announcement after it has been triggered.")]
public readonly bool OneShot = false;
public override object Create(ActorInitializer init) { return new VoiceAnnouncement(this); }
}
public class VoiceAnnouncement : ConditionalTrait<VoiceAnnouncementInfo>
{
bool triggered;
public VoiceAnnouncement(VoiceAnnouncementInfo info)
: base(info) { }
protected override void TraitEnabled(Actor self)
{
if (IsTraitDisabled)
return;
if (Info.OneShot && triggered)
return;
triggered = true;
var player = self.World.LocalPlayer ?? self.World.RenderPlayer;
if (player == null)
return;
if (Info.ValidStances.HasStance(self.Owner.Stances[player]))
self.PlayVoice(Info.Voice);
else if (Info.PlayToOwner && self.Owner == player)
self.PlayVoice(Info.Voice);
}
}
}

13
OpenRA.Mods.Common/UpdateRules/Rules/20180923/RemovedNotifyBuildComplete.cs
View File

@@ -16,13 +16,14 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
{
public class RemovedNotifyBuildComplete : UpdateRule
{
public override string Name { get { return "Render traits are no longer automatically disabled during Building make-animations"; } }
public override string Name { get { return "Traits are no longer automatically disabled during Building make-animations"; } }
public override string Description
{
get
{
return "Traits are no longer force-disabled while the WithMakeAnimation trait is active.\n" +
"This affects the With*Animation, With*Overlay, Gate, and ConyardChronoReturn traits.\n" +
"The AnnounceOnBuild trait has been replaced with a new VoiceAnnouncement trait.\n" +
"Affected actors are listed so that conditions may be manually defined.";
}
}
@@ -52,7 +53,8 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
"WithCrumbleOverlay",
"WithDeliveryOverlay",
"Gate",
"ConyardChronoReturn"
"ConyardChronoReturn",
"VoiceAnnouncement"
};
readonly Dictionary<string, List<string>> locations = new Dictionary<string, List<string>>();
@@ -70,6 +72,13 @@ namespace OpenRA.Mods.Common.UpdateRules.Rules
public override IEnumerable<string> UpdateActorNode(ModData modData, MiniYamlNode actorNode)
{
foreach (var announce in actorNode.ChildrenMatching("AnnounceOnBuild"))
{
announce.RenameKey("VoiceAnnouncement");
if (announce.LastChildMatching("Voice") == null)
announce.AddNode("Voice", "Build");
}
var used = new List<string>();
foreach (var t in Traits)
if (actorNode.LastChildMatching(t) != null)

3
mods/cnc/rules/infantry.yaml
View File

@@ -227,7 +227,8 @@ RMBO:
WithInfantryBody:
DefaultAttackSequence: shoot
IdleSequences: idle1,idle2,idle3
AnnounceOnBuild:
VoiceAnnouncement:
Voice: Build
AnnounceOnKill:
Voiced:
VoiceSet: CommandoVoice

3
mods/ra/rules/infantry.yaml
View File

@@ -371,7 +371,8 @@ E7:
WithInfantryBody:
DefaultAttackSequence: shoot
StandSequences: stand
AnnounceOnBuild:
VoiceAnnouncement:
Voice: Build
AnnounceOnKill:
DetectCloaked:
CloakTypes: Cloak, Hijacker