@@ -99,7 +99,7 @@ class Adventurer(object):

 		dieroll = dice.DieRoll()

 		dieroll.add_adjustment(-damage)

-		result, damage = self.skills.check('toughness', dieroll)

+		result, __ = self.skills.check('toughness', dieroll)

 		if not result:

 			if damage > 0:

@@ -15,6 +15,8 @@ class Overlay(object):

 		self.x = x

 		self.y = y

 		self.map = map

+	def draw(self):

+		self.map.add(self)

 class Actor(Overlay):

@@ -34,17 +36,18 @@ class Actor(Overlay):

 			adventurer = combat.Adventurer.randomize()

 		self.adventurer = adventurer

-	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

-

+		result = True

+		if self.adventurer.state >= 2:

+			result = False

+			self.char = ord('%')

+			self.blocks = False

+		return result

 	def ishostile(self, other):

 		return True #TODO: implement factions

@@ -57,9 +60,7 @@ class Actor(Overlay):

 		other.bumped_by(self)

 	def attacked_by(self, other):

-		if self.adventurer.state >= 2:

-			self.char = '%'

-		elif self.adventurer.skills.check('agility'):

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

 			self.adventurer.attack(other.adventurer)

 	def bumped_by(self, other):

@@ -1,6 +1,6 @@

 import libs.patch_random

 import random

-random.seed(2)

+#random.seed(2)

 import libtcodpy as tc

 import numpy as np

@@ -13,6 +13,7 @@ from src import console

 from src import map

 import random

+import bisect

 class Application(object):

@@ -35,15 +36,25 @@ class Application(object):

 		tc.sys_set_fps(60)

+	def update_actors(self):

+		to_pop = []

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

+			if not actor.tick():

+				bisect.insort(to_pop, idx)

+		for pop in reversed(to_pop):

+			self.actors.pop(pop)

+

 	def init(self):

 		self.screen.init("test")

 		self.player.draw()

-		for actor in self.actors:

-			actor.draw()

+		self.update_actors()

+		for overlay in self.actors + self.objects:

+			overlay.draw()

 	def run(self):

 		while not tc.console_is_window_closed():

 			self.events.tick()

+			self.update_actors()

 			self.map.draw(self.screen)

 			tc.console_print(0, 0,1, '%d' % tc.sys_get_fps())

 			tc.console_flush()

@@ -8,6 +8,7 @@ class Player(libs.overlay.Actor):

 	light_radius = 10

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

 		libs.overlay.Actor.__init__(self, x,y, map, adventurer)

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

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

 	def move(self, dx, dy):

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