diff options
Diffstat (limited to 'webAO')
| -rw-r--r-- | webAO/client.ts | 4 | ||||
| -rw-r--r-- | webAO/dom/cancelEvidence.ts | 4 | ||||
| -rw-r--r-- | webAO/dom/deleteEvidence.ts | 2 | ||||
| -rw-r--r-- | webAO/dom/editEvidence.ts | 2 | ||||
| -rw-r--r-- | webAO/dom/onEnter.ts | 2 | ||||
| -rw-r--r-- | webAO/dom/pickEvidence.ts | 10 | ||||
| -rw-r--r-- | webAO/packets/handlers/handleLE.ts | 12 | ||||
| -rw-r--r-- | webAO/styles/classic.css | 1 |
8 files changed, 20 insertions, 17 deletions
diff --git a/webAO/client.ts b/webAO/client.ts index 619955a..ebfb36f 100644 --- a/webAO/client.ts +++ b/webAO/client.ts @@ -190,7 +190,7 @@ class Client extends EventEmitter { this.manifest = []; this.resources = getResources(AO_HOST, theme); this.selectedEmote = -1; - this.selectedEvidence = 0; + this.selectedEvidence = -1; this.checkUpdater = null; this.sender = sender this.viewport = masterViewport(); @@ -221,7 +221,7 @@ class Client extends EventEmitter { get evidence() { return document.getElementById("button_present").classList.contains("dark") ? this.selectedEvidence - : 0; + : -1; } /** diff --git a/webAO/dom/cancelEvidence.ts b/webAO/dom/cancelEvidence.ts index a906613..05910f8 100644 --- a/webAO/dom/cancelEvidence.ts +++ b/webAO/dom/cancelEvidence.ts @@ -8,11 +8,11 @@ import { AO_HOST } from "../client/aoHost"; */ export function cancelEvidence() { // Clear evidence data - if (client.selectedEvidence > 0) { + if (client.selectedEvidence >= 0) { document.getElementById(`evi_${client.selectedEvidence}`)!.className = "evi_icon"; } - client.selectedEvidence = 0; + client.selectedEvidence = -1; // Clear evidence on information window (<HTMLSelectElement>document.getElementById("evi_select")).selectedIndex = 0; diff --git a/webAO/dom/deleteEvidence.ts b/webAO/dom/deleteEvidence.ts index cd299e4..764b9e5 100644 --- a/webAO/dom/deleteEvidence.ts +++ b/webAO/dom/deleteEvidence.ts @@ -5,7 +5,7 @@ import { cancelEvidence } from "./cancelEvidence"; * Delete selected evidence. */ export function deleteEvidence() { - const id = client.selectedEvidence - 1; + const id = client.selectedEvidence; client.sender.sendDE(id); cancelEvidence(); } diff --git a/webAO/dom/editEvidence.ts b/webAO/dom/editEvidence.ts index 931caad..80ce350 100644 --- a/webAO/dom/editEvidence.ts +++ b/webAO/dom/editEvidence.ts @@ -8,7 +8,7 @@ export function editEvidence() { const evidence_select = <HTMLSelectElement>( document.getElementById("evi_select") ); - const id = client.selectedEvidence - 1; + const id = client.selectedEvidence; client.sender.sendEE( id, (<HTMLInputElement>document.getElementById("evi_name")).value, diff --git a/webAO/dom/onEnter.ts b/webAO/dom/onEnter.ts index 4948783..65bfa37 100644 --- a/webAO/dom/onEnter.ts +++ b/webAO/dom/onEnter.ts @@ -9,7 +9,7 @@ export function onEnter(event: KeyboardEvent) { if (event.keyCode === 13) { const mychar = client.character; const myemo = client.emote; - const evi = client.evidence; + const evi = client.evidence + 1; const flip = Boolean( document.getElementById("button_flip")!.classList.contains("dark") ); diff --git a/webAO/dom/pickEvidence.ts b/webAO/dom/pickEvidence.ts index 411acc1..e4c86fa 100644 --- a/webAO/dom/pickEvidence.ts +++ b/webAO/dom/pickEvidence.ts @@ -10,7 +10,7 @@ import { getIndexFromSelect } from './getIndexFromSelect' export function pickEvidence(evidence: number) { if (client.selectedEvidence !== evidence) { // Update selected evidence - if (client.selectedEvidence > 0) { + if (client.selectedEvidence >= 0) { document.getElementById(`evi_${client.selectedEvidence}`)!.className = "evi_icon"; } @@ -19,20 +19,20 @@ export function pickEvidence(evidence: number) { // Show evidence on information window (<HTMLInputElement>document.getElementById("evi_name")).value = - client.evidences[evidence - 1].name; + client.evidences[evidence].name; (<HTMLInputElement>document.getElementById("evi_desc")).value = - client.evidences[evidence - 1].desc; + client.evidences[evidence].desc; // Update icon const icon_id = getIndexFromSelect( "evi_select", - client.evidences[evidence - 1].filename + client.evidences[evidence].filename ); (<HTMLSelectElement>document.getElementById("evi_select")).selectedIndex = icon_id; if (icon_id === 0) { (<HTMLInputElement>document.getElementById("evi_filename")).value = - client.evidences[evidence - 1].filename; + client.evidences[evidence].filename; } updateEvidenceIcon(); diff --git a/webAO/packets/handlers/handleLE.ts b/webAO/packets/handlers/handleLE.ts index 97cf979..7291cd6 100644 --- a/webAO/packets/handlers/handleLE.ts +++ b/webAO/packets/handlers/handleLE.ts @@ -10,7 +10,9 @@ import { prepChat, safeTags } from '../../encoding'; */ export const handleLE = (args: string[]) => { client.evidences = []; - for (let i = 1; i < args.length - 1; i++) { + for (let i = 1; i < args.length; i++) { + if (!args[i].includes("&")) + break; const arg = args[i].split("&"); client.evidences[i - 1] = { name: prepChat(arg[0]), @@ -20,14 +22,14 @@ export const handleLE = (args: string[]) => { }; } - const evidence_box = document.getElementById("evidences")!; + const evidence_box = document.getElementById("evidences"); evidence_box.innerHTML = ""; - for (let i = 1; i <= client.evidences.length; i++) { + for (let i = 0; i <= client.evidences.length-1; i++) { const evi_item = new Image(); evi_item.id = "evi_"+i; evi_item.className = "evi_icon" - evi_item.src = client.evidences[i - 1].icon; - evi_item.alt = client.evidences[i - 1].name; + evi_item.src = client.evidences[i].icon; + evi_item.alt = client.evidences[i].name; evi_item.onclick = () => { window.pickEvidence(i) } evidence_box.appendChild(evi_item); } diff --git a/webAO/styles/classic.css b/webAO/styles/classic.css index 241f8a1..d3199cd 100644 --- a/webAO/styles/classic.css +++ b/webAO/styles/classic.css @@ -104,6 +104,7 @@ hr { border: 2px ridge #dec6bd; border-radius: 2px; margin-bottom: 2px; + line-height: 1.5; } .client_button { |