Pull request #7: Pause without freeze timeScale when dying

Merge in CEGJ/ludumdare50 from jason to dev

* commit '271bd1d93f11cc373fefc96c3736fbf4d24fba18':
  Pause without freeze timeScale when dying

Assets/Prefabs/Vampire.prefab

@@ -54,6 +54,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   gameFlowManager: {fileID: 0}
   stats: {fileID: 11400000, guid: 12a626b5a296d934ba078d222ad6ba98, type: 2}
+  globalCamera: {fileID: 0}
+  safeZonePrompt: {fileID: 0}
 --- !u!114 &3126145803593047825
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -93,6 +95,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 56c3e06ea5db48a40a7f55e72291cb0d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  gameFlowManager: {fileID: 0}
   minionPrefabs:
   - {fileID: 2399377275812995974, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
   aimArrow: {fileID: 5124059627794595469}
@@ -337,7 +340,7 @@ Rigidbody2D:
   m_LinearDrag: 0
   m_AngularDrag: 0.05
   m_GravityScale: 0
-  m_Material: {fileID: 0}
+  m_Material: {fileID: 6200000, guid: 72c8b57001d325c418a78771641a077f, type: 2}
   m_Interpolate: 0
   m_SleepingMode: 1
   m_CollisionDetection: 0

Assets/Scripts/Arena.cs

@@ -31,7 +31,7 @@ public class Arena : MonoBehaviour {
 	void Start() => StartCoroutine(SpawnEnemies());
 
 	void SpawnEnemy(int spawnerIndex) {
-		if (gameFlowManager.Paused)
+		if (!gameFlowManager.CanDoAction)
 			return;
 		
 		var entity = Instantiate(entityPrefab, spawners[spawnerIndex].position, Quaternion.identity).GetComponent<Entity>();

Assets/Scripts/GameFlowManager.cs

@@ -8,12 +8,16 @@ public class GameFlowManager : MonoBehaviour {
 	[SerializeField] [Required]
 	GameTimer gameTimer = null!;
 
-	/// <summary>
+	public enum PauseLevel {
-	/// True if time is frozen (Start, Pause Menu, Dead)
+		NotPaused,
-	/// </summary>
+		PreventActions,
-	/// <remarks>Could be renamed appropriately</remarks>
+		WorldFreeze,
+	}
+
 	[field: SerializeField]
-	public bool Paused { get; private set; } = true;
+	public PauseLevel pauseLevel { get; private set; } = PauseLevel.PreventActions;
+
+	public bool CanDoAction => pauseLevel <= PauseLevel.NotPaused;
 
 	public BaseState CurrentState { get; private set; } = null!;
 	bool lastStartButton;
@@ -33,10 +37,9 @@ public class GameFlowManager : MonoBehaviour {
 
 	#endregion
 
-	void SetPause(bool value) {
+	void SetPauseLevel(PauseLevel value) {
-		Debug.Log($"Setting pause to {value}");
+		pauseLevel = value;
-		Paused = value;
+		Time.timeScale = value >= PauseLevel.WorldFreeze ? 0f : 1f;
-		Time.timeScale = value ? 0f : 1f;
 	}
 
 	public void GameOver() => SwitchState(new DeadFlowState(this));
@@ -85,8 +88,7 @@ public class GameFlowManager : MonoBehaviour {
 		public override void EnterState() {
 			base.EnterState();
 
-			Debug.Log("Press Start to start...!");
+			gameFlowManager.SetPauseLevel(PauseLevel.PreventActions);
-			gameFlowManager.SetPause(true);
 		}
 
 		public override void LeaveState() {
@@ -101,7 +103,7 @@ public class GameFlowManager : MonoBehaviour {
 			base.EnterState();
 
 			gameFlowManager.gameTimer.StartTimer();
-			gameFlowManager.SetPause(false);
+			gameFlowManager.SetPauseLevel(PauseLevel.NotPaused);
 		}
 
 		public override void LeaveState() {
@@ -116,7 +118,7 @@ public class GameFlowManager : MonoBehaviour {
 
 		public override void EnterState() {
 			base.EnterState();
-			gameFlowManager.SetPause(true);
+			gameFlowManager.SetPauseLevel(PauseLevel.NotPaused);
 		}
 	}
 
@@ -127,7 +129,7 @@ public class GameFlowManager : MonoBehaviour {
 			base.EnterState();
 
 			Debug.Log("You died!\nPress Accept to restart!");
-			gameFlowManager.SetPause(true);
+			gameFlowManager.SetPauseLevel(PauseLevel.PreventActions);
 		}
 
 		public void ReloadGame() {

Assets/Scripts/MinionThrower.cs

@@ -41,7 +41,7 @@ public class MinionThrower : MonoBehaviour {
     }
 
     public void ToggleThrowMode(InputAction.CallbackContext context) {
-	    if (gameFlowManager.Paused)
+	    if (!gameFlowManager.CanDoAction)
 		    return;
 	    
         if (context.performed) {

Assets/Scripts/PlayerMovement.cs

@@ -38,7 +38,7 @@ public class PlayerMovement : MonoBehaviour {
 	}
 
 	void Update() {
-		if (gameFlowManager.Paused)
+		if (gameFlowManager.pauseLevel >= GameFlowManager.PauseLevel.WorldFreeze)
 			return;
 
 		if (currentState.UpdateState() is {} newState)
@@ -46,7 +46,7 @@ public class PlayerMovement : MonoBehaviour {
 	}
 
 	void FixedUpdate() {
-		if (gameFlowManager.Paused)
+		if (gameFlowManager.pauseLevel >= GameFlowManager.PauseLevel.WorldFreeze)
 			return;
 
         if (safeZone != null && IsInSafeZone) {
@@ -70,16 +70,19 @@ public class PlayerMovement : MonoBehaviour {
 	#region Inputs
 
 	public void OnMove(InputAction.CallbackContext ctx) {
-		moveDirection = ctx.ReadValue<Vector2>();
+		if (gameFlowManager.CanDoAction) {
-		if (moveDirection.sqrMagnitude > 1.0f)
+			moveDirection = ctx.ReadValue<Vector2>();
-			moveDirection.Normalize();
+			if (moveDirection.sqrMagnitude > 1.0f)
+				moveDirection.Normalize();
+		}else //TODO Should set to zero via event or callback
+			moveDirection = Vector2.zero;
 	}
 
 	public void OnJump(InputAction.CallbackContext ctx) {
 		if (!ctx.WasPressedThisFrame(ref lastJumpButton))
 			return;
 
-		if (gameFlowManager.Paused || safeZone == null)
+		if (!gameFlowManager.CanDoAction || safeZone == null)
 			return;
 
 		if (IsInSafeZone) {

Assets/Scripts/VampireEntity.cs

@@ -18,10 +18,8 @@ public class VampireEntity : Entity {
 	protected override void Update() {
 		base.Update();
 
-		if (gameFlowManager.Paused)
+		if (gameFlowManager.CanDoAction)
-			return;
+			TakeDamage(playerStats.bloodLossRate * Time.deltaTime, this);
-		
-		TakeDamage(playerStats.bloodLossRate * Time.deltaTime, this);
 	}
 
 	// public override void TakeDamage(float amount) {

ProjectSettings/ProjectSettings.asset

@@ -76,7 +76,7 @@ PlayerSettings:
   androidFullscreenMode: 1
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
-  runInBackground: 0
+  runInBackground: 1
   captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0