new file mode 100644

@@ -0,0 +1,58 @@

+import abc

+

+class Overlay(object):

+	__metaclass__ = abs.ABCMeta

+

+	char = abc.abstractproperty()

+	color = (0,0,0)

+	blocks = False

+

+	@property

+	def pos(self):

+		return self.x, self.y

+	def __init__(self, x,y, map):

+		self.x = x

+		self.y = y

+		self.map = map

+

+

+class Actor(Overlay):

+	char = ord('@')

+	color = (255,0,0)

+	blocks = True

+

+	@property

+	def pos(self):

+		return self.x, self.y

+

+	def __init__(self, x,y, map, adventurer=None):

+		self.x = x

+		self.y = y

+		self.map = map

+

+	def draw(self):

+		self.map.add(self)

+

+	def move(self, dx, dy):

+		dx, dy = self.map.move(self, dx,dy)

+		self.x += dx

+		self.y += dy

+

+	def tick(self):

+		pass

+

+

+	def bump(self, other):

+		print '%s bumped %s' % (type(self).__name__, type(other).__name__)

+		other.bumped_by(self)

+	def bumped_by(self, other):

+		print '%s was bumped by %s' % (type(self).__name__, type(other).__name__)

+

+class Object(Overlay):

+	pass

+

+

+class Potion(Object):

+	char = ord('!')

+class Scroll(Object):

+	char = ord('!')

@@ -7,6 +7,7 @@ import numpy as np

 from src import events

 from src import player

+from libs import actor

 from src import console

 from src import map

@@ -25,7 +26,11 @@ class Application(object):

 		self.actors = []

 		for x in range(40):

-			self.actors.append(player.Actor(random.randrange(100), random.randrange(63), self.map))

+			self.actors.append(actor.Actor(random.randrange(100), random.randrange(63), self.map))

+

+		self.objects = []

+		for x in range(50):

+			self.objects.append(

 		tc.sys_set_fps(60)

@@ -46,14 +46,22 @@ class Map(object):

 	def add(self, object):

 		self.overlays.setdefault(object.pos,[]).append(object)

+	def check_and_execute_bump(self, object, x,y):

+		if (x,y) in self.overlays:

+			for other in self.overlays[x,y]:

+				object.bump(other)

+

 	def move(self, object, dx,dy):

 		self.overlays[object.pos].remove(object)

+		collide_x, collide_y = None, None

+

 		if abs(dx) < 2 and abs(dy) < 2:

 			ox,oy = object.pos

 			x = squeeze(ox+dx, 0, self.width-1)

 			y = squeeze(oy+dy, 0, self.height-1)

 			if not self.is_passable((x,y)):

+				collide_x, collide_y = x,y

 				x,y = ox,oy

 		else:

@@ -61,10 +69,15 @@ class Map(object):

 			tx,ty = ox+dx, oy+dy

 			gx,gy = ox,oy

 			for x,y in libs.bresenham.line(ox,oy, tx,ty, 1):

-				if not self.is_passable((x,y)): break

+				if not self.is_passable((x,y)):

+					collide_x, collide_y = x,y

+					break

 				else: gx,gy = x,y

 			x,y = gx,gy

+		if collide_x is not None:

+			self.check_and_execute_bump(object, collide_x, collide_y)

+

 		self.overlays.setdefault((x,y), []).append(object)

 		self.update_overlay(ox,oy)

 		return x-ox, y-oy

@@ -1,40 +1,16 @@

 import libtcodpy as tc

 import libs.combat

+import libs.actor

-class Actor(object):

-	char = ord('@')

-	color = (255,0,0)

-	blocks = True

-

-	@property

-	def pos(self):

-		return self.x, self.y

-

-	def __init__(self, x,y, map):

-		self.x = x

-		self.y = y

-		self.map = map

-

-	def draw(self):

-		self.map.add(self)

-

-	def move(self, dx, dy):

-		dx, dy = self.map.move(self, dx,dy)

-		self.x += dx

-		self.y += dy

-

-	def tick(self):

-		pass

-

-class Player(Actor):

+class Player(libs.actor.Actor):

 	char = ord('@')

 	color = (255,255,255)

 	light_radius = 10

 	def __init__(self, x,y, map):

-		Actor.__init__(self, x,y, map)

+		libs.actor.Actor.__init__(self, x,y, map)

 		self.map.set_pov((self.pos, self.light_radius))

 	def move(self, dx, dy):

-		Actor.move(self, dx,dy)

+		libs.actor.Actor.move(self, dx,dy)

 		self.map.set_pov((self.pos, self.light_radius))

 class ArrowHandler(object):