diff --git a/Assets/Resources/Sfx/games/karateman/alienBreak.wav b/Assets/Resources/Sfx/games/karateman/alienBreak.wav new file mode 100644 index 000000000..aae32a99f Binary files /dev/null and b/Assets/Resources/Sfx/games/karateman/alienBreak.wav differ diff --git a/Assets/Resources/Sfx/games/karateman/alienBreak.wav.meta b/Assets/Resources/Sfx/games/karateman/alienBreak.wav.meta new file mode 100644 index 000000000..40c958e24 --- /dev/null +++ b/Assets/Resources/Sfx/games/karateman/alienBreak.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 08f2db20287301941aa070db146a5573 +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/karateman/cookingPotBreak.wav b/Assets/Resources/Sfx/games/karateman/cookingPotBreak.wav new file mode 100644 index 000000000..d41a4b6c0 Binary files /dev/null and b/Assets/Resources/Sfx/games/karateman/cookingPotBreak.wav differ diff --git a/Assets/Resources/Sfx/games/karateman/cookingPotBreak.wav.meta b/Assets/Resources/Sfx/games/karateman/cookingPotBreak.wav.meta new file mode 100644 index 000000000..9d11806a3 --- /dev/null +++ b/Assets/Resources/Sfx/games/karateman/cookingPotBreak.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8550c31f523be5c429b8d8532e11bd93 +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/karateman/tacobellBreak.wav b/Assets/Resources/Sfx/games/karateman/tacobellBreak.wav new file mode 100644 index 000000000..67185840e Binary files /dev/null and b/Assets/Resources/Sfx/games/karateman/tacobellBreak.wav differ diff --git a/Assets/Resources/Sfx/games/karateman/tacobellBreak.wav.meta b/Assets/Resources/Sfx/games/karateman/tacobellBreak.wav.meta new file mode 100644 index 000000000..ffb31f744 --- /dev/null +++ b/Assets/Resources/Sfx/games/karateman/tacobellBreak.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 103d51d4c2c19c149b95be314f39b47a +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/Fireworks/Fireworks.cs b/Assets/Scripts/Games/Fireworks/Fireworks.cs index c49b4dac0..1bb3150ac 100644 --- a/Assets/Scripts/Games/Fireworks/Fireworks.cs +++ b/Assets/Scripts/Games/Fireworks/Fireworks.cs @@ -17,7 +17,7 @@ namespace HeavenStudio.Games.Loaders defaultLength = 4f, parameters = new List() { - new Param("type", false, "Firework Type", "Choose a firework") + new Param("type", Fireworks.FireworkType.Normal, "Firework Type", "Choose a firework") }, } }); @@ -37,6 +37,13 @@ namespace HeavenStudio.Games public static Fireworks instance; // Start is called before the first frame update + public enum FireworkType + { + Normal, + Quick, + TamakoBomb + } + void Awake() { instance = this; diff --git a/Assets/Scripts/Games/KarateMan/KarateManPot.cs b/Assets/Scripts/Games/KarateMan/KarateManPot.cs index d7fbe616b..df18d6721 100644 --- a/Assets/Scripts/Games/KarateMan/KarateManPot.cs +++ b/Assets/Scripts/Games/KarateMan/KarateManPot.cs @@ -459,12 +459,20 @@ namespace HeavenStudio.Games.Scripts_KarateMan Jukebox.PlayOneShotGame("karateman/lightbulbBreak", volume: 0.65f); break; case ItemType.Rock: - case ItemType.TacoBell: Jukebox.PlayOneShotGame("karateman/rockBreak", volume: 0.75f); break; case ItemType.Ball: Jukebox.PlayOneShotGame("karateman/soccerBreak", volume: 0.75f); break; + case ItemType.Cooking: + Jukebox.PlayOneShotGame("karateman/cookingPotBreak", volume: 0.5f); + break; + case ItemType.Alien: + Jukebox.PlayOneShotGame("karateman/alienBreak"); + break; + case ItemType.TacoBell: + Jukebox.PlayOneShotGame("karateman/tacobellBreak"); + break; } } @@ -735,6 +743,8 @@ namespace HeavenStudio.Games.Scripts_KarateMan case ItemType.Rock: case ItemType.Bulb: case ItemType.Ball: + case ItemType.Cooking: + case ItemType.Alien: case ItemType.TacoBell: return true; default: // bombs have their own way of breaking