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

Implemented turn passing and taking damage from it.

Browse source
This commit is contained in:
Max Dodd 2025-01-23 10:22:22 +01:00
parent 31917ba415
commit ede5ef1533
6 changed files with 572 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
PuzzleGameProject/Assets/Scripts/GameManager.cs
View file

@ -14,17 +14,21 @@ public enum GameState
}
public class GameManager : MonoBehaviour
{
[SerializeField] private GameState state;
[SerializeField] public GameState state;
[SerializeField] private GameObject rooms;
[SerializeField] private DiceRoller diceRoller;
[SerializeField] private PassManager passManager;
[SerializeField] private Player player;
private DicePair _dicePairOne = new DicePair();
private DicePair _dicePairTwo = new DicePair();
private DicePair _dicePairOne = new();
private DicePair _dicePairTwo = new();
public event EventHandler<GameState> StateChanged;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
diceRoller.diceRolled += DiceRolled;
passManager.PassRequested += PassRequested;
foreach (Transform roomTransform in rooms.transform)
{
roomTransform.gameObject.GetComponent<Room>().ValidRoomClicked += ValidRoomClicked;
@ -35,10 +39,15 @@ public class GameManager : MonoBehaviour
}
StartNewTurn();
}
private void ChangeState(GameState stateToChangeTo) {
state = stateToChangeTo;
StateChanged?.Invoke(this, state);
}
private void StartNewTurn()
{
state = GameState.RollDice;
ChangeState(GameState.RollDice);
diceRoller.Enable();
diceRoller.ResetDice();
_dicePairOne = new DicePair();
@ -61,13 +70,12 @@ public class GameManager : MonoBehaviour
room.SetRoomExplored();
if (state == GameState.PickRoomOne)
{
state = GameState.PickDiceTwo;
ChangeState(GameState.PickDiceTwo);
}
else
{
StartNewTurn();
}
}
void DieClicked(object sender, Die die)
@ -82,7 +90,7 @@ public class GameManager : MonoBehaviour
if (_dicePairOne.AreBothDiceSelected())
{
state = GameState.PickRoomOne;
ChangeState(GameState.PickRoomOne);
HighLightValidRoomsWithNumber(_dicePairOne);
}
}
@ -101,7 +109,7 @@ public class GameManager : MonoBehaviour
if (_dicePairTwo.AreBothDiceSelected())
{
state = GameState.PickRoomTwo;
ChangeState(GameState.PickRoomTwo);
HighLightValidRoomsWithNumber(_dicePairTwo);
}
}
@ -117,7 +125,7 @@ public class GameManager : MonoBehaviour
{
_dicePairOne.UnselectDie(die);
UnhighLightRoomsAsOptions();
state = GameState.PickDiceOne;
ChangeState(GameState.PickDiceOne);
}
break;
case GameState.PickRoomTwo:
@ -125,12 +133,17 @@ public class GameManager : MonoBehaviour
{
_dicePairTwo.UnselectDie(die);
UnhighLightRoomsAsOptions();
state = GameState.PickDiceTwo;
ChangeState(GameState.PickDiceTwo);
}
break;
}
}
private void PassTurn() {
player.TakeDamage(1);
StartNewTurn();
}
void HighLightValidRoomsWithNumber(DicePair pair)
{
foreach (Transform roomTransform in rooms.transform)
@ -156,7 +169,14 @@ public class GameManager : MonoBehaviour
if (state == GameState.RollDice)
{
diceRoller.Disable();
state = GameState.PickDiceOne;
ChangeState(GameState.PickDiceOne);
}
}
private void PassRequested(object sender, EventArgs e) {
if (state is GameState.PickDiceOne or GameState.PickDiceTwo)
{
PassTurn();
}
}
}