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

14
OpenRA.Mods.D2k/Traits/SpiceBloom.cs
View File

@@ -61,8 +61,8 @@ namespace OpenRA.Mods.D2k.Traits
public class SpiceBloom : ITick, INotifyKilled
{
readonly SpiceBloomInfo info;
readonly ResourceType resType;
readonly ResourceLayer resLayer;
readonly ResourceType resourceType;
readonly IResourceLayer resourceLayer;
readonly Animation body;
readonly Animation spurt;
readonly int growTicks;
@@ -75,8 +75,8 @@ namespace OpenRA.Mods.D2k.Traits
{
this.info = info;
resLayer = self.World.WorldActor.Trait<ResourceLayer>();
resType = self.World.WorldActor.TraitsImplementing<ResourceType>().First(t => t.Info.Type == info.ResourceType);
resourceLayer = self.World.WorldActor.Trait<IResourceLayer>();
resourceType = self.World.WorldActor.TraitsImplementing<ResourceType>().First(t => t.Info.Type == info.ResourceType);
var rs = self.Trait<RenderSprites>();
body = new Animation(self.World, rs.GetImage(self));
@@ -126,7 +126,11 @@ namespace OpenRA.Mods.D2k.Traits
for (var i = 0; i < pieces; i++)
{
var cell = cells.SkipWhile(p => resLayer.GetResourceType(p) == resType && resLayer.IsFull(p)).Cast<CPos?>().RandomOrDefault(self.World.SharedRandom);
var cell = cells
.SkipWhile(p => resourceLayer.GetResource(p).Type == resourceType && !resourceLayer.CanAddResource(resourceType, p))
.Cast<CPos?>()
.RandomOrDefault(self.World.SharedRandom);
if (cell == null)
cell = cells.Random(self.World.SharedRandom);