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

Reimplement demolition lock using conditions.

Browse Source
This commit is contained in:
Paul Chote
2018-10-27 17:09:30 +00:00
committed by abcdefg30
parent 0901a7d9de
commit 18b84750aa
25 changed files with 239 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenRA.Mods.Common/Traits/Buildings/BridgeHut.cs
View File

@@ -11,6 +11,7 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
@@ -164,17 +165,36 @@ namespace OpenRA.Mods.Common.Traits
repairDelay = Info.RepairPropagationDelay;
}
public void Demolish(Actor self, Actor saboteur)
bool IDemolishable.IsValidTarget(Actor self, Actor saboteur)
{
if (Info.DemolishPropagationDelay > 0)
return true;
}
void IDemolishable.Demolish(Actor self, Actor saboteur, int delay)
{
// TODO: Handle using ITick
self.World.Add(new DelayedAction(delay, () =>
{
demolishStep = 0;
demolishSaboteur = saboteur;
DemolishStep();
}
else
foreach (var s in segments.Values)
s.Demolish(saboteur);
if (self.IsDead)
return;
var modifiers = self.TraitsImplementing<IDamageModifier>()
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
.Select(t => t.GetDamageModifier(self, null));
if (Util.ApplyPercentageModifiers(100, modifiers) > 0)
{
if (Info.DemolishPropagationDelay > 0)
{
demolishStep = 0;
demolishSaboteur = saboteur;
DemolishStep();
}
else
foreach (var s in segments.Values)
s.Demolish(saboteur);
}
}));
}
public void DemolishStep()
@@ -202,11 +222,6 @@ namespace OpenRA.Mods.Common.Traits
demolishStep++;
}
public bool IsValidTarget(Actor self, Actor saboteur)
{
return true;
}
public DamageState BridgeDamageState
{
get