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

Replace ResourceLayer references with IResourceLayer in traits/warheads.

Browse Source
This commit is contained in:
Paul Chote
2021-03-07 17:31:26 +00:00
committed by reaperrr
parent 5adcbe4c78
commit dcd8eccee4
14 changed files with 72 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,14 +56,14 @@ namespace OpenRA.Mods.Common.Warheads
var resourceType = world.WorldActor.TraitsImplementing<ResourceType>()
.First(t => t.Info.Type == AddsResourceType);
var resLayer = world.WorldActor.Trait<ResourceLayer>();
var resourceLayer = world.WorldActor.Trait<IResourceLayer>();
foreach (var cell in allCells)
{
if (!resLayer.CanAddResource(resourceType, cell))
if (!resourceLayer.CanAddResource(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 - resourceLayer.GetResource(cell).Density);
resourceLayer.AddResource(resourceType, cell, splash);
}
}
}

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

@@ -34,14 +34,14 @@ namespace OpenRA.Mods.Common.Warheads
return;
var targetTile = world.Map.CellContaining(pos);
var resLayer = world.WorldActor.Trait<ResourceLayer>();
var resourceLayer = world.WorldActor.Trait<IResourceLayer>();
var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0;
var allCells = world.Map.FindTilesInAnnulus(targetTile, minRange, Size[0]);
// Destroy all resources in the selected tiles
foreach (var cell in allCells)
resLayer.ClearResources(cell);
resourceLayer.ClearResources(cell);
}
}
}