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

23
Assets/Scripts/TileBehaviour.cs
View file

@ -27,16 +27,27 @@ public class TileBehaviour : MonoBehaviour
{
Debug.Log("Clicked");
// SelectedItem always null for now
//BaseTile temp = tile.Clicked(PlayerController.getInstance().SelectedItem);
//if (temp != null)
//{
// SetTile(temp);
//}
UsableItem usable = PlayerController.instance.GetSelectedItem();
BaseTile tileToSetTo = null;
if (usable.GetType() == typeof(TerraformingTool))
{
TerraformingTool terraformingTool = (TerraformingTool) usable;
Type tileTypeToSetTo = terraformingTool.TileType;
tileToSetTo = (BaseTile) Activator.CreateInstance(tileTypeToSetTo);
}
else
{
tile.Clicked(usable);
}
if (tileToSetTo != null)
{
SetTile(tileToSetTo);
}
}
void SetTile(BaseTile tileToSet)
{
Debug.Log("Set tile to " + tileToSet.ToString());
tile = tileToSet;
GetComponent<SpriteRenderer>().color = tile.getColor; // TODO: Change to Sprite
}