1 files changed, 32 insertions, 9 deletions

diff --git a/webAO/client.js b/webAO/client.js
index dfba169..62c343e 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -485,6 +485,7 @@ class Client extends EventEmitter {
     if (extrafeatures.length == 0 && this.banned === false) {
       document.getElementById('client_errortext').textContent = 'Could not connect to the server';
     }
+    document.getElementById('client_waiting').style.display = 'block';
     document.getElementById('client_error').style.display = 'flex';
     document.getElementById('client_loading').style.display = 'none';
     document.getElementById('error_id').textContent = e.code;
@@ -872,6 +873,7 @@ class Client extends EventEmitter {
     for (let i = 2; i <= args.length - 2; i++) {
       if (i % 2 === 0) {
         document.getElementById('client_loadingtext').innerHTML = `Loading Character ${args[1]}/${this.char_list_length}`;
+        document.getElementById('client_loadingbar').value = charid;
         const chargs = args[i].split('&');
         const charid = args[i - 1];
         setTimeout(() => this.handleCharacterInfo(chargs, charid), 500);
@@ -889,15 +891,18 @@ class Client extends EventEmitter {
   async handleSC(args) {
     const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 
-    // Add this so people can see characters loading on the screen.
-    document.getElementById('client_loading').style.display = 'none';
-    document.getElementById('client_charselect').style.display = 'block';
+    if (mode === 'watch') {		// Spectators don't need to pick a character
+      document.getElementById('client_charselect').style.display = 'none';
+    } else {
+      document.getElementById('client_charselect').style.display = 'block';
+    }
 
     document.getElementById('client_loadingtext').innerHTML = 'Loading Characters';
     for (let i = 1; i < args.length; i++) {
       document.getElementById('client_loadingtext').innerHTML = `Loading Character ${i}/${this.char_list_length}`;
       const chargs = args[i].split('&');
       const charid = i - 1;
+      document.getElementById('client_loadingbar').value = charid;
       await sleep(0.1); // TODO: Too many network calls without this. net::ERR_INSUFFICIENT_RESOURCES
       this.handleCharacterInfo(chargs, charid);
     }
@@ -909,12 +914,24 @@ class Client extends EventEmitter {
 	 * Handles incoming evidence information, containing only one evidence
 	 * item per packet.
 	 *
-	 * Mostly unimplemented in webAO.
+	 * EI#id#name&description&type&image&##%    
+	 *
 	 * @param {Array} args packet arguments
 	 */
   handleEI(args) {
     document.getElementById('client_loadingtext').innerHTML = `Loading Evidence ${args[1]}/${this.evidence_list_length}`;
-    this.sendServer('RM#%');
+    const evidenceID = args[1];
+    document.getElementById('client_loadingbar').value = this.char_list_length + evidenceID;
+    
+    const arg = args[2].split('&');
+      this.evidences[evidenceID] = {
+        name: prepChat(arg[0]),
+        desc: prepChat(arg[1]),
+        filename: safeTags(arg[3]),
+        icon: `${AO_HOST}evidence/${encodeURI(arg[3].toLowerCase())}`,
+      };
+    
+    this.sendServer('AE'+(evidenceID+1)+'#%');
   }
 
   /**
@@ -926,6 +943,7 @@ class Client extends EventEmitter {
   handleLE(args) {
     this.evidences = [];
     for (let i = 1; i < args.length - 1; i++) {
+      document.getElementById('client_loadingbar').value = this.char_list_length + i;
       const arg = args[i].split('&');
       this.evidences[i - 1] = {
         name: prepChat(arg[0]),
@@ -1078,9 +1096,9 @@ class Client extends EventEmitter {
 
     for (let i = 2; i < args.length - 1; i++) {
       if (i % 2 === 0) {
-        document.getElementById('client_loadingtext').innerHTML = `Loading Music ${args[1]}/${this.music_list_length}`;
         const trackname = safeTags(args[i]);
         const trackindex = args[i - 1];
+        document.getElementById('client_loadingbar').value = this.char_list_length + this.evidence_list_length + trackindex;
         if (this.musics_time) {
                 	this.addTrack(trackname);
             	} else if (this.isAudio(trackname)) {
@@ -1113,6 +1131,7 @@ class Client extends EventEmitter {
       const trackname = safeTags(args[i]);
       const trackindex = i - 1;
       document.getElementById('client_loadingtext').innerHTML = `Loading Music ${i}/${this.music_list_length}`;
+      document.getElementById('client_loadingbar').value = this.char_list_length + this.evidence_list_length + i;
       if (this.musics_time) {
         this.addTrack(trackname);
       } else if (this.isAudio(trackname)) {
@@ -1219,7 +1238,7 @@ class Client extends EventEmitter {
   handleDONE(_args) {
     document.getElementById('client_loading').style.display = 'none';
     if (mode === 'watch') {		// Spectators don't need to pick a character
-      document.getElementById('client_charselect').style.display = 'none';
+      document.getElementById('client_waiting').style.display = 'none';
     }
   }
 
@@ -1472,6 +1491,8 @@ class Client extends EventEmitter {
     this.char_list_length += 1; // some servers count starting from 0 some from 1...
     this.evidence_list_length = Number(args[2]);
     this.music_list_length = Number(args[3]);
+    
+    document.getElementById('client_loadingbar').max = this.char_list_length + this.evidence_list_length + this.music_list_length;
 
     // create the charselect grid, to be filled by the character loader
     document.getElementById('client_chartable').innerHTML = '';
@@ -1515,6 +1536,7 @@ class Client extends EventEmitter {
 	 */
   async handlePV(args) {
     this.charID = Number(args[3]);
+    document.getElementById('client_waiting').style.display = 'none';
     document.getElementById('client_charselect').style.display = 'none';
 
     const me = this.chars[this.charID];
@@ -2582,6 +2604,7 @@ window.switchChatOffset = switchChatOffset;
  * @param {MouseEvent} event
  */
 export function changeCharacter(_event) {
+  document.getElementById('client_waiting').style.display = 'block';
   document.getElementById('client_charselect').style.display = 'block';
   document.getElementById('client_emo').innerHTML = '';
 }
@@ -2635,9 +2658,8 @@ window.opusCheck = opusCheck;
 export function ReconnectButton() {
   client.cleanup();
   client = new Client(serverIP);
+  
   if (client) {
-    mode = 'join'; // HACK: see client.onOpen
-
     document.getElementById('client_error').style.display = 'none';
   }
 }
@@ -2730,6 +2752,7 @@ window.chartable_filter = chartable_filter;
 export function pickChar(ccharacter) {
   if (ccharacter === -1) {
     // Spectator
+    document.getElementById('client_waiting').style.display = 'none';
     document.getElementById('client_charselect').style.display = 'none';
   } else {
     client.sendCharacter(ccharacter);