From 25d1704f2c435dc3486de55174ce917cd6b12878 Mon Sep 17 00:00:00 2001
From: Anders Nickelsen <anders.nickelsen@gmail.com>
Date: Wed, 20 Apr 2016 13:44:07 +0200
Subject: [PATCH 1/3] Fix engagements on stat charts.

---
 app/assets/javascripts/angular/directives/chart.js  |  8 ++++++--
 .../javascripts/angular/directives/macrochart.js    | 11 ++++++++---
 .../javascripts/angular/directives/protosschart.js  | 13 +++++++++----
 .../javascripts/angular/directives/terranchart.js   | 13 +++++++++----
 app/assets/javascripts/angular/resources/match.js   |  6 +++++-
 5 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/angular/directives/chart.js b/app/assets/javascripts/angular/directives/chart.js
index 2fdcec4..c644839 100644
--- a/app/assets/javascripts/angular/directives/chart.js
+++ b/app/assets/javascripts/angular/directives/chart.js
@@ -125,11 +125,15 @@ gg.directive('chart', ['$compile', function($compile) {
 
       if (scope.$parent.match.engagements) {
           options.xAxis.plotBands = [];
+          speed_multiplier = 1;
+          if (scope.$parent.match.expansion_tag == 'LotV') {
+            speed_multiplier = 1.4;
+          }
           _.each(scope.$parent.match.engagements, function(engagement) {
             options.xAxis.plotBands.push({
               color: 'rgba(150, 50, 50, 0.10)',
-              from: engagement[0] / 960.0,
-              to: engagement[1] / 960.0,
+              from: engagement[0] / 960.0 / speed_multiplier,
+              to: engagement[1] / 960.0 / speed_multiplier,
               zIndex: 10
             });
           });
diff --git a/app/assets/javascripts/angular/directives/macrochart.js b/app/assets/javascripts/angular/directives/macrochart.js
index a4168f8..bd87cb0 100644
--- a/app/assets/javascripts/angular/directives/macrochart.js
+++ b/app/assets/javascripts/angular/directives/macrochart.js
@@ -73,13 +73,18 @@ gg.directive('macrochart', [function() {
 
       };
 
+      speed_multiplier = 1;
+      if (scope.$parent.match.expansion_tag == 'LotV') {
+        speed_multiplier = 1.4;
+      }
+
       if (scope.$parent.match.engagements) {
           options.yAxis.plotBands = [];
           _.each(scope.$parent.match.engagements, function(engagement) {
             options.yAxis.plotBands.push({
               color: 'rgba(150, 50, 50, 0.1)',
-              from: engagement[0] / 960.0,
-              to: engagement[1] / 960.0,
+              from: engagement[0] / 960.0 / speed_multiplier,
+              to: engagement[1] / 960.0 / speed_multiplier,
               zIndex: 10
             });
           });
@@ -105,7 +110,7 @@ gg.directive('macrochart', [function() {
         for (i=0; i<hatches.length; i++) {
           times = hatches[i].times;
           for (inj=0; inj<times.length; inj++) {
-            hatchdata.push([i, times[inj] / (16.0 * 60.0), (times[inj] + 16 * 40)/(16.0 * 60.0)])
+            hatchdata.push([i, times[inj] / (16.0 * 60.0 * speed_multiplier), (times[inj] + 16 * 40)/(16.0 * 60.0 * speed_multiplier)])
           }
         }
         scope.chart.addSeries({
diff --git a/app/assets/javascripts/angular/directives/protosschart.js b/app/assets/javascripts/angular/directives/protosschart.js
index b9bc950..2dccafa 100644
--- a/app/assets/javascripts/angular/directives/protosschart.js
+++ b/app/assets/javascripts/angular/directives/protosschart.js
@@ -74,6 +74,11 @@ gg.directive('protosschart', [function() {
 
       macro = scope.match.pmacro;
 
+      speed_multiplier = 1;
+      if (scope.$parent.match.expansion_tag == 'LotV') {
+        speed_multiplier = 1.4;
+      }
+
       nametoshow = scope.$parent.entity.identity.name;
       idtoshow = scope.$parent.entity.identity.id;
       nexus_stats = macro[idtoshow];
@@ -85,7 +90,7 @@ gg.directive('protosschart', [function() {
         maxout_blob = nexus_stats[basenum][1];
         for (j=0; j<maxout_blob.length; j++) {
           maxout = maxout_blob[j]
-          maxouts.push([basenum, maxout[0] / (16.0 * 60.0), maxout[1] / (16.0 * 60.0)])
+          maxouts.push([basenum, maxout[0] / (16.0 * 60.0 * speed_multiplier), maxout[1] / (16.0 * 60.0 * speed_multiplier)])
         }
       }
 
@@ -101,8 +106,8 @@ gg.directive('protosschart', [function() {
           _.each(scope.$parent.match.engagements, function(engagement) {
             options.yAxis.plotBands.push({
               color: 'rgba(150, 50, 50, 0.1)',
-              from: engagement[0] / 960.0,
-              to: engagement[1] / 960.0,
+              from: engagement[0] / 960.0 / speed_multiplier,
+              to: engagement[1] / 960.0 / speed_multiplier,
               zIndex: 10
             });
           });
@@ -113,7 +118,7 @@ gg.directive('protosschart', [function() {
       for (basenum=0; basenum<numbases; basenum++) {
         chrono_blob = nexus_stats[basenum][0];
         for (chrono=0; chrono<chrono_blob.length; chrono++) {
-          chronoboosts.push([basenum, chrono_blob[chrono] / (16.0 * 60.0)]);
+          chronoboosts.push([basenum, chrono_blob[chrono] / (16.0 * 60.0 * speed_multiplier)]);
         }
       }
 
diff --git a/app/assets/javascripts/angular/directives/terranchart.js b/app/assets/javascripts/angular/directives/terranchart.js
index bed8047..1417569 100644
--- a/app/assets/javascripts/angular/directives/terranchart.js
+++ b/app/assets/javascripts/angular/directives/terranchart.js
@@ -74,6 +74,11 @@ gg.directive('terranchart', [function() {
 
       macro = scope.match.tmacro;
 
+      speed_multiplier = 1;
+      if (scope.$parent.match.expansion_tag == 'LotV') {
+        speed_multiplier = 1.4;
+      }
+
       nametoshow = scope.$parent.entity.identity.name;
       idtoshow = scope.$parent.entity.identity.id;
       base_stats = macro[idtoshow];
@@ -85,7 +90,7 @@ gg.directive('terranchart', [function() {
         maxout_blob = base_stats[basenum][3];
         for (j=0; j<maxout_blob.length; j++) {
           maxout = maxout_blob[j]
-          maxouts.push([basenum, maxout[0] / (16.0 * 60.0), maxout[1] / (16.0 * 60.0)])
+          maxouts.push([basenum, maxout[0] / (16.0 * 60.0 * speed_multiplier), maxout[1] / (16.0 * 60.0 * speed_multiplier)])
         }
       }
 
@@ -103,7 +108,7 @@ gg.directive('terranchart', [function() {
         for (basenum=0; basenum<numbases; basenum++) {
           ability_blob = base_stats[basenum][i];
           for (abilnum=0; abilnum<ability_blob.length; abilnum++) {
-            abilities.push([basenum, ability_blob[abilnum] / (16.0 * 60.0)]);
+            abilities.push([basenum, ability_blob[abilnum] / (16.0 * 60.0 * speed_multiplier)]);
           }
         }
 
@@ -133,8 +138,8 @@ gg.directive('terranchart', [function() {
           _.each(scope.$parent.match.engagements, function(engagement) {
             options.yAxis.plotBands.push({
               color: 'rgba(150, 50, 50, 0.1)',
-              from: engagement[0] / 960.0,
-              to: engagement[1] / 960.0,
+              from: engagement[0] / 960.0 / speed_multiplier,
+              to: engagement[1] / 960.0 / speed_multiplier,
               zIndex: 10
             });
           });
diff --git a/app/assets/javascripts/angular/resources/match.js b/app/assets/javascripts/angular/resources/match.js
index 3826be5..c9b8ba2 100644
--- a/app/assets/javascripts/angular/resources/match.js
+++ b/app/assets/javascripts/angular/resources/match.js
@@ -554,7 +554,11 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
         // don't graph the last base-time; its y-value is zero by definition
         _bases_x.pop();
 
-        _bases_x_minutes = _.map(_bases_x, function(_frame_x) { return _frame_x / 960.0 });
+        speed_multiplier = 1.0;
+        if (this.expansion_tag == 'LotV') {
+            speed_multiplier = Sc2.LOTV_SPEEDUP;
+        }
+        _bases_x_minutes = _.map(_bases_x, function(_frame_x) { return _frame_x / 960.0 / speed_multiplier });
 
         _series_y = [];
         _.each(_bases_x, function(_x) {

From f9d40cca7203b8b303de9c4fd5354be0047ccc16 Mon Sep 17 00:00:00 2001
From: Anders Nickelsen <anders.nickelsen@gmail.com>
Date: Wed, 20 Apr 2016 15:59:54 +0200
Subject: [PATCH 2/3] Use speedup constant instead of raw values so it can be
 changed later.

---
 app/assets/javascripts/angular/directives/chart.js        | 2 +-
 app/assets/javascripts/angular/directives/macrochart.js   | 2 +-
 app/assets/javascripts/angular/directives/protosschart.js | 2 +-
 app/assets/javascripts/angular/directives/terranchart.js  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/angular/directives/chart.js b/app/assets/javascripts/angular/directives/chart.js
index c644839..20b1f16 100644
--- a/app/assets/javascripts/angular/directives/chart.js
+++ b/app/assets/javascripts/angular/directives/chart.js
@@ -127,7 +127,7 @@ gg.directive('chart', ['$compile', function($compile) {
           options.xAxis.plotBands = [];
           speed_multiplier = 1;
           if (scope.$parent.match.expansion_tag == 'LotV') {
-            speed_multiplier = 1.4;
+            speed_multiplier = Sc2.LOTV_SPEEDUP;
           }
           _.each(scope.$parent.match.engagements, function(engagement) {
             options.xAxis.plotBands.push({
diff --git a/app/assets/javascripts/angular/directives/macrochart.js b/app/assets/javascripts/angular/directives/macrochart.js
index bd87cb0..3e4397c 100644
--- a/app/assets/javascripts/angular/directives/macrochart.js
+++ b/app/assets/javascripts/angular/directives/macrochart.js
@@ -75,7 +75,7 @@ gg.directive('macrochart', [function() {
 
       speed_multiplier = 1;
       if (scope.$parent.match.expansion_tag == 'LotV') {
-        speed_multiplier = 1.4;
+        speed_multiplier = Sc2.LOTV_SPEEDUP;
       }
 
       if (scope.$parent.match.engagements) {
diff --git a/app/assets/javascripts/angular/directives/protosschart.js b/app/assets/javascripts/angular/directives/protosschart.js
index 2dccafa..4f47e8b 100644
--- a/app/assets/javascripts/angular/directives/protosschart.js
+++ b/app/assets/javascripts/angular/directives/protosschart.js
@@ -76,7 +76,7 @@ gg.directive('protosschart', [function() {
 
       speed_multiplier = 1;
       if (scope.$parent.match.expansion_tag == 'LotV') {
-        speed_multiplier = 1.4;
+        speed_multiplier = Sc2.LOTV_SPEEDUP;
       }
 
       nametoshow = scope.$parent.entity.identity.name;
diff --git a/app/assets/javascripts/angular/directives/terranchart.js b/app/assets/javascripts/angular/directives/terranchart.js
index 1417569..e08b61e 100644
--- a/app/assets/javascripts/angular/directives/terranchart.js
+++ b/app/assets/javascripts/angular/directives/terranchart.js
@@ -76,7 +76,7 @@ gg.directive('terranchart', [function() {
 
       speed_multiplier = 1;
       if (scope.$parent.match.expansion_tag == 'LotV') {
-        speed_multiplier = 1.4;
+        speed_multiplier = Sc2.LOTV_SPEEDUP;
       }
 
       nametoshow = scope.$parent.entity.identity.name;

From 29995cb9bb8ec0543d982dcfa1b22125b4383d42 Mon Sep 17 00:00:00 2001
From: Anders Nickelsen <anders.nickelsen@gmail.com>
Date: Wed, 20 Apr 2016 16:10:19 +0200
Subject: [PATCH 3/3] Also fix minimap engagements.

---
 app/assets/javascripts/angular/directives/matchmap.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/angular/directives/matchmap.js b/app/assets/javascripts/angular/directives/matchmap.js
index 2dac1c1..05b4c87 100644
--- a/app/assets/javascripts/angular/directives/matchmap.js
+++ b/app/assets/javascripts/angular/directives/matchmap.js
@@ -44,7 +44,12 @@ gg.directive('matchmap', [function() {
         scope.context.lineWidth = 2;
 
 
-        nowIndex = Math.floor(999.0 * v / (scope.match.duration_seconds * 16));
+        speed_multiplier = 1;
+        if (scope.$parent.match.expansion_tag == 'LotV') {
+          speed_multiplier = Sc2.LOTV_SPEEDUP;
+        }
+
+        nowIndex = Math.floor(999.0 * v / (scope.match.duration_seconds * 16 * speed_multiplier));
         if (!scope.match.camera) return;
         cameraInfo = scope.match.camera[0];
         if (scope.match.locations)