From 9ac1377fd0ea4eee5606ee659662acd58634c2b2 Mon Sep 17 00:00:00 2001 From: miepzerino <o.skotnik@gmail.com> Date: Mon, 20 Jan 2025 04:12:25 +0000 Subject: [PATCH] Code cleanup --- Assets/Scripts/Managers/GameManager.cs | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index 13f8eb3..4f26218 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -20,6 +20,7 @@ public GenerateTileMap generateTileMap; [NonSerialized] public List<Vector3Int> destroyedTiles = new List<Vector3Int>(); + public GameObject pickups; private void Awake() { @@ -129,12 +130,28 @@ //Debug.Log(tilemap.HasTile(cellCoord)); if (tilemap.HasTile(cellCoord)) { - tilemap.SetTile(cellCoord, null); - destroyedTiles.Add(cellCoord); - Vector3 moveToPosition = grid.CellToWorld(cellCoord); - moveToPosition.x += 0.5f; - moveToPosition.y += 0.5f; - CharacterEvents.characterDrillingToPosition.Invoke(moveToPosition); + GameObject tileGameObject = tilemap.GetInstantiatedObject(cellCoord); + if (tileGameObject?.GetComponent<Drillable>()?.isDrillable ?? false) + { + Vector3 cellWorldPosition = grid.CellToWorld(cellCoord); + // middle of tile + cellWorldPosition.x += 0.5f; + cellWorldPosition.y += 0.5f; + if (tileGameObject?.GetComponent<Dropable>()?.isDropable ?? false) + { + // Change no drops, only inventory + //Instantiate(tileGameObject?.GetComponent<Dropable>().dropable, cellWorldPosition, Quaternion.identity, pickups.transform); + //Debug.Log(.name); + + } + tilemap.SetTile(cellCoord, null); + destroyedTiles.Add(cellCoord); + CharacterEvents.characterDrillingToPosition.Invoke(cellWorldPosition, drillDirection); + } + else + { + //CharacterEvents.characterDrillingToPositionAbort.Invoke(moveToPosition); + } } } #endregion -- Gitblit v1.9.3