Merge remote-tracking branch 'origin/main'

Assets/Prefabs/CameraRig.prefab

@@ -187,8 +187,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Wave: 0
   difficulty: 1
-  difficultyIncreasePerWave: 0.25
-  difficultyMultiplyDecreasePerWave: 0.1
+  difficultyIncreasePerWave: 1
+  difficultyMultiplyDecreasePerWave: 0.05
   WaveTime: 20
   enemyDifficulties: []
   SpawnRadius: 22.6

Assets/Scenes/Bloody Mary.unity

@@ -1300,7 +1300,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   numParticles: 1000000
   bloodCompute: {fileID: 7200000, guid: 99867deda8cf464cd87542adcc3c08f2, type: 3}
-  mesh: {fileID: 6466198060863859617, guid: 803eb7ed90ad4b9388c2563597bd6db2, type: 3}
+  mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
   instancedMaterial: {fileID: 2100000, guid: 0d09c46ae354e8c49b2688cc4325b256, type: 2}
   size: 0.05
   scoreMult: 1

Assets/Scripts/BloodComputeShader.cs

@@ -260,10 +260,14 @@ public class BloodComputeShader : MonoBehaviour
         // Test for race conditions
         // yield return new WaitForSeconds(1.0f);
 
-        bloodCompute.SetFloat("particleVel", power);
+        bloodCompute.SetFloat("particleVel", power/4.0f);
         bloodCompute.SetVector("particleInitPos", loc);
         bloodCompute.SetInt("particlesToInitialize", found);
 
+        Vector3 pow = Random.insideUnitSphere * power;
+        pow.z = Mathf.Abs(pow.z);
+        bloodCompute.SetVector("initialVelocity",pow);
+
         ComputeHelper.Dispatch(bloodCompute, amount, 1, 1, InitDustKernel);
 
         activeParticles += found;

Assets/Scripts/ComputeShaders/BloodCompute.compute

@@ -15,11 +15,8 @@ RWStructuredBuffer<uint> freeParticles;
 uint numParticles;
 uint particlesToInitialize;
 float3 particleInitPos;
+float3 initialVelocity;
 float deltaTime;
-// float3 attractPos;
-// float3 xAxis;
-// float attractRadius;
-// float attractForce;
 
 float3 mop1Pos;
 float3 mop2Pos;
@@ -83,8 +80,11 @@ void InitDust (uint3 id : SV_DispatchThreadID)
 
 	randState = hash(randState);
 	nvel.xy *= scaleToRange01(randState);
+
+	randState = hash(randState);
+	float3 iv = initialVelocity * scaleToRange01(randState);
 	
-	particles[i].velocity = nvel;
+	particles[i].velocity = iv + nvel;
 
 	particles[i].position = particleInitPos;
 	particles[i].position.z = 0.01;

Assets/Scripts/Upgrader.cs

@@ -108,6 +108,8 @@ public class Upgrader : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
+        bool upgrade = canUpgrade();
+
         if (canUpgrade())
         {
 
@@ -205,7 +207,7 @@ public class Upgrader : MonoBehaviour
         Player1Cursor.localPosition = Player1Input.look.normalized * (125 - 12);
         Player2Cursor.localPosition = Player2Input.look.normalized * (125 - 12);
 
-        prevCouldUpgrade = canUpgrade();
+        prevCouldUpgrade = upgrade;
     }
 
     /// Increases mop radius by 10%