Added max/zero buttons to worker assignment and expedition supply packing to prevent eg having to click 50x to fill food supplies.

This commit is contained in:
Zarkonnen
2013-07-04 16:15:29 +02:00
parent 9327358008
commit 6d99cb7c3a
3 changed files with 89 additions and 12 deletions
+33 -12
View File
@@ -194,15 +194,22 @@ div.button div.cooldown {
/* Up/Down buttons. They're complicated! */ /* Up/Down buttons. They're complicated! */
.upBtn, .dnBtn { .upBtn, .dnBtn, .maxBtn, .zeroBtn {
position: absolute; position: absolute;
width: 14px; width: 14px;
height: 15px; height: 15px;
right: 0px;
cursor: pointer; cursor: pointer;
} }
.upBtn.disabled, .dnBtn.disabled { .upBtn, .dnBtn {
right: 0px;
}
.maxBtn, .zeroBtn {
right: -11px;
}
.upBtn.disabled, .dnBtn.disabled, .maxBtn.disabled, .zeroBtn.disabled {
cursor: default; cursor: default;
} }
@@ -210,7 +217,11 @@ div.button div.cooldown {
top: -2px; top: -2px;
} }
.upBtn:after, .upBtn:before { .maxBtn {
top: -2px;
}
.upBtn:after, .upBtn:before, .maxBtn:after, .maxBtn:before {
position: absolute; position: absolute;
border: medium solid transparent; border: medium solid transparent;
content: " "; content: " ";
@@ -219,15 +230,15 @@ div.button div.cooldown {
bottom: 4px; bottom: 4px;
} }
.upBtn:after { .upBtn:after, .maxBtn:after {
border-color: transparent transparent white; border-color: transparent transparent white;
} }
.upBtn:before { .upBtn:before, .maxBtn:before {
border-color: transparent transparent black; border-color: transparent transparent black;
} }
.upBtn.disabled:before { .upBtn.disabled:before, .maxBtn.disabled:before {
border-color: transparent transparent #999; border-color: transparent transparent #999;
} }
@@ -236,7 +247,11 @@ div.button div.cooldown {
bottom: -3px; bottom: -3px;
} }
.dnBtn:after, .dnBtn:before { .zeroBtn {
bottom: -3px;
}
.dnBtn:after, .dnBtn:before, .zeroBtn:after, .zeroBtn:before {
position: absolute; position: absolute;
border: medium solid transparent; border: medium solid transparent;
content: " "; content: " ";
@@ -251,21 +266,27 @@ div.button div.cooldown {
margin-left: -3px; margin-left: -3px;
} }
.upBtn:before, .dnBtn:before { .upBtn:before, .dnBtn:before, .maxBtn:before, .zeroBtn:before {
border-width: 5px; border-width: 5px;
left: 50%; left: 50%;
margin-left: -5px; margin-left: -5px;
} }
.dnBtn:after { .maxBtn:after, .zeroBtn:after {
border-width: 2px;
left: 50%;
margin-left: -2px;
}
.dnBtn:after, .zeroBtn:after {
border-color: white transparent transparent; border-color: white transparent transparent;
} }
.dnBtn:before { .dnBtn:before, .zeroBtn:before {
border-color: black transparent transparent; border-color: black transparent transparent;
} }
.dnBtn.disabled:before { .dnBtn.disabled:before, .zeroBtn.disabled:before {
border-color: #999 transparent transparent; border-color: #999 transparent transparent;
} }
+26
View File
@@ -296,8 +296,10 @@ var Outside = {
numGatherers -= State.outside.workers[k]; numGatherers -= State.outside.workers[k];
if(State.outside.workers[k] == 0) { if(State.outside.workers[k] == 0) {
$('.dnBtn', row).addClass('disabled'); $('.dnBtn', row).addClass('disabled');
$('.zeroBtn', row).addClass('disabled');
} else { } else {
$('.dnBtn', row).removeClass('disabled'); $('.dnBtn', row).removeClass('disabled');
$('.zeroBtn', row).removeClass('disabled');
} }
} }
@@ -310,8 +312,10 @@ var Outside = {
if(numGatherers == 0) { if(numGatherers == 0) {
$('.upBtn', '#workers').addClass('disabled'); $('.upBtn', '#workers').addClass('disabled');
$('.maxBtn', '#workers').addClass('disabled');
} else { } else {
$('.upBtn', '#workers').removeClass('disabled'); $('.upBtn', '#workers').removeClass('disabled');
$('.maxBtn', '#workers').removeClass('disabled');
} }
@@ -338,8 +342,10 @@ var Outside = {
$('<span>').text(num).appendTo(val); $('<span>').text(num).appendTo(val);
if(name != 'gatherer') { if(name != 'gatherer') {
$('<div>').addClass('maxBtn').appendTo(val).click(Outside.maxWorker);
$('<div>').addClass('upBtn').appendTo(val).click(Outside.increaseWorker); $('<div>').addClass('upBtn').appendTo(val).click(Outside.increaseWorker);
$('<div>').addClass('dnBtn').appendTo(val).click(Outside.decreaseWorker); $('<div>').addClass('dnBtn').appendTo(val).click(Outside.decreaseWorker);
$('<div>').addClass('zeroBtn').appendTo(val).click(Outside.zeroWorker);
} }
$('<div>').addClass('clear').appendTo(row); $('<div>').addClass('clear').appendTo(row);
@@ -376,6 +382,26 @@ var Outside = {
} }
}, },
maxWorker: function(btn) {
var worker = $(this).closest('.workerRow').children('.row_key').text();
if(Outside.getNumGatherers() > 0) {
Engine.log('maxing ' + worker);
State.outside.workers[worker] += Outside.getNumGatherers();
Outside.updateVillageIncome();
Outside.updateWorkersView();
}
},
zeroWorker: function(btn) {
var worker = $(this).closest('.workerRow').children('.row_key').text();
if(State.outside.workers[worker] > 0) {
Engine.log('zeroing ' + worker);
State.outside.workers[worker] = 0;
Outside.updateVillageIncome();
Outside.updateWorkersView();
}
},
updateVillageRow: function(name, num, village) { updateVillageRow: function(name, num, village) {
var id = 'building_row_' + name.replace(' ', '-'); var id = 'building_row_' + name.replace(' ', '-');
var row = $('div#' + id, village); var row = $('div#' + id, village);
+30
View File
@@ -194,13 +194,17 @@ var Path = {
} }
if(num == 0) { if(num == 0) {
$('.dnBtn', row).addClass('disabled'); $('.dnBtn', row).addClass('disabled');
$('.zeroBtn', row).addClass('disabled');
} else { } else {
$('.dnBtn', row).removeClass('disabled'); $('.dnBtn', row).removeClass('disabled');
$('.zeroBtn', row).removeClass('disabled');
} }
if(num >= numAvailable || space < Path.getWeight(k)) { if(num >= numAvailable || space < Path.getWeight(k)) {
$('.upBtn', row).addClass('disabled'); $('.upBtn', row).addClass('disabled');
$('.maxBtn', row).addClass('disabled');
} else if(space >= Path.getWeight(k)) { } else if(space >= Path.getWeight(k)) {
$('.upBtn', row).removeClass('disabled'); $('.upBtn', row).removeClass('disabled');
$('.maxBtn', row).removeClass('disabled');
} }
} else if(have == 0 && row.length > 0) { } else if(have == 0 && row.length > 0) {
row.remove(); row.remove();
@@ -225,6 +229,8 @@ var Path = {
$('<span>').text(num).appendTo(val); $('<span>').text(num).appendTo(val);
$('<div>').addClass('upBtn').appendTo(val).click(Path.increaseSupply); $('<div>').addClass('upBtn').appendTo(val).click(Path.increaseSupply);
$('<div>').addClass('dnBtn').appendTo(val).click(Path.decreaseSupply); $('<div>').addClass('dnBtn').appendTo(val).click(Path.decreaseSupply);
$('<div>').addClass('maxBtn').appendTo(val).click(Path.maxSupply);
$('<div>').addClass('zeroBtn').appendTo(val).click(Path.zeroSupply);
$('<div>').addClass('clear').appendTo(row); $('<div>').addClass('clear').appendTo(row);
var numAvailable = Engine.getStore(name); var numAvailable = Engine.getStore(name);
@@ -259,6 +265,30 @@ var Path = {
} }
}, },
maxSupply: function() {
var supply = $(this).closest('.outfitRow').children('.row_key').text().replace('-', ' ');
Engine.log('maxing ' + supply);
var cur = Path.outfit[supply];
cur = typeof cur == 'number' ? cur : 0;
if(Path.getFreeSpace() >= Path.getWeight(supply) && cur < Engine.getStore(supply)) {
var maxExtraByWeight = Math.floor(Path.getFreeSpace() / Path.getWeight(supply));
var maxExtraByStore = Engine.getStore(supply) - cur;
Path.outfit[supply] = cur + Math.min(maxExtraByWeight, maxExtraByStore);
Path.updateOutfitting();
}
},
zeroSupply: function() {
var supply = $(this).closest('.outfitRow').children('.row_key').text().replace('-', ' ');
Engine.log('zeroing ' + supply);
var cur = Path.outfit[supply];
cur = typeof cur == 'number' ? cur : 0;
if(cur > 0) {
Path.outfit[supply] = 0;
Path.updateOutfitting();
}
},
onArrival: function() { onArrival: function() {
Path.setTitle(); Path.setTitle();
Path.updateOutfitting(); Path.updateOutfitting();