diff --git a/Assets/Resources/Audio/Eat.ogg b/Assets/Resources/Audio/Eat.ogg new file mode 100644 index 0000000..96d4581 Binary files /dev/null and b/Assets/Resources/Audio/Eat.ogg differ diff --git a/Assets/Resources/Audio/Eat.ogg.meta b/Assets/Resources/Audio/Eat.ogg.meta new file mode 100644 index 0000000..aee8605 --- /dev/null +++ b/Assets/Resources/Audio/Eat.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 969fb43c02f3e464c8e0907e44dc946c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/HardPunch.ogg b/Assets/Resources/Audio/HardPunch.ogg new file mode 100644 index 0000000..992a534 Binary files /dev/null and b/Assets/Resources/Audio/HardPunch.ogg differ diff --git a/Assets/Resources/Audio/HardPunch.ogg.meta b/Assets/Resources/Audio/HardPunch.ogg.meta new file mode 100644 index 0000000..4252a56 --- /dev/null +++ b/Assets/Resources/Audio/HardPunch.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3095e099213c73c4182d9feeae77ebbd +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/HardSlap.ogg b/Assets/Resources/Audio/HardSlap.ogg new file mode 100644 index 0000000..45be628 Binary files /dev/null and b/Assets/Resources/Audio/HardSlap.ogg differ diff --git a/Assets/Resources/Audio/HardSlap.ogg.meta b/Assets/Resources/Audio/HardSlap.ogg.meta new file mode 100644 index 0000000..7f9b79d --- /dev/null +++ b/Assets/Resources/Audio/HardSlap.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 292f0e8e04642864daaf315efade99c7 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Punch.ogg b/Assets/Resources/Audio/Punch.ogg new file mode 100644 index 0000000..9c8b8b7 Binary files /dev/null and b/Assets/Resources/Audio/Punch.ogg differ diff --git a/Assets/Resources/Audio/Punch.ogg.meta b/Assets/Resources/Audio/Punch.ogg.meta new file mode 100644 index 0000000..5877632 --- /dev/null +++ b/Assets/Resources/Audio/Punch.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 33e618f5ded88f7449cf8c6b88e71c8f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/Slap.ogg b/Assets/Resources/Audio/Slap.ogg new file mode 100644 index 0000000..d0169ab Binary files /dev/null and b/Assets/Resources/Audio/Slap.ogg differ diff --git a/Assets/Resources/Audio/Slap.ogg.meta b/Assets/Resources/Audio/Slap.ogg.meta new file mode 100644 index 0000000..36a929d --- /dev/null +++ b/Assets/Resources/Audio/Slap.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: aafb1c137c5574744b6c2c5b7d5e7055 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index f6a8669..6577d39 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -47232,7 +47232,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1671840916} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5, y: -2, z: 0} + m_LocalPosition: {x: 45.5, y: 35.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} @@ -90341,12 +90341,12 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.x - value: 42.01 + value: 54.1 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_LocalPosition.y - value: 22.76 + value: 32.6 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs index b9f8b89..aa7d29e 100644 --- a/Assets/Scripts/EventControls.cs +++ b/Assets/Scripts/EventControls.cs @@ -228,7 +228,7 @@ public class EventControls : MonoBehaviour // var offset = camera.transform.position.x - (int)camera.transform.position.x; // transform.position = new Vector3(transform.position.x + offset, transform.position.y, 0); //} - + private EventControlTile GenerateEventControlTile(Vector3Int position) { var randomNumber = Random.Range(0, TileToKeyMappings.TileToKey.Count); diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index 116d592..20366a4 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -30,6 +30,8 @@ public class Player : MonoBehaviour private bool isMovementEnabled = true; private bool isFighting = false; + private bool isPlayerHurt = false; + private void Start() { rigidBody = GetComponent(); @@ -73,6 +75,7 @@ public class Player : MonoBehaviour if (coll.gameObject.tag == "Pizza") { Destroy(coll.gameObject); + SoundManagerScript.PlaySound("eat"); currentHealth += currentHealth < startHealth ? 1 : 0; healthBar.size = new Vector2(1.5f * currentHealth, this.healthBar.size.y); } @@ -111,7 +114,7 @@ public class Player : MonoBehaviour Run(); FlipSprite(); } - + PlayFightSound(); HandleAnimations(); } @@ -216,20 +219,38 @@ public class Player : MonoBehaviour animator.SetBool("IsFighting", isFighting); } + private void PlayFightSound() + { + if (isFighting && !isPlayerHurt) + { + SoundManagerScript.PlaySound(GetRandomFightClipName()); + } + } + + private string GetRandomFightClipName() + { + var fightClipNames = new List { "punch", "hard punch", "slap", "hard slap" }; + var randomNumber = UnityEngine.Random.Range(0, fightClipNames.Count); + return fightClipNames[randomNumber]; + } + public void StartEncounter() { + isPlayerHurt = false; isFighting = true; isMovementEnabled = false; } public void EndEncounter() { + isPlayerHurt = false; isFighting = false; isMovementEnabled = true; } public void ThrowUserInTheAirHurt() - { + { + isPlayerHurt = true; GetComponent().velocity += new Vector2(Mathf.Sign(transform.localScale.x) * -1 * hurtVelocity, hurtVelocity); } } diff --git a/Assets/Scripts/SoundManagerScript.cs b/Assets/Scripts/SoundManagerScript.cs index 8964c0f..7b13777 100644 --- a/Assets/Scripts/SoundManagerScript.cs +++ b/Assets/Scripts/SoundManagerScript.cs @@ -5,7 +5,9 @@ using UnityEngine; public class SoundManagerScript : MonoBehaviour { - public static AudioClip jumpSound, screamSound, wrongButtonSound, bugLaughSound, drinkSound; + public static AudioClip jumpSound, screamSound, wrongButtonSound, + bugLaughSound, drinkSound, eatSound, punchSound, hardPunchSound, + slapSound, hardSlapSound, winSound; static AudioSource audioSrc; // Start is called before the first frame update @@ -16,6 +18,11 @@ public class SoundManagerScript : MonoBehaviour wrongButtonSound = Resources.Load("Audio/WrongButton"); bugLaughSound = Resources.Load("Audio/BugLaugh"); drinkSound = Resources.Load("Audio/Drink"); + eatSound = Resources.Load("Audio/Eat"); + punchSound = Resources.Load("Audio/Punch"); + hardPunchSound = Resources.Load("Audio/HardPunch"); + slapSound = Resources.Load("Audio/Slap"); + hardSlapSound = Resources.Load("Audio/HardSlap"); audioSrc = GetComponent(); } @@ -45,6 +52,25 @@ public class SoundManagerScript : MonoBehaviour case "drink": audioSrc.PlayOneShot(drinkSound); break; + case "eat": + audioSrc.PlayOneShot(eatSound); + break; + case "punch": + audioSrc.PlayOneShot(punchSound); + break; + case "hard punch": + audioSrc.PlayOneShot(hardPunchSound); + break; + case "slap": + audioSrc.PlayOneShot(slapSound); + break; + case "hard slap": + audioSrc.PlayOneShot(hardSlapSound); + break; + case "win": + audioSrc.PlayOneShot(winSound); + break; + } } }