diff --git a/script/events.js b/script/events.js index fd2d898..9e111aa 100644 --- a/script/events.js +++ b/script/events.js @@ -153,7 +153,7 @@ var Events = { string = 'resume.'; log = 'paused'; } - btn.children('.text').first().text( _(string) ) + btn.children('.text').first().text( _(string) ); Events.paused = (state == 'auto') ? 'auto' : true; event.addClass('paused'); Button.clearCooldown(btn); @@ -189,6 +189,7 @@ var Events = { break; case 'auto': Button.cooldown(btn); + /* falls through */ default: log = 'resumed'; time = Events._PAUSE_COOLDOWN * 1000; @@ -373,8 +374,8 @@ var Events = { out = true; } } - for(var k in mod) { - Path.outfit[k] += mod[k]; + for(var m in mod) { + Path.outfit[m] += mod[m]; } if(out) { Button.setDisabled(btn, true); @@ -596,11 +597,12 @@ var Events = { if(weight > freeSpace) { // Draw the drop menu Engine.log('drop menu'); + var dropMenu; if($('#dropMenu').length){ - var dropMenu = $('#dropMenu'); + dropMenu = $('#dropMenu'); $('#dropMenu').empty(); } else { - var dropMenu = $('
').attr({'id': 'dropMenu', 'data-legend': _('drop:')}); + dropMenu = $('
').attr({'id': 'dropMenu', 'data-legend': _('drop:')}); needsAppend = true; } for(var k in Path.outfit) { @@ -676,9 +678,10 @@ var Events = { } } lootButtons.appendTo(desc); + var takeET = null; if(lootButtons.children().length > 0) { var takeETrow = $('
').addClass('takeETrow'); - var takeET = new Button.Button({ + takeET = new Button.Button({ id: 'loot_takeEverything', text: '', cooldown: Events._LEAVE_COOLDOWN, @@ -773,10 +776,10 @@ var Events = { World.updateSupplies(); }, - getLoot: function(btn, skipButtonSet) { + getLoot: function(btn, stateSkipButtonSet) { var name = btn.attr('id').substring(5).replace('-', ' '); if(btn.data('numLeft') > 0) { - var skipButtonSet = skipButtonSet || false; + var skipButtonSet = stateSkipButtonSet || false; var weight = Path.getWeight(name); var freeSpace = Path.getFreeSpace(); if(weight <= freeSpace) { @@ -857,8 +860,9 @@ var Events = { } // Draw any loot + var takeETbtn; if(scene.loot) { - var takeETbtn = Events.drawLoot(scene.loot); + takeETbtn = Events.drawLoot(scene.loot); } // Draw the buttons @@ -1113,7 +1117,7 @@ var Events = { if(typeof target[i] == 'function'){ target[i](); } else { - $SM.remove(stateName) + $SM.remove(stateName); } } } @@ -1127,7 +1131,7 @@ var Events = { if(delay){ $SM.set(state, delay); } else { - var delay = $SM.get(state, true) + delay = $SM.get(state, true); } var time = Engine.setInterval(function(){ // update state every half second