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

12
OpenRA.Mods.Common/Activities/HarvestResource.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Activities
readonly HarvesterInfo harvInfo;
readonly IFacing facing;
readonly ResourceClaimLayer claimLayer;
readonly ResourceLayer resLayer;
readonly IResourceLayer resourceLayer;
readonly BodyOrientation body;
readonly IMove move;
readonly CPos targetCell;
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Activities
body = self.Trait<BodyOrientation>();
move = self.Trait<IMove>();
claimLayer = self.World.WorldActor.Trait<ResourceClaimLayer>();
resLayer = self.World.WorldActor.Trait<ResourceLayer>();
resourceLayer = self.World.WorldActor.Trait<IResourceLayer>();
this.targetCell = targetCell;
notifyHarvesterActions = self.TraitsImplementing<INotifyHarvesterAction>().ToArray();
}
@@ -81,14 +81,14 @@ namespace OpenRA.Mods.Common.Activities
}
}
var resourceType = resLayer.GetResourceType(self.Location);
if (resourceType == null || resLayer.RemoveResource(resourceType, self.Location) != 1)
var resource = resourceLayer.GetResource(self.Location);
if (resource.Type == null || resourceLayer.RemoveResource(resource.Type, self.Location) != 1)
return true;
harv.AcceptResource(self, resourceType);
harv.AcceptResource(self, resource.Type);
foreach (var t in notifyHarvesterActions)
t.Harvested(self, resourceType);
t.Harvested(self, resource.Type);
QueueChild(new Wait(harvInfo.BaleLoadDelay));
return false;