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

8
Assets/Scripts/Crop.cs
View file

@ -57,13 +57,13 @@ public class Crop {
public void Clicked(UsableItem usableItem) {
if(usableItem != null) {
ItemContainer ic = ItemContainer.Instance;
if(ic.GetItemIdByName("Hoe") == usableItem.Id) {
if(ic.GetItemIdByName("Hoe") == usableItem.ID) {
ApplyAction(Hoe);
} else if(ic.GetItemIdByName("Scythe") == usableItem.Id) {
} else if(ic.GetItemIdByName("Scythe") == usableItem.ID) {
ApplyAction(Scythe);
} else if(ic.GetItemIdByName("Wheat Seeds") == usableItem.Id) {
} else if(ic.GetItemIdByName("Wheat Seeds") == usableItem.ID) {
ApplyAction(Seeds);
} else if(ic.GetItemIdByName("Watering Can") == usableItem.Id) {
} else if(ic.GetItemIdByName("Watering Can") == usableItem.ID) {
ApplyAction(WateringCan);
}
}

8
Assets/Scripts/FishingController.cs
View file

@ -55,15 +55,15 @@ public class FishingController : MonoBehaviour {
}
} else {
_fishingTime += Time.deltaTime;
//NotifyShake();
NotifyShake();
}
}
}
private void NotifyShake() {
_exMark.transform.position =
new Vector3(_exMark.transform.position.x * _ampsXY.x * Time.deltaTime,
_exMark.transform.position.y * _ampsXY.y * Time.deltaTime,
new Vector3(_exMark.transform.position.x + _ampsXY.x * Time.deltaTime,
_exMark.transform.position.y + _ampsXY.y * Time.deltaTime,
transform.position.z);
_ampsXY.x *= -1;
_ampsXY.y *= -1;
@ -100,7 +100,7 @@ public class FishingController : MonoBehaviour {
Debug.Log("Tried to catch!");
if (_fishingTime <= _maxTime) {
Debug.Log("Caught!");
Inventory.instance.AddItem(ItemContainer.Instance.GetItemByName("Fish"), (int)(3 / _fishingTime));
Inventory.instance.AddItem(ItemContainer.Instance.GetItemByName("Fish"), Math.Max((int)(1 / (_fishingTime/2)), 1));
ResetFishing();
} else {
Debug.Log("Failed to catch!");

2
Assets/Scripts/Item.cs
View file

@ -10,7 +10,7 @@ public class Item : ScriptableObject, IComparable<Item> {
public Sprite defaultSprite;
public int price;
public int SellPrice => Convert.ToInt32(price * 0.8);
public int Id => _id;
public int ID => _id;
public Item(string displayName, string description, int id) {
this.displayName = displayName;

2
Assets/Scripts/ItemContainer.cs
View file

@ -48,6 +48,6 @@ public class ItemContainer : MonoBehaviour {
}
public int GetItemIdByName(String name) {
return GetItemByName(name).Id;
return GetItemByName(name).ID;
}
}

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