diff --git a/Assets/Resources/Games/clapTrap.prefab b/Assets/Resources/Games/clapTrap.prefab
index 8586edf38..72da90196 100644
--- a/Assets/Resources/Games/clapTrap.prefab
+++ b/Assets/Resources/Games/clapTrap.prefab
@@ -1802,7 +1802,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4719402819936628921}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.26, z: 0}
m_LocalScale: {x: 4.600001, y: 4.600001, z: 1.0000001}
m_ConstrainProportionsScale: 0
@@ -1851,7 +1851,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 50
- m_Sprite: {fileID: 21300000, guid: ee475e9bfab799a44a5fcd7c3a4d903a, type: 3}
+ m_Sprite: {fileID: 21300000, guid: af806de0839389d46900bc96ac5081ce, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0.8156863}
m_FlipX: 0
m_FlipY: 0
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_A.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_A.wav
new file mode 100644
index 000000000..bbcbd1b46
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_A.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/aceClap3.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_A.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/clapTrap/aceClap3.ogg.meta
rename to Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_A.wav.meta
index 790759c0a..e823c212f 100644
--- a/Assets/Resources/Sfx/games/clapTrap/aceClap3.ogg.meta
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_A.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: b774d9fd1627da6459034a2c79fd0607
+guid: 97ea9c0f170d8f24ba0e9e4b92227ddf
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_B.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_B.wav
new file mode 100644
index 000000000..292eda74b
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_B.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/aceClap1.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_B.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/clapTrap/aceClap1.ogg.meta
rename to Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_B.wav.meta
index 998262519..b6aa657d3 100644
--- a/Assets/Resources/Sfx/games/clapTrap/aceClap1.ogg.meta
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_BREATH_B.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: fc0b7bd4f2f9d5444a175884406d2497
+guid: 82ef05c79eace20428cdd4482dc6003b
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_OSII_B.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_OSII_B.wav
new file mode 100644
index 000000000..4594a657a
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_OSII_B.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/aceClap4.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_OSII_B.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/clapTrap/aceClap4.ogg.meta
rename to Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_OSII_B.wav.meta
index 5937b191e..e2a4e6ede 100644
--- a/Assets/Resources/Sfx/games/clapTrap/aceClap4.ogg.meta
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_OSII_B.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: dbbad9e512a4c0040b773aeea28b5c18
+guid: 977e06eb0af664f419d0da2ad78aad4a
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_A.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_A.wav
new file mode 100644
index 000000000..a77f66ff4
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_A.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/aceClap2.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_A.wav.meta
similarity index 91%
rename from Assets/Resources/Sfx/games/clapTrap/aceClap2.ogg.meta
rename to Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_A.wav.meta
index 9f5c5abb3..ebd17fbb3 100644
--- a/Assets/Resources/Sfx/games/clapTrap/aceClap2.ogg.meta
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_A.wav.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 16c0f0ca4cc41a5409ca6fcdf24a24e4
+guid: fe2d8e0a0ebfff84bab6b7321194321c
AudioImporter:
externalObjects: {}
serializedVersion: 6
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_B.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_B.wav
new file mode 100644
index 000000000..011a0824b
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_B.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_B.wav.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_B.wav.meta
new file mode 100644
index 000000000..61205d3b5
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_B.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: c0d70a2fd5d801a4d958b5855177290f
+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/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_C.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_C.wav
new file mode 100644
index 000000000..8b47b77bd
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_C.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_C.wav.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_C.wav.meta
new file mode 100644
index 000000000..94288fd00
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_C.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: de61b1c8b42818d4689830e61e24cee9
+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/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_D.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_D.wav
new file mode 100644
index 000000000..142b0ef51
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_D.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_D.wav.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_D.wav.meta
new file mode 100644
index 000000000..7309ef8fb
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_CATCH_SUCCESS_D.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 493f5a6793a7ee0419885deb06f5edc3
+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/clapTrap/SE_SIRAHA_EN_KANKYO.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_KANKYO.wav
new file mode 100644
index 000000000..f2e833c26
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_KANKYO.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_KANKYO.wav.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_KANKYO.wav.meta
new file mode 100644
index 000000000..e7cba518e
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_KANKYO.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 553683c4fdbf20546ae0807f5d8e6df3
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 6
+ defaultSettings:
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 0.01
+ 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/clapTrap/SE_SIRAHA_EN_SWING_1P.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_1P.wav
new file mode 100644
index 000000000..3b9d17ae6
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_1P.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_1P.wav.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_1P.wav.meta
new file mode 100644
index 000000000..f68dad0e9
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_1P.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 15d5cf7cbc1358a45ac1e93307674316
+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/clapTrap/SE_SIRAHA_EN_SWING_2P_UNUSED.wav b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_2P_UNUSED.wav
new file mode 100644
index 000000000..2370c7c4f
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_2P_UNUSED.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_2P_UNUSED.wav.meta b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_2P_UNUSED.wav.meta
new file mode 100644
index 000000000..844796ec4
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/SE_SIRAHA_EN_SWING_2P_UNUSED.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3c4c644a6f372b546a2fdc571f1ca1a9
+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/clapTrap/aceClap1.ogg b/Assets/Resources/Sfx/games/clapTrap/aceClap1.ogg
deleted file mode 100644
index 4bc4b3e76..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/aceClap1.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/aceClap2.ogg b/Assets/Resources/Sfx/games/clapTrap/aceClap2.ogg
deleted file mode 100644
index a63153063..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/aceClap2.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/aceClap3.ogg b/Assets/Resources/Sfx/games/clapTrap/aceClap3.ogg
deleted file mode 100644
index 1e8a4b138..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/aceClap3.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/aceClap4.ogg b/Assets/Resources/Sfx/games/clapTrap/aceClap4.ogg
deleted file mode 100644
index fc9db5443..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/aceClap4.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/barely1.ogg b/Assets/Resources/Sfx/games/clapTrap/barely1.ogg
deleted file mode 100644
index b4f77813b..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/barely1.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/barely1.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/barely1.ogg.meta
deleted file mode 100644
index 2b860adf9..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/barely1.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 40d1875f35f91b445bba79a565cbcd4c
-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/clapTrap/barely1.wav b/Assets/Resources/Sfx/games/clapTrap/barely1.wav
new file mode 100644
index 000000000..b07604dc7
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/barely1.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/barely1.wav.meta b/Assets/Resources/Sfx/games/clapTrap/barely1.wav.meta
new file mode 100644
index 000000000..951967b97
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/barely1.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 7adbb337e7e9f1840862d351cee31f3c
+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/clapTrap/barely2.ogg b/Assets/Resources/Sfx/games/clapTrap/barely2.ogg
deleted file mode 100644
index 871926f93..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/barely2.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/barely2.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/barely2.ogg.meta
deleted file mode 100644
index d2f98a472..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/barely2.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 128915ad90457484c943798d8695be72
-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/clapTrap/barely2.wav b/Assets/Resources/Sfx/games/clapTrap/barely2.wav
new file mode 100644
index 000000000..a954456c9
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/barely2.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/barely2.wav.meta b/Assets/Resources/Sfx/games/clapTrap/barely2.wav.meta
new file mode 100644
index 000000000..79dc56ae8
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/barely2.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3ee6e8084918530458da9e12271e1da2
+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/clapTrap/clap.ogg b/Assets/Resources/Sfx/games/clapTrap/clap.ogg
deleted file mode 100644
index a70033b6b..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/clap.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/clap.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/clap.ogg.meta
deleted file mode 100644
index a6d28b6c8..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/clap.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 0619f92f7a3541b41abc8c6b86e14e81
-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/clapTrap/clap.wav b/Assets/Resources/Sfx/games/clapTrap/clap.wav
new file mode 100644
index 000000000..7601d6187
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/clap.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/clap.wav.meta b/Assets/Resources/Sfx/games/clapTrap/clap.wav.meta
new file mode 100644
index 000000000..3ae0a79ac
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/clap.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: a5a5892f6c934cd46abf545f7c005c06
+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/clapTrap/clapAce.wav b/Assets/Resources/Sfx/games/clapTrap/clapAce.wav
new file mode 100644
index 000000000..10b4a0977
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/clapAce.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/clapAce.wav.meta b/Assets/Resources/Sfx/games/clapTrap/clapAce.wav.meta
new file mode 100644
index 000000000..23c1d3297
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/clapAce.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1bbc4cbb77be6db47b8e6579e8fb5b74
+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/clapTrap/clapGood.wav b/Assets/Resources/Sfx/games/clapTrap/clapGood.wav
new file mode 100644
index 000000000..0363cbd26
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/clapGood.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/clapGood.wav.meta b/Assets/Resources/Sfx/games/clapTrap/clapGood.wav.meta
new file mode 100644
index 000000000..eb96dc88c
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/clapGood.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: e8b030ea837150a4a94f5d1daa84726d
+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/clapTrap/deepExhale1.ogg b/Assets/Resources/Sfx/games/clapTrap/deepExhale1.ogg
deleted file mode 100644
index 2b97d953a..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/deepExhale1.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/deepExhale1.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/deepExhale1.ogg.meta
deleted file mode 100644
index 8dde00207..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/deepExhale1.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 8a60ebf360c8d04439a278a48f21e6db
-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/clapTrap/deepExhale1.wav b/Assets/Resources/Sfx/games/clapTrap/deepExhale1.wav
new file mode 100644
index 000000000..5d3250b04
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/deepExhale1.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/deepExhale1.wav.meta b/Assets/Resources/Sfx/games/clapTrap/deepExhale1.wav.meta
new file mode 100644
index 000000000..3fd74d6d8
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/deepExhale1.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 51f815acf9768c74b8e474dd33e3f64b
+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/clapTrap/deepExhale2.ogg b/Assets/Resources/Sfx/games/clapTrap/deepExhale2.ogg
deleted file mode 100644
index 8cab501d0..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/deepExhale2.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/deepExhale2.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/deepExhale2.ogg.meta
deleted file mode 100644
index 709e0cfb0..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/deepExhale2.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 78ffea5c4c3083e42b93a921bac2595d
-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/clapTrap/deepExhale2.wav b/Assets/Resources/Sfx/games/clapTrap/deepExhale2.wav
new file mode 100644
index 000000000..291ff0336
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/deepExhale2.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/deepExhale2.wav.meta b/Assets/Resources/Sfx/games/clapTrap/deepExhale2.wav.meta
new file mode 100644
index 000000000..26d77d02a
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/deepExhale2.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 7db77aea7021d224a85159e697176e1c
+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/clapTrap/deepInhale.ogg b/Assets/Resources/Sfx/games/clapTrap/deepInhale.ogg
deleted file mode 100644
index 1ecf3675a..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/deepInhale.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/deepInhale.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/deepInhale.ogg.meta
deleted file mode 100644
index 72a5f80fe..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/deepInhale.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: de1c46e7782613842be1deafdaa66e95
-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/clapTrap/deepInhale.wav b/Assets/Resources/Sfx/games/clapTrap/deepInhale.wav
new file mode 100644
index 000000000..83f511ab8
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/deepInhale.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/deepInhale.wav.meta b/Assets/Resources/Sfx/games/clapTrap/deepInhale.wav.meta
new file mode 100644
index 000000000..f20fdeb4a
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/deepInhale.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 1ea11ea49ca6ef24abd57b1ba354a085
+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/clapTrap/donk.ogg b/Assets/Resources/Sfx/games/clapTrap/donk.ogg
deleted file mode 100644
index 75141b683..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/donk.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/donk.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/donk.ogg.meta
deleted file mode 100644
index 603d511bd..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/donk.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: dc44472a0ae90d44b978ad4813112500
-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/clapTrap/donk.wav b/Assets/Resources/Sfx/games/clapTrap/donk.wav
new file mode 100644
index 000000000..880e9ae71
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/donk.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/donk.wav.meta b/Assets/Resources/Sfx/games/clapTrap/donk.wav.meta
new file mode 100644
index 000000000..0ef4ca74a
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/donk.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 82fb0cc09d0e3a04daf5861561af7769
+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/clapTrap/goodClap1.ogg b/Assets/Resources/Sfx/games/clapTrap/goodClap1.ogg
deleted file mode 100644
index 9080a20b3..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/goodClap1.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/goodClap1.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/goodClap1.ogg.meta
deleted file mode 100644
index b8e51105f..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/goodClap1.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: d470b4578a050824ab481d5813545db4
-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/clapTrap/goodClap1.wav b/Assets/Resources/Sfx/games/clapTrap/goodClap1.wav
new file mode 100644
index 000000000..f5aa63f23
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/goodClap1.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/goodClap1.wav.meta b/Assets/Resources/Sfx/games/clapTrap/goodClap1.wav.meta
new file mode 100644
index 000000000..cc6712123
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/goodClap1.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 27b0e01ea54603548b2d8a90af243b52
+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/clapTrap/goodClap2.ogg b/Assets/Resources/Sfx/games/clapTrap/goodClap2.ogg
deleted file mode 100644
index 61c2fa367..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/goodClap2.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/goodClap2.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/goodClap2.ogg.meta
deleted file mode 100644
index 84d16aadf..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/goodClap2.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 4420935de6761de4890d6b4b55c53f0d
-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/clapTrap/goodClap2.wav b/Assets/Resources/Sfx/games/clapTrap/goodClap2.wav
new file mode 100644
index 000000000..7b3193f6f
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/goodClap2.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/goodClap2.wav.meta b/Assets/Resources/Sfx/games/clapTrap/goodClap2.wav.meta
new file mode 100644
index 000000000..980e17c97
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/goodClap2.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 11ca43f573bda9f48b45c059775f0fe2
+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/clapTrap/goodClap3.ogg b/Assets/Resources/Sfx/games/clapTrap/goodClap3.ogg
deleted file mode 100644
index 1a645090c..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/goodClap3.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/goodClap3.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/goodClap3.ogg.meta
deleted file mode 100644
index 7589f1dd1..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/goodClap3.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 272c24edda3776648803c57623062dc0
-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/clapTrap/goodClap3.wav b/Assets/Resources/Sfx/games/clapTrap/goodClap3.wav
new file mode 100644
index 000000000..ae7af0e7d
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/goodClap3.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/goodClap3.wav.meta b/Assets/Resources/Sfx/games/clapTrap/goodClap3.wav.meta
new file mode 100644
index 000000000..8e0d3f79c
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/goodClap3.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: df41eae76dfa7cf43bcfd1464ecab972
+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/clapTrap/goodClap4.ogg b/Assets/Resources/Sfx/games/clapTrap/goodClap4.ogg
deleted file mode 100644
index fa8e01c1f..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/goodClap4.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/goodClap4.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/goodClap4.ogg.meta
deleted file mode 100644
index 702273aa9..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/goodClap4.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 3f78ecb5929253946bbb6f551f48cf80
-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/clapTrap/goodClap4.wav b/Assets/Resources/Sfx/games/clapTrap/goodClap4.wav
new file mode 100644
index 000000000..a1f3fd57d
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/goodClap4.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/goodClap4.wav.meta b/Assets/Resources/Sfx/games/clapTrap/goodClap4.wav.meta
new file mode 100644
index 000000000..a1c6a9ced
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/goodClap4.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 3d714ebe437ad8a44bc0f39b6d5d8320
+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/clapTrap/miss.ogg b/Assets/Resources/Sfx/games/clapTrap/miss.ogg
deleted file mode 100644
index 0338d9ef3..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/miss.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/miss.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/miss.ogg.meta
deleted file mode 100644
index 3ff0ba230..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/miss.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 8b33f5583a1f1ae4ca1151cabf3a93c1
-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/clapTrap/miss.wav b/Assets/Resources/Sfx/games/clapTrap/miss.wav
new file mode 100644
index 000000000..9d8c432e9
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/miss.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/miss.wav.meta b/Assets/Resources/Sfx/games/clapTrap/miss.wav.meta
new file mode 100644
index 000000000..a1a7687a8
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/miss.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: b456db06424d84d42bec2c25183f9ab8
+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/clapTrap/sigh1.ogg b/Assets/Resources/Sfx/games/clapTrap/sigh1.ogg
deleted file mode 100644
index bf966d09b..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/sigh1.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/sigh1.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/sigh1.ogg.meta
deleted file mode 100644
index 435881fd3..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/sigh1.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 598208c21bd7ea34eaa7cf5dbd7d9604
-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/clapTrap/sigh2.ogg b/Assets/Resources/Sfx/games/clapTrap/sigh2.ogg
deleted file mode 100644
index 3926e5d05..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/sigh2.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/sigh2.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/sigh2.ogg.meta
deleted file mode 100644
index 1bc9c2324..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/sigh2.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: 06b15e7a4d7fbb8488dd34e1e3b57099
-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/clapTrap/sigh3.ogg b/Assets/Resources/Sfx/games/clapTrap/sigh3.ogg
deleted file mode 100644
index b46316a20..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/sigh3.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/sigh3.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/sigh3.ogg.meta
deleted file mode 100644
index 038957c21..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/sigh3.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: a013c7ffb733c3b4889eaf60814cc3e0
-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/clapTrap/whiff.ogg b/Assets/Resources/Sfx/games/clapTrap/whiff.ogg
deleted file mode 100644
index 2ddac2915..000000000
Binary files a/Assets/Resources/Sfx/games/clapTrap/whiff.ogg and /dev/null differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/whiff.ogg.meta b/Assets/Resources/Sfx/games/clapTrap/whiff.ogg.meta
deleted file mode 100644
index 8079c36e4..000000000
--- a/Assets/Resources/Sfx/games/clapTrap/whiff.ogg.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: dcdce0d0c2e5b314d948cb082471c498
-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/clapTrap/whiff.wav b/Assets/Resources/Sfx/games/clapTrap/whiff.wav
new file mode 100644
index 000000000..1d1144ed3
Binary files /dev/null and b/Assets/Resources/Sfx/games/clapTrap/whiff.wav differ
diff --git a/Assets/Resources/Sfx/games/clapTrap/whiff.wav.meta b/Assets/Resources/Sfx/games/clapTrap/whiff.wav.meta
new file mode 100644
index 000000000..ccbddabbd
--- /dev/null
+++ b/Assets/Resources/Sfx/games/clapTrap/whiff.wav.meta
@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 22ec075677db6214fb0b0833f32042f9
+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/Sprites/Games/ClapTrap/Animations/swordGreenOnionHit.anim b/Assets/Resources/Sprites/Games/ClapTrap/Animations/swordGreenOnionHit.anim
index 4de9ba261..c314f12ea 100644
--- a/Assets/Resources/Sprites/Games/ClapTrap/Animations/swordGreenOnionHit.anim
+++ b/Assets/Resources/Sprites/Games/ClapTrap/Animations/swordGreenOnionHit.anim
@@ -19,7 +19,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: {x: 0, y: 0, z: 20}
+ value: {x: 0, y: 0, z: -65}
inSlope: {x: 0, y: 0, z: Infinity}
outSlope: {x: 0, y: 0, z: Infinity}
tangentMode: 0
@@ -28,7 +28,16 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
- value: {x: 0, y: 0, z: -70}
+ value: {x: 0, y: 0, z: -65}
+ inSlope: {x: 0, y: 0, z: Infinity}
+ outSlope: {x: 0, y: 0, z: Infinity}
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+ - serializedVersion: 3
+ time: 0.1
+ value: {x: 0, y: 0, z: -65}
inSlope: {x: 0, y: 0, z: Infinity}
outSlope: {x: 0, y: 0, z: Infinity}
tangentMode: 0
@@ -46,61 +55,7 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.46666667
- value: {x: 0, y: 0, z: -55}
- inSlope: {x: 0, y: 0, z: Infinity}
- outSlope: {x: 0, y: 0, z: Infinity}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.48333332
- value: {x: 0, y: 0, z: -50}
- inSlope: {x: 0, y: 0, z: Infinity}
- outSlope: {x: 0, y: 0, z: Infinity}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.5
- value: {x: 0, y: 0, z: -45}
- inSlope: {x: 0, y: 0, z: Infinity}
- outSlope: {x: 0, y: 0, z: Infinity}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.51666665
- value: {x: 0, y: 0, z: -40}
- inSlope: {x: 0, y: 0, z: Infinity}
- outSlope: {x: 0, y: 0, z: Infinity}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.53333336
- value: {x: 0, y: 0, z: -35}
- inSlope: {x: 0, y: 0, z: Infinity}
- outSlope: {x: 0, y: 0, z: Infinity}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.56666666
- value: {x: 0, y: 0, z: -30}
- inSlope: {x: 0, y: 0, z: Infinity}
- outSlope: {x: 0, y: 0, z: Infinity}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.5833333
- value: {x: 0, y: 0, z: -30}
+ value: {x: 0, y: 0, z: -60}
inSlope: {x: 0, y: 0, z: Infinity}
outSlope: {x: 0, y: 0, z: Infinity}
tangentMode: 0
@@ -117,7 +72,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: {x: -10.69, y: -0.6, z: 0}
+ value: {x: -12.27, y: -3.1, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
@@ -126,99 +81,45 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.033333335
- value: {x: -10.69, y: -0.6, z: 0}
+ value: {x: -12.27, y: -3.14, z: 0}
inSlope: {x: Infinity, y: Infinity, z: Infinity}
- outSlope: {x: Infinity, y: Infinity, z: 0}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.06666667
- value: {x: -10.59, y: -0.7, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
+ value: {x: -12.1, y: -3.56, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.1
- value: {x: -10.59, y: -0.6, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
+ value: {x: -12.1, y: -3.43, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.43333334
- value: {x: -10.69, y: -0.8, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
+ value: {x: -12.06, y: -2.94, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.46666667
- value: {x: -10.69, y: -0.95, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.48333332
- value: {x: -10.69, y: -1.05, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.5
- value: {x: -10.89, y: -0.95, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.51666665
- value: {x: -11.44, y: -0.75, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.53333336
- value: {x: -11.99, y: -0.75, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.56666666
- value: {x: -12.89, y: -0.45, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.5833333
- value: {x: -12.89, y: -0.45, z: 0}
- inSlope: {x: Infinity, y: Infinity, z: 0}
- outSlope: {x: Infinity, y: Infinity, z: 0}
+ value: {x: -12.06, y: -2.94, z: 0}
+ inSlope: {x: Infinity, y: Infinity, z: Infinity}
+ outSlope: {x: Infinity, y: Infinity, z: Infinity}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@@ -235,6 +136,12 @@ AnimationClip:
value: {fileID: 1302396010, guid: be67975450a040e46acbd973861e1ce1, type: 3}
- time: 0.06666667
value: {fileID: -924056792, guid: be67975450a040e46acbd973861e1ce1, type: 3}
+ - time: 0.1
+ value: {fileID: -924056792, guid: be67975450a040e46acbd973861e1ce1, type: 3}
+ - time: 0.43333334
+ value: {fileID: -924056792, guid: be67975450a040e46acbd973861e1ce1, type: 3}
+ - time: 0.46666667
+ value: {fileID: -924056792, guid: be67975450a040e46acbd973861e1ce1, type: 3}
attribute: m_Sprite
path:
classID: 212
@@ -270,12 +177,15 @@ AnimationClip:
pptrCurveMapping:
- {fileID: 1302396010, guid: be67975450a040e46acbd973861e1ce1, type: 3}
- {fileID: -924056792, guid: be67975450a040e46acbd973861e1ce1, type: 3}
+ - {fileID: -924056792, guid: be67975450a040e46acbd973861e1ce1, type: 3}
+ - {fileID: -924056792, guid: be67975450a040e46acbd973861e1ce1, type: 3}
+ - {fileID: -924056792, guid: be67975450a040e46acbd973861e1ce1, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.5833333
+ m_StopTime: 0.48333335
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -296,7 +206,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: -10.69
+ value: -12.27
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -305,7 +215,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
- value: -10.69
+ value: -12.27
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -314,7 +224,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
- value: -10.59
+ value: -12.1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -323,7 +233,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
- value: -10.59
+ value: -12.1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -332,7 +242,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.43333334
- value: -10.69
+ value: -12.06
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -340,44 +250,8 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.5
- value: -10.89
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.51666665
- value: -11.44
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.53333336
- value: -11.99
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.56666666
- value: -12.89
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.5833333
- value: -12.89
+ time: 0.46666667
+ value: -12.06
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -396,7 +270,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: -0.6
+ value: -3.1
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -405,7 +279,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.033333335
- value: -0.6
+ value: -3.14
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -414,7 +288,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
- value: -0.7
+ value: -3.56
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -423,7 +297,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.1
- value: -0.6
+ value: -3.43
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -432,7 +306,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.43333334
- value: -0.8
+ value: -2.94
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -441,52 +315,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
- value: -0.95
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.48333332
- value: -1.05
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.5
- value: -0.95
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.51666665
- value: -0.75
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.56666666
- value: -0.45
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.5833333
- value: -0.45
+ value: -2.94
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -521,6 +350,42 @@ AnimationClip:
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.06666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.1
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.43333334
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.46666667
+ value: 0
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
@@ -533,7 +398,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 20
+ value: -65
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -542,7 +407,16 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.06666667
- value: -70
+ value: -65
+ inSlope: Infinity
+ outSlope: Infinity
+ tangentMode: 103
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 0.1
+ value: -65
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
@@ -560,61 +434,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 0.46666667
- value: -55
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.48333332
- value: -50
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.5
- value: -45
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.51666665
- value: -40
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.53333336
- value: -35
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.56666666
- value: -30
- inSlope: Infinity
- outSlope: Infinity
- tangentMode: 103
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.5833333
- value: -30
+ value: -60
inSlope: Infinity
outSlope: Infinity
tangentMode: 103
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.000.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.000.png
index 4784c2f79..d199bd9a5 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.000.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.000.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.001.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.001.png
index 11e315273..4836b707a 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.001.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.001.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.002.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.002.png
index 5e32e9714..560eb84e8 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.002.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.002.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.003.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.003.png
index 9f310d9c1..e90d0b1d2 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.003.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.003.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.004.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.004.png
index 50bf25279..bd85aa03d 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.004.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.004.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.005.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.005.png
index ea3499137..5236a9da6 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.005.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.005.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.006.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.006.png
index 0fc411797..717cff8fd 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.006.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.006.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.007.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.007.png
index fa46aa291..6c89279f5 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.007.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.007.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.008.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.008.png
index 7c6eac800..104b414dc 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.008.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.008.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.009.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.009.png
index 23cfc9779..5403a9fe2 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.009.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.009.png differ
diff --git a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.010.png b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.010.png
index f92d48181..8c332bc77 100644
Binary files a/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.010.png and b/Assets/Resources/Sprites/Games/ClapTrap/references/chop_block.010.png differ
diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity
index d12f97aa3..5a95df634 100644
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
@@ -16661,7 +16661,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -50}
+ m_AnchoredPosition: {x: 0, y: -50.000015}
m_SizeDelta: {x: -48, y: -148}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &572765323
diff --git a/Assets/Scripts/Games/ClapTrap/ClapTrap.cs b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs
index 6b18dac80..8c7a447b5 100644
--- a/Assets/Scripts/Games/ClapTrap/ClapTrap.cs
+++ b/Assets/Scripts/Games/ClapTrap/ClapTrap.cs
@@ -19,9 +19,9 @@ namespace HeavenStudio.Games.Loaders
resizable = true,
parameters = new List()
{
- new Param("sword", ClapTrap.ClapType.Hand, "Object", "The object attempting to hit the doll"),
+ new Param("sword", ClapTrap.ClapType.Hand, "Object", "The evil, giant object attempting to karate chop the doll."),
//new Param("sighBeat", new EntityTypes.Float(2, 100), "Sigh Beat", "The slapper attempting to hit the doll"),
- new Param("spotlight", true, "Spotlight", "Whether or not there's a spotlight for the cue"),
+ new Param("spotlight", true, "Spotlight", "Toggle if the spotlight should appear."),
}
},
new GameAction("doll animations", "Doll Animations")
@@ -30,7 +30,7 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 0.5f,
parameters = new List()
{
- new Param("animate", ClapTrap.DollAnim.Inhale, "Animation", "The animation that the doll will play"),
+ new Param("animate", ClapTrap.DollAnim.Inhale, "Animation", "The animation that the doll will play."),
}
},
new GameAction("spotlight", "Force Spotlight")
@@ -39,7 +39,7 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 0.5f,
parameters = new List()
{
- new Param("force", true, "Force Spotlight", "Whether or not to force the spotlight to be active"),
+ new Param("force", true, "Force Spotlight", "Toggle if the spotlight should appear."),
}
},
new GameAction("background color", "Background Colors")
@@ -49,7 +49,7 @@ namespace HeavenStudio.Games.Loaders
resizable = true,
parameters = new List()
{
- new Param("bgColor", ClapTrap.defaultBgColor, "Start Color", "Set the color at the start of the event"),
+ new Param("bgColor", ClapTrap.defaultBgColor, "Start Color", "Set the color at the start of the event."),
new Param("bgColorEnd", ClapTrap.defaultBgColor, "End Color", "Set the color at the end of the event."),
new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.")
@@ -61,11 +61,11 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 0.5f,
parameters = new List()
{
- new Param("left", ClapTrap.defaultLeftColor, "Left Hand", "The color used on the doll's right hand."),
- new Param("right", ClapTrap.defaultRightColor, "Right Hand", "The color used on the doll's left hand."),
- new Param("spotlightBottom", ClapTrap.defaultBgColor, "Spotlight Bottom", "The color at the bottom of the spotlight"),
- new Param("spotlightTop", ClapTrap.glowSpotlight, "Spotlight Top", "The color at the top of the spotlight"),
- new Param("spotlightGlow", ClapTrap.glowSpotlight, "Spotlight Glow", "The color that glows around the spotlight")
+ new Param("left", ClapTrap.defaultLeftColor, "Left Hand", "The color for the doll's right hand."),
+ new Param("right", ClapTrap.defaultRightColor, "Right Hand", "The color for the doll's left hand."),
+ new Param("spotlightBottom", ClapTrap.defaultBgColor, "Spotlight Bottom", "The color for the bottom of the spotlight."),
+ new Param("spotlightTop", ClapTrap.glowSpotlight, "Spotlight Top", "The color for the top of the spotlight."),
+ new Param("spotlightGlow", ClapTrap.glowSpotlight, "Spotlight Glow", "The color for the glow around the spotlight.")
},
},
@@ -85,9 +85,9 @@ namespace HeavenStudio.Games
{
Hand,
Paw,
- GreenOnion,
- Branch,
- Random
+ //GreenOnion,
+ //Branch,
+ //Random
}
public enum DollAnim
@@ -219,7 +219,7 @@ namespace HeavenStudio.Games
BeatAction.New(instance, new List()
{
new BeatAction.Action(Conductor.instance.songPositionInBeats, delegate { canClap = false; }),
- new BeatAction.Action(Conductor.instance.songPositionInBeats + 1.2, delegate { canClap = true; })
+ new BeatAction.Action(Conductor.instance.songPositionInBeats + 0.6, delegate { canClap = true; })
});
}
@@ -291,7 +291,7 @@ namespace HeavenStudio.Games
else if (animate == 2)
{
dollHead.DoScaledAnimationAsync("HeadBreatheOut", 0.5f);
- SoundByte.PlayOneShotGame($"clapTrap/deepExhale{UnityEngine.Random.Range(1, 2)}");
+ SoundByte.PlayOneShotGame($"clapTrap/deepExhale{UnityEngine.Random.Range(1, 3)}");
}
else if (animate == 3)
{
diff --git a/Assets/Scripts/Games/ClapTrap/Sword.cs b/Assets/Scripts/Games/ClapTrap/Sword.cs
index ac1c7d280..f52a11a30 100644
--- a/Assets/Scripts/Games/ClapTrap/Sword.cs
+++ b/Assets/Scripts/Games/ClapTrap/Sword.cs
@@ -50,18 +50,21 @@ namespace HeavenStudio.Games.Scripts_ClapTrap
{
if (state >= 1f || state <= -1f)
{
- SoundByte.PlayOneShotGame($"clapTrap/barely{UnityEngine.Random.Range(1, 2)}");
+ SoundByte.PlayOneShotGame($"clapTrap/barely{UnityEngine.Random.Range(1, 3)}");
dollHead.DoScaledAnimationAsync("HeadBarely", 0.5f);
}
- else if (state >= -0.2 && state <= 0.2)
- {
- SoundByte.PlayOneShotGame($"clapTrap/aceClap{UnityEngine.Random.Range(1, 4)}");
- dollHead.DoScaledAnimationAsync("HeadHit", 0.5f);
- }
else
{
- SoundByte.PlayOneShotGame($"clapTrap/goodClap{UnityEngine.Random.Range(1, 4)}");
+ SoundByte.PlayOneShotGame($"clapTrap/goodClap{UnityEngine.Random.Range(1, 5)}");
dollHead.DoScaledAnimationAsync("HeadHit", 0.5f);
+ if (state >= -0.2 && state <= 0.2)
+ {
+ SoundByte.PlayOneShotGame($"clapTrap/clapAce");
+ }
+ else
+ {
+ SoundByte.PlayOneShotGame($"clapTrap/clapGood");
+ }
}
dollArms.DoScaledAnimationAsync("ArmsHit", 0.5f);