Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/noellt/seedling

Assets/Scripts/Character.cs

@@ -30,7 +30,10 @@ public abstract class Character : MonoBehaviour, VariableSoundPlayer.SoundOwner
 
     public VariableSoundPlayer.ActivateSoundDelegate activateSound { get; set; } = delegate{};
 
-
+    public bool getGroundStatus()
+    {
+        return isGrounded;
+    }
     void Awake()
     {
         rigidbody = GetComponent<Rigidbody2D>();

Assets/Scripts/Player/InputManager.cs

@@ -2,6 +2,7 @@
 
 public class InputManager : MonoBehaviour
 {
+    public Animator animator;
     [SerializeField] private Player player = null;
     [SerializeField] private UI_SceneManager scene = null;
     [SerializeField] private RopeSystem ropesys = null;
@@ -21,6 +22,16 @@ public class InputManager : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
+        if (Input.GetButton("Horizontal"))
+        {
+            animator.SetFloat("speed", 1F);
+        }
+
+        if (Input.GetButtonUp("Horizontal"))
+        {
+            animator.SetFloat("speed", 0F);
+        }
+
         if (Input.GetButtonDown("Cancel"))
         {
             scene.TogglePause();
@@ -30,11 +41,25 @@ public class InputManager : MonoBehaviour
         {
             return;
         }
+
         if (Input.GetButtonDown("Jump"))
         {
+            animator.SetBool("isJumping", true);
             jump = true;
+           
         }
 
+        if (Input.GetButton("Jump"))
+        {
+            animator.SetBool("isJumping", true);
+            jump = true;
+
+        }
+
+        if (player.getGroundStatus())
+        {
+            animator.SetBool("isJumping", false);
+        }
         if (Input.GetButtonDown("Attack"))
         {
             attack = true;

Assets/Scripts/RopeSystem.cs

@@ -140,6 +140,8 @@ public class RopeSystem : MonoBehaviour, VariableSoundPlayer.SoundOwner
             if (hit.collider.GetComponentInParent<PullableObject>() != null)
             {
                 ropeAttached = true;
+                ropePositions.Add(hit.point);
+                wrapPointsLookup.Add(hit.point, 0);
                 springJoint.enabled = true;
                 springJoint.distance = Vector2.Distance(playerPosition, hit.point);
                 springJoint.connectedBody = hit.collider.GetComponentInParent<Rigidbody2D>();