Merge remote-tracking branch 'origin/main' into main

MuseumGame/Assets/Scenes/DemoLevels/PathToBoss.unity

@@ -8766,6 +8766,7 @@ GameObject:
   - component: {fileID: 1704149510}
   - component: {fileID: 1704149512}
   - component: {fileID: 1704149511}
+  - component: {fileID: 1704149513}
   m_Layer: 0
   m_Name: Lava
   m_TagString: Untagged
@@ -10297,6 +10298,22 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
+--- !u!19719996 &1704149513
+TilemapCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1704149509}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_MaximumTileChangeCount: 1000
+  m_ExtrusionFactor: 0.00001
 --- !u!1 &1935037035
 GameObject:
   m_ObjectHideFlags: 0

MuseumGame/Assets/Scenes/DemoLevels/RouteToTower.unity

@@ -1927,9 +1927,10 @@ GameObject:
   - component: {fileID: 378298694}
   - component: {fileID: 378298696}
   - component: {fileID: 378298695}
+  - component: {fileID: 378298697}
   m_Layer: 0
   m_Name: Lava
-  m_TagString: Untagged
+  m_TagString: EnemyPlatform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -2838,6 +2839,22 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
+--- !u!19719996 &378298697
+TilemapCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 378298693}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_MaximumTileChangeCount: 1000
+  m_ExtrusionFactor: 0.00001
 --- !u!1 &392279113
 GameObject:
   m_ObjectHideFlags: 0

MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity

@@ -2266,7 +2266,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3275569032751403274, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
       propertyPath: m_Size.y
-      value: 1.1801329
+      value: 1.257689
       objectReference: {fileID: 0}
     - target: {fileID: 3275569032751403274, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
       propertyPath: m_Offset.x
@@ -2274,7 +2274,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3275569032751403274, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
       propertyPath: m_Offset.y
-      value: 0.001922369
+      value: -0.004920721
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}

MuseumGame/Assets/Scripts/GameManager.cs

@@ -136,7 +136,14 @@ public class GameManager : MonoBehaviour
 
         if (obtainedPowerups.Contains(Powerup.Shrink))
         {
-
+            if (Input.GetKeyDown("2") && !player.GetComponent<Shrink>().isShrunk)
+            {
+                player.GetComponent<Shrink>().startShrinking();
+            }
+            if (Input.GetKeyDown("2") && player.GetComponent<Shrink>().isShrunk)
+            {
+                player.GetComponent<Shrink>().startUnShrinking();
+            }
         }
     }
 

MuseumGame/Assets/Scripts/Health.cs

@@ -9,18 +9,29 @@ public class Health : MonoBehaviour
 
     public HealthBarCustom healthBar;
 
+    private Rigidbody2D rb2d;
+
     void OnTriggerEnter2D(Collider2D collider2D)
     {
+        Debug.Log("colliding");
         if (collider2D.gameObject.CompareTag("EnemyProjectile") || collider2D.gameObject.CompareTag("Enemy"))
         {
             DamagePlayer(10);
         }
+        if (collider2D.gameObject.CompareTag("EnemyPlatform")) 
+        {
+            Debug.Log("lava");
+            DamagePlayer(10);
+            rb2d.velocity = new Vector2(rb2d.velocity.x, 0);
+            rb2d.AddForce(new Vector2(0, 200));
+        }
     }
 
     // Start is called before the first frame update
     void Start()
     {
         currentHealth = maxHealth;
+        rb2d = GetComponent<Rigidbody2D>();
     }
 
     // Update is called once per frame

MuseumGame/Assets/Scripts/Shrink.cs

@@ -5,9 +5,8 @@ using UnityEngine;
 public class Shrink : MonoBehaviour
 {
     private GameObject player;
-    private CapsuleCollider2D hitbox;
-    private bool canShrink = false;
-    private float timer = 0;
+    private bool canUnShrink = true;
+    public bool isShrunk = true;
     // Start is called before the first frame update
     void Start()
     {
@@ -17,12 +16,12 @@ public class Shrink : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-        timer += Time.deltaTime;
+
     }
 
     public void startShrinking()
     {
-        if (canShrink)
+        if (canUnShrink)
         {
             for(int i = 0; i < 3; i++)
             {
@@ -35,7 +34,7 @@ public class Shrink : MonoBehaviour
 
     public void startUnShrinking()
     {
-        if (canShrink)
+        if (canUnShrink)
         {
             for(int i = 0; i<3; i++)
             {
@@ -48,11 +47,11 @@ public class Shrink : MonoBehaviour
 
     private void OnTriggerEnter2D(Collider2D collision)
     {
-        canShrink = false;
+        canUnShrink = false;
     }
 
     private void OnTriggerExit2D(Collider2D collision)
     {
-        canShrink = true;
+        canUnShrink = true;
     }
 }

MuseumGame/Assets/Scripts/movement.cs

@@ -125,9 +125,12 @@ public class movement : MonoBehaviour
 
     private void OnCollisionEnter2D(Collision2D collision)
     {
-        numJumps = maxJumps;
-        isGrounded = true;
-        Debug.Log("Able to Jump");
+        if(collision.gameObject.tag == "Floor")
+        {
+            numJumps = maxJumps;
+            isGrounded = true;
+            Debug.Log("Able to Jump");
+        }   
     }
     
     private void JumpAnimation()

MuseumGame/ProjectSettings/TagManager.asset

@@ -7,6 +7,7 @@ TagManager:
   - EnemyProjectile
   - Platform
   - Enemy
+  - EnemyPlatform
   layers:
   - Default
   - TransparentFX

MuseumGame/UserSettings/EditorUserSettings.asset

@@ -15,16 +15,28 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
+      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
     RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
+      value: 22424703114646680e0b0227036c6b1505032b292926237e38271427fb
       flags: 0
     RecentlyUsedScenePath-5:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
       flags: 0
     RecentlyUsedScenePath-6:
       value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b
+      flags: 0
+    RecentlyUsedScenePath-7:
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
+      flags: 0
+    RecentlyUsedScenePath-8:
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
+      flags: 0
+    RecentlyUsedScenePath-9:
+      value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650