diff --git a/MrBigsock/Assets/Code/Character.cs b/MrBigsock/Assets/Code/Character.cs
index a28d445b9c9a4d725691b12da3e23a8e1bfef2c0..c025a2a9b07bf4a455b1ad6986274b4b1f7be885 100644
--- a/MrBigsock/Assets/Code/Character.cs
+++ b/MrBigsock/Assets/Code/Character.cs
@@ -18,7 +18,7 @@ namespace BigSock {
public float AttackSpeed => Stats.AttackSpeed;
public float baseAttackSpeed = 1;
- public AudioSource source;
+ public AudioSource[] source;
public AudioClip TakeDamageAudio;
/*
@@ -130,6 +130,8 @@ namespace BigSock {
ProjectileSpeed = 1,
Accuracy = 1,
};
+ source = Camera.main.gameObject.GetComponents<AudioSource>();
+
UpdateModifiers();
@@ -210,9 +212,9 @@ namespace BigSock {
OnTakeDamage?.Invoke(this, attack.Actor, attack);
if (TakeDamageAudio != null){
- source = GetComponent<AudioSource>();
- source.clip = TakeDamageAudio;
- source.Play();
+ source[0] = GetComponent<AudioSource>();
+ source[0].clip = TakeDamageAudio;
+ source[0].Play();
}
// Inform the attacker they hit us.
diff --git a/MrBigsock/Assets/Prefabs/Enemy_Slime.prefab b/MrBigsock/Assets/Prefabs/Enemy_Slime.prefab
index a6df830b959a9732792d834ed4c645afb2864f6a..7c7624f151db0fb59c56ffd93732208e2e5d56e1 100644
--- a/MrBigsock/Assets/Prefabs/Enemy_Slime.prefab
+++ b/MrBigsock/Assets/Prefabs/Enemy_Slime.prefab
@@ -14,7 +14,6 @@ GameObject:
- component: {fileID: 5891912875293609069}
- component: {fileID: 2395291586284291126}
- component: {fileID: -2882901802891604921}
- - component: {fileID: 9219589711046240871}
m_Layer: 0
m_Name: Enemy_Slime
m_TagString: 5
@@ -171,7 +170,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
baseAttackSpeed: 1
- source: {fileID: 9219589711046240871}
+ source:
+ - {fileID: 0}
TakeDamageAudio: {fileID: 8300000, guid: f1cd1110ebb2e3f4289a7667f4fea401, type: 3}
baseMovementSpeed: 2
baseDamage: 1
@@ -197,102 +197,6 @@ MonoBehaviour:
maxDepth: 0
minNormalAngle: 0
maxNormalAngle: 0
---- !u!82 &9219589711046240871
-AudioSource:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2996495149472241661}
- m_Enabled: 1
- serializedVersion: 4
- OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 0}
- m_PlayOnAwake: 1
- m_Volume: 1
- m_Pitch: 1
- Loop: 0
- Mute: 0
- Spatialize: 0
- SpatializePostEffects: 0
- Priority: 128
- DopplerLevel: 1
- MinDistance: 1
- MaxDistance: 500
- Pan2D: 0
- rolloffMode: 0
- BypassEffects: 0
- BypassListenerEffects: 0
- BypassReverbZones: 0
- rolloffCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- panLevelCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- spreadCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- reverbZoneMixCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
--- !u!1 &7539630614846898202
GameObject:
m_ObjectHideFlags: 0
diff --git a/MrBigsock/Assets/Prefabs/enemy_orc_range.prefab b/MrBigsock/Assets/Prefabs/enemy_orc_range.prefab
index 5d012f38637ddc346dbe4c6772ccc1974ea3552d..769267092132d3c748446a6ba11b87c2c1e99810 100644
--- a/MrBigsock/Assets/Prefabs/enemy_orc_range.prefab
+++ b/MrBigsock/Assets/Prefabs/enemy_orc_range.prefab
@@ -14,7 +14,6 @@ GameObject:
- component: {fileID: 5891912875293609069}
- component: {fileID: 2395291586284291126}
- component: {fileID: 1448466269}
- - component: {fileID: -2602028222554294296}
m_Layer: 6
m_Name: enemy_orc_range
m_TagString: 5
@@ -172,7 +171,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
baseAttackSpeed: 1
- source: {fileID: -2602028222554294296}
+ source:
+ - {fileID: 0}
TakeDamageAudio: {fileID: 8300000, guid: 0d78a0205a770454c86c53710a0b4ff1, type: 3}
baseMovementSpeed: 1
baseDamage: 1
@@ -199,102 +199,6 @@ MonoBehaviour:
minNormalAngle: 0
maxNormalAngle: 0
attack: {fileID: 0}
---- !u!82 &-2602028222554294296
-AudioSource:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2996495149472241661}
- m_Enabled: 1
- serializedVersion: 4
- OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 0}
- m_PlayOnAwake: 1
- m_Volume: 1
- m_Pitch: 1
- Loop: 0
- Mute: 0
- Spatialize: 0
- SpatializePostEffects: 0
- Priority: 128
- DopplerLevel: 1
- MinDistance: 1
- MaxDistance: 500
- Pan2D: 0
- rolloffMode: 0
- BypassEffects: 0
- BypassListenerEffects: 0
- BypassReverbZones: 0
- rolloffCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- panLevelCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- spreadCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- reverbZoneMixCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
--- !u!1 &4965090359149211768
GameObject:
m_ObjectHideFlags: 0
diff --git a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
index d98af572b586e0aa41f38b12c99f50ca528df3a1..c787901de06ba61982cd18f24d21513ba1d2288f 100644
--- a/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
+++ b/MrBigsock/Assets/Prefabs/enemy_orc_warrior.prefab
@@ -14,7 +14,6 @@ GameObject:
- component: {fileID: 5891912875293609069}
- component: {fileID: 1992931693109878676}
- component: {fileID: 2395291586284291126}
- - component: {fileID: -5008784444948990005}
m_Layer: 6
m_Name: enemy_orc_warrior
m_TagString: 5
@@ -145,7 +144,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
baseAttackSpeed: 1
- source: {fileID: -5008784444948990005}
+ source:
+ - {fileID: 0}
TakeDamageAudio: {fileID: 8300000, guid: 0d78a0205a770454c86c53710a0b4ff1, type: 3}
baseMovementSpeed: 4
baseDamage: 1
@@ -197,102 +197,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.6390133, y: 0.9770762}
m_EdgeRadius: 0
---- !u!82 &-5008784444948990005
-AudioSource:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2996495149472241661}
- m_Enabled: 1
- serializedVersion: 4
- OutputAudioMixerGroup: {fileID: 0}
- m_audioClip: {fileID: 0}
- m_PlayOnAwake: 1
- m_Volume: 1
- m_Pitch: 1
- Loop: 0
- Mute: 0
- Spatialize: 0
- SpatializePostEffects: 0
- Priority: 128
- DopplerLevel: 1
- MinDistance: 1
- MaxDistance: 500
- Pan2D: 0
- rolloffMode: 0
- BypassEffects: 0
- BypassListenerEffects: 0
- BypassReverbZones: 0
- rolloffCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 1
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- panLevelCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- spreadCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- reverbZoneMixCustomCurve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1
- inSlope: 0
- outSlope: 0
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
--- !u!1 &7539630614846898202
GameObject:
m_ObjectHideFlags: 0
diff --git a/MrBigsock/Assets/Scenes/GenTilemap.unity b/MrBigsock/Assets/Scenes/GenTilemap.unity
index ab4bf0413295998a4a438bd011b998b18c8da06a..67eee0ba4cefcf2288fbddf414b4f614a92fe2b1 100644
--- a/MrBigsock/Assets/Scenes/GenTilemap.unity
+++ b/MrBigsock/Assets/Scenes/GenTilemap.unity
@@ -37921,6 +37921,7 @@ GameObject:
- component: {fileID: 135519494}
- component: {fileID: 135519497}
- component: {fileID: 135519498}
+ - component: {fileID: 135519499}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -38042,6 +38043,102 @@ MonoBehaviour:
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []
+--- !u!82 &135519499
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 135519493}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 0}
+ m_PlayOnAwake: 1
+ m_Volume: 1
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
--- !u!1001 &137619414
PrefabInstance:
m_ObjectHideFlags: 0