From 9091ebb3293f58e759949304b236d788141846b1 Mon Sep 17 00:00:00 2001
From: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
Date: Fri, 6 Nov 2020 19:47:45 +0100
Subject: play the gif and don't do extra animation for custom shouts

---
 webAO/client.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'webAO/client.js')

diff --git a/webAO/client.js b/webAO/client.js
index f91d208..1016d24 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -1453,7 +1453,8 @@ class Viewport {
 			undefined,
 			"holdit",
 			"objection",
-			"takethat"
+			"takethat",
+			"custom"
 		];
 
 		this.colors = [
@@ -1840,9 +1841,14 @@ async changeBackground(position) {
 		if (shout) {
 			// Hide message box
 			chatContainerBox.style.opacity = 0;
-			shoutSprite.src = client.resources[shout]["src"];
+			if (shout === 4) {
+				shoutSprite.src = `${AO_HOST}characters/${encodeURI(this.chatmsg.name.toLowerCase())}/custom.gif`;
+			} else {
+				shoutSprite.src = client.resources[shout]["src"];
+				shoutSprite.style.animation = "bubble 700ms steps(10, jump-both)";
+			}
 			shoutSprite.style.opacity = 1;
-			shoutSprite.style.animation = "bubble 700ms steps(10, jump-both)";
+			
 
 			let shoutUrl;
 
-- 
cgit 


From b5a8b9740e9f755d7c82ee81d9ed42c1a22d4f2f Mon Sep 17 00:00:00 2001
From: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
Date: Fri, 6 Nov 2020 19:53:43 +0100
Subject: compared the wrong thing

---
 webAO/client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webAO/client.js')

diff --git a/webAO/client.js b/webAO/client.js
index 1016d24..5656c7c 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -1841,7 +1841,7 @@ async changeBackground(position) {
 		if (shout) {
 			// Hide message box
 			chatContainerBox.style.opacity = 0;
-			if (shout === 4) {
+			if (this.chatmsg.objection === 4) {
 				shoutSprite.src = `${AO_HOST}characters/${encodeURI(this.chatmsg.name.toLowerCase())}/custom.gif`;
 			} else {
 				shoutSprite.src = client.resources[shout]["src"];
-- 
cgit 


From 6cf67c8a3012cfbe41cc7453962afcc4c0aa6c46 Mon Sep 17 00:00:00 2001
From: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
Date: Fri, 6 Nov 2020 19:55:34 +0100
Subject: add default length

---
 webAO/client.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'webAO/client.js')

diff --git a/webAO/client.js b/webAO/client.js
index 5656c7c..0aa0dea 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -143,6 +143,10 @@ class Client extends EventEmitter {
 				"src": AO_HOST + "misc/default/takethat_bubble.png",
 				"duration": 840
 			},
+			"custom": {
+				"src": AO_HOST + "characters//custom.gif",
+				"duration": 840
+			},
 			"witnesstestimony": {
 				"src": AO_HOST + "themes/" + THEME + "/witnesstestimony.gif",
 				"duration": 1560,
-- 
cgit 


From 35325a09a9a7ded9786dd09d91f30088b9f5a9f1 Mon Sep 17 00:00:00 2001
From: stonedDiscord <10584181+stonedDiscord@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:29:35 +0100
Subject: there is no default custom shout

---
 webAO/client.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webAO/client.js')

diff --git a/webAO/client.js b/webAO/client.js
index 0aa0dea..f01ff64 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -144,7 +144,7 @@ class Client extends EventEmitter {
 				"duration": 840
 			},
 			"custom": {
-				"src": AO_HOST + "characters//custom.gif",
+				"src": "",
 				"duration": 840
 			},
 			"witnesstestimony": {
-- 
cgit