Max/PuzzleGame
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactored clicking on dice and rooms so that logic is moved out of the game manager

Browse source
This commit is contained in:
Max Dodd 2025-01-25 17:18:01 +01:00
parent ede5ef1533
commit e7ea8302ad
8 changed files with 150 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

28
PuzzleGameProject/Assets/Scripts/Room.cs
View file

@ -20,12 +20,12 @@ public class Room : MonoBehaviour
public event EventHandler<Room> ValidRoomClicked;
bool _isExplored = false;
private bool _isClickable = true;
private Color _roomNumberOriginalColor;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start() {
GameManager.Instance.StateChanged += HandleStateChange;
if (isEntrance) {
SetPropertiesOfEntrance();
@ -44,6 +44,10 @@ public class Room : MonoBehaviour
}
}
private void OnEnable() {
}
public void SetRoomExplored() {
_isExplored = true;
UnhighlightRoomAsOption();
@ -66,12 +70,11 @@ public class Room : MonoBehaviour
isEntrance = true;
}
IEnumerator OnMouseDown()
{
void OnMouseDown() {
if (!_isClickable) return;
if (IsValidRoomToExplore()) {
OnValidRoomClicked();
}
yield return null;
}
protected virtual void OnValidRoomClicked() {
@ -126,4 +129,19 @@ public class Room : MonoBehaviour
return false;
}
private void HandleStateChange(GameState state) {
switch (state)
{
case GameState.PickDiceOne:
case GameState.PickDiceTwo:
case GameState.RollDice:
_isClickable = false;
break;
case GameState.PickRoomTwo:
case GameState.PickRoomOne:
_isClickable = true;
break;
}
}
}