diff --git a/Assets/BaseTile.prefab b/Assets/BaseTile.prefab index d9d5305..ab5f718 100644 --- a/Assets/BaseTile.prefab +++ b/Assets/BaseTile.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 4752245148499717902} - component: {fileID: 4752245148499717903} - component: {fileID: 4752245148499717900} + - component: {fileID: 7967442993183754557} m_Layer: 0 m_Name: BaseTile m_TagString: Untagged @@ -124,3 +125,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3fd8bc1d313319d4f89f11548ccb1b6a, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &7967442993183754557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4752245148499717901} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae14b865b73e45c5b15efb9484f9cae2, type: 3} + m_Name: + m_EditorClassIdentifier: + GrassTileSprite: {fileID: 21300002, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} + FarmlandTileSprite: {fileID: 21300016, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} + WheatSprite: {fileID: 21300078, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index ee638aa..62222cc 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1639,7 +1639,7 @@ MonoBehaviour: m_HandleRect: {fileID: 2006577138} m_Direction: 2 m_Value: 1 - m_Size: 0.5932421 + m_Size: 0.59324205 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -4545,7 +4545,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1291863650 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6236,7 +6236,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 05183797fdda4aa9ac518eee0d2d85d4, type: 3} m_Name: m_EditorClassIdentifier: - allItems: [] + allItems: + - {fileID: 11400000, guid: bb9777a7d5804bd6bf25d5510206aaf0, type: 2} + - {fileID: 11400000, guid: d651d57ba97a4246a0094409e29fe56a, type: 2} + - {fileID: 11400000, guid: 430db451ae959f34b8fba8d8b17276fd, type: 2} + - {fileID: 11400000, guid: 008a8fdd2c3a95745acafee4087a855d, type: 2} --- !u!1001 &1805366398 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/TileBehaviour.cs b/Assets/Scripts/TileBehaviour.cs index 833bb10..2dd38d5 100644 --- a/Assets/Scripts/TileBehaviour.cs +++ b/Assets/Scripts/TileBehaviour.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using Items.TerraformingTools; using Tiles; using UnityEngine; public class TileBehaviour : MonoBehaviour { - private BaseTile tile; + private BaseTile _tile; // Start is called before the first frame update void Start() @@ -15,7 +11,7 @@ public class TileBehaviour : MonoBehaviour Debug.Log("Created"); SetTile(new GrassTile()); - HouseController.NewDayEvent.AddListener(tile.DayLightStep); + HouseController.NewDayEvent.AddListener(_tile.DayLightStep); } // Update is called once per frame @@ -27,20 +23,17 @@ public class TileBehaviour : MonoBehaviour void OnMouseDown() { Debug.Log("Clicked"); - - UsableItem usable = PlayerController.instance.GetSelectedItem(); + + UsableItem usable = null; BaseTile tileToSetTo = null; - if (usable.GetType() == typeof(TerraformingTool)) + + if (PlayerController.instance.GetSelectedItem() != null) { - TerraformingTool terraformingTool = (TerraformingTool) usable; - Type tileTypeToSetTo = terraformingTool.TileType; - tileToSetTo = (BaseTile) Activator.CreateInstance(tileTypeToSetTo); - } - else - { - tileToSetTo = tile.Clicked(usable); - Debug.Log("AMOGUS " + tileToSetTo.ToString()); + usable = PlayerController.instance.GetSelectedItem(); } + + tileToSetTo = _tile.Clicked(usable); + if (tileToSetTo != null) { SetTile(tileToSetTo); @@ -50,7 +43,8 @@ public class TileBehaviour : MonoBehaviour void SetTile(BaseTile tileToSet) { Debug.Log("Set tile to " + tileToSet.ToString()); - tile = tileToSet; - GetComponent().color = tile.getColor; // TODO: Change to Sprite + _tile = tileToSet; + Debug.Log(_tile.Sprite); + GetComponent().sprite = _tile.Sprite; // TODO: Change to Sprite } } diff --git a/Assets/Scripts/TileSpriteContainer.cs b/Assets/Scripts/TileSpriteContainer.cs new file mode 100644 index 0000000..62e1271 --- /dev/null +++ b/Assets/Scripts/TileSpriteContainer.cs @@ -0,0 +1,12 @@ +using System; +using UnityEngine; + +namespace DefaultNamespace +{ + public class TileSpriteContainer : MonoBehaviour + { + public static Sprite GrassTileSprite; + public static Sprite FarmlandTileSprite; + public static Sprite WheatSprite; + } +} \ No newline at end of file diff --git a/Assets/Scripts/TileSpriteContainer.cs.meta b/Assets/Scripts/TileSpriteContainer.cs.meta new file mode 100644 index 0000000..3f8040a --- /dev/null +++ b/Assets/Scripts/TileSpriteContainer.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ae14b865b73e45c5b15efb9484f9cae2 +timeCreated: 1654172944 \ No newline at end of file diff --git a/Assets/Scripts/Tiles/BaseTile.cs b/Assets/Scripts/Tiles/BaseTile.cs index a95d044..5ffa2f5 100644 --- a/Assets/Scripts/Tiles/BaseTile.cs +++ b/Assets/Scripts/Tiles/BaseTile.cs @@ -26,7 +26,7 @@ namespace Tiles public void DayLightStep() { - Debug.Log("I evolve"); + } public virtual BaseTile Clicked(UsableItem usable) @@ -34,5 +34,11 @@ namespace Tiles Debug.Log(usable.ToString() + " used on " + this.ToString()); return null; } +/* + static protected Sprite GenerateSpriteFromFile() + { + + } + */ } } \ No newline at end of file diff --git a/Assets/Scripts/Tiles/FarmlandTile.cs b/Assets/Scripts/Tiles/FarmlandTile.cs index d1dcf5e..89acd8d 100644 --- a/Assets/Scripts/Tiles/FarmlandTile.cs +++ b/Assets/Scripts/Tiles/FarmlandTile.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using DefaultNamespace; +using UnityEngine; namespace Tiles { @@ -7,7 +8,7 @@ namespace Tiles private Crop _crop; private bool _hydrated; - public FarmlandTile() : base(Color.black) + public FarmlandTile() : base(TileSpriteContainer.FarmlandTileSprite) { _crop = null; _hydrated = false; diff --git a/Assets/Scripts/Tiles/GrassTile.cs b/Assets/Scripts/Tiles/GrassTile.cs index 875425c..4fb738f 100644 --- a/Assets/Scripts/Tiles/GrassTile.cs +++ b/Assets/Scripts/Tiles/GrassTile.cs @@ -1,12 +1,13 @@ -using UnityEngine; +using DefaultNamespace; +using UnityEngine; namespace Tiles { public class GrassTile : BaseTile { - public GrassTile() : base(Color.green) + public GrassTile() : base(TileSpriteContainer.GrassTileSprite) { - + } /// @@ -15,11 +16,14 @@ namespace Tiles /// the UsableItem that the Tile was clicked on with /// a subclass of BaseTile if the Tile has to change, null if it stays the same type public override BaseTile Clicked(UsableItem usable) { - base.Clicked(usable); BaseTile rv = null; - if (usable.id == ItemContainer.Instance.GetItemIdByName("Hoe")) + if (usable != null) { - rv = new FarmlandTile(); + base.Clicked(usable); + if (usable.id == ItemContainer.Instance.GetItemIdByName(new string("Hoe"))) + { + rv = new FarmlandTile(); + } } return rv; } diff --git a/Assets/Scripts/Tiles/WaterTile.cs b/Assets/Scripts/Tiles/WaterTile.cs index 9542f0b..37afdd7 100644 --- a/Assets/Scripts/Tiles/WaterTile.cs +++ b/Assets/Scripts/Tiles/WaterTile.cs @@ -4,7 +4,7 @@ namespace Tiles { public class WaterTile : BaseTile { - public WaterTile() : base(Color.blue) + public WaterTile() : base(null) { }