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

Allow granting a condition to Carryalls currently carrying units

Browse Source
This commit is contained in:
Oliver Brakmann
2020-07-04 23:54:04 +02:00
committed by abcdefg30
parent 39d0abe982
commit 8b3db6f3d6
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/Traits/Carryall.cs
View File

@@ -53,6 +53,10 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Cursor to display when picking up the passengers.")] [Desc("Cursor to display when picking up the passengers.")]
public readonly string PickUpCursor = "ability"; public readonly string PickUpCursor = "ability";
[GrantedConditionReference]
[Desc("Condition to grant to the Carryall while it is carrying something.")]
public readonly string CarryCondition = null;
[VoiceReference] [VoiceReference]
public readonly string Voice = "Action"; public readonly string Voice = "Action";
@@ -85,6 +89,7 @@ namespace OpenRA.Mods.Common.Traits
WAngle cachedFacing; WAngle cachedFacing;
IActorPreview[] carryablePreview; IActorPreview[] carryablePreview;
HashSet<string> landableTerrainTypes; HashSet<string> landableTerrainTypes;
int carryConditionToken = Actor.InvalidConditionToken;
/// <summary>Offset between the carryall's and the carried actor's CenterPositions</summary> /// <summary>Offset between the carryall's and the carried actor's CenterPositions</summary>
public WVec CarryableOffset { get; private set; } public WVec CarryableOffset { get; private set; }
@@ -177,6 +182,8 @@ namespace OpenRA.Mods.Common.Traits
Carryable = carryable; Carryable = carryable;
State = CarryallState.Carrying; State = CarryallState.Carrying;
self.World.ScreenMap.AddOrUpdate(self); self.World.ScreenMap.AddOrUpdate(self);
if (carryConditionToken == Actor.InvalidConditionToken)
carryConditionToken = self.GrantCondition(Info.CarryCondition);
CarryableOffset = OffsetForCarryable(self, carryable); CarryableOffset = OffsetForCarryable(self, carryable);
landableTerrainTypes = Carryable.Trait<Mobile>().Info.LocomotorInfo.TerrainSpeeds.Keys.ToHashSet(); landableTerrainTypes = Carryable.Trait<Mobile>().Info.LocomotorInfo.TerrainSpeeds.Keys.ToHashSet();
@@ -188,6 +195,8 @@ namespace OpenRA.Mods.Common.Traits
{ {
UnreserveCarryable(self); UnreserveCarryable(self);
self.World.ScreenMap.AddOrUpdate(self); self.World.ScreenMap.AddOrUpdate(self);
if (carryConditionToken != Actor.InvalidConditionToken)
carryConditionToken = self.RevokeCondition(carryConditionToken);
carryablePreview = null; carryablePreview = null;
landableTerrainTypes = null; landableTerrainTypes = null;