diff options
| author | sD <stoned@derpymail.org> | 2020-04-26 17:46:22 +0200 |
|---|---|---|
| committer | sD <stoned@derpymail.org> | 2020-04-26 17:46:22 +0200 |
| commit | dcb35d7ee1ebc04ef58e686b795935e3b3e9c2bb (patch) | |
| tree | 84581463117d8586790ef5eb6ff11c689aae6f99 /webAO | |
| parent | 716df2b8ad160524b8b0a2275691623417d567f7 (diff) | |
use the png and css animation for objections
Diffstat (limited to 'webAO')
| -rw-r--r-- | webAO/client.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/webAO/client.js b/webAO/client.js index 3d9b6b5..e3fb830 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -126,15 +126,15 @@ class Client extends EventEmitter { this.resources = { "holdit": { - "src": AO_HOST + "themes/" + THEME + "/holdit.gif", + "src": AO_HOST + "misc/default/holdit_bubble.png", "duration": 720 }, "objection": { - "src": AO_HOST + "themes/" + THEME + "/objection.gif", + "src": AO_HOST + "misc/default/objection_bubble.png", "duration": 720 }, "takethat": { - "src": AO_HOST + "themes/" + THEME + "/takethat.gif", + "src": AO_HOST + "misc/default/takethat_bubble.png", "duration": 840 }, "witnesstestimony": { @@ -1607,6 +1607,7 @@ async changeBackground(position) { chatContainerBox.style.opacity = 0; shoutSprite.src = client.resources[shout]["src"]; shoutSprite.style.opacity = 1; + shoutSprite.style.animation = "bubble 700ms steps(10, jump-both)"; let shoutUrl; @@ -1750,6 +1751,7 @@ async changeBackground(position) { // Pre-animation stuff if (this.chatmsg.preanimdelay > 0) { shoutSprite.style.opacity = 0; + shoutSprite.style.animation = ""; const charName = this.chatmsg.name.toLowerCase(); const preanim = this.chatmsg.preanim.toLowerCase(); charSprite.src = `${AO_HOST}characters/${encodeURI(charName)}/${encodeURI(preanim)}.gif`; @@ -1804,6 +1806,7 @@ async changeBackground(position) { if (this.chatmsg.preanimdelay === 0) { shoutSprite.style.opacity = 0; + shoutSprite.style.animation = ""; this.changeBackground(this.chatmsg.side); } |