Merge changes

Author: bretsky

dungeon.py

@@ -936,7 +936,8 @@ def __init__(self, tutorial=False, debug=False):
 		else:
 			self.drop_constant = 1
 			while name_length == 0:
-				name_length = self.get_name()
+				name = self.get_name()
+				name_length = name[0]
 				if name_length == -1:
 					warning = "Are you sure you want to close the window? (Hit escape to cancel, enter to confirm)"
 					brlb.printf(self.screen_x//2 - len(warning)//2, self.screen_y//2 + 1, warning)
@@ -949,6 +950,9 @@ def __init__(self, tutorial=False, debug=False):
 							elif key == brlb.TK_ESCAPE:
 								name_length = 0
 								break
+				else:
+					self.gamer = name[1]
+					print(self.gamer)
 		if name_length == -1:
 			brlb.close()
 			return
@@ -1029,7 +1033,7 @@ def descend(self, game_start=False):
 		elif not game_start:
 			self.dungeon = self.dungeons[self.dungeons.index(self.dungeon) + 1]
 		else:
-			self.dungeons.append(Dungeon(len(self.dungeons) + 1, name=self.dungeon_name))
+			self.dungeons.append(Dungeon(len(self.dungeons) + 1, name=self.dungeon_name, animate=False))
 			self.dungeon = self.dungeons[-1]
 		self.log.update()
 		self.log.log('Welcome to level {l} of '.format(l=self.dungeon.level) + self.dungeon.name)
@@ -1080,8 +1084,8 @@ def get_name(self):
 		brlb.color(brlb.color_from_argb(255, 255, 255, 255))
 		brlb.layer(2)
 		user_input = brlb.read_str(start_x, start_y, self.gamer, 24)
-		# print(user_input)
-		return user_input[0]
+		print(user_input)
+		return user_input
 		# brlb.refresh()
 
 
@@ -1669,7 +1673,7 @@ def on_move_events(self):
 								character.map_direction = "up"
 			if self.character.hp <= 0:
 				self.log.log(self.character.name.capitalize() + ' died')
-				self.log.log(self.character.name.capitalize() + ' killed ' + str(self.kills) + ' enemies')
+				self.log.log(self.character.name.capitalize() + ' killed ' + str(self.character.kills) + ' enemies')
 				self.end_game() 
 			moved_ids = []
 			for item in self.inventory.items: