GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-06-08 21:47:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #463 from AndySky21/Take-everything-bug

Browse Source 
Take-everything bug
This commit is contained in:
Blake Grotewold
2016-03-19 14:55:55 -04:00
parent 3d8e07510f d295ca9aa5
commit cc18daa111
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/events.js
+4 -1
View File
@@ -589,6 +589,7 @@ var Events = {
var takeET = new Button.Button({ var takeET = new Button.Button({
id: 'loot_takeEverything', id: 'loot_takeEverything',
text: '', text: '',
cooldown: Events._LEAVE_COOLDOWN,
click: Events.takeEverything click: Events.takeEverything
}).appendTo(takeETrow); }).appendTo(takeETrow);
$('<span>').insertBefore(takeET.children('.cooldown')); $('<span>').insertBefore(takeET.children('.cooldown'));
@@ -650,8 +651,10 @@ var Events = {
var textbox = btn.children('span'); var textbox = btn.children('span');
var takeAndLeave = (btn.data('leaveBtn')) ? btn.data('canTakeEverything') : false; var takeAndLeave = (btn.data('leaveBtn')) ? btn.data('canTakeEverything') : false;
if(takeAndLeave){ if(takeAndLeave){
textbox.text( basetext + _(' and ') + _('leave') ); var verb = btn.data('leaveBtn').text() || _('leave');
textbox.text( basetext + _(' and ') + verb);
btn.data('canLeave', true); btn.data('canLeave', true);
Button.cooldown(btn);
} else { } else {
textbox.text( basetext ); textbox.text( basetext );
btn.data('canLeave', false) btn.data('canLeave', false)