Merge branch 'master' into jshint-compliance

This commit is contained in:
Lucas Lois
2017-01-25 11:44:18 -03:00
committed by GitHub
21 changed files with 3450 additions and 3485 deletions
+1 -1
View File
@@ -68,7 +68,7 @@ Events.Outside = [
{ /* Hut fire */
title: _('Fire'),
isAvailable: function() {
return Engine.activeModule == Outside && $SM.get('game.buildings["hut"]', true) > 0 && $SM.get('game.population', true) > 5;
return Engine.activeModule == Outside && $SM.get('game.buildings["hut"]', true) > 0 && $SM.get('game.population', true) > 50;
},
scenes: {
'start': {