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

fixed SelectedItem when no item

Browse source
This commit is contained in:
j-weissen 2022-06-09 09:27:35 +02:00
parent 8e64a009f5
commit 93809f5052
3 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Assets/Scripts/Inventory.cs
View file

@ -35,6 +35,15 @@ public class Inventory : ItemStorage {
base.AddItem(item, amount);
}
public override void RemoveItem(Item item, int amount)
{
base.RemoveItem(item, amount);
if (!items.ContainsKey(item))
{
PlayerController.instance.DeselectItem();
}
}
public void SellItem(Item item, int amount) {
PlayerController.instance.ChangeMoney(item.SellPrice);
Shop.instance.AddItem(item, amount);

6
Assets/Scripts/PlayerController.cs
View file

@ -51,6 +51,12 @@ public class PlayerController : MonoBehaviour {
}
}
public void DeselectItem()
{
_selectedItem = null;
Cursor.SetCursor(null, Vector2.zero, CursorMode.Auto);
}
public UsableItem GetSelectedItem() {
return _selectedItem;
}

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

@ -20,14 +20,17 @@ namespace Tiles
public override BaseTile Clicked(UsableItem usable)
{
BaseTile rv = null;
base.Clicked(usable);
_crop.Clicked(usable);
if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.Id)
if (usable != null)
{
rv = new GrassTile(_gameObject);
base.Clicked(usable);
_crop.Clicked(usable);
if (ItemContainer.Instance.GetItemIdByName("Shovel") == usable.Id)
{
rv = new GrassTile(_gameObject);
}
}
return rv;
}
}