Level/Credit Updates

Added a few more enemies to earlier levels. Added music to credits. Added some comments to code for summary, waiting on some info to finish level progress.
CS383-Dream-Team · Nov 27, 2018 · 6b1ff95 · 6b1ff95
1 parent 21d40c2
commit 6b1ff95
Show file tree

Hide file tree

Showing 7 changed files with 251 additions and 5 deletions.
diff --git a/src/Chasing the End/Assets/Edgar/Credits/Credits.unity b/src/Chasing the End/Assets/Edgar/Credits/Credits.unity
@@ -313,6 +313,10 @@ MonoBehaviour:
 
 
 
+    Music:
+
+
+
 
 '
 --- !u!222 &901947801
@@ -501,6 +505,17 @@ MonoBehaviour:
     "Chocolate Monster" By bevouliin.com licenced CC-BY 3.0: https://opengameart.org/content/chocolate-monster-sprite-sheets
 
 
+    By Rolemusic (Free Use):
+
+
+    "The Black"
+
+    "The Black Kitty"
+
+    "The Little Broth"
+
+    "The White"
+
 
 
 '

diff --git a/src/Chasing the End/Assets/Scenes/UpdatedScenes/Level1.unity b/src/Chasing the End/Assets/Scenes/UpdatedScenes/Level1.unity
@@ -3886,7 +3886,7 @@ GameObject:
   - component: {fileID: 1673455240}
   m_Layer: 0
   m_Name: Circle Key
-  m_TagString: Untagged
+  m_TagString: Circle Key
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0

diff --git a/src/Chasing the End/Assets/Scenes/UpdatedScenes/level2.unity b/src/Chasing the End/Assets/Scenes/UpdatedScenes/level2.unity
@@ -11639,6 +11639,48 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
+--- !u!1001 &1165645113
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0.04
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -11.95
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_RootOrder
+      value: 14
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+  m_IsPrefabAsset: 0
 --- !u!1001 &1427746383
 Prefab:
   m_ObjectHideFlags: 0

diff --git a/src/Chasing the End/Assets/Scenes/UpdatedScenes/level3.unity b/src/Chasing the End/Assets/Scenes/UpdatedScenes/level3.unity
@@ -5143,6 +5143,52 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
+--- !u!1001 &308068706
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 17.13
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -11.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_RootOrder
+      value: 16
+      objectReference: {fileID: 0}
+    - target: {fileID: 1323455447923484, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_Name
+      value: BossEnemy (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+  m_IsPrefabAsset: 0
 --- !u!1001 &334217573
 Prefab:
   m_ObjectHideFlags: 0
@@ -5236,6 +5282,52 @@ Prefab:
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 023faaaab17144a4c8ecf1a8bbe76798, type: 2}
   m_IsPrefabAsset: 0
+--- !u!1001 &483485834
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -15.08
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -0.91
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_RootOrder
+      value: 17
+      objectReference: {fileID: 0}
+    - target: {fileID: 1697981930261092, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_Name
+      value: Enemy (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+  m_IsPrefabAsset: 0
 --- !u!1001 &600151443
 Prefab:
   m_ObjectHideFlags: 0
@@ -5656,11 +5748,11 @@ Prefab:
     m_Modifications:
     - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
       propertyPath: m_LocalPosition.x
-      value: 7.76
+      value: 6.08
       objectReference: {fileID: 0}
     - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
       propertyPath: m_LocalPosition.y
-      value: -0.08
+      value: -3.29
       objectReference: {fileID: 0}
     - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
       propertyPath: m_LocalPosition.z
@@ -7962,6 +8054,48 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
+--- !u!1001 &1609362420
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -20.71
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 26.04
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4490213255686342, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+      propertyPath: m_RootOrder
+      value: 15
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f257d278d51ca41078c5f09428659fab, type: 2}
+  m_IsPrefabAsset: 0
 --- !u!1 &1617663120
 GameObject:
   m_ObjectHideFlags: 0
@@ -8199,6 +8333,52 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4431301356554910, guid: d8f45ed30df32fc48bb9c653c063da27,
     type: 2}
   m_PrefabInternal: {fileID: 1999208114}
+--- !u!1001 &2005745029
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 20.26
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 22.49
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_RootOrder
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 1697981930261092, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_Name
+      value: Enemy (2)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+  m_IsPrefabAsset: 0
 --- !u!1001 &2028421329
 Prefab:
   m_ObjectHideFlags: 0

diff --git a/src/Chasing the End/Assets/Tyler/Assets/Scripts/LevelControl.cs b/src/Chasing the End/Assets/Tyler/Assets/Scripts/LevelControl.cs
@@ -3,14 +3,22 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
+
+/// <summary>
+/// Allows for different scenes to be loaded after a trigger.
+/// In this case when the character with tag Player has specific items in their inventory
+/// the specified scene will load in. -Tyler
+/// </summary>
 public class LevelControl : MonoBehaviour {
 
     public int index;
+    //Must use scene name exactly to load correct scene
     public string levelName;
 
+    //Trigger for loading scenes
     private void OnTriggerEnter2D(Collider2D other)
     {
-        if (other.CompareTag("Player"))
+        if ((other.CompareTag("Player")))
         {
             SceneManager.LoadScene(index);
             SceneManager.LoadScene(levelName);

diff --git a/src/Chasing the End/ProjectSettings/ProjectVersion.txt b/src/Chasing the End/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.2.14f1
+m_EditorVersion: 2018.2.15f1
diff --git a/src/Chasing the End/ProjectSettings/TagManager.asset b/src/Chasing the End/ProjectSettings/TagManager.asset
@@ -10,6 +10,7 @@ TagManager:
   - Apple
   - Door
   - Trap
+  - Circle Key
   layers:
   - Default
   - TransparentFX
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		m_EditorVersion: 2018.2.14f1
		m_EditorVersion: 2018.2.15f1
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ TagManager: @@
       - Apple
       - Door
       - Trap
+      - Circle Key
       layers:
       - Default
       - TransparentFX
@@ Expand Down @@