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

Add order voice to GrantConditionOnDeploy.

Browse Source
This commit is contained in:
tovl
2019-04-21 21:12:53 +02:00
committed by reaperrr
parent 9419d1b924
commit 8e91a1ba89
5 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeploy.cs
View File

@@ -54,13 +54,15 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Skip make/deploy animation?")] [Desc("Skip make/deploy animation?")]
public readonly bool SkipMakeAnimation = false; public readonly bool SkipMakeAnimation = false;
[VoiceReference] public readonly string Voice = "Action";
public override object Create(ActorInitializer init) { return new GrantConditionOnDeploy(init, this); } public override object Create(ActorInitializer init) { return new GrantConditionOnDeploy(init, this); }
} }
public enum DeployState { Undeployed, Deploying, Deployed, Undeploying } public enum DeployState { Undeployed, Deploying, Deployed, Undeploying }
public class GrantConditionOnDeploy : PausableConditionalTrait<GrantConditionOnDeployInfo>, IResolveOrder, IIssueOrder, INotifyCreated, public class GrantConditionOnDeploy : PausableConditionalTrait<GrantConditionOnDeployInfo>, IResolveOrder, IIssueOrder, INotifyCreated,
INotifyDeployComplete, IIssueDeployOrder INotifyDeployComplete, IIssueDeployOrder, IOrderVoice
{ {
readonly Actor self; readonly Actor self;
readonly bool checkTerrainType; readonly bool checkTerrainType;
@@ -157,6 +159,11 @@ namespace OpenRA.Mods.Common.Traits
self.QueueActivity(new DeployForGrantedCondition(self, this)); self.QueueActivity(new DeployForGrantedCondition(self, this));
} }
public string VoicePhraseForOrder(Actor self, Order order)
{
return order.OrderString == "GrantConditionOnDeploy" ? Info.Voice : null;
}
bool IsCursorBlocked() bool IsCursorBlocked()
{ {
if (IsTraitPaused) if (IsTraitPaused)

2
OpenRA.Mods.Common/Traits/Transforms.cs
View File

@@ -71,7 +71,7 @@ namespace OpenRA.Mods.Common.Traits
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
{ {
return (order.OrderString == "DeployTransform") ? Info.Voice : null; return order.OrderString == "DeployTransform" ? Info.Voice : null;
} }
public bool CanDeploy() public bool CanDeploy()

1
mods/ts/rules/gdi-vehicles.yaml
View File

@@ -355,6 +355,7 @@ JUGG:
AllowedTerrainTypes: Clear, Road, DirtRoad, Rough AllowedTerrainTypes: Clear, Road, DirtRoad, Rough
DeploySounds: place2.aud DeploySounds: place2.aud
UndeploySounds: clicky1.aud UndeploySounds: clicky1.aud
Voice: Move
GrantCondition@PREVIEWWORKAROUND: GrantCondition@PREVIEWWORKAROUND:
Condition: real-actor Condition: real-actor
QuantizeFacingsFromSequence: QuantizeFacingsFromSequence:

2
mods/ts/rules/nod-vehicles.yaml
View File

@@ -139,6 +139,7 @@ TTNK:
AllowedTerrainTypes: Clear, Road, DirtRoad, Rough AllowedTerrainTypes: Clear, Road, DirtRoad, Rough
DeploySounds: place2.aud DeploySounds: place2.aud
UndeploySounds: clicky1.aud UndeploySounds: clicky1.aud
Voice: Move
GrantCondition@PREVIEWWORKAROUND: GrantCondition@PREVIEWWORKAROUND:
Condition: real-actor Condition: real-actor
WithVoxelBody: WithVoxelBody:
@@ -244,6 +245,7 @@ ART2:
AllowedTerrainTypes: Clear, Road, DirtRoad, Rough AllowedTerrainTypes: Clear, Road, DirtRoad, Rough
DeploySounds: place2.aud DeploySounds: place2.aud
UndeploySounds: clicky1.aud UndeploySounds: clicky1.aud
Voice: Move
GrantCondition@PREVIEWWORKAROUND: GrantCondition@PREVIEWWORKAROUND:
Condition: real-actor Condition: real-actor
WithVoxelBody: WithVoxelBody:

1
mods/ts/rules/shared-vehicles.yaml
View File

@@ -152,6 +152,7 @@ LPST:
AllowedTerrainTypes: Clear, Road, DirtRoad, Rough AllowedTerrainTypes: Clear, Road, DirtRoad, Rough
DeploySounds: place2.aud DeploySounds: place2.aud
UndeploySounds: clicky1.aud UndeploySounds: clicky1.aud
Voice: Move
WithVoxelBody: WithVoxelBody:
RequiresCondition: undeployed RequiresCondition: undeployed
WithSpriteBody@deployed: WithSpriteBody@deployed: