diff --git a/Assets/Resources/Sfx/games/nailCarpenter/HammerStrong.wav b/Assets/Resources/Sfx/games/nailCarpenter/HammerStrong.wav new file mode 100644 index 000000000..fc0079471 Binary files /dev/null and b/Assets/Resources/Sfx/games/nailCarpenter/HammerStrong.wav differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_catch_old.ogg.meta b/Assets/Resources/Sfx/games/nailCarpenter/HammerStrong.wav.meta similarity index 79% rename from Assets/Resources/Sfx/games/nailCarpenter/somen_catch_old.ogg.meta rename to Assets/Resources/Sfx/games/nailCarpenter/HammerStrong.wav.meta index 1e70e9f29..58fc024a5 100644 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_catch_old.ogg.meta +++ b/Assets/Resources/Sfx/games/nailCarpenter/HammerStrong.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d85d319d0b2bc654bb3b86621c5d2ff8 +guid: d7940c98db7f18e45a2e92eae26d8c46 AudioImporter: externalObjects: {} serializedVersion: 6 @@ -7,7 +7,7 @@ AudioImporter: loadType: 0 sampleRateSetting: 0 sampleRateOverride: 44100 - compressionFormat: 0 + compressionFormat: 1 quality: 1 conversionMode: 0 platformSettingOverrides: {} @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: pcosomen/common + assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/HammerWeak.wav b/Assets/Resources/Sfx/games/nailCarpenter/HammerWeak.wav new file mode 100644 index 000000000..1f44ef3a6 Binary files /dev/null and b/Assets/Resources/Sfx/games/nailCarpenter/HammerWeak.wav differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_bell.ogg.meta b/Assets/Resources/Sfx/games/nailCarpenter/HammerWeak.wav.meta similarity index 79% rename from Assets/Resources/Sfx/games/nailCarpenter/somen_bell.ogg.meta rename to Assets/Resources/Sfx/games/nailCarpenter/HammerWeak.wav.meta index 2fab67a2b..800ac7498 100644 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_bell.ogg.meta +++ b/Assets/Resources/Sfx/games/nailCarpenter/HammerWeak.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6796f726f8e5a3f42a1cdb8aba3e8052 +guid: 39dfb2cebefb0434e99242b44167222c AudioImporter: externalObjects: {} serializedVersion: 6 @@ -7,7 +7,7 @@ AudioImporter: loadType: 0 sampleRateSetting: 0 sampleRateOverride: 44100 - compressionFormat: 0 + compressionFormat: 1 quality: 1 conversionMode: 0 platformSettingOverrides: {} @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: pcosomen/common + assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/alarm.wav b/Assets/Resources/Sfx/games/nailCarpenter/alarm.wav new file mode 100644 index 000000000..a1796da1e Binary files /dev/null and b/Assets/Resources/Sfx/games/nailCarpenter/alarm.wav differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_doublealarm.ogg.meta b/Assets/Resources/Sfx/games/nailCarpenter/alarm.wav.meta similarity index 79% rename from Assets/Resources/Sfx/games/nailCarpenter/somen_doublealarm.ogg.meta rename to Assets/Resources/Sfx/games/nailCarpenter/alarm.wav.meta index f9040e20d..00f14966d 100644 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_doublealarm.ogg.meta +++ b/Assets/Resources/Sfx/games/nailCarpenter/alarm.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cf98e6ad5700929419032bc074ac44a7 +guid: 22fb8c5cdaca8ce458e79733a7685da0 AudioImporter: externalObjects: {} serializedVersion: 6 @@ -7,7 +7,7 @@ AudioImporter: loadType: 0 sampleRateSetting: 0 sampleRateOverride: 44100 - compressionFormat: 0 + compressionFormat: 1 quality: 1 conversionMode: 0 platformSettingOverrides: {} @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: pcosomen/common + assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/one.wav b/Assets/Resources/Sfx/games/nailCarpenter/one.wav new file mode 100644 index 000000000..08419969b Binary files /dev/null and b/Assets/Resources/Sfx/games/nailCarpenter/one.wav differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_catch.wav.meta b/Assets/Resources/Sfx/games/nailCarpenter/one.wav.meta similarity index 79% rename from Assets/Resources/Sfx/games/nailCarpenter/somen_catch.wav.meta rename to Assets/Resources/Sfx/games/nailCarpenter/one.wav.meta index b170f0252..9fe3daf03 100644 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_catch.wav.meta +++ b/Assets/Resources/Sfx/games/nailCarpenter/one.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 61e6da8c205481149b07591b8843e223 +guid: 8d761bfeb7539f94dacc1278e6e9be1d AudioImporter: externalObjects: {} serializedVersion: 6 @@ -7,7 +7,7 @@ AudioImporter: loadType: 0 sampleRateSetting: 0 sampleRateOverride: 44100 - compressionFormat: 0 + compressionFormat: 1 quality: 1 conversionMode: 0 platformSettingOverrides: {} @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: pcosomen/common + assetBundleName: assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/signal1.wav b/Assets/Resources/Sfx/games/nailCarpenter/signal1.wav new file mode 100644 index 000000000..7d40eec9f Binary files /dev/null and b/Assets/Resources/Sfx/games/nailCarpenter/signal1.wav differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/signal1.wav.meta b/Assets/Resources/Sfx/games/nailCarpenter/signal1.wav.meta new file mode 100644 index 000000000..65fae034f --- /dev/null +++ b/Assets/Resources/Sfx/games/nailCarpenter/signal1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e3a0dc8a99660cc47bf0cb5ad6eb7532 +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/Sfx/games/nailCarpenter/signal2.wav b/Assets/Resources/Sfx/games/nailCarpenter/signal2.wav new file mode 100644 index 000000000..3031ec56c Binary files /dev/null and b/Assets/Resources/Sfx/games/nailCarpenter/signal2.wav differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/signal2.wav.meta b/Assets/Resources/Sfx/games/nailCarpenter/signal2.wav.meta new file mode 100644 index 000000000..63efce608 --- /dev/null +++ b/Assets/Resources/Sfx/games/nailCarpenter/signal2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 52095f2ecb627b04cadd52aa3723e4fb +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/Sfx/games/nailCarpenter/somen_bell.ogg b/Assets/Resources/Sfx/games/nailCarpenter/somen_bell.ogg deleted file mode 100644 index cf5d12d09..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_bell.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_catch.wav b/Assets/Resources/Sfx/games/nailCarpenter/somen_catch.wav deleted file mode 100644 index 56307180d..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_catch.wav and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_catch_old.ogg b/Assets/Resources/Sfx/games/nailCarpenter/somen_catch_old.ogg deleted file mode 100644 index 2b62a73d2..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_catch_old.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_doublealarm.ogg b/Assets/Resources/Sfx/games/nailCarpenter/somen_doublealarm.ogg deleted file mode 100644 index 786bf61fe..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_doublealarm.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_drop.ogg b/Assets/Resources/Sfx/games/nailCarpenter/somen_drop.ogg deleted file mode 100644 index 4e12220d8..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_drop.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_drop.ogg.meta b/Assets/Resources/Sfx/games/nailCarpenter/somen_drop.ogg.meta deleted file mode 100644 index 38f4c158f..000000000 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_drop.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 146c2e67e60e6324f972945a7ea122d5 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 0 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: pcosomen/common - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerclose.ogg b/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerclose.ogg deleted file mode 100644 index abb62b7df..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerclose.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerclose.ogg.meta b/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerclose.ogg.meta deleted file mode 100644 index d0315f648..000000000 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerclose.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: c7111845c46ebeb45a0dc84ccda5fd40 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 0 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: pcosomen/common - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerfar.ogg b/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerfar.ogg deleted file mode 100644 index 58b97b635..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerfar.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerfar.ogg.meta b/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerfar.ogg.meta deleted file mode 100644 index a652cb7e2..000000000 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_lowerfar.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: e0db05542736eba48ad10e4f035d2cd3 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 0 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: pcosomen/common - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_mistake.ogg b/Assets/Resources/Sfx/games/nailCarpenter/somen_mistake.ogg deleted file mode 100644 index 238163c9e..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_mistake.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_mistake.ogg.meta b/Assets/Resources/Sfx/games/nailCarpenter/somen_mistake.ogg.meta deleted file mode 100644 index d25026980..000000000 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_mistake.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: ba0ad3677c32a71438bdd4fb42cf5b21 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 0 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: pcosomen/common - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_splash.ogg b/Assets/Resources/Sfx/games/nailCarpenter/somen_splash.ogg deleted file mode 100644 index f7d681fb1..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_splash.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_splash.ogg.meta b/Assets/Resources/Sfx/games/nailCarpenter/somen_splash.ogg.meta deleted file mode 100644 index 67bb16ac9..000000000 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_splash.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: 2a7f9c3e24c476c4ca882cec289c2d7a -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 0 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: pcosomen/common - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_woosh.ogg b/Assets/Resources/Sfx/games/nailCarpenter/somen_woosh.ogg deleted file mode 100644 index d6a748228..000000000 Binary files a/Assets/Resources/Sfx/games/nailCarpenter/somen_woosh.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/somen_woosh.ogg.meta b/Assets/Resources/Sfx/games/nailCarpenter/somen_woosh.ogg.meta deleted file mode 100644 index 0a55c9305..000000000 --- a/Assets/Resources/Sfx/games/nailCarpenter/somen_woosh.ogg.meta +++ /dev/null @@ -1,22 +0,0 @@ -fileFormatVersion: 2 -guid: ff6c8516f1997424dac54e8b20e29b27 -AudioImporter: - externalObjects: {} - serializedVersion: 6 - defaultSettings: - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 0 - quality: 1 - conversionMode: 0 - platformSettingOverrides: {} - forceToMono: 0 - normalize: 1 - preloadAudioData: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: pcosomen/common - assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/nailCarpenter/three.wav b/Assets/Resources/Sfx/games/nailCarpenter/three.wav new file mode 100644 index 000000000..ed0dff297 Binary files /dev/null and b/Assets/Resources/Sfx/games/nailCarpenter/three.wav differ diff --git a/Assets/Resources/Sfx/games/nailCarpenter/three.wav.meta b/Assets/Resources/Sfx/games/nailCarpenter/three.wav.meta new file mode 100644 index 000000000..0adb76f44 --- /dev/null +++ b/Assets/Resources/Sfx/games/nailCarpenter/three.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a1f0ab17c67c17043a4056d0886d85b2 +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/Scripts/Games/NailCarpenter/LongNail.cs b/Assets/Scripts/Games/NailCarpenter/LongNail.cs index eecabd456..0faacda95 100644 --- a/Assets/Scripts/Games/NailCarpenter/LongNail.cs +++ b/Assets/Scripts/Games/NailCarpenter/LongNail.cs @@ -32,7 +32,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter SoundByte.PlayOneShot("miss"); return; } - SoundByte.PlayOneShotGame("nailCarpenter/somen_catch"); + SoundByte.PlayOneShotGame("nailCarpenter/HammerStrong"); nailAnim.DoScaledAnimationAsync("longNailHammered", 0.5f); } @@ -45,8 +45,8 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter SoundByte.PlayOneShot("miss"); return; } + SoundByte.PlayOneShotGame("nailCarpenter/HammerWeak"); nailAnim.DoScaledAnimationAsync("longNailWeakHammered", 0.5f); - SoundByte.PlayOneShotGame("nailCarpenter/somen_catch"); } private void HammmerMiss(PlayerActionEvent caller) diff --git a/Assets/Scripts/Games/NailCarpenter/Nail.cs b/Assets/Scripts/Games/NailCarpenter/Nail.cs index 9f932b963..9e7dc0705 100644 --- a/Assets/Scripts/Games/NailCarpenter/Nail.cs +++ b/Assets/Scripts/Games/NailCarpenter/Nail.cs @@ -31,7 +31,7 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter SoundByte.PlayOneShot("miss"); return; } - SoundByte.PlayOneShotGame("nailCarpenter/somen_catch"); + SoundByte.PlayOneShotGame("nailCarpenter/HammerWeak"); nailAnim.DoScaledAnimationAsync("nailHammered", 0.5f); } private void strongHammmerJust(PlayerActionEvent caller, float state) @@ -43,8 +43,8 @@ namespace HeavenStudio.Games.Scripts_NailCarpenter SoundByte.PlayOneShot("miss"); return; } + SoundByte.PlayOneShotGame("nailCarpenter/HammerStrong"); nailAnim.DoScaledAnimationAsync("nailStrongHammered", 0.5f); - SoundByte.PlayOneShotGame("nailCarpenter/somen_catch"); } private void HammmerMiss(PlayerActionEvent caller) diff --git a/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs b/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs index e303fb0a5..e85fec578 100644 --- a/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs +++ b/Assets/Scripts/Games/NailCarpenter/NailCarpenter.cs @@ -144,7 +144,7 @@ namespace HeavenStudio.Games if (PlayerInput.GetIsAction(InputAction_BasicPress) && !IsExpectingInputNow(InputAction_BasicPress)) { - SoundByte.PlayOneShotGame("nailCarpenter/somen_mistake"); + SoundByte.PlayOneShot("miss"); HammerArm.DoScaledAnimationAsync("hammerHit", 0.5f); hasSlurped = false; EffectSweat.DoScaledAnimationAsync("BlobSweating", 0.5f); @@ -195,7 +195,7 @@ namespace HeavenStudio.Games if (startBeat <= targetNailBeat && targetNailBeat < endBeat) { - sounds.Add(new MultiSound.Sound("nailCarpenter/somen_drop", targetNailBeat)); + sounds.Add(new MultiSound.Sound("nailCarpenter/one", targetNailBeat)); SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.Pudding); SpawnNail(targetNailBeat+0.5f, startBeat); } @@ -216,7 +216,7 @@ namespace HeavenStudio.Games var targetNailBeat = nailBeat + (2f * b); if (startBeat <= targetNailBeat && targetNailBeat < endBeat) { - sounds.Add(new MultiSound.Sound("nailCarpenter/somen_drop", targetNailBeat)); + sounds.Add(new MultiSound.Sound("nailCarpenter/three", targetNailBeat)); SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.Pudding); SpawnNail(targetNailBeat+0.5f, startBeat); SpawnNail(targetNailBeat+1.0f, startBeat); @@ -239,7 +239,7 @@ namespace HeavenStudio.Games var targetNailBeat = nailBeat + (2f * b); if (startBeat <= targetNailBeat && targetNailBeat < endBeat) { - sounds.Add(new MultiSound.Sound("nailCarpenter/somen_doublealarm", targetNailBeat)); + sounds.Add(new MultiSound.Sound("nailCarpenter/alarm", targetNailBeat)); SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.Pudding); SpawnNail(targetNailBeat+0.5f, startBeat); SpawnPudding(targetNailBeat+1.0f, startBeat, (int)sweetsType.Pudding); @@ -263,8 +263,8 @@ namespace HeavenStudio.Games var targetNailBeat = nailBeat + (2f * b); if (startBeat <= targetNailBeat && targetNailBeat < endBeat) { - sounds.Add(new MultiSound.Sound("nailCarpenter/somen_drop", targetNailBeat)); - sounds.Add(new MultiSound.Sound("nailCarpenter/somen_lowerfar", targetNailBeat+1f)); + sounds.Add(new MultiSound.Sound("nailCarpenter/signal1", targetNailBeat)); + sounds.Add(new MultiSound.Sound("nailCarpenter/signal2", targetNailBeat+1f)); SpawnPudding(targetNailBeat, startBeat, (int)sweetsType.LayerCake); SpawnNail(targetNailBeat+0.5f, startBeat); SpawnLongNail(targetNailBeat+1f, startBeat);