Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020

Assets/ParallaxBackground.cs

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ParallaxBackground : MonoBehaviour
+{
+    public Camera camera;
+    public SpriteRenderer renderer;
+    public Vector2 scrollRate = Vector2.one * .4f;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        //var currentPos = 
+
+        //var offset = new Vector3(8f, -7.5f, 0f);
+
+        //renderer.transform.position = camera.transform.position + ((camera.transform.position * new Vector3(scrollRate.x, scrollRate.y, 0f)) - offset);
+
+    }
+}

Assets/ParallaxBackground.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: af4fa3c5d20488d4fa39fb11819d3f97
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Player.cs

@@ -20,6 +20,7 @@ public class Player : MonoBehaviour
 
     private int currentHealth;
     private int currentStamina;
+    private float staminaInitialSize;
 
     [SerializeField] private SpriteRenderer healthBar;
     [SerializeField] private SpriteRenderer staminaBar;
@@ -35,10 +36,11 @@ public class Player : MonoBehaviour
         rigidBody = GetComponent<Rigidbody2D>();
         collider = GetComponent<Collider2D>();
         animator = GetComponent<Animator>();
-        currentHealth = startHealth;
+        currentHealth = 1; // startHealth;
-        currentStamina = startStamina;
+        currentStamina = 50; // startStamina;
         healthBar.size = new Vector2(1.5f * startHealth, healthBar.size.y);
-        staminaBar.size = new Vector2(staminaBar.size.x, staminaBar.size.y);
+        staminaInitialSize = staminaBar.size.x;
+        staminaBar.size = new Vector2(staminaInitialSize * 0.5f, staminaBar.size.y);
     }
 
     private void Update()
@@ -88,7 +90,8 @@ public class Player : MonoBehaviour
         SoundManagerScript.PlaySound("drink");
         int result = currentStamina + GetStaminaValueChange(coffeValuePercent);
         currentStamina = result < startStamina ? result : startStamina;
-        staminaBar.size = new Vector2(staminaBar.size.x * (currentStamina/startStamina), staminaBar.size.y);
+        float multiplier = currentStamina * 1f / startStamina;
+        staminaBar.size = new Vector2(staminaInitialSize * multiplier, staminaBar.size.y);
     }
 
     private void DecreaseStaminaAfterBugFight()

Assets/ScrollingBackg.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ScrollingBackg : MonoBehaviour
+{
+    public Camera camera;
+    public SpriteRenderer renderer;
+    public Vector2 scrollSpeed = Vector2.one * .4f;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

Assets/ScrollingBackg.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ff168e2e79b136b49af5cf60184c3beb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/TagManager.asset

@@ -46,3 +46,6 @@ TagManager:
   - name: Default
     uniqueID: 0
     locked: 0
+  - name: Stats
+    uniqueID: 4179335367
+    locked: 0