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

Pause during fight

Browse Source 
This commit adds a pause button during the fight. It relies upon the new
Events.paused property: when set to true, no buttons will work except
the pause button itself, and cooldown on attack/healing buttons is
interrupted.
This commit also groups event buttons in different groups (attack,
healing, scene), so that the position of "eat meat" and "use meds" does
not depend on how many scene buttons are present (sometimes 1, other
times 2)
This commit is contained in:
AndySky21
2016-02-15 21:04:02 +01:00
parent e3d5e25b94
commit 6ace681a91
4 changed files with 130 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/Button.js
+7 -5
View File
@@ -13,7 +13,7 @@ var Button = {
.addClass('button')
.text(typeof(options.text) != 'undefined' ? options.text : "button")
.click(function() {
if(!$(this).hasClass('disabled')) {
if(!$(this).hasClass('disabled') && (!Events.paused || $(this).data("handler") == Events.togglePause)) {
Button.cooldown($(this));
$(this).data("handler")($(this));
}
@@ -73,13 +73,16 @@ var Button = {
// param "start" takes value from cooldown time if not specified
var start, left;
switch(option){
// a switch will allow for several uses of cooldown function
case 'state':
if(!$SM.get(id)){
return;
}
start = Math.min($SM.get(id), cd);
left = (start / cd).toFixed(4);
left = (start / cd).toFixed(3);
break;
case 'pause':
left = (btn.children('div.cooldown').width() / btn.width()).toFixed(3);
start = cd * left;
break;
default:
start = cd;
@@ -98,7 +101,7 @@ var Button = {
if (Engine.options.doubleTime){
time /= 2;
}
$('div.cooldown', btn).width(left * 100 +"%").animate({width: '0%'}, time * 1000, 'linear', function() {
$('div.cooldown', btn).width(Math.floor(left * 100) +"%").animate({width: '0%'}, time * 1000, 'linear', function() {
Button.clearCooldown(btn, true);
});
btn.addClass('disabled');
@@ -107,7 +110,6 @@ var Button = {
},
clearCooldown: function(btn, ended) {
var ended = ended || false;
if(!ended){
$('div.cooldown', btn).stop(true, true);
}