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.

Sign up for GitHub

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

Jump to bottom

Fix MAD Tank command bar deploy. #13700

Merged
merged 2 commits into from Jul 23, 2017
Merged

Fix MAD Tank command bar deploy. #13700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8da6245
Implement IIssueDeployOrder on MADTank.
pchote Jul 22, 2017
db78681
Add Demo Truck and MAD Tank to Deploy description.
pchote Jul 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion OpenRA.Mods.Cnc/Traits/MadTank.cs
View file
Open in desktop
Expand Up @@ -61,7 +61,7 @@ public void RulesetLoaded(Ruleset rules, ActorInfo ai)
}
}

class MadTank : IIssueOrder, IResolveOrder, IOrderVoice, ITick, IPreventsTeleport
class MadTank : IIssueOrder, IResolveOrder, IOrderVoice, ITick, IPreventsTeleport, IIssueDeployOrder
{
readonly Actor self;
readonly MadTankInfo info;
Expand Down Expand Up @@ -116,6 +116,11 @@ public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool qu
return new Order(order.OrderID, self, queued) { TargetActor = target.Actor };
}

Order IIssueDeployOrder.IssueDeployOrder(Actor self)
{
return new Order("Detonate", self, false);
}

public string VoicePhraseForOrder(Actor self, Order order)
{
return info.Voice;
Expand Down
2 changes: 1 addition & 1 deletion mods/ra/chrome/ingame-player.yaml
View file
Open in desktop
Expand Up @@ -119,7 +119,7 @@ Container@PLAYER_WIDGETS:
Background: command-button
DisableKeyRepeat: true
TooltipText: Deploy
TooltipDesc: Selected units will perform their default deploy activity\n - MCVs will unpack into a Construction Yard\n - Construction Yards will re-pack into a MCV\n - Transports will unload their passengers\n - Aircraft will return to base\n\nActs immediately on selected units.
TooltipDesc: Selected units will perform their default deploy activity\n - MCVs will unpack into a Construction Yard\n - Construction Yards will re-pack into a MCV\n - Transports will unload their passengers\n - Demolition Trucks and MAD Tanks will self-destruct\n - Aircraft will return to base\n\nActs immediately on selected units.
TooltipContainer: TOOLTIP_CONTAINER
Children:
Image@ICON:
Expand Down