Pull request #5: Jason

Merge in CEGJ/ludumdare50 from jason to dev

* commit 'd8289dce3f31a83e05a5c2ddb5cf9ea0823557c0':
  Reset blood loss to 3
  Basic play replay game loop
  Lose blood overtime and switch to Dead state

Assets/GameFlowManager.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using UnityEngine.InputSystem;
+using UnityEngine.SceneManagement;
 
 //Could be a singleton
 public class GameFlowManager : MonoBehaviour {
@@ -11,6 +12,7 @@ public class GameFlowManager : MonoBehaviour {
 	public bool Paused { get; private set; } = true;
 	public BaseState CurrentState { get; private set; } = null!;
 	bool lastStartButton;
+	bool lastAcceptButton;
 
 	#region  Unity Messages
 	void Awake() => CurrentState = new StartFlowState(this);
@@ -19,23 +21,29 @@ public class GameFlowManager : MonoBehaviour {
 	#endregion
 
 	void SetPause(bool value) {
+		Debug.Log($"Setting pause to {value}");
 		Paused = value;
 		Time.timeScale = value ? 0f : 1f;
 	}
 
+	public void GameOver() => SwitchState(new DeadFlowState(this));
+
 	#region Inputs
 	public void OnStart(InputAction.CallbackContext ctx) {
-		//feels pretty redundant ^^'
+		if (!ctx.WasPressedThisFrame(ref lastStartButton))
-		bool newValue = ctx.ReadValueAsButton();
-		bool wasJustPressed = !lastStartButton && newValue;
-		lastStartButton = newValue;
-
-		if (!wasJustPressed)
 			return;
 
 		if (CurrentState is StartFlowState)
 			SwitchState(new GameplayFlowState(this));
 	}
+	
+	public void OnAccept(InputAction.CallbackContext ctx) {
+		if (!ctx.WasPressedThisFrame(ref lastAcceptButton))
+			return;
+
+		if (CurrentState is DeadFlowState deadState)
+			deadState.ReloadGame();
+	}
 	#endregion
 
 	#region States
@@ -88,8 +96,15 @@ public class GameFlowManager : MonoBehaviour {
 		
 		public override void EnterState() {
 			base.EnterState();
+			
+			Debug.Log("You died!\nPress Accept to restart!");
 			gameFlowManager.SetPause(true);
 		}
+
+		public void ReloadGame() {
+			Debug.Log("Reloading scene...");
+			SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex);
+		}
 	}
 	#endregion
 }

Assets/Scenes/SampleScene.unity

@@ -408,7 +408,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.size
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[13].m_ActionId
@@ -418,6 +418,10 @@ PrefabInstance:
       propertyPath: m_ActionEvents.Array.data[14].m_ActionId
       value: 01a06960-a379-49e3-9d58-9b7c8effcb3d
       objectReference: {fileID: 0}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_ActionId
+      value: 65aa4e67-f805-47b9-adc0-444ca0e0bec8
+      objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[13].m_ActionName
       value: Player/SwitchMinion[/Keyboard/q,/Keyboard/e,/XInputControllerWindows/leftShoulder,/XInputControllerWindows/rightShoulder]
@@ -426,6 +430,10 @@ PrefabInstance:
       propertyPath: m_ActionEvents.Array.data[14].m_ActionName
       value: Player/Start[/XInputControllerWindows/start,/Keyboard/enter]
       objectReference: {fileID: 0}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_ActionName
+      value: Player/Accept[/XInputControllerWindows/buttonSouth,/XInputControllerWindows/start,/Keyboard/enter]
+      objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.size
       value: 1
@@ -434,6 +442,10 @@ PrefabInstance:
       propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.size
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
       value: 0
@@ -442,6 +454,10 @@ PrefabInstance:
       propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
@@ -450,6 +466,10 @@ PrefabInstance:
       propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Target
       value: 
       objectReference: {fileID: 1359990806}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1359990806}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
       value: 2
@@ -458,6 +478,10 @@ PrefabInstance:
       propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
       value: ChangeSelectedIcon
@@ -466,6 +490,10 @@ PrefabInstance:
       propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
       value: OnStart
       objectReference: {fileID: 0}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: OnAccept
+      objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
       value: MinionBar, Assembly-CSharp
@@ -474,6 +502,10 @@ PrefabInstance:
       propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
       value: GameFlowManager, Assembly-CSharp
       objectReference: {fileID: 0}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: GameFlowManager, Assembly-CSharp
+      objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: m_ActionEvents.Array.data[13].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
       value: UnityEngine.Object, UnityEngine
@@ -482,6 +514,10 @@ PrefabInstance:
       propertyPath: m_ActionEvents.Array.data[14].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
       value: UnityEngine.Object, UnityEngine
       objectReference: {fileID: 0}
+    - target: {fileID: 1214567908930553477, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: m_ActionEvents.Array.data[15].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
     - target: {fileID: 1214567908930553592, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: gameFlowManager
       value: 
@@ -542,6 +578,10 @@ PrefabInstance:
       propertyPath: healthBar
       value: 
       objectReference: {fileID: 1464970062}
+    - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
+      propertyPath: playerStats
+      value: 
+      objectReference: {fileID: 11400000, guid: 12a626b5a296d934ba078d222ad6ba98, type: 2}
     - target: {fileID: 3126145803593047825, guid: 3e0aae8cda56aef44af9598dc5471020, type: 3}
       propertyPath: gameFlowManager
       value: 

Assets/Scripts/AIEntity.cs

@@ -2,11 +2,12 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Serialization;
 
 public class AIEntity : Entity
 {
-    [SerializeField] AIStats stats = null!;
+    [FormerlySerializedAs("stats")] [SerializeField] AIStats AIStats = null!;
-    public string ennemyName {get; protected set; }
+    public string? ennemyName {get; protected set; }
     
     abstract class BaseStateAI : BaseState{
 		protected AIEntity entity;
@@ -59,7 +60,7 @@ public class AIEntity : Entity
                     if(distance < lastDist){
                         lastDist = distance;
                         chosenEntity = other;
-                        if(lastDist <= entity.stats.closeEnough)break;
+                        if(lastDist <= entity.AIStats.closeEnough)break;
                     }
                 }
             }

Assets/Scripts/Entity.cs

@@ -7,7 +7,7 @@ using UnityEngine;
 public class Entity : MonoBehaviour 
 {
 	[SerializeField] [Required]
-	GameFlowManager gameFlowManager = null!;
+	protected GameFlowManager gameFlowManager = null!;
 
 	[field: SerializeField] [field: Required]
 	protected EntityStats stats { get; private set; }
@@ -34,6 +34,8 @@ public class Entity : MonoBehaviour
         attackTimer = attackCooldown;
     }
     
+    protected virtual void Update() {}
+
     protected virtual void FixedUpdate() {
 	    //TODO sqrMagnitude?
 	    if (beingPushed && rb.velocity.magnitude < stats.MinVelocityWhenPushed) {
@@ -72,6 +74,7 @@ public class Entity : MonoBehaviour
         Health -= amount;
         if(Health <= 0){
             isAlive = false;
+            OnDied();
             return false;
         }
         return true;
@@ -94,4 +97,6 @@ public class Entity : MonoBehaviour
 	    beingPushed = true;
 	    rb.AddForce(impulse, ForceMode2D.Impulse);
     }
+
+    protected virtual void OnDied() {}
 }

Assets/Scripts/Gladiator.cs

@@ -13,8 +13,8 @@ public class Gladiator : AIEntity
     }
 
     // Update is called once per frame
-    void Update()
+    protected override void Update()
     {
-        
+        base.Update();
     }
 }

Assets/Scripts/Monster.cs

@@ -19,8 +19,10 @@ public class Monster : AIEntity
     }
 
     // Update is called once per frame
-    void Update()
+    protected override void Update()
     {
+	    base.Update();
+	    
         if(IsInAttackRange()){
             if(attackTimer >= attackCooldown){
                 Attack();

Assets/Scripts/Player Stats.asset

@@ -14,5 +14,4 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   movementSpeed: 3
   suckSpeed: 1
-  safeZoneJumpDuration: 1.2
+  bloodLossRate: 3
-  safeZonePosition: {x: 0, y: 0, z: 0}

Assets/Scripts/PlayerMovement.cs

@@ -58,12 +58,7 @@ public class PlayerMovement : MonoBehaviour {
 	}
 
 	public void OnJump(InputAction.CallbackContext ctx) {
-		//feels pretty redundant ^^'
+		if (!ctx.WasPressedThisFrame(ref lastJumpButton))
-		bool newValue = ctx.ReadValueAsButton();
-		bool wasJustPressed = !lastJumpButton && newValue;
-		lastJumpButton = newValue;
-
-		if (!wasJustPressed)
 			return;
 
 		if (gameFlowManager.Paused || safeZone == null)

Assets/Scripts/PlayerStats.cs

@@ -2,6 +2,12 @@
 
 [CreateAssetMenu]
 public class PlayerStats : ScriptableObject {
+	[field: SerializeField] [Min(0f)]
 	public float movementSpeed = 3f;
+	
+	[field: SerializeField] [Min(0f)]
 	public float suckSpeed = 1f;
+
+	[field: SerializeField] [Min(0f)]
+	public float bloodLossRate = 1f;
 }

Assets/Scripts/Utils.cs

@@ -0,0 +1,11 @@
+using UnityEngine.InputSystem;
+
+public static class Utils {
+	public static bool WasPressedThisFrame(this InputAction.CallbackContext ctx, ref bool lastValue) {
+		bool newValue = ctx.ReadValueAsButton();
+		bool wasJustPressed = !lastValue && newValue;
+		lastValue = newValue;
+
+		return wasJustPressed;
+	}
+}

Assets/Scripts/Utils.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1e5065f064a94fed9f3cc40edc9c60af
+timeCreated: 1648920968

Assets/Scripts/VampireEntity.cs

@@ -2,6 +2,9 @@
 using UnityEngine;
 
 public class VampireEntity : Entity {
+	[SerializeField] [field: Required]
+	PlayerStats playerStats = null!;
+	
 	[SerializeField] [Required]
 	HealthBar healthBar;
 	[Min(10f)]
@@ -14,10 +17,21 @@ public class VampireEntity : Entity {
 		initialHealth = Health;
 	}
 
+	protected override void Update() {
+		base.Update();
+
+		if (gameFlowManager.Paused)
+			return;
+		
+		TakeDamage(playerStats.bloodLossRate * Time.deltaTime);
+	}
+
 	public override bool TakeDamage(float amount) {
 		bool stillAlive = base.TakeDamage(amount);
 		healthBar.SetHealthFraction(Health / initialHealth);
 
 		return stillAlive;
 	}
+
+	protected override void OnDied() => gameFlowManager.GameOver();
 }

Assets/Settings/ConjureLudumDare50.inputactions

@@ -49,6 +49,15 @@
                     "processors": "",
                     "interactions": "",
                     "initialStateCheck": false
+                },
+                {
+                    "name": "Accept",
+                    "type": "Button",
+                    "id": "65aa4e67-f805-47b9-adc0-444ca0e0bec8",
+                    "expectedControlType": "Button",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                 }
             ],
             "bindings": [
@@ -315,6 +324,39 @@
                     "action": "Start",
                     "isComposite": false,
                     "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "6264d8cf-a124-4ae2-a851-5ce21b5b0306",
+                    "path": "<Gamepad>/buttonSouth",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Gamepad",
+                    "action": "Accept",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "23fc3eaa-8abb-4c1a-b706-4dd2c2e2b760",
+                    "path": "<Gamepad>/start",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Gamepad",
+                    "action": "Accept",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "4ce4b7b9-060f-4582-ae33-ac536c61a411",
+                    "path": "<Keyboard>/enter",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Keyboard&Mouse",
+                    "action": "Accept",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                 }
             ]
         },