From 7e36f3024ab3ffba130cb93c396408e4ff708c0d Mon Sep 17 00:00:00 2001 From: sD Date: Tue, 24 Dec 2019 15:36:36 +0100 Subject: replace modcall dialog with a prompt --- webAO/client.html | 11 ----------- webAO/client.js | 40 +++++++--------------------------------- 2 files changed, 7 insertions(+), 44 deletions(-) diff --git a/webAO/client.html b/webAO/client.html index 9a54cb9..7982419 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -7,14 +7,10 @@ - - - - @@ -338,13 +334,6 @@ -

- - Are you sure you want to call a moderator? -

diff --git a/webAO/client.js b/webAO/client.js index 3d9d926..6e481f5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -2211,7 +2211,12 @@ window.randomCharacterOOC = randomCharacterOOC; * Call mod. */ export function callMod() { - $("#callmod_dialog").dialog("open"); + let modcall = prompt("Please enter the reason for the modcall",""); + if (modcall == null || modcall === "") { + // cancel + } else { + client.sendZZ(modcall); + } } window.callMod = callMod; @@ -2449,35 +2454,4 @@ function decodeChat(estring) { // let client = new Client(serverIP); -let viewport = new Viewport(); - -// Create dialog and link to button -$(function () { - $("#callmod_dialog").dialog({ - autoOpen: false, - resizable: false, - show: { - effect: "drop", - direction: "down", - duration: 500 - }, - hide: { - effect: "drop", - direction: "down", - duration: 500 - }, - height: "auto", - width: 400, - modal: true, - buttons: { - Sure: function () { - const reason = prompt("Please enter the reason", ""); - client.sendZZ(reason); - $(this).dialog("close"); - }, - Cancel: function () { - $(this).dialog("close"); - } - } - }); -}); +let viewport = new Viewport(); \ No newline at end of file -- cgit From 9695d2919e177924b607cc2f51e08104b969d839 Mon Sep 17 00:00:00 2001 From: sD Date: Wed, 25 Dec 2019 18:40:14 +0100 Subject: swap add and remove defense hp to make them match the bars --- webAO/client.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webAO/client.html b/webAO/client.html index 7982419..84bf1d3 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -91,12 +91,12 @@
- - - - Defense + + Defense + + -- cgit From b4acc593d3193ea2d508372982bafe4ad9e45d0f Mon Sep 17 00:00:00 2001 From: sD Date: Wed, 25 Dec 2019 18:40:28 +0100 Subject: add css transition to get rid of jquery --- webAO/client.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webAO/client.css b/webAO/client.css index 4199cf9..d512c8b 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -430,6 +430,8 @@ img { bottom: 0; position: relative; display: inline-block; + transition: 0.4s linear; + transition-property: width; } .client_button { -- cgit From 2e7825b0ca0508053826e36add9888a64c62925a Mon Sep 17 00:00:00 2001 From: sD Date: Wed, 25 Dec 2019 18:44:23 +0100 Subject: slow animation to match the real game --- webAO/client.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webAO/client.css b/webAO/client.css index d512c8b..d18d5f3 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -430,7 +430,7 @@ img { bottom: 0; position: relative; display: inline-block; - transition: 0.4s linear; + transition: 1s linear; transition-property: width; } -- cgit From 099ae02dd9ff85a0ff31a93042abd2ec3e3a96c6 Mon Sep 17 00:00:00 2001 From: sD Date: Wed, 25 Dec 2019 18:44:39 +0100 Subject: use DOM instead of jquery --- webAO/client.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/webAO/client.js b/webAO/client.js index 6e481f5..ca1dcdd 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -830,19 +830,17 @@ class Client extends EventEmitter { */ handleHP(args) { const percent_hp = args[2] * 10; - if (args[1] === 1) { + let healthbox; + if (args[1] === "1") { // Def hp this.hp[0] = args[2]; - $("#client_defense_hp > .health-bar").animate({ - "width": percent_hp + "%" - }, 500); + healthbox = document.getElementById("client_defense_hp"); } else { // Pro hp this.hp[1] = args[2]; - $("#client_prosecutor_hp > .health-bar").animate({ - "width": percent_hp + "%" - }, 500); + healthbox = document.getElementById("client_prosecutor_hp"); } + healthbox.getElementsByClassName("health-bar")[0].style.width = percent_hp + "%"; } /** -- cgit From 9737b4274caca7c9b1c6b97e5cee5b63ca2199a1 Mon Sep 17 00:00:00 2001 From: sD Date: Wed, 25 Dec 2019 19:18:04 +0100 Subject: add flash and shake keyframes --- webAO/client.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/webAO/client.css b/webAO/client.css index d18d5f3..95b6cca 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -79,6 +79,19 @@ img { width: 100%; } +@keyframes shake { + 0%,100% {left: 0; } + 20% {left: -10%; } + 40% {left: +10%; } + 60% {left: -10%; } + 80% {left: +10%; } +} + +@keyframes flash { + 0%,100% {background-color: transparent; } + 50% {background-color: white; } +} + #client_charselect { position: fixed; top: 0; -- cgit From 32c42015e57e7cf2d5c66a1d54ceec2e9cdb1214 Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 16:08:28 +0100 Subject: replace shake animation --- webAO/client.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/webAO/client.js b/webAO/client.js index ca1dcdd..10ae4e5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1368,9 +1368,7 @@ class Viewport { this.sfxplayed = 1; this.sfxaudio.src = AO_HOST + "sounds/general/sfx-stab.wav"; this.sfxaudio.play(); - $("#client_gamewindow").effect("shake", { - "direction": "up" - }); + document.getElementById("client_gamewindow").style.animation = "shake 0.2s 1"; } else if (this.chatmsg.flash === "1") { // Flash screen background.style.backgroundColor = "white"; -- cgit From fd81db5965b3847491e808dea67dd353c896a6e4 Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 18:02:05 +0100 Subject: show fg as i will use it for flash --- webAO/client.css | 1 - webAO/client.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/webAO/client.css b/webAO/client.css index 95b6cca..895293e 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -193,7 +193,6 @@ img { } #client_fg { - display: none; position: absolute; height: 100%; width: 100%; diff --git a/webAO/client.html b/webAO/client.html index 84bf1d3..be402b7 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -26,7 +26,7 @@ Character

-- cgit From 11e800bdf67dd3f5a1a63f7e9bd83fbb79a3d30e Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 18:04:00 +0100 Subject: add flash --- webAO/client.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/webAO/client.js b/webAO/client.js index 10ae4e5..c03d32e 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1376,7 +1376,7 @@ class Viewport { this.sfxplayed = 1; this.sfxaudio.src = AO_HOST + "sounds/general/sfx-realization.wav"; this.sfxaudio.play(); - $("#client_gamewindow").effect("pulsate", { times: 1 }, 200); + document.getElementById("client_fg").style.animation = "flash 0.4s 1"; } // Pre-animation stuff @@ -1889,7 +1889,6 @@ async function changeBackground(position) { }; const { bg, desk, speedLines } = positions[position]; - document.getElementById("client_fg").style.display = "none"; if (viewport.chatmsg.type === "5") { document.getElementById("client_court").src = `${AO_HOST}themes/default/${encodeURI(speedLines)}`; -- cgit From b987a8fdd9a6c2a85e95effd73e15746a3ffc495 Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 18:07:00 +0100 Subject: reset the animation --- webAO/client.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webAO/client.js b/webAO/client.js index c03d32e..9ecae71 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1135,6 +1135,11 @@ class Viewport { this.sfxplayed = 0; this.textTimer = 0; this._animating = true; + + // Reset CSS animation + document.getElementById("client_fg").style.animation = ""; + document.getElementById("client_gamewindow").style.animation = ""; + clearTimeout(this.updater); // If preanim existed then determine the length if (chatmsg.preanim !== "-") { -- cgit From 6840bc478608079aeb2cdebfa858d14e44deda67 Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 18:13:18 +0100 Subject: animate evidence --- webAO/client.css | 2 ++ webAO/client.js | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/webAO/client.css b/webAO/client.css index 895293e..037bb0a 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -208,6 +208,8 @@ img { height: 0%; width: auto; top: 1.5em; + transition: 0.25s linear; + transition-property: height, opacity; } #client_shout { diff --git a/webAO/client.js b/webAO/client.js index 9ecae71..26181f5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1420,17 +1420,13 @@ class Viewport { // Only def show evidence on right eviBox.style.right = "1.5em"; eviBox.style.left = "initial"; - $("#client_evi").animate({ - height: "30%", - opacity: 1 - }, 250); + eviBox.style.height = "30%"; + eviBox.style.opacity = 1; } else { eviBox.style.right = "initial"; eviBox.style.left = "1.5em"; - $("#client_evi").animate({ - height: "30%", - opacity: 1 - }, 250); + eviBox.style.height = "30%"; + eviBox.style.opacity = 1; } } -- cgit From 5cdf61a2c53a7c0782fe026f0b19fdc13528df71 Mon Sep 17 00:00:00 2001 From: sD Date: Thu, 26 Dec 2019 18:58:46 +0100 Subject: this is unnecessary now --- webAO/client.js | 1 - 1 file changed, 1 deletion(-) diff --git a/webAO/client.js b/webAO/client.js index fa3f2dd..f9cdc52 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1415,7 +1415,6 @@ class Viewport { document.getElementById("client_gamewindow").style.animation = "shake 0.2s 1"; } else if (this.chatmsg.flash === "1") { // Flash screen - background.style.backgroundColor = "white"; this.sfxaudio.pause(); this.sfxplayed = 1; this.sfxaudio.src = AO_HOST + "sounds/general/sfx-realization.wav"; -- cgit