From d14aa149918f3f8e4437d4e8b65c13a2b06d212d Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Thu, 03 Apr 2025 21:12:13 +0000
Subject: [PATCH] #42 fix chunk y position
---
Assets/Scripts/Managers/GameManager.cs | 63 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 7 deletions(-)
diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs
index 00a5bc0..9f4d5ed 100644
--- a/Assets/Scripts/Managers/GameManager.cs
+++ b/Assets/Scripts/Managers/GameManager.cs
@@ -10,10 +10,14 @@
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]
@@ -21,9 +25,12 @@
[NonSerialized]
public List<Vector3Int> destroyedTiles = new List<Vector3Int>();
public GameObject pickups;
+ public Tilemap fogTilemap;
+ public FogOfWar fogOfWar;
private void Awake()
{
+ GameIsPaused = false;
SoundManager.instance.ChangeMusic(SoundName.MusicHappy);
LoadTileMaps(SaveSystem.isGameLoaded);
}
@@ -32,7 +39,7 @@
private void LoadTileMaps(bool loadFromSave)
{
generateTileMap = tilemap.GetComponent<GenerateTileMap>();
- pauseMenuUI.GetComponent<PauseMenu>().Pause();
+ PauseGame();
levelChanger.GetComponent<Animator>().SetBool("SceneLoading", true);
if (loadFromSave)
{
@@ -47,6 +54,7 @@
SaveDataMap mapState = SaveSystem.LoadMapState();
if (mapState != null)
{
+ //fogOfWar.LoadFromSaveData(mapState.fogOfWarData);
generateTileMap.SetSettingsFromSeed(mapState.seed);
if (mapState.destroyedTiles != null && mapState.destroyedTiles.Count > 0)
{
@@ -67,7 +75,7 @@
}
public void GameLoaded()
{
- pauseMenuUI.GetComponent<PauseMenu>().Resume();
+ ResumeGame();
pauseMenuUI.GetComponent<Animator>().SetTrigger("GameLoaded");
}
@@ -109,6 +117,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>();
@@ -122,7 +144,10 @@
cellCoord.x = cellCoord.x + 1;
break;
case DrillDirection.Down:
- cellCoord.y = cellCoord.y - 1;
+ // Use player's center position for downward drilling
+ Vector3 playerCenter = contact.rigidbody.transform.position;
+ cellCoord = grid.WorldToCell(playerCenter);
+ cellCoord.y = grid.WorldToCell(contact.point).y - 1; // Keep the vertical position from contact point
break;
}
@@ -137,11 +162,19 @@
// middle of tile
cellWorldPosition.x += 0.5f;
cellWorldPosition.y += 0.5f;
- if (tileGameObject?.GetComponent<Dropable>()?.isDropable ?? false)
+ Dropable dropable = tileGameObject?.GetComponent<Dropable>();
+ if (dropable?.isDropable ?? false)
{
- Instantiate(tileGameObject?.GetComponent<Dropable>().dropable, cellWorldPosition, Quaternion.identity, pickups.transform);
- //Debug.Log(.name);
-
+ // 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);
@@ -155,4 +188,20 @@
}
#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