From 00dfd4ff2a44ea7dfc7c7bda0e5aa8e6769c0802 Mon Sep 17 00:00:00 2001 From: sD Date: Fri, 27 Dec 2019 19:51:17 +0100 Subject: ebidense --- webAO/client.css | 12 ++++++++---- webAO/client.html | 8 ++++---- webAO/client.js | 35 +++++++++++++++++++---------------- 3 files changed, 31 insertions(+), 24 deletions(-) (limited to 'webAO') diff --git a/webAO/client.css b/webAO/client.css index a5db488..be80855 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -367,10 +367,14 @@ img { height: auto; } -#evi_icon { - background-image: url("/misc/empty.png"); - background-repeat: no-repeat; - background-size: contain; +.evi_icon { + width: 70px; + height: 70px; + background-color: #787878; + outline-color:#886060; + outline-width: 1px; + outline-style: inset; + outline-offset: -1px; } #evi_options { diff --git a/webAO/client.html b/webAO/client.html index 57e7827..71e2e86 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -27,7 +27,7 @@ Character Various overlay - Character Evidence Shout overlay
@@ -189,7 +189,7 @@
Information
- Evidence Icon + Evidence Icon
@@ -262,7 +262,7 @@

+ onclick="changeCharacter()">Change Character
@@ -301,7 +301,7 @@ - +

webAO

version 2.4

Client created by diff --git a/webAO/client.js b/webAO/client.js index 5b58d10..4e04ba5 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -341,6 +341,7 @@ class Client extends EventEmitter { // Load evidence array to select const evidence_select = document.getElementById("evi_select"); evidence_select.add(new Option("Custom", 0)); + console.log(evidence_arr); evidence_arr.forEach(evidence => { evidence_select.add(new Option(evidence)); }); @@ -681,7 +682,7 @@ class Client extends EventEmitter { evidence_box.innerHTML += `${this.evidences[i - 1].name}`; } } @@ -1381,7 +1382,7 @@ class Viewport { chatBox.style.display = "none"; chatBoxInner.className = ""; eviBox.style.opacity = "0"; - eviBox.style.height = "0%"; + eviBox.style.height = "0"; const shouts = [ undefined, "holdit", @@ -1453,19 +1454,20 @@ class Viewport { if (this.chatmsg.startspeaking) { if (this.chatmsg.evidence > 0) { // Prepare evidence - eviBox.style.backgroundImage = "url('" + client.evidences[this.chatmsg.evidence - 1].icon + "')"; + eviBox.src = safe_tags(client.evidences[this.chatmsg.evidence - 1].icon); + + eviBox.style.width = "auto"; + eviBox.style.height = "30%"; + eviBox.style.opacity = 1; if (this.chatmsg.side === "def") { // Only def show evidence on right eviBox.style.right = "1.5em"; eviBox.style.left = "initial"; - eviBox.style.height = "30%"; - eviBox.style.opacity = 1; - } else { + } else { eviBox.style.right = "initial"; eviBox.style.left = "1.5em"; - eviBox.style.height = "30%"; - eviBox.style.opacity = 1; + } } @@ -2047,13 +2049,14 @@ window.pickEmotion = pickEmotion; * Highlights and selects an evidence for in-character chat. * @param {string} evidence the evidence to be presented */ -export function pickEvidence(evidence) { +export function pickEvidence(evidenceID) { + const evidence = Number(evidenceID); if (client.selectedEvidence !== evidence) { //Update selected evidence if (client.selectedEvidence > 0) { - document.getElementById("evi_" + client.selectedEvidence).className = "client_button"; + document.getElementById("evi_" + client.selectedEvidence).className = "evi_icon"; } - document.getElementById("evi_" + evidence).className = "client_button dark"; + document.getElementById("evi_" + evidence).className = "evi_icon dark"; client.selectedEvidence = evidence; // Show evidence on information window @@ -2127,7 +2130,7 @@ window.deleteEvidence = deleteEvidence; export function cancelEvidence() { //Clear evidence data if (client.selectedEvidence > 0) { - document.getElementById("evi_" + client.selectedEvidence).className = "client_button"; + document.getElementById("evi_" + client.selectedEvidence).className = "evi_icon"; } client.selectedEvidence = 0; @@ -2137,7 +2140,7 @@ export function cancelEvidence() { document.getElementById("evi_filename").value = ""; document.getElementById("evi_name").value = ""; document.getElementById("evi_desc").value = ""; - document.getElementById("evi_icon").style.backgroundImage = "url('misc/empty.png')"; //Clear icon + document.getElementById("evi_preview").src = "misc/empty.png"; //Clear icon // Update button document.getElementById("evi_add").className = "client_button hover_button"; @@ -2170,14 +2173,14 @@ window.getIndexFromSelect = getIndexFromSelect; export function updateEvidenceIcon() { const evidence_select = document.getElementById("evi_select"); const evidence_filename = document.getElementById("evi_filename"); - const evidence_iconbox = document.getElementById("evi_icon"); + const evidence_iconbox = document.getElementById("evi_preview"); if (evidence_select.selectedIndex === 0) { evidence_filename.style.display = "initial"; - evidence_iconbox.style.backgroundImage = `url(${AO_HOST}evidence/${encodeURI(evidence_filename.value.toLowerCase())})`; + evidence_iconbox.src = AO_HOST + "evidence/" + encodeURI(evidence_filename.value.toLowerCase()); } else { evidence_filename.style.display = "none"; - evidence_iconbox.style.backgroundImage = `url(${AO_HOST}evidence/${encodeURI(evidence_select.value.toLowerCase())})`; + evidence_iconbox.src = AO_HOST + "evidence/" + encodeURI(evidence_select.value.toLowerCase()); } } window.updateEvidenceIcon = updateEvidenceIcon; -- cgit