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

Outfit update on Income

Browse Source 
A very easy fix indeed. When Path is active, the outfit is updated on Income event. This way the "available" tooltip is reliable, increment/decrement buttons are activated/deactivated correctly and there is no risk of phantom resources.
This commit is contained in:
Andrea Rendine
2016-02-14 02:39:49 +01:00
parent 4032738d57
commit 0f8a2ccfb6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/path.js
+8 -6
View File
@@ -176,11 +176,12 @@ var Path = {
for(var k in carryable) { for(var k in carryable) {
var lk = _(k); var lk = _(k);
var store = carryable[k]; var store = carryable[k];
var have = $SM.get('stores["'+k+'"]'); var have = $SM.get('stores["'+k+'"]', true);
var num = Path.outfit[k]; var num = Path.outfit[k];
num = typeof num == 'number' ? num : 0; num = typeof num == 'number' ? num : 0;
if (have < num) { num = have; } if (have < num) { num = have; }
var numAvailable = $SM.get('stores["'+k+'"]', true); $SM.set('outfit["'+k+'"]', num, true);
var row = $('div#outfit_row_' + k.replace(' ', '-'), outfit); var row = $('div#outfit_row_' + k.replace(' ', '-'), outfit);
if((store.type == 'tool' || store.type == 'weapon') && have > 0) { if((store.type == 'tool' || store.type == 'weapon') && have > 0) {
total += num * Path.getWeight(k); total += num * Path.getWeight(k);
@@ -204,7 +205,7 @@ var Path = {
} }
} else { } else {
$('div#' + row.attr('id') + ' > div.row_val > span', outfit).text(num); $('div#' + row.attr('id') + ' > div.row_val > span', outfit).text(num);
$('div#' + row.attr('id') + ' .tooltip .numAvailable', outfit).text(numAvailable - num); $('div#' + row.attr('id') + ' .tooltip .numAvailable', outfit).text(have - num);
} }
if(num === 0) { if(num === 0) {
$('.dnBtn', row).addClass('disabled'); $('.dnBtn', row).addClass('disabled');
@@ -213,7 +214,7 @@ var Path = {
$('.dnBtn', row).removeClass('disabled'); $('.dnBtn', row).removeClass('disabled');
$('.dnManyBtn', row).removeClass('disabled'); $('.dnManyBtn', row).removeClass('disabled');
} }
if(num >= numAvailable || space < Path.getWeight(k)) { if(num >= have || space < Path.getWeight(k)) {
$('.upBtn', row).addClass('disabled'); $('.upBtn', row).addClass('disabled');
$('.upManyBtn', row).addClass('disabled'); $('.upManyBtn', row).addClass('disabled');
} else if(space >= Path.getWeight(k)) { } else if(space >= Path.getWeight(k)) {
@@ -289,7 +290,6 @@ var Path = {
Path.setTitle(); Path.setTitle();
Path.updateOutfitting(); Path.updateOutfitting();
Path.updatePerks(true); Path.updatePerks(true);
$SM.set('outfit', Path.outfit);
Engine.moveStoresView($('#perks'), transition_diff); Engine.moveStoresView($('#perks'), transition_diff);
}, },
@@ -311,7 +311,9 @@ var Path = {
handleStateUpdates: function(e){ handleStateUpdates: function(e){
if(e.category == 'character' && e.stateName.indexOf('character.perks') === 0 && Engine.activeModule == Path){ if(e.category == 'character' && e.stateName.indexOf('character.perks') === 0 && Engine.activeModule == Path){
Path.updatePerks(); Path.updatePerks();
}; } else if(e.category == 'income' && Engine.activeModule == Path){
Path.updateOutfitting();
}
}, },
scrollSidebar: function(direction, reset){ scrollSidebar: function(direction, reset){