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

Allow driving under crates and crushable units

Browse Source
This commit is contained in:
Gustas
2022-09-29 19:27:06 +03:00
committed by abcdefg30
parent 5abbdc37cb
commit 7f677f1842
4 changed files with 30 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Crushable.cs
View File

@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits
LongBitSet<PlayerBitMask> ICrushable.CrushableBy(Actor self, BitSet<CrushClass> crushClasses)
{
if (IsTraitDisabled || !self.IsAtGroundLevel() || !Info.CrushClasses.Overlaps(crushClasses))
if (IsTraitDisabled || !Info.CrushClasses.Overlaps(crushClasses))
return self.World.NoPlayersMask;
return Info.CrushedByFriendlies ? self.World.AllPlayersMask : self.World.AllPlayersMask.Except(self.Owner.AlliedPlayersMask);
@@ -78,10 +78,6 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled)
return false;
// Only make actor crushable if it is on the ground.
if (!self.IsAtGroundLevel())
return false;
if (!Info.CrushedByFriendlies && crushOwner.IsAlliedWith(self.Owner))
return false;