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

Account for custom terrain layers in GrantConditionOnTerrain.

Browse Source
This commit is contained in:
Michael Silber
2018-05-10 08:49:34 +00:00
committed by reaperrr
parent 579cc090a7
commit b199f45f04
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnTerrain.cs
View File

@@ -31,14 +31,18 @@ namespace OpenRA.Mods.Common.Traits
public class GrantConditionOnTerrain : INotifyCreated, ITick public class GrantConditionOnTerrain : INotifyCreated, ITick
{ {
readonly GrantConditionOnTerrainInfo info; readonly GrantConditionOnTerrainInfo info;
readonly TileSet tileSet;
ConditionManager conditionManager; ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken; int conditionToken = ConditionManager.InvalidConditionToken;
string previousTerrain;
string cachedTerrain;
CPos cachedLocation;
public GrantConditionOnTerrain(ActorInitializer init, GrantConditionOnTerrainInfo info) public GrantConditionOnTerrain(ActorInitializer init, GrantConditionOnTerrainInfo info)
{ {
this.info = info; this.info = info;
tileSet = init.World.Map.Rules.TileSet;
} }
void INotifyCreated.Created(Actor self) void INotifyCreated.Created(Actor self)
@@ -48,12 +52,15 @@ namespace OpenRA.Mods.Common.Traits
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (conditionManager == null) var loc = self.Location;
if (conditionManager == null || loc == cachedLocation)
return; return;
var currentTerrain = self.World.Map.GetTerrainInfo(self.Location).Type; var currentTerrain = loc.Layer == 0 ? self.World.Map.GetTerrainInfo(loc).Type :
tileSet[self.World.GetCustomMovementLayers()[loc.Layer].GetTerrainIndex(loc)].Type;
var wantsGranted = info.TerrainTypes.Contains(currentTerrain); var wantsGranted = info.TerrainTypes.Contains(currentTerrain);
if (currentTerrain != previousTerrain) if (currentTerrain != cachedTerrain)
{ {
if (wantsGranted && conditionToken == ConditionManager.InvalidConditionToken) if (wantsGranted && conditionToken == ConditionManager.InvalidConditionToken)
conditionToken = conditionManager.GrantCondition(self, info.Condition); conditionToken = conditionManager.GrantCondition(self, info.Condition);
@@ -61,7 +68,8 @@ namespace OpenRA.Mods.Common.Traits
conditionToken = conditionManager.RevokeCondition(self, conditionToken); conditionToken = conditionManager.RevokeCondition(self, conditionToken);
} }
previousTerrain = currentTerrain; cachedTerrain = currentTerrain;
cachedLocation = loc;
} }
} }
} }