Merge branch 'sprechtl' into develop
# Conflicts: # Assets/Scripts/Tiles/FarmlandTile.cs
This commit is contained in:
commit
2311f9fdfe
7 changed files with 18 additions and 19 deletions
|
|
@ -25,12 +25,11 @@ namespace Tiles
|
|||
base.Clicked(usable);
|
||||
_crop.Clicked(usable);
|
||||
|
||||
if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.Id)
|
||||
{
|
||||
rv = new GrassTile(_gameObject);
|
||||
}
|
||||
if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.ID)
|
||||
{
|
||||
rv = new GrassTile(_gameObject);
|
||||
}
|
||||
|
||||
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue