diff --git a/Assets/Audio/Augments/Mower/Train1.wav b/Assets/Audio/Augments/Mower/Train1.wav new file mode 100644 index 000000000..2a97a85bb Binary files /dev/null and b/Assets/Audio/Augments/Mower/Train1.wav differ diff --git a/Assets/Audio/Augments/Mower/Train1.wav.meta b/Assets/Audio/Augments/Mower/Train1.wav.meta new file mode 100644 index 000000000..89065442e --- /dev/null +++ b/Assets/Audio/Augments/Mower/Train1.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 6cd47774f94072f87bb1f5361ca2eac6 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Augments/Mower/Train2.wav b/Assets/Audio/Augments/Mower/Train2.wav new file mode 100644 index 000000000..a9c52abf3 Binary files /dev/null and b/Assets/Audio/Augments/Mower/Train2.wav differ diff --git a/Assets/Audio/Augments/Mower/Train2.wav.meta b/Assets/Audio/Augments/Mower/Train2.wav.meta new file mode 100644 index 000000000..26f132c7f --- /dev/null +++ b/Assets/Audio/Augments/Mower/Train2.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: fe34a4195aeaef62eab87edb1364200a +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Augments/Mower/Train3.wav b/Assets/Audio/Augments/Mower/Train3.wav new file mode 100644 index 000000000..985137a81 Binary files /dev/null and b/Assets/Audio/Augments/Mower/Train3.wav differ diff --git a/Assets/Audio/Augments/Mower/Train3.wav.meta b/Assets/Audio/Augments/Mower/Train3.wav.meta new file mode 100644 index 000000000..911a022d0 --- /dev/null +++ b/Assets/Audio/Augments/Mower/Train3.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 5ec349364bd3cc0b8bc61f139f790738 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Augments/Mower/Train4.wav b/Assets/Audio/Augments/Mower/Train4.wav new file mode 100644 index 000000000..8efc8c743 Binary files /dev/null and b/Assets/Audio/Augments/Mower/Train4.wav differ diff --git a/Assets/Audio/Augments/Mower/Train4.wav.meta b/Assets/Audio/Augments/Mower/Train4.wav.meta new file mode 100644 index 000000000..6c51b046c --- /dev/null +++ b/Assets/Audio/Augments/Mower/Train4.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 660e1c14774513095aa7b1a200fe3dd2 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Augments/Mower/Train5.wav b/Assets/Audio/Augments/Mower/Train5.wav new file mode 100644 index 000000000..5ea06cb04 Binary files /dev/null and b/Assets/Audio/Augments/Mower/Train5.wav differ diff --git a/Assets/Audio/Augments/Mower/Train5.wav.meta b/Assets/Audio/Augments/Mower/Train5.wav.meta new file mode 100644 index 000000000..5e06e31b2 --- /dev/null +++ b/Assets/Audio/Augments/Mower/Train5.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: c08ff536cfa87d971bb1ae8838e43fa3 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 2 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Augments/Mower/TrainFlute.asset b/Assets/Audio/Augments/Mower/TrainFlute.asset new file mode 100644 index 000000000..78bd540b0 --- /dev/null +++ b/Assets/Audio/Augments/Mower/TrainFlute.asset @@ -0,0 +1,29 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa94d7cf98a253641a478b6ab78a05e3, type: 3} + m_Name: TrainFlute + m_EditorClassIdentifier: + sounds: + - {fileID: 8300000, guid: 6cd47774f94072f87bb1f5361ca2eac6, type: 3} + - {fileID: 8300000, guid: fe34a4195aeaef62eab87edb1364200a, type: 3} + - {fileID: 8300000, guid: 5ec349364bd3cc0b8bc61f139f790738, type: 3} + - {fileID: 8300000, guid: 660e1c14774513095aa7b1a200fe3dd2, type: 3} + - {fileID: 8300000, guid: c08ff536cfa87d971bb1ae8838e43fa3, type: 3} + semitoneRange: + min: -1 + max: 1 + continuousPitchBend: 1 + volumeRange: + min: 1 + max: 1 + is3D: 1 + shouldPlayInSplitscreen: 1 diff --git a/Assets/Audio/Augments/Mower/TrainFlute.asset.meta b/Assets/Audio/Augments/Mower/TrainFlute.asset.meta new file mode 100644 index 000000000..a5c77648f --- /dev/null +++ b/Assets/Audio/Augments/Mower/TrainFlute.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e18e11f7c469d59daa405417f575a267 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GunParts/LawnMowerBody.prefab b/Assets/Prefabs/GunParts/LawnMowerBody.prefab index 81caada45..14b512857 100644 --- a/Assets/Prefabs/GunParts/LawnMowerBody.prefab +++ b/Assets/Prefabs/GunParts/LawnMowerBody.prefab @@ -239,6 +239,7 @@ MonoBehaviour: mowerScreenMaterialIndex: 1 mowerScreen: {fileID: 2100000, guid: ba0e56975e31013409abfe9b36e7aa35, type: 2} plopSounds: {fileID: 11400000, guid: e3cc9c8a794f4f94bb6e134c61b5a645, type: 2} + overheatSounds: {fileID: 11400000, guid: e18e11f7c469d59daa405417f575a267, type: 2} --- !u!95 &2789145164633129729 Animator: serializedVersion: 5 diff --git a/Assets/Scripts/Augment/AugmentImplementations/LawnMower.cs b/Assets/Scripts/Augment/AugmentImplementations/LawnMower.cs index 62816d420..4ef70d571 100644 --- a/Assets/Scripts/Augment/AugmentImplementations/LawnMower.cs +++ b/Assets/Scripts/Augment/AugmentImplementations/LawnMower.cs @@ -46,6 +46,8 @@ public class LawnMower : GunBody private AudioSource audioSource; [SerializeField] private AudioGroup plopSounds; + [SerializeField] + private AudioGroup overheatSounds; public override void Start() { @@ -112,6 +114,7 @@ private void Fire(GunStats stats) else { success = false; + overheatSounds.Play(audioSource); failedExhaustParticles.Play(); }