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

Remove more unnecessary plumbing.

Browse Source
This commit is contained in:
Paul Chote
2014-08-17 17:44:15 +12:00
parent 1261d5891d
commit 34ca30c9f1
4 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/Warheads/CreateEffectWarhead.cs
View File

@@ -34,11 +34,6 @@ namespace OpenRA.Mods.RA
[Desc("What impact types should this effect NOT apply to.", "Overrides ValidImpactTypes.")] [Desc("What impact types should this effect NOT apply to.", "Overrides ValidImpactTypes.")]
public readonly ImpactType InvalidImpactTypes = ImpactType.None; public readonly ImpactType InvalidImpactTypes = ImpactType.None;
public override void DoImpact(Target target, Actor firedBy, float firepowerModifier)
{
DoImpact(target.CenterPosition, firedBy, firepowerModifier);
}
public static ImpactType GetImpactType(World world, CPos cell, WPos pos) public static ImpactType GetImpactType(World world, CPos cell, WPos pos)
{ {
var isAir = pos.Z > 0; var isAir = pos.Z > 0;
@@ -79,8 +74,9 @@ namespace OpenRA.Mods.RA
return false; return false;
} }
public void DoImpact(WPos pos, Actor firedBy, float firepowerModifier) public override void DoImpact(Target target, Actor firedBy, float firepowerModifier)
{ {
var pos = target.CenterPosition;
var world = firedBy.World; var world = firedBy.World;
var targetTile = world.Map.CellContaining(pos); var targetTile = world.Map.CellContaining(pos);
var isValid = IsValidImpact(pos, firedBy); var isValid = IsValidImpact(pos, firedBy);

7
OpenRA.Mods.RA/Warheads/CreateResourceWarhead.cs
View File

@@ -27,17 +27,12 @@ namespace OpenRA.Mods.RA
// TODO: Allow maximum resource splatter to be defined. (Per tile, and in total). // TODO: Allow maximum resource splatter to be defined. (Per tile, and in total).
public override void DoImpact(Target target, Actor firedBy, float firepowerModifier) public override void DoImpact(Target target, Actor firedBy, float firepowerModifier)
{
DoImpact(target.CenterPosition, firedBy, firepowerModifier);
}
public void DoImpact(WPos pos, Actor firedBy, float firepowerModifier)
{ {
if (string.IsNullOrEmpty(AddsResourceType)) if (string.IsNullOrEmpty(AddsResourceType))
return; return;
var world = firedBy.World; var world = firedBy.World;
var targetTile = world.Map.CellContaining(pos); var targetTile = world.Map.CellContaining(target.CenterPosition);
var resLayer = world.WorldActor.Trait<ResourceLayer>(); var resLayer = world.WorldActor.Trait<ResourceLayer>();
var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0; var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0;

7
OpenRA.Mods.RA/Warheads/DestroyResourceWarhead.cs
View File

@@ -24,14 +24,9 @@ namespace OpenRA.Mods.RA
// TODO: Allow maximum resource removal to be defined. (Per tile, and in total). // TODO: Allow maximum resource removal to be defined. (Per tile, and in total).
public override void DoImpact(Target target, Actor firedBy, float firepowerModifier) public override void DoImpact(Target target, Actor firedBy, float firepowerModifier)
{
DoImpact(target.CenterPosition, firedBy, firepowerModifier);
}
public void DoImpact(WPos pos, Actor firedBy, float firepowerModifier)
{ {
var world = firedBy.World; var world = firedBy.World;
var targetTile = world.Map.CellContaining(pos); var targetTile = world.Map.CellContaining(target.CenterPosition);
var resLayer = world.WorldActor.Trait<ResourceLayer>(); var resLayer = world.WorldActor.Trait<ResourceLayer>();
var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0; var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0;

7
OpenRA.Mods.RA/Warheads/LeaveSmudgeWarhead.cs
View File

@@ -26,14 +26,9 @@ namespace OpenRA.Mods.RA
public readonly string[] SmudgeType = { }; public readonly string[] SmudgeType = { };
public override void DoImpact(Target target, Actor firedBy, float firepowerModifier) public override void DoImpact(Target target, Actor firedBy, float firepowerModifier)
{
DoImpact(target.CenterPosition, firedBy, firepowerModifier);
}
public void DoImpact(WPos pos, Actor firedBy, float firepowerModifier)
{ {
var world = firedBy.World; var world = firedBy.World;
var targetTile = world.Map.CellContaining(pos); var targetTile = world.Map.CellContaining(target.CenterPosition);
var smudgeLayers = world.WorldActor.TraitsImplementing<SmudgeLayer>().ToDictionary(x => x.Info.Type); var smudgeLayers = world.WorldActor.TraitsImplementing<SmudgeLayer>().ToDictionary(x => x.Info.Type);
var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0; var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0;