Merge branch 'dev' into dev-gameplay

src/Player/Player.gd

@@ -150,24 +150,13 @@ func movement_hit():
 func hit_finished():
 	grid._update_grid()
 	movementState = moveState.IDLE
-	ai_movement_state = STEP
-	ExecutionState = EXECUTING
+	ExecutionState = AI_MOVE
 	actionFieldUsed = false
 
 
 func movement_roll():
 	velocity = rollvector * ROLL_SPEED
 	animation_state.change_state("roll")
-	
-	"""
-	# Roll.gd
-	func enter():
-		owner.animation_state.travel("roll")
-	
-	func update():
-		owner.velocity = rollvector * ROLL_SPEED
-	"""
-	ExecutionState = EXECUTING
 
 
 func roll_finished():

src/Player/Player.tscn

@@ -632,8 +632,11 @@ font_data = ExtResource( 6 )
 scale = Vector2( 2, 2 )
 collision_mask = 14
 script = ExtResource( 1 )
+debug = null
 ROLL_SPEED = 120
 FRICTION = 270
+ACCELERATION = null
+title_scene = null
 
 [node name="Kind" parent="." instance=ExtResource( 7 )]
 general = 4