From 8ceb9488aa077048c608662bf0ccd5b0243e1a5c Mon Sep 17 00:00:00 2001 From: Blake Grotewold Date: Wed, 23 Jul 2014 02:02:05 -0400 Subject: [PATCH 1/4] Add cooldown when leaving events Adding this cooldown prevents users from accidently clicking leave or continue before they have a chance to eat or collect loot. This was originally brought up in and resolves #8. May be of interest to #122 as well --- script/events.js | 12 +++- script/events/setpieces.js | 123 +++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+), 3 deletions(-) diff --git a/script/events.js b/script/events.js index e72991e..e13d078 100644 --- a/script/events.js +++ b/script/events.js @@ -8,6 +8,7 @@ var Events = { _FIGHT_SPEED: 100, _EAT_COOLDOWN: 5, _MEDS_COOLDOWN: 7, + _LEAVE_COOLDOWN: 1, STUN_DURATION: 4000, init: function(options) { @@ -460,8 +461,9 @@ var Events = { // Draw the buttons Events.drawButtons(scene); } else { - new Button.Button({ + Button.cooldown(new Button.Button({ id: 'leaveBtn', + cooldown: Events._LEAVE_COOLDOWN, click: function() { var scene = Events.activeEvent().scenes[Events.activeScene]; if(scene.nextScene && scene.nextScene != 'end') { @@ -471,7 +473,7 @@ var Events = { } }, text: _('leave') - }).appendTo(btns); + }).appendTo(btns)); Events.createEatMeatButton(0).appendTo(btns); if((Path.outfit['medicine'] || 0) != 0) { @@ -631,11 +633,15 @@ var Events = { id: id, text: info.text, cost: info.cost, - click: Events.buttonClick + click: Events.buttonClick, + cooldown: info.cooldown }).appendTo(btns); if(typeof info.available == 'function' && !info.available()) { Button.setDisabled(b, true); } + if(typeof info.cooldown == 'number') { + Button.cooldown(b); + } } Events.updateButtons(); diff --git a/script/events/setpieces.js b/script/events/setpieces.js index 17fb1cb..b6d79d5 100644 --- a/script/events/setpieces.js +++ b/script/events/setpieces.js @@ -23,6 +23,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -132,10 +133,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'b1', 1: 'b2'} }, 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -181,10 +184,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'b3', 1: 'b4'} }, 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -220,10 +225,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'c1' } }, 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -270,10 +277,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'c2'} }, 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -302,10 +311,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'c2'} }, 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -334,10 +345,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'end1', 1: 'end2'} }, 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -366,10 +379,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.7: 'end2', 1: 'end3'} }, 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -411,6 +426,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -462,6 +478,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -493,6 +510,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave cave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -567,10 +585,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'b3', 1: 'b4'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -621,10 +641,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'c1', 1: 'c2'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -658,10 +680,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'c2', 1: 'c3'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -690,10 +714,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'c4', 1: 'c5'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -728,10 +754,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'c5', 1: 'c6' } }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -765,10 +793,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.3: 'end5', 1: 'end6'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -802,10 +832,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'd1'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -834,10 +866,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'd1'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -883,10 +917,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'd2'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -922,10 +958,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'd2'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -959,10 +997,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'end1', 1: 'end2'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -996,10 +1036,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'end3', 1: 'end4'} }, 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1042,6 +1084,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1074,6 +1117,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1101,6 +1145,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1144,6 +1189,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1165,6 +1211,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave town'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1180,6 +1227,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave town'), + nextScene: 'end' } } @@ -1317,10 +1365,12 @@ Events.Setpieces = { buttons: { 'descend': { text: _('descend'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'c2', 1: 'c3'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1355,10 +1405,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'c4', 1: 'c5'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1393,10 +1445,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'c5', 1: 'c6'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1435,10 +1489,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'c7', 1: 'c8'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1504,10 +1560,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.3: 'c13', 0.7: 'c11', 1: 'end15'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1541,10 +1599,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'd1', 1: 'd2'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1579,10 +1639,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'd2'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1711,10 +1773,12 @@ Events.Setpieces = { buttons: { 'enter': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'd8'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1735,10 +1799,12 @@ Events.Setpieces = { buttons: { 'enter': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'd8', 1: 'd9'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1790,10 +1856,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'end10' } }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1829,10 +1897,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'end10' } }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1852,10 +1922,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 0.5: 'end10', 1: 'end11' } }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1880,10 +1952,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'end1', 1: 'end2'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1919,10 +1993,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'end2'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1953,10 +2029,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'end2', 1: 'end3'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -1986,10 +2064,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'end4', 1: 'end5'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2025,10 +2105,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'end5'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2064,10 +2146,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'end5', 1: 'end6'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2098,10 +2182,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'end7', 1: 'end8'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2131,10 +2217,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'end8'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2164,10 +2252,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {0.5: 'end8', 1: 'end9'} }, 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2207,6 +2297,7 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'end14'} } } @@ -2232,6 +2323,7 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: {1: 'end13'} } } @@ -2266,6 +2358,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2295,6 +2388,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2340,6 +2434,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2375,6 +2470,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2415,6 +2511,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2450,6 +2547,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2484,6 +2582,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2519,6 +2618,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2559,6 +2659,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2599,6 +2700,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2633,6 +2735,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2681,6 +2784,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2725,6 +2829,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2769,6 +2874,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2812,6 +2918,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave city'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2868,6 +2975,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2890,6 +2998,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2926,6 +3035,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -2978,6 +3088,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave'), + nextScene: 'end' } } @@ -3006,6 +3117,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -3085,10 +3197,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'a2' } }, 'run': { text: _('run'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -3123,10 +3237,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'a3' } }, 'run': { text: _('run'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -3155,6 +3271,7 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'cleared' } } } @@ -3223,10 +3340,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'a2' } }, 'run': { text: _('run'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -3255,10 +3374,12 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'a3' } }, 'run': { text: _('run'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: 'end' } } @@ -3292,6 +3413,7 @@ Events.Setpieces = { buttons: { 'continue': { text: _('continue'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'cleared' } } } @@ -3367,6 +3489,7 @@ Events.Setpieces = { buttons: { 'leave': { text: _('leave'), + cooldown: Events._LEAVE_COOLDOWN, nextScene: { 1: 'cleared' } } } From 0087da9b5e8f8bd6fcbecbc81fb460aec902e27f Mon Sep 17 00:00:00 2001 From: Tony Lambregts Date: Wed, 23 Jul 2014 19:00:36 -0600 Subject: [PATCH 2/4] stop creating income without enough resources Fix issue where there worker created income without enough resources available. --- script/state_manager.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/script/state_manager.js b/script/state_manager.js index e07ea37..9e2ddb9 100644 --- a/script/state_manager.js +++ b/script/state_manager.js @@ -342,9 +342,20 @@ var StateManager = { if(income.timeLeft <= 0) { Engine.log('collection income from ' + source); - if(source == 'thieves') $SM.addStolen(income.stores); - $SM.addM('stores', income.stores, true); - changed = true; + if(source == 'thieves') $SM.addStolen(income.stores); + + var cost = income.stores; + var ok = true; + for(var k in cost) { + var have = $SM.get('stores["'+k+'"]', true); + if(have + cost[k] < 0) { + ok = false; + } + } + if(ok){ + $SM.addM('stores', income.stores, true); + } + changed = true; if(typeof income.delay == 'number') { income.timeLeft = income.delay; } From 08277b33ae8e64a39f8122416379c4ab4a9ca409 Mon Sep 17 00:00:00 2001 From: Tony Lambregts Date: Thu, 24 Jul 2014 21:38:02 -0600 Subject: [PATCH 3/4] Let thieves Steal. --- script/state_manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/state_manager.js b/script/state_manager.js index 9e2ddb9..c6455fe 100644 --- a/script/state_manager.js +++ b/script/state_manager.js @@ -349,7 +349,7 @@ var StateManager = { for(var k in cost) { var have = $SM.get('stores["'+k+'"]', true); if(have + cost[k] < 0) { - ok = false; + if(source != 'thieves') ok = false; } } if(ok){ From 5ceac11e53c46d78064b649d59929b327868e165 Mon Sep 17 00:00:00 2001 From: Michael Townsend Date: Sat, 26 Jul 2014 11:42:50 -0400 Subject: [PATCH 4/4] merge leave cooldowns --- script/engine.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/engine.js b/script/engine.js index ff3dbef..4053d82 100644 --- a/script/engine.js +++ b/script/engine.js @@ -562,13 +562,14 @@ }, keyDown: function(e) { + e = e || window.event; if(!Engine.keyPressed && !Engine.keyLock) { Engine.pressed = true; if(Engine.activeModule.keyDown) { Engine.activeModule.keyDown(e); } } - return !(jQuery.inArray(window.event.keycode, [37,38,39,40])); + return !(jQuery.inArray(e.keycode, [37,38,39,40])); }, keyUp: function(e) {