Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream

Assets/Scripts/CharacterController2D.cs.meta

+fileFormatVersion: 2
+guid: e937fe68fce80d44fb385a099114c29f
+timeCreated: 1433439077
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/PlayerControl.cs

 using UnityEngine;
 using System.Collections;
 
-public class PlayerControl : MonoBehaviour {
+public class PlayerControl : MonoBehaviour
+{
+
+    #region members
+    public float gravity = -25f;
+    public float runSpeed = 8f;
+    public float groundDamping = 20f; // how fast do we change direction? higher means faster
+    public float inAirDamping = 5f;
+    public float jumpHeight = 3f;
+
+    [HideInInspector]
+    private float normalizedHorizontalSpeed = 0;
+    private CharacterController2D _controller;
+    private Vector3 _velocity;
+    #endregion
 
     // Use this for initialization
     void Start () {
+        _controller = GetComponent<CharacterController2D>();
+    }
+
+    void Update()
+    {
+        // grab our current _velocity to use as a base for all calculations
+        _velocity = _controller.velocity;
+
+        if (_controller.isGrounded)
+            _velocity.y = 0;
+
+        if (Input.GetKey(KeyCode.RightArrow))
+        {
+            normalizedHorizontalSpeed = 1;
+            if (transform.localScale.x < 0f)
+                transform.localScale = new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z);
+
+            if (_controller.isGrounded)
+            {
+                //TODO animation run
+            }
+                
+        }
+        else if (Input.GetKey(KeyCode.LeftArrow))
+        {
+            normalizedHorizontalSpeed = -1;
+            if (transform.localScale.x > 0f)
+                transform.localScale = new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z);
 
+            if (_controller.isGrounded)
+            {
+                //TODO animation run
             }
+        }
+        else
+        {
+            normalizedHorizontalSpeed = 0;
+
+            if (_controller.isGrounded)
+            {
+                //TODO animation idle
+            }
+        }
+
+
+        // we can only jump whilst grounded
+        if (_controller.isGrounded && Input.GetKeyDown(KeyCode.UpArrow))
+        {
+            _velocity.y = Mathf.Sqrt(2f * jumpHeight * -gravity);
+            //TODO animation jump
+        }
+
+
+        // apply horizontal speed smoothing it
+        var smoothedMovementFactor = _controller.isGrounded ? groundDamping : inAirDamping; // how fast do we change direction?
+        _velocity.x = Mathf.Lerp(_velocity.x, normalizedHorizontalSpeed * runSpeed, Time.deltaTime * smoothedMovementFactor);
 
-	// Update is called once per frame
-	void Update () {
+        // apply gravity before moving
+        _velocity.y += gravity * Time.deltaTime;
 
+        _controller.move(_velocity * Time.deltaTime);
     }
 }

Assets/Scripts/Spikes.cs

@@ -3,6 +3,8 @@ using System.Collections;
 
 public class Spikes : MonoBehaviour {
 
+    float damage; //the amount of damage the spikes make.
+
     // Use this for initialization
     void Start () {
     
@@ -12,4 +14,14 @@ public class Spikes : MonoBehaviour {
     void Update () {
     
     }
+
+    void OnCollisionEnter2D(Collision2D coll)
+    {
+        if (coll.gameObject.tag == "Player")
+        {
+            //TODO: do damage
+        }
+           
+
+    } 
 }