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

Merge pull request #6760 from atlimit8/RepairableBuildingByUpgrade

Browse Source 
Repairable building by upgrade
This commit is contained in:
Paul Chote
2014-11-29 22:16:24 +13:00
parent 84a8d6ba9f 9ddf6dc36c
commit 71a8815ffb
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,37 +19,37 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA.Buildings namespace OpenRA.Mods.RA.Buildings
{ {
[Desc("Building can be repaired by the repair button.")] [Desc("Building can be repaired by the repair button.")]
public class RepairableBuildingInfo : ITraitInfo, Requires<HealthInfo> public class RepairableBuildingInfo : UpgradableTraitInfo, ITraitInfo, Requires<HealthInfo>
{ {
public readonly int RepairPercent = 20; public readonly int RepairPercent = 20;
public readonly int RepairInterval = 24; public readonly int RepairInterval = 24;
public readonly int RepairStep = 7; public readonly int RepairStep = 7;
public readonly int[] RepairBonuses = { 100, 150, 175, 200, 220, 240, 260, 280, 300 }; public readonly int[] RepairBonuses = { 100, 150, 175, 200, 220, 240, 260, 280, 300 };
public readonly bool CancelWhenDisabled = false;
public readonly string IndicatorPalettePrefix = "player"; public readonly string IndicatorPalettePrefix = "player";
public object Create(ActorInitializer init) { return new RepairableBuilding(init.self, this); } public object Create(ActorInitializer init) { return new RepairableBuilding(init.self, this); }
} }
public class RepairableBuilding : ITick, ISync public class RepairableBuilding : UpgradableTrait<RepairableBuildingInfo>, ITick
{ {
[Sync] [Sync]
public int RepairersHash { get { return Repairers.Aggregate(0, (code, player) => code ^ Sync.hash_player(player)); } } public int RepairersHash { get { return Repairers.Aggregate(0, (code, player) => code ^ Sync.hash_player(player)); } }
public List<Player> Repairers = new List<Player>(); public List<Player> Repairers = new List<Player>();
Health Health; Health Health;
RepairableBuildingInfo Info;
public bool RepairActive = false; public bool RepairActive = false;
public RepairableBuilding(Actor self, RepairableBuildingInfo info) public RepairableBuilding(Actor self, RepairableBuildingInfo info)
: base (info)
{ {
Health = self.Trait<Health>(); Health = self.Trait<Health>();
Info = info;
} }
public void RepairBuilding(Actor self, Player player) public void RepairBuilding(Actor self, Player player)
{ {
if (self.AppearsFriendlyTo(player.PlayerActor)) if (!IsTraitDisabled && self.AppearsFriendlyTo(player.PlayerActor))
{ {
// If the player won't affect the repair, we won't add him // If the player won't affect the repair, we won't add him
if (!Repairers.Remove(player) && Repairers.Count < Info.RepairBonuses.Length) if (!Repairers.Remove(player) && Repairers.Count < Info.RepairBonuses.Length)
@@ -70,6 +70,17 @@ namespace OpenRA.Mods.RA.Buildings
public void Tick(Actor self) public void Tick(Actor self)
{ {
if (IsTraitDisabled)
{
if (RepairActive && Info.CancelWhenDisabled)
{
Repairers.Clear();
RepairActive = false;
}
return;
}
if (remainingTicks == 0) if (remainingTicks == 0)
{ {
Repairers = Repairers.Where(player => player.WinState == WinState.Undefined Repairers = Repairers.Where(player => player.WinState == WinState.Undefined

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

@@ -31,7 +31,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.Paused = () => !rb.RepairActive || rb.IsTraitDisabled;
CycleRepairer(); CycleRepairer();
} }

3
OpenRA.Mods.RA/Orders/RepairOrderGenerator.cs
View File

@@ -31,7 +31,8 @@ namespace OpenRA.Mods.RA.Orders
if (mi.Button == MouseButton.Left) if (mi.Button == MouseButton.Left)
{ {
var underCursor = world.ScreenMap.ActorsAt(mi) var underCursor = world.ScreenMap.ActorsAt(mi)
.FirstOrDefault(a => !world.FogObscures(a) && a.AppearsFriendlyTo(world.LocalPlayer.PlayerActor) && a.HasTrait<RepairableBuilding>()); .FirstOrDefault(a => !world.FogObscures(a) && a.AppearsFriendlyTo(world.LocalPlayer.PlayerActor)
&& a.TraitsImplementing<RepairableBuilding>().Any(t => !t.IsTraitDisabled));
if (underCursor == null) if (underCursor == null)
yield break; yield break;