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

Update DestroyResourceWarhead to support Resource type and amount options.

Browse Source
This commit is contained in:
abc013
2020-10-31 13:51:35 +01:00
committed by Paul Chote
parent f9b058d36b
commit 0a02bd524a
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenRA.Mods.Common/Warheads/DestroyResourceWarhead.cs
View File

@@ -9,6 +9,9 @@
*/ */
#endregion #endregion
using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Traits; using OpenRA.Traits;
@@ -17,10 +20,15 @@ namespace OpenRA.Mods.Common.Warheads
{ {
public class DestroyResourceWarhead : Warhead public class DestroyResourceWarhead : Warhead
{ {
[Desc("Size of the area. The resources are seeded within this area.", "Provide 2 values for a ring effect (outer/inner).")] [Desc("Size of the area. The resources are removed within this area.", "Provide 2 values for a ring effect (outer/inner).")]
public readonly int[] Size = { 0, 0 }; public readonly int[] Size = { 0, 0 };
// TODO: Allow maximum resource removal to be defined. (Per tile, and in total). [Desc("Amount of resources to be removed. If negative or zero, all resources within the area will be removed.")]
public readonly int ResourceAmount = 0;
[Desc("Resource types to remove with this warhead.", "If empty, all resource types will be removed.")]
public readonly HashSet<string> ResourceTypes = new HashSet<string>();
public override void DoImpact(in Target target, WarheadArgs args) public override void DoImpact(in Target target, WarheadArgs args)
{ {
if (target.Type == TargetType.Invalid) if (target.Type == TargetType.Invalid)
@@ -39,9 +47,20 @@ namespace OpenRA.Mods.Common.Warheads
var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0; var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0;
var allCells = world.Map.FindTilesInAnnulus(targetTile, minRange, Size[0]); var allCells = world.Map.FindTilesInAnnulus(targetTile, minRange, Size[0]);
// Destroy all resources in the selected tiles var removeAllTypes = ResourceTypes.Count == 0;
foreach (var cell in allCells) foreach (var cell in allCells)
{
var cellContents = resourceLayer.GetResource(cell);
if (removeAllTypes || ResourceTypes.Contains(cellContents.Type))
{
if (ResourceAmount <= 0)
resourceLayer.ClearResources(cell); resourceLayer.ClearResources(cell);
else
resourceLayer.RemoveResource(cellContents.Type, cell, ResourceAmount);
}
}
} }
} }
} }