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

Merge pull request #10153 from abcdefg30/repairableNear

Browse Source 
Add a 'Voice' field to RepairableNearInfo
This commit is contained in:
Oliver Brakmann
2015-12-14 21:59:56 +01:00
parent 11cbb43212 fe334906f6
commit 20725c9b2c
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/VoiceExts.cs
View File

@@ -63,12 +63,14 @@ namespace OpenRA
continue;
foreach (var voice in orderSubject.TraitsImplementing<IVoiced>())
{
foreach (var v in orderSubject.TraitsImplementing<IOrderVoice>())
{
if (voice.PlayVoice(orderSubject, v.VoicePhraseForOrder(orderSubject, o),
orderSubject.Owner.Faction.InternalName))
return;
}
}
}
}
}

12
OpenRA.Mods.Common/Traits/RepairableNear.cs
View File

@@ -20,12 +20,13 @@ namespace OpenRA.Mods.Common.Traits
class RepairableNearInfo : ITraitInfo, Requires<HealthInfo>, Requires<IMoveInfo>
{
[ActorReference] public readonly HashSet<string> Buildings = new HashSet<string> { "spen", "syrd" };
public readonly int CloseEnough = 4; /* cells */
public readonly WDist CloseEnough = WDist.FromCells(4);
[VoiceReference] public readonly string Voice = "Action";
public object Create(ActorInitializer init) { return new RepairableNear(init.Self, this); }
}
class RepairableNear : IIssueOrder, IResolveOrder
class RepairableNear : IIssueOrder, IResolveOrder, IOrderVoice
{
readonly Actor self;
readonly RepairableNearInfo info;
@@ -65,6 +66,11 @@ namespace OpenRA.Mods.Common.Traits
return self.GetDamageState() > DamageState.Undamaged;
}
public string VoicePhraseForOrder(Actor self, Order order)
{
return (order.OrderString == "RepairNear" && ShouldRepair()) ? info.Voice : null;
}
public void ResolveOrder(Actor self, Order order)
{
if (order.OrderString == "RepairNear" && CanRepairAt(order.TargetActor) && ShouldRepair())
@@ -72,7 +78,7 @@ namespace OpenRA.Mods.Common.Traits
var target = Target.FromOrder(self.World, order);
self.CancelActivity();
self.QueueActivity(movement.MoveWithinRange(target, new WDist(1024 * info.CloseEnough)));
self.QueueActivity(movement.MoveWithinRange(target, info.CloseEnough));
self.QueueActivity(new Repair(order.TargetActor));
self.SetTargetLine(target, Color.Green, false);

11
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -2683,6 +2683,17 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
// 'CloseEnough' on 'RepairableNear' uses WDist now
if (engineVersion < 20151214)
{
if (node.Key == "RepairableNear")
{
var ce = node.Value.Nodes.FirstOrDefault(n => n.Key == "CloseEnough");
if (ce != null && !ce.Value.Value.Contains("c"))
ce.Value.Value = ce.Value.Value + "c0";
}
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
}
}