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

Rename ConditionManager variables.

Browse Source
This commit is contained in:
Paul Chote
2016-12-23 15:02:52 +00:00
parent dcad5c3f7c
commit f360c10569
21 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Upgrades/GrantCondition.cs
View File

@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits
class GrantCondition : UpgradableTrait<GrantConditionInfo>
{
ConditionManager manager;
ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken;
public GrantCondition(GrantConditionInfo info)
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
manager = self.Trait<ConditionManager>();
conditionManager = self.Trait<ConditionManager>();
base.Created(self);
}
@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits
protected override void TraitEnabled(Actor self)
{
if (conditionToken == ConditionManager.InvalidConditionToken)
conditionToken = manager.GrantCondition(self, Info.Condition);
conditionToken = conditionManager.GrantCondition(self, Info.Condition);
}
protected override void TraitDisabled(Actor self)
@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.Traits
if (conditionToken == ConditionManager.InvalidConditionToken)
return;
conditionToken = manager.RevokeCondition(self, conditionToken);
conditionToken = conditionManager.RevokeCondition(self, conditionToken);
}
}
}

10
OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDamageState.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits
readonly GrantConditionOnDamageStateInfo info;
readonly Health health;
ConditionManager manager;
ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken;
public GrantConditionOnDamageState(Actor self, GrantConditionOnDamageStateInfo info)
@@ -52,7 +52,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
manager = self.TraitOrDefault<ConditionManager>();
conditionManager = self.TraitOrDefault<ConditionManager>();
GrantUpgradeOnValidDamageState(self, health.DamageState);
}
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits
if (!info.ValidDamageStates.HasFlag(state) || conditionToken != ConditionManager.InvalidConditionToken)
return;
conditionToken = manager.GrantCondition(self, info.Condition);
conditionToken = conditionManager.GrantCondition(self, info.Condition);
var sound = info.EnabledSounds.RandomOrDefault(Game.CosmeticRandom);
Game.Sound.Play(SoundType.World, sound, self.CenterPosition);
@@ -70,14 +70,14 @@ namespace OpenRA.Mods.Common.Traits
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
{
var granted = conditionToken != ConditionManager.InvalidConditionToken;
if ((granted && info.GrantPermanently) || manager == null)
if ((granted && info.GrantPermanently) || conditionManager == null)
return;
if (!granted && !info.ValidDamageStates.HasFlag(e.PreviousDamageState))
GrantUpgradeOnValidDamageState(self, health.DamageState);
else if (granted && !info.ValidDamageStates.HasFlag(e.DamageState) && info.ValidDamageStates.HasFlag(e.PreviousDamageState))
{
conditionToken = manager.RevokeCondition(self, conditionToken);
conditionToken = conditionManager.RevokeCondition(self, conditionToken);
var sound = info.DisabledSounds.RandomOrDefault(Game.CosmeticRandom);
Game.Sound.Play(SoundType.World, sound, self.CenterPosition);

16
OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs
View File

@@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Traits
readonly Lazy<WithSpriteBody> body;
DeployState deployState;
ConditionManager manager;
ConditionManager conditionManager;
int deployedToken = ConditionManager.InvalidConditionToken;
int undeployedToken = ConditionManager.InvalidConditionToken;
@@ -89,7 +89,7 @@ namespace OpenRA.Mods.Common.Traits
public void Created(Actor self)
{
manager = self.TraitOrDefault<ConditionManager>();
conditionManager = self.TraitOrDefault<ConditionManager>();
switch (deployState)
{
@@ -244,15 +244,15 @@ namespace OpenRA.Mods.Common.Traits
void OnDeployStarted()
{
if (undeployedToken != ConditionManager.InvalidConditionToken)
undeployedToken = manager.RevokeCondition(self, undeployedToken);
undeployedToken = conditionManager.RevokeCondition(self, undeployedToken);
deployState = DeployState.Deploying;
}
void OnDeployCompleted()
{
if (manager != null && !string.IsNullOrEmpty(info.DeployedCondition) && deployedToken == ConditionManager.InvalidConditionToken)
deployedToken = manager.GrantCondition(self, info.DeployedCondition);
if (conditionManager != null && !string.IsNullOrEmpty(info.DeployedCondition) && deployedToken == ConditionManager.InvalidConditionToken)
deployedToken = conditionManager.GrantCondition(self, info.DeployedCondition);
deployState = DeployState.Deployed;
}
@@ -260,15 +260,15 @@ namespace OpenRA.Mods.Common.Traits
void OnUndeployStarted()
{
if (deployedToken != ConditionManager.InvalidConditionToken)
deployedToken = manager.RevokeCondition(self, deployedToken);
deployedToken = conditionManager.RevokeCondition(self, deployedToken);
deployState = DeployState.Deploying;
}
void OnUndeployCompleted()
{
if (manager != null && !string.IsNullOrEmpty(info.UndeployedCondition) && undeployedToken == ConditionManager.InvalidConditionToken)
undeployedToken = manager.GrantCondition(self, info.UndeployedCondition);
if (conditionManager != null && !string.IsNullOrEmpty(info.UndeployedCondition) && undeployedToken == ConditionManager.InvalidConditionToken)
undeployedToken = conditionManager.GrantCondition(self, info.UndeployedCondition);
deployState = DeployState.Undeployed;
}

10
OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnMovement.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Traits
{
readonly IMove movement;
ConditionManager manager;
ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken;
public GrantConditionOnMovement(Actor self, GrantConditionOnMovementInfo info)
@@ -42,21 +42,21 @@ namespace OpenRA.Mods.Common.Traits
protected override void Created(Actor self)
{
manager = self.TraitOrDefault<ConditionManager>();
conditionManager = self.TraitOrDefault<ConditionManager>();
base.Created(self);
}
void ITick.Tick(Actor self)
{
if (manager == null)
if (conditionManager == null)
return;
var isMovingVertically = Info.ConsiderVerticalMovement ? movement.IsMovingVertically : false;
var isMoving = !IsTraitDisabled && !self.IsDead && (movement.IsMoving || isMovingVertically);
if (isMoving && conditionToken == ConditionManager.InvalidConditionToken)
conditionToken = manager.GrantCondition(self, Info.Condition);
conditionToken = conditionManager.GrantCondition(self, Info.Condition);
else if (!isMoving && conditionToken != ConditionManager.InvalidConditionToken)
conditionToken = manager.RevokeCondition(self, conditionToken);
conditionToken = conditionManager.RevokeCondition(self, conditionToken);
}
}
}

10
OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnTerrain.cs
View File

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.Common.Traits
{
readonly GrantConditionOnTerrainInfo info;
ConditionManager manager;
ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken;
string previousTerrain;
@@ -43,12 +43,12 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
manager = self.TraitOrDefault<ConditionManager>();
conditionManager = self.TraitOrDefault<ConditionManager>();
}
public void Tick(Actor self)
{
if (manager == null)
if (conditionManager == null)
return;
var currentTerrain = self.World.Map.GetTerrainInfo(self.Location).Type;
@@ -56,9 +56,9 @@ namespace OpenRA.Mods.Common.Traits
if (currentTerrain != previousTerrain)
{
if (wantsGranted && conditionToken == ConditionManager.InvalidConditionToken)
conditionToken = manager.GrantCondition(self, info.Condition);
conditionToken = conditionManager.GrantCondition(self, info.Condition);
else if (!wantsGranted && conditionToken != ConditionManager.InvalidConditionToken)
conditionToken = manager.RevokeCondition(self, conditionToken);
conditionToken = conditionManager.RevokeCondition(self, conditionToken);
}
previousTerrain = currentTerrain;

18
OpenRA.Mods.Common/Traits/Upgrades/ProximityExternalCondition.cs
View File

@@ -108,9 +108,9 @@ namespace OpenRA.Mods.Common.Traits
if (!info.ValidStances.HasStance(stance))
return;
var um = a.TraitOrDefault<ConditionManager>();
if (um != null && !tokens.ContainsKey(a) && um.AcceptsExternalCondition(a, info.Condition))
tokens[a] = um.GrantCondition(a, info.Condition, true);
var cm = a.TraitOrDefault<ConditionManager>();
if (cm != null && !tokens.ContainsKey(a) && cm.AcceptsExternalCondition(a, info.Condition))
tokens[a] = cm.GrantCondition(a, info.Condition, true);
}
public void UnitProducedByOther(Actor self, Actor producer, Actor produced)
@@ -130,9 +130,9 @@ namespace OpenRA.Mods.Common.Traits
if (!info.ValidStances.HasStance(stance))
return;
var um = produced.TraitOrDefault<ConditionManager>();
if (um != null && um.AcceptsExternalCondition(produced, info.Condition))
tokens[produced] = um.GrantCondition(produced, info.Condition, true);
var cm = produced.TraitOrDefault<ConditionManager>();
if (cm != null && cm.AcceptsExternalCondition(produced, info.Condition))
tokens[produced] = cm.GrantCondition(produced, info.Condition, true);
}
}
@@ -146,9 +146,9 @@ namespace OpenRA.Mods.Common.Traits
return;
tokens.Remove(a);
var um = a.TraitOrDefault<ConditionManager>();
if (um != null)
um.RevokeCondition(a, token);
var cm = a.TraitOrDefault<ConditionManager>();
if (cm != null)
cm.RevokeCondition(a, token);
}
}
}