Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix several small inconsistencies with TS deployable units. #16431

Merged
merged 3 commits into from Apr 22, 2019

Conversation

@tovl
Copy link
Contributor

commented Apr 21, 2019

split from #16142.

Fixes #16420
Fixes #16422

These are some small fixes that where fixed along the way in #16142, but don't depend on any other changes in that PR. Since that PR will probably not be merged for a while, I'd hate for these to be wasted.

@matjaeck

This comment has been minimized.

Copy link
Contributor

commented Apr 22, 2019

Is it expected that the order voice plays when deploying tick tanks, artillery, etc? Because it doesn't.

@tovl tovl force-pushed the tovl:emp-deploy branch from 505ff4c to 36370e4 Apr 22, 2019

@tovl

This comment has been minimized.

Copy link
Contributor Author

commented Apr 22, 2019

Should be fixed now.

@pchote
Copy link
Member

left a comment

LGTM, just one minor code style nit.

Note that the GrantConditionOnDeploy change affects several units in other mods, but I consider these extra cases to be bugfixes - e.g. the MAD tank in RA would have an order voice (it was specifically implemented in the MADTank trait), but the demo truck did not.

@@ -157,6 +159,11 @@ public void ResolveOrder(Actor self, Order order)
self.QueueActivity(new DeployForGrantedCondition(self, this));
}

public string VoicePhraseForOrder(Actor self, Order order)
{
return (order.OrderString == "GrantConditionOnDeploy") ? Info.Voice : null;

This comment has been minimized.

Copy link
@pchote

pchote Apr 22, 2019

Member

Style nit: The parens aren't needed here.

This comment has been minimized.

Copy link
@tovl

tovl Apr 22, 2019

Author Contributor

Fixed the style nit and also fixed the same nit in Transforms.

This comment has been minimized.

Copy link
@matjaeck

matjaeck Apr 22, 2019

Contributor

Not fixed yet.

This comment has been minimized.

Copy link
@matjaeck

matjaeck Apr 22, 2019

Contributor

Apologize again, another misunderstanding.

@tovl tovl force-pushed the tovl:emp-deploy branch from 36370e4 to a939008 Apr 22, 2019

@matjaeck
Copy link
Contributor

left a comment

LGTM

@reaperrr reaperrr merged commit 8e91a1b into OpenRA:bleed Apr 22, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.