Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main

Assets/Art Assets/Sound/Ancient_Game_Deep_Dark_Dungeon_Ambience_Loop.wav (Stored with Git LFS)

+size 18853784

Assets/Art Assets/Sound/Ancient_Game_Deep_Dark_Dungeon_Ambience_Loop.wav.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 26b05661b72f11741a80e5126f2256f2
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art Assets/Sound/SFX/Postive_Game_Sound.wav (Stored with Git LFS)

+size 263522

Assets/Art Assets/Sound/SFX/Postive_Game_Sound.wav.meta

@@ -0,0 +1,36 @@
+fileFormatVersion: 2
+guid: 25300bf305e2f6e49a92b4a22d34ad6b
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides:
+    4:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 3
+      quality: 1
+      conversionMode: 0
+    7:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 1
+      quality: 1
+      conversionMode: 0
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art Assets/Sound/SFX/Spikes.wav (Stored with Git LFS)

+size 353536

Assets/Art Assets/Sound/SFX/Spikes.wav.meta

@@ -0,0 +1,36 @@
+fileFormatVersion: 2
+guid: 3342524d5a4ccda4283d0a1afdaf6307
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides:
+    4:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 3
+      quality: 1
+      conversionMode: 0
+    7:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 1
+      quality: 1
+      conversionMode: 0
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art Assets/Sound/SFX/Subtle_Jump.wav (Stored with Git LFS)

+size 177602

Assets/Art Assets/Sound/SFX/Subtle_Jump.wav.meta

@@ -0,0 +1,36 @@
+fileFormatVersion: 2
+guid: f299cdaedee0d3945af92005e838736c
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 6
+  defaultSettings:
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 0
+    quality: 1
+    conversionMode: 0
+  platformSettingOverrides:
+    4:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 3
+      quality: 1
+      conversionMode: 0
+    7:
+      loadType: 0
+      sampleRateSetting: 0
+      sampleRateOverride: 44100
+      compressionFormat: 1
+      quality: 1
+      conversionMode: 0
+  forceToMono: 0
+  normalize: 1
+  preloadAudioData: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/MonsterWorking.unity (Stored with Git LFS)

+size 110580

Assets/Scenes/MonsterWorking.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 72869211a51722a49b486c6163795717
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/Official Levels/Level 1.unity (Stored with Git LFS)

+size 174931

Assets/Scenes/Official Levels/Level 2.unity (Stored with Git LFS)

+size 1964746

Assets/Scenes/Official Levels/Level 3.unity (Stored with Git LFS)

+size 594251

Assets/Scripts/Character/CharacterInputController.cs

@@ -26,6 +26,15 @@ public class CharacterInputController : MonoBehaviour
     [SerializeField]
     private Animator m_animator;
 
+    [SerializeField]
+    private AudioClip m_DeathSound;
+
+    [SerializeField]
+    private AudioClip m_VictoryClip;
+
+    [SerializeField]
+    private AudioClip m_JumpSound;
+
     [SerializeField, BoxGroup("Settings")]
     private float m_speed = 2.0f;
 
@@ -79,25 +88,32 @@ public class CharacterInputController : MonoBehaviour
 
     public void OnLandHappened()
     {
-        m_animator.SetTrigger("Land");
+        m_animator.SetTrigger("Land");
     }
 
     public void OnJumpHappened()
     {
         m_animator.SetTrigger("Land");
+        //AudioSource.PlayClipAtPoint(m_JumpSound, transform.position);
     }
     public void OnDeath(bool value)
     {
-        if (value)
+        if (value)
+        {
             m_animator.SetTrigger("Death");
+            AudioSource.PlayClipAtPoint(m_DeathSound, transform.position);
+        }
         else
             m_animator.SetTrigger("Respawn");
     }
 
     public void OnVictory(bool value)
     {
-        if (value)
+        if (value)
+        {
             m_animator.SetTrigger("Victory");
+            AudioSource.PlayClipAtPoint(m_VictoryClip, transform.position);
+        }
     }
 
 

Assets/Scripts/LevelManager.cs

@@ -54,7 +54,7 @@ public class LevelManager : MonoBehaviour
 
     private void Start()
     {
-        m_allResetable = FindObjectsOfType<MonoBehaviour>().OfType<IResettable>().ToArray();
+        m_allResetable = FindObjectsOfType<MonoBehaviour>(true).OfType<IResettable>().ToArray();
         m_timer.Value = m_timeInLevel;
 
         m_isVictory.Value = false;

Assets/Scripts/MonsterController.cs

@@ -14,12 +14,16 @@ public class MonsterController : MonoBehaviour, IResettable
     private GameObject[] m_possibleFrames;
 
 
-    [SerializeField]
     private Transform m_player;
+    public GameObject m_defaultObject;
 
+    [SerializeField]
+    private float m_distance = 3;
 
     [SerializeField]
-    public GameObject m_defaultObject;
+    private Vector3 m_offset = Vector3.zero;
+
+    private bool m_hasChanged = false;
 
     private void OnEnable()
     {
@@ -33,6 +37,7 @@ public class MonsterController : MonoBehaviour, IResettable
 
     private void Start()
     {
+        m_player = GameObject.FindGameObjectWithTag("Player").transform;
         foreach (Transform child in transform)
         {
             if (child.gameObject.activeInHierarchy)
@@ -53,14 +58,35 @@ public class MonsterController : MonoBehaviour, IResettable
         }
     }
 
+    private void ResetMonster()
+    {
+        foreach (Transform child in transform)
+        {
+            child.gameObject.SetActive(child.gameObject == m_defaultObject);
+        }
+    }
+
 
     private void OnLightChange(float value)
     {
-        if (value <= 0)
+        float distanceToPlayer = Vector3.Distance(m_player.position, transform.position + m_offset);
+        
+        if (value <= 0.1 && distanceToPlayer < m_distance && !m_hasChanged)
         {
+            Debug.Log(distanceToPlayer);
             ChangeRandomMonster();
+            m_hasChanged = true;
+        }
+        else if (value <= 0)
+        {
+            ResetMonster();
+        }
+        if (value > 0.5)
+        {
+            m_hasChanged = false;
         }
 
+
     }
 
     public void OnLevelLoad()
@@ -75,9 +101,13 @@ public class MonsterController : MonoBehaviour, IResettable
 
     public void OnResetEnd()
     {
-        foreach (Transform child in transform)
-        {
-            child.gameObject.SetActive(child.gameObject == m_defaultObject);
-        }
+        ResetMonster();
+    }
+
+
+    private void OnDrawGizmosSelected()
+    {
+        Gizmos.color = Color.yellow;
+        Gizmos.DrawWireSphere(transform.position + m_offset, m_distance);
     }
 }