@@ -14,6 +14,7 @@ class Overlay(object):

 	def pos(self):

 		return self.x, self.y

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

+		super(Overlay, self).__init__()

 		print self.handled_events

 		self.events = collections.OrderedDict()

 		self.x = x

@@ -32,10 +33,7 @@ class Overlay(object):

 		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]:

+		for cb in self.events.get(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

@@ -95,6 +93,7 @@ class Actor(Overlay):

 			self.char = ord('%')

 			self.blocks = False

 		else:

+			self.act()

 			ractions = {}

 			for nleft, actions in self.repeated_actions.items():

 				for (action,args,kwargs) in actions:

@@ -102,9 +101,12 @@ class Actor(Overlay):

 					action(*args, **kwargs)

 					if nleft > 1:

 						ractions.setdefault(nleft-1, []).append( (action,args,kwargs) )

+				print ractions

 			self.repeated_actions = ractions

 		return result

+	def act(self): pass

+

 	def ishostile(self, other):

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

@@ -134,6 +136,12 @@ class Actor(Overlay):

 	def bumped_by(self, other):

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

+import random

+class AIActor(Actor):

+	def act(self):

+		print 'wiggly %s' % self.adventurer.name

+		self.move(random.choice([-1,0,1]), random.choice([-1,0,1]))

+

 @Overlay.add_event('picked_up',  'picked_up_by')

 @Overlay.add_event('bumped',  'bumped_by')

 class Object(Overlay):

@@ -46,7 +46,8 @@ class Application(object):

 		self.actors = [self.player]

 		for x in range(40):

-			self.actors.append(overlay.Actor(random.randrange(WIDTH), random.randrange(HEIGHT), self.map))

+			self.actors.append(overlay.AIActor(random.randrange(WIDTH), random.randrange(HEIGHT), self.map))

+		self.player.register_event('update', self.tick_actors)

 		self.objects = []

 		for x in range(50):

@@ -54,9 +55,19 @@ class Application(object):

 		tc.sys_set_fps(30)

+	def tick_actor(self, actor):

+		keep = actor.tick()

+		if not keep:

+			self.actors.remove(actor)

+			self.objects.append(actor)

+

 	def update_actors(self):

+		self.player.tick()

+

+	def tick_actors(self, player):

+		print 'actor_tick'

 		to_pop = []

-		for idx,actor in enumerate(self.actors):

+		for idx,actor in enumerate(self.actors[1:],1):

 			if not actor.tick():

 				bisect.insort(to_pop, idx)

 		for pop in reversed(to_pop):

@@ -67,7 +78,6 @@ class Application(object):

 		self.screen.init("test")

 		self.message_console.fill(0,0,128)

 		#self.player.draw()

-		self.update_actors()

 		for overlay in self.actors + self.objects:

 			overlay.draw()

@@ -128,6 +128,7 @@ class Map(object):

 		color_mask = np.ones( (con.width, con.height, 3) )

 		char_mask = np.ones( (con.width, con.height) ).astype('bool')

+		self.pov = None

 		if self.pov is not None:

 			origin, radius = self.pov

 			ox, oy = origin

@@ -2,6 +2,14 @@ import libtcodpy as tc

 import libs.combat

 import libs.overlay

+def trigger_update(func):

+	def _inner(self, *a, **kw):

+		self.trigger_event('preupdate')

+		result = func(self, *a, **kw)

+		self.trigger_event('update')

+		return result

+	return _inner

+

 class Player(libs.overlay.Actor):

 	char = ord('@')

 	color = (255,255,255)

@@ -11,14 +19,16 @@ class Player(libs.overlay.Actor):

 		print 'Player\'s name is %s' % self.adventurer.name

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

 		self.display = None

+

+	@trigger_update

 	def move(self, dx, dy):

 		libs.overlay.Actor.move(self, dx,dy)

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

 	def claim_display(self, display):

 		self.display = display

+

 	def tick(self):

-		print 'player_tick'

 		return libs.overlay.Actor.tick(self)

 class ArrowHandler(object):