from enum import Enum

import position
import block


class Move(Enum):
	up, down, right, left, done, none = range(6)


class Entity(object):
	def __init__(self, pos_y=0, pos_x=0, icon=block.Entity.player):
		"""
		Contain pos, representation, and direction
		"""
		self.pos = position.Position(pos_y, pos_x)
		self.icon = icon
		self.moved = Move.none

	def move(self, direction):
		"""
		Base on Move type, use position to move in correct direction
		"""
		if direction == Move.up:
			self.pos.move_up()
		elif direction == Move.down:
			self.pos.move_down()
		elif direction == Move.left:
			self.pos.move_left()
		elif direction == Move.right:
			self.pos.move_right()

		self.moved = direction

@@ -20,16 +20,30 @@
 um%0A%0A
+from position 
 import 
-p
+P
 osit
@@ -177,17 +177,19 @@
 pos_
-y
+row
 =0, pos_
 x=0,
@@ -184,17 +184,19 @@
 =0, pos_
-x
+col
 =0, icon
@@ -292,17 +292,8 @@
 s = 
-position.
 Posi
@@ -305,16 +305,20 @@
 pos_
-y
+row
 , pos_
-x
+col
 )%0A%09%09

Renamed y,x to row,col