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

Merge pull request #5539 from deniz1a/repair-pause

Browse Source 
Closes #5322
This commit is contained in:
Matthias Mailänder
2014-06-09 16:24:34 +02:00
parent 7216688baf 5055764e04
commit 13fad65c19
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Buildings/RepairableBuilding.cs
View File

@@ -32,6 +32,7 @@ namespace OpenRA.Mods.RA.Buildings
Health Health; Health Health;
RepairableBuildingInfo Info; RepairableBuildingInfo Info;
public bool RepairActive = true;
public RepairableBuilding(Actor self, RepairableBuildingInfo info) public RepairableBuilding(Actor self, RepairableBuildingInfo info)
{ {
@@ -81,7 +82,8 @@ namespace OpenRA.Mods.RA.Buildings
var hpToRepair = Math.Min(Info.RepairStep, Health.MaxHP - Health.HP); var hpToRepair = Math.Min(Info.RepairStep, Health.MaxHP - Health.HP);
var cost = Math.Max(1, (hpToRepair * Info.RepairPercent * buildingValue) / (Health.MaxHP * 100)); var cost = Math.Max(1, (hpToRepair * Info.RepairPercent * buildingValue) / (Health.MaxHP * 100));
if (!Repairer.PlayerActor.Trait<PlayerResources>().TakeCash(cost)) RepairActive = Repairer.PlayerActor.Trait<PlayerResources>().TakeCash(cost);
if (!RepairActive)
{ {
remainingTicks = 1; remainingTicks = 1;
return; return;

1
OpenRA.Mods.RA/Effects/RepairIndicator.cs
View File

@@ -32,6 +32,7 @@ namespace OpenRA.Mods.RA.Effects
rb = building.TraitOrDefault<RepairableBuilding>(); rb = building.TraitOrDefault<RepairableBuilding>();
anim = new Animation(building.World, "allyrepair"); anim = new Animation(building.World, "allyrepair");
anim.Paused = () => !rb.RepairActive;
anim.PlayRepeating("repair"); anim.PlayRepeating("repair");
} }