Merge sprechtl develop

This commit is contained in:
s-prechtl 2022-06-09 00:00:26 +02:00
commit f8da73695c
4 changed files with 45 additions and 16 deletions

View file

@ -1,12 +1,29 @@
using UnityEngine;
using System.Collections;
using UnityEngine;
namespace Tiles
{
public class WaterTile : BaseTile
{
public WaterTile() : base(null, null)
{
namespace Tiles {
public class WaterTile : BaseTile {
public WaterTile() : base("Assets/Farming Asset Pack/Split Assets/farming_tileset_023.png") {
}
public override BaseTile Clicked(UsableItem usable) {
base.Clicked(usable);
BaseTile rv = null;
ItemContainer ic = ItemContainer.Instance;
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")) {
rv = new GrassTile();
}
return rv;
}
}
}