Sveskejuice/fgm24
Sveskejuice
/
fgm24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
SpoodyTheOne 2024-02-04 11:48:50 +01:00
parent 89af403895 b228433eaa
commit f320603800
4 changed files with 174 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
Assets/Fonts/janitor.regular SDF 1.asset
View File

File diff suppressed because one or more lines are too long

76
Assets/Fonts/janitor.regular SDF.asset
View File

File diff suppressed because one or more lines are too long

2
Assets/Scripts/Enemy/EnemyPathFinding.cs
View File

@ -28,7 +28,7 @@ public class EnemyPathFinding : MonoBehaviour
private void Rumble() private void Rumble()
{ {
RumbleManager.StartRumble(-1, 0.5f, 0.5f, 0.25f); RumbleManager.StartRumble(-1, 0.5f, 0.5f, 0.25f);
CameraShaker.ShakecShake(0.125f, 0.25f); CameraShaker.ShakecShake(0.1f, 0.25f);
} }
private void Update() private void Update()

2
Assets/Scripts/Player/HealthComponent.cs
View File

@ -87,7 +87,7 @@ public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver
if (bloodRegen) if (bloodRegen)
{ {
PlayerInput playerInput = GetComponent<PlayerInput>(); PlayerInput playerInput = GetComponent<PlayerInput>();
float bloodAccumalted = playerInput.PlayerNum == 1 ? BloodComputeShader.Instance.mop1Clean : BloodComputeShader.Instance.mop2Clean; float bloodAccumalted = playerInput.PlayerNum == 0 ? BloodComputeShader.Instance.mop1Clean : BloodComputeShader.Instance.mop2Clean;
TakeDamage(-bloodAccumalted / regen); TakeDamage(-bloodAccumalted / regen);
} }