Merge pull request doublespeakgames#425 from Sebring/master

Showing total in stores tooltip - Issue doublespeakgames#170
Head4che · Aug 2, 2015 · 64f6797 · 64f6797
2 parents 95cf44c + 1e37f45
commit 64f6797
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/css/main.css b/css/main.css
@@ -182,6 +182,10 @@ div.row_val {
 	float: right;
 }
 
+div.total {
+	font-weight: bold;
+}
+
 /* Notifications */
 
 div#notifications {

diff --git a/script/room.js b/script/room.js
@@ -885,6 +885,7 @@ var Room = {
 
 	updateIncomeView: function() {
 		var stores = $('div#resources');
+		var totalIncome = {};
 		if(stores.length === 0 || typeof $SM.get('income') == 'undefined') return;
 		$('div.storeRow', stores).each(function(index, el) {
 			el = $(el);
@@ -900,10 +901,19 @@ var Room = {
 							.addClass('row_val')
 							.text(Engine.getIncomeMsg(income.stores[store], income.delay))
 							.appendTo(tt);
+						if (totalIncome[store] === undefined || totalIncome[store]['income'] === undefined) {
+							totalIncome[store] = {};
+							totalIncome[store]['income'] = 0;
+						}
+						totalIncome[store]['income'] += Number(income.stores[store]);
+						totalIncome[store]['delay'] = income.delay;
 					}
 				}
 			}
 			if(tt.children().length > 0) {
+				var total = totalIncome[storeName]['income'];
+				$('<div>').addClass('total row_key').text(_('total')).appendTo(tt);
+				$('<div>').addClass('total row_val').text(Engine.getIncomeMsg(total, totalIncome[storeName]['delay'])).appendTo(tt);
 				tt.appendTo(el);
 			}
 		});