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

Merge remote-tracking branch 'origin/develop' into develop

Browse source 
# Conflicts:
#	Assets/BaseTile.prefab.meta
#	Assets/Scenes/MainScene.unity
#	Assets/Scripts/PlayerController.cs
#	Assets/Scripts/TileBehaviour.cs
#	Assets/Scripts/Tiles/GrassTile.cs.meta
This commit is contained in:
s-prechtl 2022-05-20 08:19:17 +02:00
commit 45fd8aed5e
122 changed files with 17495 additions and 788 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
using System.Collections;
using System.Collections.Generic;
using System;
using Items.TerraformingTools;
using UnityEngine;

11
Assets/Scripts/Tiles/BaseTile.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2619a266d1f1c0c468e81e5bfda1cd78
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

11
Assets/Scripts/Tiles/FarmlandTile.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5b78d95148d53bd4aa70e3d0d595ab93
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

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

@ -14,10 +14,10 @@ namespace Tiles
/// </summary>
/// <param name="usable">the UsableItem that the Tile was clicked on with</param>
/// <returns>a subclass of BaseTile if the Tile has to change, null if it stays the same type</returns>
new public BaseTile Clicked(UsableItem usable) {
public new BaseTile Clicked(UsableItem usable) {
base.Clicked(usable);
BaseTile rv = null;
if (usable.GetType() == typeof(Items.Hoe))
if (usable.displayName == "Hoe")
{
rv = new FarmlandTile();
}

11
Assets/Scripts/Tiles/GrassTile.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: af8926946929c0644a4fbbe9d92b2729
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

11
Assets/Scripts/Tiles/WaterTile.cs.meta Normal file
View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: e1921bfec5aa63e44a32c0492c021809
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: