From 5e14cc355fd3a4a27a0196f504fee16d68f39612 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Wed, 02 Apr 2025 17:25:03 +0000
Subject: [PATCH] #41 fixed item description text

---
 Assets/Scripts/Managers/GameManager.cs |   75 +++++++++++++++++++++++++++++++++----
 1 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs
index 13f8eb3..b5a90bf 100644
--- a/Assets/Scripts/Managers/GameManager.cs
+++ b/Assets/Scripts/Managers/GameManager.cs
@@ -10,19 +10,25 @@
 
 public class GameManager : SettingsManager
 {
+    public static bool GameIsPaused = false;
+
     public GameObject damageTextPrefab;
     public GameObject healthTextPrefab;
+    public GameObject lootTextPrefab;
     public Canvas playerUI;
     public Canvas pauseMenuUI;
+    public Canvas worldSpaceUI;
     public GameObject levelChanger;
     public Tilemap tilemap;
     [NonSerialized]
     public GenerateTileMap generateTileMap;
     [NonSerialized]
     public List<Vector3Int> destroyedTiles = new List<Vector3Int>();
+    public GameObject pickups;
 
     private void Awake()
     {
+        GameIsPaused = false;
         SoundManager.instance.ChangeMusic(SoundName.MusicHappy);
         LoadTileMaps(SaveSystem.isGameLoaded);
     }
@@ -31,7 +37,7 @@
     private void LoadTileMaps(bool loadFromSave)
     {
         generateTileMap = tilemap.GetComponent<GenerateTileMap>();
-        pauseMenuUI.GetComponent<PauseMenu>().Pause();
+        PauseGame();
         levelChanger.GetComponent<Animator>().SetBool("SceneLoading", true);
         if (loadFromSave)
         {
@@ -66,7 +72,7 @@
     }
     public void GameLoaded()
     {
-        pauseMenuUI.GetComponent<PauseMenu>().Resume();
+        ResumeGame();
         pauseMenuUI.GetComponent<Animator>().SetTrigger("GameLoaded");
     }
 
@@ -108,6 +114,20 @@
         tmpText.text = healthRestored.ToString();
 
     }
+    public void CharacterLootObtained(Vector3 position, Item itemReceived, int quantity)
+    {
+        // Offset the position slightly up so it doesn't spawn inside the ground/player
+        position += Vector3.up * 0.5f;
+
+        // Create text in world space (no parent needed)
+        GameObject textObj = Instantiate(lootTextPrefab, position, Quaternion.identity, worldSpaceUI.transform);
+        TextMeshProUGUI tmpText = textObj.GetComponent<TextMeshProUGUI>();
+        tmpText.text = $"+{quantity} ({itemReceived.itemName})";
+
+        // Ensure it's visible to the camera
+        textObj.transform.rotation = Camera.main.transform.rotation;
+
+    }
     public void CharacterDrill(ContactPoint2D contact, DrillDirection drillDirection)
     {
         GridLayout grid = tilemap.transform.GetComponentInParent<GridLayout>();
@@ -129,14 +149,53 @@
         //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;
+                Dropable dropable = tileGameObject?.GetComponent<Dropable>();
+                if (dropable?.isDropable ?? false)
+                {
+                    // Change no drops, only inventory
+                    //Instantiate(tileGameObject?.GetComponent<Dropable>().dropable, cellWorldPosition, Quaternion.identity, pickups.transform);
+                    Inventory playerInventory = contact.rigidbody.gameObject.GetComponent<Inventory>();
+                    if (playerInventory != null)
+                    {
+                        Item item = dropable.dropable;
+                        int dropAmount = dropable.GetRandomDropAmount();
+                        playerInventory.AddItem(item, dropAmount);
+                        CharacterLootObtained(tileGameObject.transform.position, item, dropAmount);
+                    }
+                }
+                tilemap.SetTile(cellCoord, null);
+                destroyedTiles.Add(cellCoord);
+                CharacterEvents.characterDrillingToPosition.Invoke(cellWorldPosition, drillDirection);
+            }
+            else
+            {
+                //CharacterEvents.characterDrillingToPositionAbort.Invoke(moveToPosition);
+            }
         }
     }
     #endregion
 
+
+    #region GameState
+
+    public static void PauseGame()
+    {
+        Time.timeScale = 0f;
+        GameIsPaused = true;
+        //GameStateEvents.gameStatePauseChanged.Invoke(GameIsPaused);
+    }
+    public static void ResumeGame()
+    {
+        Time.timeScale = 1f;
+        GameIsPaused = false;
+        //GameStateEvents.gameStatePauseChanged.Invoke(GameIsPaused);
+    }
+    #endregion
 }

--
Gitblit v1.9.3