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

don't try to spawn resources when the cell is already full

Browse Source 
fixes #5699
This commit is contained in:
Matthias Mailänder
2014-06-22 11:49:40 +02:00
parent 69ddcf3fee
commit 05609399eb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/Traits/World/ResourceLayer.cs
View File

@@ -156,7 +156,7 @@ namespace OpenRA.Traits
public bool CanSpawnResourceAt(ResourceType newResourceType, CPos cell) public bool CanSpawnResourceAt(ResourceType newResourceType, CPos cell)
{ {
var currentResourceType = GetResource(cell); var currentResourceType = GetResource(cell);
return currentResourceType == newResourceType return (currentResourceType == newResourceType && !IsFull(cell))
|| (currentResourceType == null && AllowResourceAt(newResourceType, cell)); || (currentResourceType == null && AllowResourceAt(newResourceType, cell));
} }
@@ -186,9 +186,9 @@ namespace OpenRA.Traits
dirty.Add(p); dirty.Add(p);
} }
public bool IsFull(int i, int j) public bool IsFull(CPos c)
{ {
return content[i, j].Density == content[i, j].Type.Info.MaxDensity; return content[c.X, c.Y].Density == content[c.X, c.Y].Type.Info.MaxDensity;
} }
public ResourceType Harvest(CPos p) public ResourceType Harvest(CPos p)

2
OpenRA.Mods.RA/SeedsResource.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA
var cell = RandomWalk(self.Location, self.World.SharedRandom) var cell = RandomWalk(self.Location, self.World.SharedRandom)
.Take(info.MaxRange) .Take(info.MaxRange)
.SkipWhile(p => resLayer.GetResource(p) == resourceType && resLayer.IsFull(p.X, p.Y)) .SkipWhile(p => resLayer.GetResource(p) == resourceType && resLayer.IsFull(p))
.Cast<CPos?>().FirstOrDefault(); .Cast<CPos?>().FirstOrDefault();
if (cell != null && resLayer.CanSpawnResourceAt(resourceType, cell.Value)) if (cell != null && resLayer.CanSpawnResourceAt(resourceType, cell.Value))