GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-05-28 00:01:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into jshint-compliance

Browse Source
This commit is contained in:
Lucas Lois
2017-01-25 11:44:18 -03:00
committed by GitHub
parent 69267045a8 efe44ba3a7
commit fb9e39bbaf
21 changed files with 3450 additions and 3485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/room.js
+6 -3
View File
@@ -893,7 +893,8 @@ var Room = {
$('div.storeRow', stores).each(function(index, el) {
el = $(el);
$('div.tooltip', el).remove();
var tt = $('<div>').addClass('tooltip bottom right');
var ttPos = index > 10 ? 'top right' : 'bottom right';
var tt = $('<div>').addClass('tooltip ' + ttPos);
var storeName = el.attr('id').substring(4).replace('-', ' ');
for(var incomeSource in $SM.get('income')) {
var income = $SM.get('income["'+incomeSource+'"]');
@@ -1117,7 +1118,8 @@ var Room = {
cost: good.cost(),
text: _(g),
click: Room.buy,
width: '80px'
width: '80px',
ttPos: buySection.children().length > 10 ? 'top right' : 'bottom right'
}).css('opacity', 0).attr('buildThing', g).appendTo(buySection).animate({opacity:1}, 300, 'linear');
}
} else {
@@ -1152,7 +1154,8 @@ var Room = {
},
compassTooltip: function(direction){
var tt = $('<div>').addClass('tooltip bottom right');
var ttPos = $('div#resources').children().length > 10 ? 'top right' : 'bottom right';
var tt = $('<div>').addClass('tooltip ' + ttPos);
$('<div>').addClass('row_key').text(_('the compass points '+ direction)).appendTo(tt);
tt.appendTo($('#row_compass'));
},