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

Assets/Resources/Levels.xml

 <?xml version="1.0" encoding="us-ascii"?>
-
 <Levels>
-
   <Developer StartLevel="0" />
   <Level>
-    <Item prefab="Player Two" x="-3.05" y="2.06" />
-    <Item prefab="Player One" x="-0.23" y="2.06" />
-    <Item prefab="Trap" x="-5.02" y="-0.57" rot="90" />
-    <Item prefab="ground" x="1.51" y="-0.8" scalex="58.39" />
-    <Item prefab="Turret" x="4.47" y="0.71" />
-    <Item prefab="PortableFire" x="4.04" y="-0.22" scalex="0.2" scaley="0.2" />
-  </Level>
-  <Level>
-    <Item prefab="PlayerStartPosition" x="5.11" y="-0.92" />
-    <Item prefab="PortableFire" x="6.57" y="-1.3" />
-    <Item prefab="PortableFire" x="6.41" y="-2.37" />
-    <Item prefab="PortableFire" x="4.84" y="-1.68" />
+    <Item prefab="Start_Position" x="5" />
+    <Item prefab="Start_Position" x="-5" />
+    <Item prefab="Start_Position" />
+    <Item prefab="ground" y="-1.5" scalex="22.78" />
+    <Item prefab="ground" x="-7.5" y="-0.38" rot="90" scalex="30" />
+    <Item prefab="ground" x="7.5" y="-0.38" rot="90" scalex="30" />
+    <Item prefab="ground" x="4.69" y="-2.71" scalex="22.78" />
+    <Item prefab="ground" x="-4.7" y="-2.7" scalex="22.78" />
+    <Item prefab="ground" y="-4" scalex="60" />
   </Level>
 </Levels>

Assets/Resources/Prefabs/Start_Position.prefab.meta

+fileFormatVersion: 2
+guid: d0e95f1c653856b409b235f9de3f6493
+timeCreated: 1433514922
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameMaster.cs

@@ -6,6 +6,7 @@ using UnityEngine.UI;
 public class GameMaster : MonoBehaviour {
 
     DeserializedLevelsLoader levelLoader;
+    public PlayerControl[] playerPrefabs;
     public GameObject gameOverPanel;
     public Text rankingText;
 
@@ -14,9 +15,53 @@ public class GameMaster : MonoBehaviour {
         levelLoader = new DeserializedLevelsLoader();
     }
 
-    public void loadLevel()
+    public void loadLevel(int numberOfPlayers)
     {
         levelLoader.loadLevel();
+
+        deleteAllPlayers();
+        spawnPlayers(numberOfPlayers);
+    }
+
+    private void deleteAllPlayers()
+    {
+      foreach (GameObject player in GameObject.FindGameObjectsWithTag("Player"))
+        Object.Destroy(player, 0f);
+    }
+
+    private void spawnPlayers(int count)
+    {
+      Debug.Log("spawning " + count + " players");
+
+      GameObject[] startPositions = GameObject.FindGameObjectsWithTag("Start_Position");
+      if (count > startPositions.Length)
+      {
+        count = startPositions.Length;
+        Debug.LogError("map is capped at " + count + " players");
+      }
+
+      shuffle(startPositions);
+
+      for (int i = 0; i < count; i++)
+      {
+        PlayerControl player = (PlayerControl) Object.Instantiate(
+            playerPrefabs[i % playerPrefabs.Length],
+            startPositions[i].transform.position,
+            Quaternion.identity);
+        player.init(i + 1);
+      }
+    }
+
+    private static void shuffle<T>(T[] array)
+    {
+      int i = array.Length;
+      while (i > 1)
+      {
+        int k = Random.Range(0, i--);
+        T t = array[k];
+        array[k] = array[i];
+        array[i] = t;
+      }
     }
 
     public void gameOver(List<string> ranking)

Assets/Scripts/Menu.cs

@@ -7,6 +7,7 @@ using UnityEngine.UI;
 public class Menu : MonoBehaviour
 {
     public GameStateTracker gameStateTracker;
+    public GameObject gameUI;
     public GameMaster gameMaster;
     public GameObject menuPanel;
     public GameObject p1Image, p2Image, p3Image, p4Image;
@@ -38,9 +39,10 @@ public class Menu : MonoBehaviour
     {
         if (numberOfRegisteredPlayers > 1 || (numberOfRegisteredPlayers > 0 && Debug.isDebugBuild))
         {
+            gameUI.SetActive(true);
             gameStateTracker.setNumberOfPlayers(numberOfRegisteredPlayers);
             gameStateTracker.reset();
-            gameMaster.loadLevel();
+            gameMaster.loadLevel(numberOfRegisteredPlayers);
             gameObject.SetActive(false);
             return true;
         }

Assets/Scripts/PlayerControl.cs

@@ -5,9 +5,6 @@ using GamepadInput;
 
 public class PlayerControl : MonoBehaviour
 {
-    private enum Keys : int { Left = 0, Right, Up, Down, Jump, Dash, Shoot };
-
-        
     private Rigidbody2D body2D;
     private Vector3 lastPos; // we make sure the last Pos is never the curPos.
     private Vector2 moveDirection;
@@ -16,7 +13,8 @@ public class PlayerControl : MonoBehaviour
     public LayerMask mask;
 
     // movement config
-    public float pushForce = 20f;
+    public float pushForce = 5f;
+    public float pushTime = 0.5f;
     public float gravity = -15f;
     public float runSpeed = 8f;
     public float groundDamping = 20f; // how fast do we change direction? higher means faster
@@ -31,44 +29,60 @@ public class PlayerControl : MonoBehaviour
     public float dashCompletionTime = 0.25f;
     public float dashStartSpeed = 20.0f;
     public float dashEndSpeed = 8.0f;
-    public float dashCoolDown = 0.5f;
+    public float dashCoolDown = 0.4f;
+    public float dashVerticalScale = 0.5f;
     public float dashCollisionCoolDown = 1.5f;
     [HideInInspector]
     public float currentDashCoolDown = 0.0f;
+    [HideInInspector]
+    public bool hasLandedSinceLastDash = true;
     // public float jumpWaitTime = 2.0;
 
     [HideInInspector]
+    public Vector2 pushSpeed = Vector2.zero;
+    [HideInInspector]
+    public float lastPushStart = float.NegativeInfinity;
+
+    [HideInInspector]
     public float rawMovementDirection = 1;
     //[HideInInspector]
     public float normalizedHorizontalSpeed = 0;
 
     [HideInInspector]
-    public Vector3 velocity;
+    public Vector2 velocity;
 
     public int playerNumber = 1; //gibt an, ob es sich um player one, player two, etc. handelt. sollte nicht 0 sein;
     public PlayerInputMapping inputMapping;
-    private controlType controls;
-    KeyCode[] keyCodes = new KeyCode[Keys.GetNames(typeof(Keys)).Length];
 
     void Start()
     {
         body2D = GetComponent<Rigidbody2D>();
+    }
+
+    public void init(int playerNumber)
+    {
+        this.playerNumber = playerNumber;
 
         //in der szene muss fuer jeden spieer so ein InputMapping"nr" sein:
         inputMapping = GameObject.Find("InputMapping" + playerNumber).GetComponent<PlayerInputMapping>();
+        GetComponent<PlayerHealth>().init(playerNumber);
     }
 
-
-    void onControllerCollider(RaycastHit2D hit)
+    void OnCollisionEnter2D(Collision2D coll)
     {
-        Rigidbody2D body = hit.collider.gameObject.GetComponent<Rigidbody2D>();
-        if (body)
-        {
-            //TODO abfrage " is dashing"
-            body.AddForce(moveDirection * pushForce);
+        if (coll.collider.tag != "Player" || !isDashing())
+            return;
+
+        PlayerControl other = coll.collider.gameObject.GetComponent<PlayerControl>();
+        other.setPushSpeed(currentDashDirection * pushForce);
         lastDashStart = Time.time - dashCompletionTime;
         currentDashCoolDown = dashCollisionCoolDown;
     }
+
+    private void setPushSpeed(Vector2 pushSpeed)
+    {
+        this.pushSpeed = pushSpeed;
+        this.lastPushStart = Time.time;
     }
 
     void FixedUpdate()
@@ -87,56 +101,46 @@ public class PlayerControl : MonoBehaviour
             lastDashStart = Time.time;
             currentDashDirection = dashDirection;
             currentDashCoolDown = dashCoolDown;
+            hasLandedSinceLastDash = false;
         }
 
-        if (isDashing ())
+        if (isDashing())
         {
             velocity = currentDashDirection * Mathf.Lerp(dashStartSpeed, dashEndSpeed, getDashTime() / dashCompletionTime);
         }
         else
         {
-            velocity = body2D.velocity;
-            if (playerNumber == 1)
+            bool grounded = isGrounded();
+            if (grounded && !isDashing())
             {
-                Debug.Log("is right pressed p1: "+inputMapping.isRightPressed());
+                hasLandedSinceLastDash = true;
             }
+
+            velocity = body2D.velocity;
             if (inputMapping.isRightPressed())
             {
-              //normalizedHorizontalSpeed = 1;
-              //if (transform.localScale.x < 0f)
-              //    transform.localScale = new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z);
-
-
-              //go right:
-              velocity = new Vector2(runSpeed,velocity.y);
-
-              //if (_controller.isGrounded)
+                velocity.x = runSpeed;
             }
             else if (inputMapping.isLeftPressed())
             {
-              //normalizedHorizontalSpeed = -1;
-              //if (transform.localScale.x > 0f)
-              //    transform.localScale = new Vector3(-transform.localScale.x, transform.localScale.y, transform.localScale.z);
-
-              velocity = new Vector2(-runSpeed, velocity.y);
-              //if (_controller.isGrounded)
+                velocity.x = -runSpeed;
             }
 
             if (inputMapping.isJumpPressed())
             {
                 //to avoid DOUBLE JUMP
-              if (isGrounded())
+                if (grounded)
                 {
-                  velocity = new Vector2(velocity.x, targetJumpHeight);
+                    velocity.y = targetJumpHeight;
                 }
             }
 
             // apply horizontal speed smoothing it
             var smoothedMovementFactor = isGrounded() ? groundDamping : inAirDamping; // how fast do we change direction?
-          velocity.x = Mathf.Lerp(velocity.x,0, Time.deltaTime * smoothedMovementFactor);
+            velocity.x = Mathf.Lerp(velocity.x, 0, Time.deltaTime * smoothedMovementFactor);
 
             float verticalSmoothedFactor = isGrounded() ? 0 : inAirDampingVertical;
-          if (velocity.y>0.0f) velocity.y = Mathf.Lerp(velocity.y, 0, Time.deltaTime * verticalSmoothedFactor);
+            if (velocity.y > 0.0f) velocity.y = Mathf.Lerp(velocity.y, 0, Time.deltaTime * verticalSmoothedFactor);
 
             /*==========Power Ups // Bullet management ===*/
             if (inputMapping.isShootPressed())
@@ -150,9 +154,15 @@ public class PlayerControl : MonoBehaviour
             }
         }
 
+        float currentPushTime = Time.time - lastPushStart;
+        Vector2 currentPushSpeed = Vector2.zero;
+        if (0 <= currentPushTime && currentPushTime <= pushTime)
+        {
+            currentPushSpeed = Vector2.Lerp(pushSpeed, Vector2.zero, currentPushTime / pushTime);
+        }
 
         //finally set the velocity:
-        body2D.velocity = velocity;
+        body2D.velocity = velocity + currentPushSpeed;
 
         //update move direction after the currentposition was updated:
         moveDirection = (transform.position - lastPos).normalized;
@@ -179,43 +189,43 @@ public class PlayerControl : MonoBehaviour
     private void updateDashDirection()
     {
         float horizontalDashDirection = 0.0f;
-      if (Input.GetKey (keyCodes[(int)Keys.Right]))
+        if (inputMapping.isRightPressed())
         {
             horizontalDashDirection = 1.0f;
         }
-      else if (Input.GetKey (keyCodes[(int)Keys.Left]))
+        else if (inputMapping.isLeftPressed())
         {
             horizontalDashDirection = -1.0f;
         }
 
         float verticalDashDirection = 0.0f;
-      if (Input.GetKey (keyCodes[(int)Keys.Up]))
+        if (inputMapping.isUpPressed())
         {
             verticalDashDirection = 1.0f;
         }
-      else if (Input.GetKey (keyCodes[(int)Keys.Down]))
+        else if (inputMapping.isDownPressed())
         {
             verticalDashDirection = -1.0f;
         }
 
         if (horizontalDashDirection != 0.0f || verticalDashDirection != 0.0f)
-        dashDirection = new Vector2(horizontalDashDirection, verticalDashDirection);
+            dashDirection = new Vector2(horizontalDashDirection, dashVerticalScale * verticalDashDirection);
     }
 
-    private float getDashTime ()
+    private float getDashTime()
     {
         return Time.time - lastDashStart;
     }
 
-    private bool isDashing ()
+    private bool isDashing()
     {
         float dashTime = getDashTime();
         return 0 <= dashTime && dashTime < dashCompletionTime;
     }
 
-    private bool canDash ()
+    private bool canDash()
     {
-        return getDashTime() >= dashCompletionTime + currentDashCoolDown;
+        return hasLandedSinceLastDash && getDashTime() >= dashCompletionTime + currentDashCoolDown;
     }
 
     /*==========Power Ups // Bullet management ===*/

Assets/Scripts/PlayerHealth.cs

@@ -13,13 +13,10 @@ public class PlayerHealth : MonoBehaviour {
     private GameStateTracker gameStateTracker;
     private bool hasShield = false;
 
-    
-
-    void Start()
+    public void init(int playerNumber)
     {
-        gameStateTracker = GameObject.Find("GameMaster").GetComponent<GameStateTracker>(); //warning: geht kaputt wenn der name "Game Master" sich aendert.
-        playerControl = gameObject.GetComponent<PlayerControl>();
-        string healthbarName = "HealthBar" + playerControl.playerNumber.ToString();
+        string healthbarName = "HealthBar" + playerNumber;
+        Debug.Log(healthbarName);
         healthbar = GameObject.Find(healthbarName).GetComponent<Scrollbar>();
 
         if (name.EndsWith("(Clone)"))