Conjure/gather-and-defend
9
0
Fork 0
Code Issues Pull Requests 1 Projects Wiki Activity

Pull request #73: Fixed issue where farmer can be placed on a non-resource tile.

Browse Source 
Merge in CGD/gather-and-defend from origin/bugfix/FarmerTileRestriction to main

* commit '884d4a9ee6fb0bb68dccebb797b4617dc4cac1da':
  Fixed issue where farmer can be placed on a non-resource tile.
This commit is contained in:
Maximilien Blanchard-Bizien 2024-09-06 00:16:00 +00:00
commit 15782ad8c2
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Assets/Scripts/Drag&Drop/ObjectPlaceholder.cs
View File

@ -18,6 +18,23 @@ public class ObjectPlaceholder : UnitPlaceholder
&& LevelBoundCache.Contains(transform.position) && LevelBoundCache.Contains(transform.position)
&& ResourceManager.Instance.EnoughFor(Rock, Wood, Food) && ResourceManager.Instance.EnoughFor(Rock, Wood, Food)
&& (Prefab.GetComponent<Building>() && (Prefab.GetComponent<Building>()
|| ResourceManager.Instance.EnoughPopulationFor(defaultUnitCost)); || ResourceManager.Instance.EnoughPopulationFor(defaultUnitCost))
&& IsFarmerAndAllowed();
}
private bool IsFarmerAndAllowed()
{
Ally unit = Prefab.GetComponent<Ally>();
//Obtiens info correctement.
LevelTile pointedTile = LevelManager.Instance.Get<LevelTile>(obj => obj.Position.IsContainedIn(transform.position));
return unit is not Harvester || (unit is Harvester && IsAllowedTile(pointedTile));
//return true;
}
private bool IsAllowedTile(LevelTile pointedTile)
{
return pointedTile is ResourceTile;
} }
} }