From 1a58a9689eee177bdd14baf04a121fdbd4e74cb9 Mon Sep 17 00:00:00 2001
From: Jonas Mucke <jonas.mucke@s2018.tu-chemnitz.de>
Date: Sun, 19 Apr 2020 18:27:48 +0200
Subject: [PATCH] fixed placer movement

---
 src/Player/Player.gd | 21 ++++++++++++---------
 src/World.tscn       |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Player/Player.gd b/src/Player/Player.gd
index eb6972b..8bccff7 100644
--- a/src/Player/Player.gd
+++ b/src/Player/Player.gd
@@ -49,25 +49,28 @@ func _physics_process(delta):
 	while(totaldamage < -1):
 		totaldamage+=1
 		player_stats.health+=1
-	adjustPrio(player_stats.health, player_stats.max_health)
+	#adjustPrio(player_stats.health, player_stats.max_health)
 	_debug_update()
 	if debug == true:
 		match movementState:
 			moveState.MOVE:
 				movement_move(delta)
+			moveState.IDLE:
+				movement_move(delta)
 			moveState.ROLL:
 				movement_roll()
 			moveState.HIT:
 				movement_hit()
-	elif movementState == moveState.ROLL:
-		movement_roll()
-	elif movementState == moveState.HIT:
-		movement_hit()
-	elif movementState == moveState.IDLE:
-		movement_idle()
 	else:
-		movement_run(Vector2(0,0), delta)
-	makeMove(delta)
+		if movementState == moveState.ROLL:
+			movement_roll()
+		elif movementState == moveState.HIT:
+			movement_hit()
+		elif movementState == moveState.IDLE:
+			movement_idle()
+		else:
+			movement_run(Vector2(0,0), delta)
+		makeMove(delta)
 	move()
 
 # IMPORTANT: If you are using move_and_slide don't multiply by delta
diff --git a/src/World.tscn b/src/World.tscn
index d90d371..84e817d 100644
--- a/src/World.tscn
+++ b/src/World.tscn
@@ -34,6 +34,7 @@ position = Vector2( 152, 120 )
 [node name="Player" parent="YSort" instance=ExtResource( 1 )]
 position = Vector2( 176, 112 )
 scale = Vector2( 2, 2 )
+debug = true
 FRICTION = 200
 
 [node name="AnimationTree" parent="YSort/Player" index="4"]