Merge remote-tracking branch 'origin/main'

Assets/Scenes/Bloody Mary.unity

@@ -1102,6 +1102,140 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 538127010}
   m_CullTransparentMesh: 1
+--- !u!1 &557837175
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 557837176}
+  - component: {fileID: 557837178}
+  - component: {fileID: 557837177}
+  m_Layer: 5
+  m_Name: Description
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &557837176
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 557837175}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1197965563}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 25}
+  m_SizeDelta: {x: 200, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &557837177
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 557837175}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &557837178
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 557837175}
+  m_CullTransparentMesh: 1
 --- !u!1 &761043861
 GameObject:
   m_ObjectHideFlags: 0
@@ -1466,6 +1600,7 @@ RectTransform:
   - {fileID: 268970235}
   - {fileID: 1208295405}
   - {fileID: 761043862}
+  - {fileID: 557837176}
   m_Father: {fileID: 185592112}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -1536,6 +1671,7 @@ MonoBehaviour:
   reelIncrease: 1.1
   upgradeCost: 100000
   BloodMeter: {fileID: 268970236}
+  description: {fileID: 0}
 --- !u!95 &1197965567
 Animator:
   serializedVersion: 5

Assets/Scripts/Player/PlayerMovement.cs

@@ -31,10 +31,13 @@ public class PlayerMovement : MonoBehaviour
 
     private PlayerInput playerInput;
 
+    private HealthComponent hp;
+
     private void Start()
     {
         rb = GetComponent<Rigidbody2D>();
         playerInput = GetComponent<PlayerInput>();
+        hp = GetComponent<HealthComponent>();
 
         if (gameObject.name == "Player2")
         {
@@ -103,4 +106,12 @@ public class PlayerMovement : MonoBehaviour
             yield return new WaitForSeconds(stepCooldown);
         }
     }
+
+    void OnCollisionStay2D(Collision2D collision)
+    {
+        if (collision.otherCollider.gameObject.CompareTag("Enemy"))
+        { // Other object is an enemy
+            hp.TakeDamage(1f);
+        }
+    }
 }

Assets/Scripts/Upgrader.cs

@@ -1,4 +1,5 @@
 using System.Collections;
+using TMPro;
 using System.Collections.Generic;
 using UnityEngine.UI;
 using UnityEngine;
@@ -59,6 +60,7 @@ public class Upgrader : MonoBehaviour
     private bool prevCouldUpgrade = true;
 
     public Image BloodMeter;
+    public TMPro.TextMeshProUGUI description;
 
     // Start is called before the first frame update
     void Start()
@@ -179,6 +181,8 @@ public class Upgrader : MonoBehaviour
             }
             else
             {
+                description.text = "";
+
                 if (acceptTime > 0f)
                 {
                     foreach (Image i in upgradeImages)
@@ -194,10 +198,14 @@ public class Upgrader : MonoBehaviour
         }
         else if (prevCouldUpgrade)
         {
+            // TODO: PLAY SOUND HERE!!
+
+            description.text = "";
             background.color = Color.gray;
             foreach (Image i in upgradeImages)
             {
                 i.color = Color.gray;
+                i.gameObject.transform.localScale = Vector3.one;
             }
 
             Player1Cursor.gameObject.SetActive(false);
@@ -213,6 +221,7 @@ public class Upgrader : MonoBehaviour
     /// Increases mop radius by 10%
     public void UpgradeMopSize()
     {
+        description.text = upgrades.mopUpgrade.name;
         bloodManager.CleanRadius *= mopSizeIncrease;
         upgrades.mopUpgrade.amount++;
     }
@@ -220,6 +229,7 @@ public class Upgrader : MonoBehaviour
     /// Increases move speed by 10%
     public void UpgradeSpeed()
     {
+        description.text = upgrades.speedUpgrade.name;
         player1.GetComponent<PlayerMovement>().moveSpeed *= speedIncrease;
         player2.GetComponent<PlayerMovement>().moveSpeed *= speedIncrease;
         upgrades.speedUpgrade.amount++;
@@ -228,12 +238,15 @@ public class Upgrader : MonoBehaviour
     public void RopeUpgrade()
     {
         // todo: public methods
+        description.text = upgrades.ropeUpgrade.name;
         rope.ropeMaxLength *= ropeIncrease;
         upgrades.ropeUpgrade.amount++;
     }
 
     public void HealthUpgrade()
     {
+        description.text = upgrades.healthUpgrade.name;
+
         var comp1 = player1.GetComponent<HealthComponent>();
         comp1.setMaxHealth((int)(comp1.getMaxHealth() * healthIncrease));
 
@@ -244,6 +257,7 @@ public class Upgrader : MonoBehaviour
 
     public void DamageUpgrade()
     {
+        description.text = upgrades.damageUpgrade.name;
         // todo: public rope methods
         // rope.da
         upgrades.damageUpgrade.amount++;
@@ -251,6 +265,7 @@ public class Upgrader : MonoBehaviour
 
     public void BloodUpgrade()
     {
+        description.text = upgrades.bloodUpgrade.name;
         bloodManager.scoreMult *= bloodIncrease;
         upgrades.bloodUpgrade.amount++;
     }
@@ -258,15 +273,18 @@ public class Upgrader : MonoBehaviour
     public void ReelUpgrade()
     {
         // todo rope methods
+        description.text = upgrades.reelUpgrade.name;
         rope.ropeExtendSpeed *= reelIncrease;
         upgrades.reelUpgrade.amount++;
     }
 
-    IEnumerator updateBloodMeter() {
+    IEnumerator updateBloodMeter()
-        while (true) {
+    {
+        while (true)
+        {
             yield return new WaitForSeconds(0.5f);
 
-            BloodMeter.fillAmount = ((float)bloodManager.score)/((float)upgradeCost);
+            BloodMeter.fillAmount = ((float)bloodManager.score) / ((float)upgradeCost);
         }
 
         // dont care