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

Merge branch 'master' of git://github.com/chrisforbes/OpenRA

Browse Source
This commit is contained in:
Alli
2010-01-02 16:19:54 +13:00
parent 9cd8ab6a76 cbadccd49a
commit a54909cdaf
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRa.Game/Traits/Activities/Repair.cs
View File

@@ -9,17 +9,23 @@ namespace OpenRa.Game.Traits.Activities
{ {
public IActivity NextActivity { get; set; } public IActivity NextActivity { get; set; }
bool isCanceled; bool isCanceled;
int remainingTicks = ticksPerPoint; int remainingTicks;
const int ticksPerPoint = 15;
const int hpPerPoint = 8;
public IActivity Tick(Actor self) public IActivity Tick(Actor self)
{ {
if (isCanceled) return NextActivity; if (isCanceled) return NextActivity;
if (--remainingTicks == 0) if (remainingTicks == 0)
{ {
self.InflictDamage(self, -hpPerPoint, Rules.WarheadInfo["Super"]); var costPerHp = (Rules.General.URepairPercent * self.Info.Cost) / self.Info.Strength;
var hpToRepair = Math.Min(Rules.General.URepairStep, self.Info.Strength - self.Health);
var cost = (int)Math.Ceiling(costPerHp * hpToRepair);
if (!self.Owner.TakeCash(cost))
{
remainingTicks = 1;
return this;
}
self.InflictDamage(self, -hpToRepair, Rules.WarheadInfo["Super"]);
if (self.Health == self.Info.Strength) if (self.Health == self.Info.Strength)
return NextActivity; return NextActivity;
@@ -29,8 +35,10 @@ namespace OpenRa.Game.Traits.Activities
if (hostBuilding != null) if (hostBuilding != null)
hostBuilding.traits.Get<RenderBuilding>().PlayCustomAnim(hostBuilding, "active"); hostBuilding.traits.Get<RenderBuilding>().PlayCustomAnim(hostBuilding, "active");
remainingTicks = ticksPerPoint; remainingTicks = (int)(Rules.General.RepairRate * 60 * 25);
} }
else
--remainingTicks;
return this; return this;
} }