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

#48

Browse Source
This commit is contained in:
Chris Forbes
2009-11-09 22:36:56 +13:00
parent 19e0ea970b
commit 7534492526
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRa.Game/UnitOrders.cs
View File

@@ -27,17 +27,13 @@ namespace OpenRa.Game
{ {
const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */ const int RangeTolerance = 1; /* how far inside our maximum range we should try to sit */
var mobile = order.Subject.traits.GetOrDefault<Mobile>(); var mobile = order.Subject.traits.GetOrDefault<Mobile>();
/* todo: choose the appropriate weapon, when only one works against this target */
var weapon = order.Subject.unitInfo.Primary ?? order.Subject.unitInfo.Secondary; var weapon = order.Subject.unitInfo.Primary ?? order.Subject.unitInfo.Secondary;
mobile.Cancel(order.Subject); mobile.Cancel(order.Subject);
// TODO: this block should be a separate activity; "MoveNear", maybe?
{
/* todo: choose the appropriate weapon, when only one works against this target */
var range = Rules.WeaponInfo[weapon].Range;
mobile.QueueActivity( mobile.QueueActivity(
new Traits.Activities.Follow(order.TargetActor, Math.Max(0, (int)range - RangeTolerance))); new Traits.Activities.Follow(order.TargetActor,
} Math.Max(0, (int)Rules.WeaponInfo[weapon].Range - RangeTolerance)));
order.Subject.traits.Get<AttackTurreted>().target = order.TargetActor; order.Subject.traits.Get<AttackTurreted>().target = order.TargetActor;
break; break;