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

Sanitize resource warheads

Browse Source 
- Fix potential crash due to invalid target (no CenterPosition)
- Fix potential crash on multiple ResourceLayers
This commit is contained in:
reaperrr
2020-05-08 12:55:22 +02:00
committed by abcdefg30
parent 2bdefe0e9e
commit 2b3d99fac2
2 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
OpenRA.Mods.Common/Warheads/CreateResourceWarhead.cs
View File

@@ -17,43 +17,50 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Warheads
{
public class CreateResourceWarhead : Warhead
public class CreateResourceWarhead : Warhead, IRulesetLoaded<WeaponInfo>
{
[Desc("Size of the area. The resources are seeded within this area.", "Provide 2 values for a ring effect (outer/inner).")]
public readonly int[] Size = { 0, 0 };
[Desc("Will this splatter resources and which?")]
[FieldLoader.Require]
public readonly string AddsResourceType = null;
void IRulesetLoaded<WeaponInfo>.RulesetLoaded(Ruleset rules, WeaponInfo info)
{
var world = rules.Actors["world"];
var resourceType = world.TraitInfos<ResourceTypeInfo>()
.FirstOrDefault(t => t.Type == AddsResourceType);
if (resourceType == null)
throw new YamlException("CreateResourceWarhead defines an invalid resource type '{0}'".F(AddsResourceType));
}
// TODO: Allow maximum resource splatter to be defined. (Per tile, and in total).
public override void DoImpact(Target target, WarheadArgs args)
{
if (string.IsNullOrEmpty(AddsResourceType))
if (target.Type == TargetType.Invalid)
return;
var firedBy = args.SourceActor;
var pos = target.CenterPosition;
var world = firedBy.World;
var targetTile = world.Map.CellContaining(target.CenterPosition);
var resLayer = world.WorldActor.Trait<ResourceLayer>();
var targetTile = world.Map.CellContaining(pos);
var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0;
var allCells = world.Map.FindTilesInAnnulus(targetTile, minRange, Size[0]);
var resourceType = world.WorldActor.TraitsImplementing<ResourceType>()
.FirstOrDefault(t => t.Info.Type == AddsResourceType);
.First(t => t.Info.Type == AddsResourceType);
if (resourceType == null)
Log.Write("debug", "Warhead defines an invalid resource type '{0}'".F(AddsResourceType));
else
var resLayer = world.WorldActor.Trait<ResourceLayer>();
foreach (var cell in allCells)
{
foreach (var cell in allCells)
{
if (!resLayer.CanSpawnResourceAt(resourceType, cell))
continue;
if (!resLayer.CanSpawnResourceAt(resourceType, cell))
continue;
var splash = world.SharedRandom.Next(1, resourceType.Info.MaxDensity - resLayer.GetResourceDensity(cell));
resLayer.AddResource(resourceType, cell, splash);
}
var splash = world.SharedRandom.Next(1, resourceType.Info.MaxDensity - resLayer.GetResourceDensity(cell));
resLayer.AddResource(resourceType, cell, splash);
}
}
}

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

@@ -24,9 +24,13 @@ namespace OpenRA.Mods.Common.Warheads
// TODO: Allow maximum resource removal to be defined. (Per tile, and in total).
public override void DoImpact(Target target, WarheadArgs args)
{
if (target.Type == TargetType.Invalid)
return;
var firedBy = args.SourceActor;
var pos = target.CenterPosition;
var world = firedBy.World;
var targetTile = world.Map.CellContaining(target.CenterPosition);
var targetTile = world.Map.CellContaining(pos);
var resLayer = world.WorldActor.Trait<ResourceLayer>();
var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0;