@@ -4,7 +4,7 @@ namegen_class: "male"

 char: "h"

 color: amber

-spawn_chance: 4

+spawn_chance: 3

 hp: 10

 defense: 1

@@ -12,18 +12,47 @@ power: 5

 ai_class: monsters.AdvancedMonster

+---

+race_name: "Scoundrel"

+namegen_class: "Mingos Norse male"

+char: "s"

+color: amber

+

+spawn_chance: 2

+

+hp: 10

+defense: 0

+power: 4

+         

+---

+race_name: "Thief"

+namegen_class: "male"

+char: "T"

+color: amber

+

+spawn_chance: 2

+

+hp: 10

+defense: 0

+power: 4

+         

+ai_class:

+   class_name: monsters.Thief

+   skill: 32

+

 ---

 race_name: "Imp"

 namegen_class: "male"

 char: "i"

 color: dark_red

-spawn_chance: 7

+spawn_chance: 9

 hp: 4

 defense: 0

-power: 4

+power: 5

+ai_class: monsters.DjikstraMonster

 ---

 race_name: "Troll Fighter"

 namegen_class: "demon male"

@@ -32,9 +61,9 @@ color: darker_yellow

 spawn_chance: 1

-hp: 17

-defense: 2

-power: 5

+hp: 20

+defense: 1

+power: 7

-ai_class: monsters.AdvancedMonster

-         

+ai_class: monsters.DjikstraMonster

+

@@ -11,6 +11,10 @@ from algorithms import djikstra

 class Monster(object):

 	def init(self,*a): pass

 	def take_turn(self): pass

+	def load_data(self, data):

+		for k,v in data.items():

+			setattr(self, k,v)

+		return self

 class BasicMonster(Monster):

 	def take_turn(self):

@@ -26,6 +30,41 @@ class BasicMonster(Monster):

 			elif game_instance.player.fighter.hp > 0:

 				monster.fighter.attack(game_instance.player)

+class Thief(BasicMonster):

+	def init(self, level):

+		self.level = level

+		self.player = level.player

+		self.inventory = []

+		self.skill = self.skill / 100.0

+

+	def take_turn(self):

+		if self.player.distance(self.owner.x, self.owner.y) < 2 and random.random() < .7:

+			self.steal()

+		else:

+			BasicMonster.take_turn(self)

+

+	def steal(self):

+		if self.player.inventory.keys() == 0:

+			game_instance.message( ('%s can\'t find anything to steal'%self.owner.name).capitalize(), libtcod.orange )

+		obj = random.choice(self.player.inventory.keys())

+		game_instance.message( ('%s tries to steal %s'%(self.owner.name,obj)).capitalize(), libtcod.red)

+		if random.random() < self.skill:

+			game_instance.message( ('%s successfully steals %s'%(self.owner.name,obj)).capitalize(), libtcod.orange)

+			obj = self.player.inventory[obj]

+			self.inventory.append(obj)

+			del self.player.inventory[obj]

+

+	def death(self):

+		monster_death(self.owner)

+		for item in self.inventory:

+			self.drop(item)

+

+	def drop(self, item):

+		item.x, item.y = self.owner.pos

+		self.level.add_object(item)

+		self.inventory.remove(item)

+

+

 class DjikstraMonster(Monster):

 	maps = {}

@@ -52,7 +91,7 @@ class DjikstraMonster(Monster):

 			while self.dj.cycle(): pass

-		self.dj.visualize()

+		#self.dj.visualize()

 	def take_turn(self):

 		pos = self.owner.x, self.owner.y

@@ -187,11 +226,20 @@ class MonsterLoader(object):

 			color = libtcod.Color(*color)

 		ai_class = doc.get('ai_class', BasicMonster)

+		cls_data = {}

 		if ai_class is not BasicMonster:

+			cls_data = {}

+			if hasattr(ai_class, 'items'):

+				nm = ai_class.pop('class_name', 'monsters.BasicMonster')

+				cls_data.update(ai_class)

+				ai_class = nm

+

 			module, clas = ai_class.rsplit('.',1)

 			module = __import__(module)

 			ai_class = getattr(module, clas)

+		death_func = getattr(ai_class, 'death', monster_death)

+

 		print 'loading', doc

 		Game.register_monster_type(

 			(lambda doc:

@@ -209,30 +257,30 @@ class MonsterLoader(object):

 						power=doc['power'],

 						death_function=monster_death

 					),

-					ai=ai_class(),

+					ai=ai_class().load_data(cls_data),

 					level=level

 				)

 			)(doc), doc['spawn_chance'])

-#Game.register_monster_type(

-#	lambda map,level, con,x,y: objects.Object(map, con,

-#		x,y, '\x02', '%s the Orc' % libtcod.namegen_generate('Fantasy male'),

-#			libtcod.blue, True,

-#

-#		fighter=objects.Fighter(hp=10, defense=2, power=3, death_function=monster_death),

-#		ai=AdvancedMonster(),

-#		level=level

-#), 8)

-#

-#Game.register_monster_type(

-#	lambda map,level, con,x,y: objects.Object(map, con,

-#		x,y, '\x01', '%s the Troll' % libtcod.namegen_generate('Norse male'),

-#			libtcod.orange, True,

-#

-#		fighter=objects.Fighter(hp=16, defense=1, power=4, death_function=monster_death),

-#		ai=AdvancedMonster(),

-#		level=level

-#), 2)

+Game.register_monster_type(

+	lambda map,level, con,x,y: objects.Object(map, con,

+		x,y, '\x02', '%s the Orc' % libtcod.namegen_generate('Fantasy male'),

+			libtcod.blue, True,

+

+		fighter=objects.Fighter(hp=10, defense=2, power=3, death_function=monster_death),

+		ai=AdvancedMonster(),

+		level=level

+), 8)

+

+Game.register_monster_type(

+	lambda map,level, con,x,y: objects.Object(map, con,

+		x,y, '\x01', '%s the Troll' % libtcod.namegen_generate('Norse male'),

+			libtcod.orange, True,

+

+		fighter=objects.Fighter(hp=16, defense=1, power=4, death_function=monster_death),

+		ai=AdvancedMonster(),

+		level=level

+), 2)

 Game.register_monster_type(

 	lambda map,level, con,x,y: objects.Object(map, con,

@@ -240,7 +288,7 @@ Game.register_monster_type(

 			libtcod.amber, True,

 		fighter=objects.Fighter(hp=16, defense=1, power=7, death_function=monster_death),

-		ai=DjikstraMonster(),

+		ai=BasicMonster(),

 		level=level

 ), 1)

 Game.register_monster_type(None, 7)

@@ -34,6 +34,10 @@ class Object(object):

 			item.owner = self

 		self.item = item

+	@property

+	def pos(self):

+		return self.x, self.y

+

 	def enter_level(self, level):

 		self.level = level

 		return self

@@ -84,6 +84,9 @@ class Inventory(object):

 		if v.ident != k: raise ValueError('Inventory key must equal the item\'s name')

 		self.add_item(v)

+	def keys(self):

+		return self.objects.keys()

+

 	def add_item(self, item):

 		print 'add_item', item.name

 		slot = self.objects.setdefault(item.name, [Slot()])

@@ -143,6 +146,7 @@ class Player(Object):

 		obj.x, obj.y = self.x, self.y

 		self.level.add_object(obj)

 		del self.inventory[obj.name]

+		return obj

 	def use(self, item):

 		item.owner.enter_level(self.level)