Fix the bubble thin with the mouse ...

This commit is contained in:
Aaron Fischer 2017-08-29 23:21:18 +02:00
parent 9abd6a4663
commit 2243a5a788
4 changed files with 42 additions and 37 deletions

View file

@ -1,67 +1,63 @@
(function() {
"use strict";
var bubble = {};
var activeTalk = false;
var skip = false;
var dom = document.getElementById('bubble');
var resolveFn, fragmentTimer, delayTimer = null;
var show = function(text, position) {
return new Promise(function(resolve, reject) {
dom.style.display = '';
return new Promise(function(resolve) {
resolveFn = resolve;
dom.innerHTML = '';
dom.style.left = position[0]*8;
dom.style.top = position[1]*8;
dom.innerHTML = '';
parts = text.split(' ');
var parts = text.split(' ');
var showFragment = function() {
if (skip) {
dom.innerHTML = '';
dom.style.display = 'none';
skip = false;
throw new Error('dfad');
}
if (parts.length === 0) {
setTimeout(function() {
dom.style.display = 'none';
return resolve();
}, 1500);
delayTimer = setTimeout(resolve, 3000);
return;
}
dom.innerHTML += parts.shift() + ' ';
setTimeout(showFragment, 150);
fragmentTimer = setTimeout(showFragment, 140);
};
showFragment();
});
};
bubble.skip = function() {
dom.innerHTML = '';
skip = true;
bubble.skip = function(what) {
clearTimeout(fragmentTimer);
clearTimeout(delayTimer);
if (resolveFn) resolveFn(what || 'line');
};
bubble.stop = function() {
bubble.skip();
if (!activeTalk) return;
activeTalk.reject();
activeTalk = false;
};
bubble.talk = function(texts, position) {
if (texts.length === 0) return;
if (texts.length === 0) {
dom.innerHTML = '';
return;
}
var text = texts.shift();
return show(text, position || [5, 44])
.then(function() {return bubble.talk(texts, position);})
.catch(function() { return; });
.then(function(what) {
if (what !== undefined) return Promise.resolve(what);
return bubble.talk(texts, position);
});
};
bubble.story = function(talkList) {
if (talkList.length === 0) return;
if (talkList.length === 0) {
dom.innerHTML = '';
return;
}
bubble.skip('story');
var params = talkList.shift();
var activeTalk = bubble.talk(params[0], params[1])
.then(function() {return bubble.story(talkList);})
.catch(function() { return; });
return activeTalk;
return bubble.talk(params[0], params[1])
.then(function(what) {
if (what === 'story') return Promise.resolve();
return bubble.story(talkList);
});
};
bubble.name = 'bubble';

View file

@ -6,7 +6,7 @@
<div id="content">
<div>
<canvas width="100" height="50" id="js13k-2017"></canvas>
<div id="bubble" style="display: none;">Uh ...</div>
<div id="bubble"></div>
</div>
</div>
<p id="loading">loading game ...</p>

View file

@ -25,6 +25,10 @@
return sprite.collidesWith(mouseSprite);
};
mouse.isClickReleased = function() {
return mouseSprite.x === -1 && mouseSprite.y === -1;
};
mouse.releaseClick = function() {
mouseSprite.x = -1;
mouseSprite.y = -1;

View file

@ -85,6 +85,11 @@ var muri = (function() {
muri.modules.forEach(function(m) {
if (m.update !== undefined) m.update();
});
if (!muri.get('mouse').isClickReleased()) {
muri.get('mouse').releaseClick();
muri.get('bubble').skip();
}
},
render: function() {
muri.room(muri.currentRoom).render();