Merge pull request #1 from doublespeakgames/master

Update

lang/adarkroom.pot

@@ -3153,3 +3153,23 @@ msgstr ""
 #: script/events/setpieces.js:3565
 msgid "ripe for the picking."
 msgstr ""
+
+#: script/events/outside.js:74
+msgid "a fire rampages through one of the huts, destroying it."
+msgstr ""
+
+#: script/events/outside.js:75
+msgid "all residents in the hut perished in the fire."
+msgstr ""
+
+#: script/events/outside.js:77
+msgid "a fire has started"
+msgstr ""
+
+#: script/events/outside.js:87
+msgid "mourn"
+msgstr ""
+
+#: script/events/outside.js:88
+msgid "some villagers have died"
+msgstr ""

script/outside.js

@@ -158,6 +158,7 @@ var Outside = {
 		
 		this.updateVillage();
 		Outside.updateWorkersView();
+		Outside.updateVillageIncome();
 		
 		Engine.updateSlider();
 		
@@ -363,26 +364,27 @@ var Outside = {
 	
 	updateVillageRow: function(name, num, village) {
 		var id = 'building_row_' + name.replace(' ', '-');
+		var lname = _(name);
 		var row = $('div#' + id, village);
 		if(row.length === 0 && num > 0) {
 			row = $('<div>').attr('id', id).addClass('storeRow');
-			$('<div>').addClass('row_key').text(_(name)).appendTo(row);
+			$('<div>').addClass('row_key').text(lname).appendTo(row);
 			$('<div>').addClass('row_val').text(num).appendTo(row);
 			$('<div>').addClass('clear').appendTo(row);
 			var curPrev = null;
 			village.children().each(function(i) {
 				var child = $(this);
 				if(child.attr('id') != 'population') {
-					var cName = child.attr('id').substring(13).replace('-', ' ');
+					var cName = child.children('.row_key').text();
-					if(cName < name && (curPrev == null || cName > curPrev)) {
+					if(cName < lname) {
-						curPrev = cName;
+						curPrev = child.attr('id');
 					}
 				}
 			});
 			if(curPrev == null) {
 				row.prependTo(village);
 			} else {
-				row.insertAfter('#building_row_' + curPrev.replace(' ', '-'));
+				row.insertAfter('#' + curPrev);
 			}
 		} else if(num > 0) {
 			$('div#' + row.attr('id') + ' > div.row_val', village).text(num);
@@ -585,13 +587,13 @@ var Outside = {
 				}
 			}
 		}
-        /// TRANSLATORS : Mind the whitespace at the end.
+		/// TRANSLATORS : Mind the whitespace at the end.
 		var s = _('the traps contain ');
 		for(var i = 0, len = msg.length; i < len; i++) {
 			if(len > 1 && i > 0 && i < len - 1) {
 				s += ", ";
 			} else if(len > 1 && i == len - 1) {
-                /// TRANSLATORS : Mind the whitespaces at the beginning and end.
+				/// TRANSLATORS : Mind the whitespaces at the beginning and end.
 				s += _(" and ");
 			}
 			s += msg[i];

script/room.js

@@ -797,6 +797,7 @@ var Room = {
 				$SM.set('stores["'+k+'"]', 0);
 			}
 			
+			var lk = _(k);
 			
 			// thieves?
 			if(typeof $SM.get('game.thieves') == 'undefined' && num > 5000 && $SM.get('features.location.world')) {
@@ -805,21 +806,21 @@ var Room = {
 			
 			if(row.length === 0 && num > 0) {
 				row = $('<div>').attr('id', id).addClass('storeRow');
-				$('<div>').addClass('row_key').text(_(k)).appendTo(row);
+				$('<div>').addClass('row_key').text(lk).appendTo(row);
 				$('<div>').addClass('row_val').text(Math.floor(num)).appendTo(row);
 				$('<div>').addClass('clear').appendTo(row);
 				var curPrev = null;
 				location.children().each(function(i) {
 					var child = $(this);
-					var cName = child.attr('id').substring(4).replace('-', ' ');
+					var cName = child.children('.row_key').text();
-					if(cName < k && (curPrev == null || cName > curPrev)) {
+					if(cName < lk) {
-						curPrev = cName;
+						curPrev = child.attr('id');
 					}
 				});
 				if(curPrev == null) {
 					row.prependTo(location);
 				} else {
-					row.insertAfter(location.find('#row_' + curPrev.replace(' ', '-')));
+					row.insertAfter(location.find('#' + curPrev));
 				}
 				newRow = true;
 			} else if(num>= 0){