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

Misc code improvements

Browse Source
This commit is contained in:
abcdefg30
2020-09-25 17:04:48 +02:00
committed by Paul Chote
parent 10f645bf77
commit 718cf37146
4 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenRA.Mods.Common/Traits/DeliversCash.cs
View File

@@ -94,22 +94,28 @@ namespace OpenRA.Mods.Common.Traits
public override bool CanTargetActor(Actor self, Actor target, TargetModifiers modifiers, ref string cursor)
{
var type = self.Info.TraitInfo<DeliversCashInfo>().Type;
var targetInfo = target.Info.TraitInfoOrDefault<AcceptsDeliveredCashInfo>();
return targetInfo != null
&& targetInfo.ValidStances.HasStance(target.Owner.RelationshipWith(self.Owner))
&& (targetInfo.ValidTypes.Count == 0
|| (!string.IsNullOrEmpty(type) && targetInfo.ValidTypes.Contains(type)));
if (targetInfo == null || !targetInfo.ValidStances.HasStance(target.Owner.RelationshipWith(self.Owner)))
return false;
if (targetInfo.ValidTypes.Count == 0)
return true;
var type = self.Info.TraitInfo<DeliversCashInfo>().Type;
return !string.IsNullOrEmpty(type) && targetInfo.ValidTypes.Contains(type);
}
public override bool CanTargetFrozenActor(Actor self, FrozenActor target, TargetModifiers modifiers, ref string cursor)
{
var type = self.Info.TraitInfo<DeliversCashInfo>().Type;
var targetInfo = target.Info.TraitInfoOrDefault<AcceptsDeliveredCashInfo>();
return targetInfo != null
&& targetInfo.ValidStances.HasStance(target.Owner.RelationshipWith(self.Owner))
&& (targetInfo.ValidTypes.Count == 0
|| (!string.IsNullOrEmpty(type) && targetInfo.ValidTypes.Contains(type)));
if (targetInfo == null || !targetInfo.ValidStances.HasStance(target.Owner.RelationshipWith(self.Owner)))
return false;
if (targetInfo.ValidTypes.Count == 0)
return true;
var type = self.Info.TraitInfo<DeliversCashInfo>().Type;
return !string.IsNullOrEmpty(type) && targetInfo.ValidTypes.Contains(type);
}
}
}