Merge branch 'jweissen' into develop

# Conflicts:
#	Assets/Scripts/Actions/ActionManager.cs
This commit is contained in:
j-weissen 2022-06-24 08:07:22 +02:00
commit d3a06effc5
10 changed files with 98 additions and 19 deletions

View file

@ -2,6 +2,7 @@
using Tiles;
using UnityEngine;
/// Definitions of ClickActionHandlers here
namespace Assets.Scripts.Actions {
public abstract class AbstractTileClickActionHandler : ClickActionHandler {
protected BaseTile _tile;
@ -185,7 +186,7 @@ namespace Assets.Scripts.Actions {
public override void InvokeAction(GameObject gameObject) {
if(crop.FullyGrown) {
Inventory.instance.AddElement(ItemContainer.Instance.GetItemByName("Wheat Seeds"),
(int)(Random.Range(1, 300)));
(int)(Random.Range(1, 3)));
Inventory.instance.AddElement(ItemContainer.Instance.GetItemByName("Wheat"), 1);
crop.ResetPlant();
updateFarmlandSprites(gameObject);