Merge pull request #25 from toofarapart/persistent_stores_view

Stores panel now persists on all non-world/non-space views.
This commit is contained in:
Michael Townsend
2013-07-08 14:25:20 -07:00
6 changed files with 72 additions and 7 deletions
+8 -1
View File
@@ -461,6 +461,10 @@ var Outside = {
}
this.setTitle();
if(Engine.activeModule === Outside && village.children().length > 1) {
$('#storesContainer').css({top: village.height() + 26 + 'px'});
}
},
checkWorker: function(name) {
@@ -565,13 +569,16 @@ var Outside = {
$('#location_outside').text(title);
},
onArrival: function() {
onArrival: function(transition_diff) {
Outside.setTitle();
if(!State.seenForest) {
Notifications.notify(Outside, "the sky is grey and the wind blows relentlessly");
State.seenForest = true;
}
Outside.updateTrapButton();
Outside.updateVillage();
Engine.moveStoresView($('#village'), transition_diff);
},
gatherWood: function() {