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

Some cleanups

Browse Source
This commit is contained in:
penev92
2015-07-04 16:16:33 +03:00
parent 41cdc57ea5
commit c3fcd9a8a1
7 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/AI/AttackOrFleeFuzzy.cs
View File

@@ -12,8 +12,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using AI.Fuzzy.Library; using AI.Fuzzy.Library;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Warheads;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.AI namespace OpenRA.Mods.Common.AI
@@ -191,13 +191,13 @@ namespace OpenRA.Mods.Common.AI
protected float RelativePower(IEnumerable<Actor> own, IEnumerable<Actor> enemy) protected float RelativePower(IEnumerable<Actor> own, IEnumerable<Actor> enemy)
{ {
return RelativeValue(own, enemy, 100, SumOfValues<AttackBase>, (Actor a) => return RelativeValue(own, enemy, 100, SumOfValues<AttackBase>, a =>
{ {
var sumOfDamage = 0; var sumOfDamage = 0;
var arms = a.TraitsImplementing<Armament>(); var arms = a.TraitsImplementing<Armament>();
foreach (var arm in arms) foreach (var arm in arms)
{ {
var warhead = arm.Weapon.Warheads.Select(w => w as DamageWarhead).FirstOrDefault(w => w != null); var warhead = arm.Weapon.Warheads.OfType<DamageWarhead>().FirstOrDefault();
if (warhead != null) if (warhead != null)
sumOfDamage += warhead.Damage; sumOfDamage += warhead.Damage;
} }

2
OpenRA.Mods.Common/Lint/CheckDeathTypes.cs
View File

@@ -10,8 +10,8 @@
using System; using System;
using System.Linq; using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Warheads;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Lint namespace OpenRA.Mods.Common.Lint

7
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.GameRules; using OpenRA.Mods.Common.Warheads;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -101,8 +101,11 @@ namespace OpenRA.Mods.Common.Traits
{ {
get get
{ {
if (IsTraitDisabled)
yield break;
var armament = Armaments.FirstOrDefault(a => a.Weapon.Warheads.Any(w => (w is DamageWarhead))); var armament = Armaments.FirstOrDefault(a => a.Weapon.Warheads.Any(w => (w is DamageWarhead)));
if (armament == null || IsTraitDisabled) if (armament == null)
yield break; yield break;
var negativeDamage = (armament.Weapon.Warheads.FirstOrDefault(w => (w is DamageWarhead)) as DamageWarhead).Damage < 0; var negativeDamage = (armament.Weapon.Warheads.FirstOrDefault(w => (w is DamageWarhead)) as DamageWarhead).Damage < 0;

2
OpenRA.Mods.Common/UtilityCommands/ActorStatsExport.cs
View File

@@ -12,8 +12,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Linq; using System.Linq;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Warheads;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.UtilityCommands namespace OpenRA.Mods.Common.UtilityCommands

3
OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs
View File

@@ -8,11 +8,8 @@
*/ */
#endregion #endregion
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Warheads namespace OpenRA.Mods.Common.Warheads

3
OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs
View File

@@ -10,9 +10,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Warheads namespace OpenRA.Mods.Common.Warheads

10
OpenRA.Mods.D2k/Warheads/ChangeOwnerWarhead.cs
View File

@@ -9,7 +9,7 @@
#endregion #endregion
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.GameRules; using OpenRA.Mods.Common.Warheads;
using OpenRA.Mods.D2k.Traits; using OpenRA.Mods.D2k.Traits;
using OpenRA.Traits; using OpenRA.Traits;
@@ -30,11 +30,12 @@ namespace OpenRA.Mods.D2k.Warheads
foreach (var a in actors) foreach (var a in actors)
{ {
if (a.Owner == firedBy.Owner) // don't do anything on friendly fire // Don't do anything on friendly fire
if (a.Owner == firedBy.Owner)
continue; continue;
if (Duration == 0) if (Duration == 0)
a.ChangeOwner(firedBy.Owner); // permanent a.ChangeOwner(firedBy.Owner); // Permanent
else else
{ {
var tempOwnerManager = a.TraitOrDefault<TemporaryOwnerManager>(); var tempOwnerManager = a.TraitOrDefault<TemporaryOwnerManager>();
@@ -44,7 +45,8 @@ namespace OpenRA.Mods.D2k.Warheads
tempOwnerManager.ChangeOwner(a, firedBy.Owner, Duration); tempOwnerManager.ChangeOwner(a, firedBy.Owner, Duration);
} }
a.CancelActivity(); // stop shooting, you have got new enemies // Stop shooting, you have new enemies
a.CancelActivity();
} }
} }
} }