sprechtl/Foerming
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'sprechtl' into develop

Browse source 
# Conflicts:
#	Assets/Scripts/Tiles/FarmlandTile.cs
This commit is contained in:
s-prechtl 2022-06-09 09:28:36 +02:00
commit 2311f9fdfe
7 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Assets/Scripts/Tiles/FarmlandTile.cs
View file

@ -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;
}
}

4
Assets/Scripts/Tiles/GrassTile.cs
View file

@ -20,9 +20,9 @@ namespace Tiles
if (usable != null)
{
base.Clicked(usable);
if (usable.Id == ic.GetItemIdByName("Hoe")) {
if (usable.ID == ic.GetItemIdByName("Hoe")) {
rv = new FarmlandTile(_gameObject);
} else if (usable.Id == ic.GetItemIdByName("Shovel")) {
} else if (usable.ID == ic.GetItemIdByName("Shovel")) {
rv = new WaterTile(_gameObject);
}
}

4
Assets/Scripts/Tiles/WaterTile.cs
View file

@ -12,14 +12,14 @@ namespace Tiles {
ItemContainer ic = ItemContainer.Instance;
if (usable.Id == ic.GetItemIdByName("Fishing Rod")) {
if (usable.ID == ic.GetItemIdByName("Fishing Rod")) {
FishingController fc = FishingController.instance;
if (!fc.Fishing) {
fc.StartFishing();
} else {
fc.TryCatch();
}
} else if (usable.Id == ic.GetItemIdByName("Shovel")) {
} else if (usable.ID == ic.GetItemIdByName("Shovel")) {
rv = new GrassTile(_gameObject);
}