Merge pull request #149 from battlecode/minor-tournament-client-fixes

Minor client tournament mode fixes

Author: pv711

client/visualizer/src/gamearea/renderer.ts

@@ -194,7 +194,7 @@ export default class Renderer {
       if (effect.type == 'destabilize') {
         color = effect.turns_remaining == 0 ? "#D53E432F" : "#573f5e2F"
       }
-      if (effect.type == 'boost' || true) {
+      if (effect.type == 'boost') {
         color = "#00F0000F"
       }
       this.drawCircle(effect.x, height - effect.y - 1, 25, color, cst.TEAM_COLORS[effect.team])

client/visualizer/src/runner.ts

@@ -441,6 +441,14 @@ export default class Runner {
       infoString += `<br>`
       infoString += `Score: <b class="red">${wins[this.tournament.current().team1]}</b> - <b class="blue">${wins[this.tournament.current().team2]}</b>`
     }
+    if (this.conf.tournamentMode) {
+      const team1 = this.games[this.currentGame].meta.teams[1].name
+      const team2 = this.games[this.currentGame].meta.teams[2].name
+      const wins = this.getCurrentWins(team1, team2, this.currentMatch - 1)
+      infoString += `Map: <b>${this.games[this.currentGame].getMatch(this.currentMatch).current.mapStats.name}</b>`
+      infoString += `<br>`
+      infoString += `Score: <b class="red">${wins[team1]}</b> - <b class="blue">${wins[team2]}</b>`
+    }
 
     this.looper = new Looper(match, meta, this.conf, this.imgs,
       this.controls, this.stats, this.gamearea, this.console, this.matchqueue, this.profiler, infoString,

client/visualizer/src/sidebar/stats.ts

@@ -457,24 +457,24 @@ export default class Stats {
     this.maxVotes = 750;
 
     this.div.appendChild(document.createElement("br"));
-    if (this.conf.tournamentMode) {
-      // FOR TOURNAMENT
-      this.tourneyUpload = document.createElement('div');
+    // if (this.conf.tournamentMode) {
+    //   // FOR TOURNAMENT
+    //   this.tourneyUpload = document.createElement('div');
 
-      let uploadButton = this.runner.getUploadButton();
-      let tempdiv = document.createElement("div");
-      tempdiv.className = "upload-button-div";
-      tempdiv.appendChild(uploadButton);
-      this.tourneyUpload.appendChild(tempdiv);
-
-      // add text input field
-      this.tourIndexJump.type = "text";
-      this.tourIndexJump.onkeyup = (e) => { this.tourIndexJumpFun(e) };
-      this.tourIndexJump.onchange = (e) => { this.tourIndexJumpFun(e) };
-      this.tourneyUpload.appendChild(this.tourIndexJump);
-
-      this.div.appendChild(this.tourneyUpload);
-    }
+    //   let uploadButton = this.runner.getUploadButton();
+    //   let tempdiv = document.createElement("div");
+    //   tempdiv.className = "upload-button-div";
+    //   tempdiv.appendChild(uploadButton);
+    //   this.tourneyUpload.appendChild(tempdiv);
+
+    //   // add text input field
+    //   this.tourIndexJump.type = "text";
+    //   this.tourIndexJump.onkeyup = (e) => { this.tourIndexJumpFun(e) };
+    //   this.tourIndexJump.onchange = (e) => { this.tourIndexJumpFun(e) };
+    //   this.tourneyUpload.appendChild(this.tourIndexJump);
+
+    //   this.div.appendChild(this.tourneyUpload);
+    // }
 
     this.extraInfo = document.createElement('div');
     this.extraInfo.className = "extra-info";