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

Merge two ifs into one in SpawnActorOnDeath

Browse Source
This commit is contained in:
reaperrr
2020-05-28 00:46:13 +02:00
committed by Paul Chote
parent 6d0fbfa21f
commit 84246d287d
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Traits/Explodes.cs
View File

@@ -84,8 +84,6 @@ namespace OpenRA.Mods.Common.Traits
BuildingInfo buildingInfo; BuildingInfo buildingInfo;
Armament[] armaments; Armament[] armaments;
bool anyArmaments;
public Explodes(ExplodesInfo info, Actor self) public Explodes(ExplodesInfo info, Actor self)
: base(info) : base(info)
{ {
@@ -96,7 +94,6 @@ namespace OpenRA.Mods.Common.Traits
{ {
buildingInfo = self.Info.TraitInfoOrDefault<BuildingInfo>(); buildingInfo = self.Info.TraitInfoOrDefault<BuildingInfo>();
armaments = self.TraitsImplementing<Armament>().ToArray(); armaments = self.TraitsImplementing<Armament>().ToArray();
anyArmaments = armaments.Length > 0;
base.Created(self); base.Created(self);
} }
@@ -106,14 +103,13 @@ namespace OpenRA.Mods.Common.Traits
if (IsTraitDisabled || !self.IsInWorld) if (IsTraitDisabled || !self.IsInWorld)
return; return;
var sharedRandom = self.World.SharedRandom.Next(100); if (self.World.SharedRandom.Next(100) > Info.Chance)
if (sharedRandom > Info.Chance)
return; return;
if (!Info.DeathTypes.IsEmpty && !e.Damage.DamageTypes.Overlaps(Info.DeathTypes)) if (!Info.DeathTypes.IsEmpty && !e.Damage.DamageTypes.Overlaps(Info.DeathTypes))
return; return;
var weapon = ChooseWeaponForExplosion(self, sharedRandom); var weapon = ChooseWeaponForExplosion(self);
if (weapon == null) if (weapon == null)
return; return;
@@ -134,11 +130,11 @@ namespace OpenRA.Mods.Common.Traits
weapon.Impact(Target.FromPos(self.CenterPosition), source); weapon.Impact(Target.FromPos(self.CenterPosition), source);
} }
WeaponInfo ChooseWeaponForExplosion(Actor self, int sharedRandom) WeaponInfo ChooseWeaponForExplosion(Actor self)
{ {
if (!anyArmaments) if (armaments.Length == 0)
return Info.WeaponInfo; return Info.WeaponInfo;
else if (sharedRandom > Info.LoadedChance) else if (self.World.SharedRandom.Next(100) > Info.LoadedChance)
return Info.EmptyWeaponInfo; return Info.EmptyWeaponInfo;
// PERF: Avoid LINQ // PERF: Avoid LINQ

5
OpenRA.Mods.Common/Traits/SpawnActorOnDeath.cs
View File

@@ -77,10 +77,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyKilled.Killed(Actor self, AttackInfo e) void INotifyKilled.Killed(Actor self, AttackInfo e)
{ {
if (!enabled || IsTraitDisabled) if (!enabled || IsTraitDisabled || !self.IsInWorld)
return;
if (!self.IsInWorld)
return; return;
if (self.World.SharedRandom.Next(100) > Info.Probability) if (self.World.SharedRandom.Next(100) > Info.Probability)