@@ -44,8 +44,8 @@ class Adventurer(object):

 		return self.attributes.state

 	@state.setter

 	def state(self, val):

-		if val not in {const.HEALTHY, const.WOUNDED, const.KNOCKOUT}:

-			raise ValueError('Value for state invalid')

+		if val < 0: val == 0

+		if val > const.KNOCKOUT: val = const.KNOCKOUT

 		self.attributes.state = val

 	@classmethod

@@ -1,4 +1,5 @@

 import abc

+import collections

 from . import combat

 class Overlay(object):

@@ -12,12 +13,40 @@ class Overlay(object):

 	def pos(self):

 		return self.x, self.y

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

+		self.events = collections.OrderedDict()

 		self.x = x

 		self.y = y

 		self.map = map

+		for key, value in self.handled_events.viewitems():

+			self.events.setdefault(key, []).extend(value)

+

 	def draw(self):

 		self.map.add(self)

+	def register_event(self, event, cb):

+		'''register a callback for an event

+

+		if the callback returns a false value besides None, execution will end after that event'''

+		self.events.setdefault(event, []).append(cb)

+

+	def trigger_event(self, event, *args, **kw):

+		if event not in self.events:

+			raise ValueError('%r has no event %r' % (self, event))

+

+		for cb in self.events[event]:

+			result = cb(self, *args, **kw)

+			result = result is None or result # if the event returns a false value besides None, break

+			if result == False: break

+

+	handled_events = collections.OrderedDict()

+	@classmethod

+	def handle_event(cls, event):

+		def _inner(cb):

+			cls.handled_events.setdefault(event, []).append(cb)

+			return cb

+		return _inner

+

+

 class Actor(Overlay):

 	char = ord('@')

@@ -29,9 +58,8 @@ class Actor(Overlay):

 		return self.x, self.y

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

-		self.x = x

-		self.y = y

-		self.map = map

+		super(Actor, self).__init__(x,y, map)

+		self.inventory = []

 		if adventurer is None:

 			adventurer = combat.Adventurer.randomize()

 		self.adventurer = adventurer

@@ -50,27 +78,42 @@ class Actor(Overlay):

 		return result

 	def ishostile(self, other):

-		return True #TODO: implement factions

+		return self.adventurer.state < 2 #TODO: implement factions

 	def bump(self, other):

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

 		if isinstance(other, Actor) and other.ishostile(self):

 			self.adventurer.attack(other.adventurer)

-			other.attacked_by(self)

-		other.bumped_by(self)

+			other.trigger_event('attacked', self)

+		elif isinstance(other, Object):

+			self.pickup(other)

+			other.trigger_event('picked_up', self)

+		other.trigger_event('bumped', self)

+

+	@Overlay.handle_event('attacked')

 	def attacked_by(self, other):

 		if self.adventurer.skills.check('agility'):

 			self.adventurer.attack(other.adventurer)

+	@Overlay.handle_event('bumped')

 	def bumped_by(self, other):

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

 class Object(Overlay):

-	pass

+	item = None

+	@Overlay.handle_event('picked_up')

+	def picked_up_by(self, other):

+		self.map.remove(self)

+class Weapon(Object):

+	item = None

 class Potion(Object):

 	char = ord('!')

+

 class Scroll(Object):

 	char = ord('!')

+

+class Equipment(Object):

+	pass