Exit aliases are now stored in a single <alias> tag

digger.py

@@ -118,7 +118,7 @@ def readExitNode(element):
 			for i in element.getElementsByTagName("alias"):
 				load_exit_alias.append(getText(i))
 			exitList.append(Exit(load_exit_name, load_exit_id, load_exit_source))
-			exitList[-1].alias = load_exit_alias
+			exitList[-1].alias = ";".join(load_exit_alias)
 			exitList[-1].dest = load_exit_dest
 			exitList[-1].desc = mushUnEscape(load_exit_desc)
 			self.ui.scene.addItem(exitList[-1].line)
@@ -385,8 +385,10 @@ def openExit(self):
 			exitList[-1].desc = exitDialog.te1.toPlainText()
 
 			if exitDialog.le.text() not in diggerconf.aliasDict: # Don't override alias tab
+				items = []
 				for x in xrange(exitDialog.list1.count()):
-					exitList[-1].alias.append(exitDialog.list1.item(x).text())
+					items.append(exitDialog.list1.item(x).text())
+				exitList[-1].alias = ";".join(items)
 
 			self.ui.scene.addItem(exitList[-1].line)
 			self.drawExit(exitList[-1])
@@ -440,9 +442,11 @@ def editExitProperties(self, index):
 			exitList[index].source = editDialog.rDict[str(editDialog.combo1.currentText())]
 			exitList[index].dest = editDialog.rDict[str(editDialog.combo2.currentText())]
 			exitList[index].desc = editDialog.te1.toPlainText()
-			exitList[index].alias = []
+			items = []
 			for x in xrange(editDialog.list1.count()):
-				exitList[index].alias.append(editDialog.list1.item(x).text())
+				items.append(editDialog.list1.item(x).text())
+			exitList[-1].alias = ";".join(items)
+
 			# Draw ONLY the modified exit and the affected rooms
 			self.drawExit(exitList[index])
 			self.drawRoom(self.getPosOfRoom(exitList[index].source))

diggerfuncs.py

@@ -80,8 +80,8 @@ def saveToFile(fname, parent):
 		stream << "\t\t<name>" << Qt.escape(iExit.name) << "</name>\n"
 		if iExit.desc != "":
 			stream <<"\t\t<description>" << mushEscape(Qt.escape(iExit.desc)) << "</description>\n"
-		for x in xrange(len(iExit.alias)):
-			stream << "\t\t<alias>" << Qt.escape(iExit.alias[x]) << "</alias>\n"
+		if iExit.alias != "":
+			stream << "\t\t<alias>" << Qt.escape(iExit.alias) << "</alias>\n"
 		stream << "\t</exit>\n"
 	for x in xrange(len(labelList)):
 		stream << ("\t<label x='%d' y='%d'>" % (labelList[x].x, labelList[x].y))
@@ -155,7 +155,7 @@ def __init__(self, name, id_, source):
 
 		self.id = id_
 		self.name = name
-		self.alias = []
+		self.alias = ""
 		self.desc = ""
 		self.source = source
 		self.dest = -1
@@ -164,7 +164,9 @@ def __init__(self, name, id_, source):
 			self.name = diggerconf.aliasDict[str(name)][0]
 			for x in xrange(len(diggerconf.aliasDict[str(name)])):
 				if x != 0:
-					self.alias.append(diggerconf.aliasDict[str(name)][x])
+					self.alias += diggerconf.aliasDict[str(name)][x] + ";"
+			self.alias = self.alias[:-1]
+
 class Label:
 	type='label'
 	def __init__(self, text, x_, y_):
@@ -206,8 +208,8 @@ def isCode(codelist):
 			strExport += "@tel [v(" + diggerconf.attributePrefix + str(k.id) + ")]\n"
 		for j in sourceExits:
 			aliasString = ""
-			for x in j.alias:
-				aliasString += ";" + x
+			if j.alias != "":
+				aliasString += ";" + j.alias
 			if j.dest != -1:
 				strExport += "@open " + j.name + aliasString + "=[v(" + diggerconf.attributePrefix + str(j.dest) + ")]\n"
 			else:
@@ -490,7 +492,7 @@ def fillData(self, exit):
 		else:
 			self.combo2.setCurrentIndex(self.combo2.findText("#" + str(exitList[exit].dest) + ": " + roomList[exitList[exit].dest].name))
 		self.te1.setPlainText(exitList[exit].desc)
-		for x in exitList[exit].alias:
+		for x in exitList[exit].alias.split(";"):
 			self.list1.addItem(x)
 
 class addLabel(QDialog):