Merge pull request dsjoerg#26 from nickelsen/lotv-saturation-benchmarks

Update saturation benchmarks for LotV

Author: dsjoerg

app/assets/javascripts/angular/resources/match.js

@@ -622,6 +622,11 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
               is_team: false
           }
 
+          speed_multiplier = 1
+          if (this.expansion_tag == 'LotV') {
+              speed_multiplier = Sc2.LOTV_SPEEDUP
+          }
+
           // Income and army graphs from summary
           // Graph data is already prepared currently, so we just have to add it
           if(entity.summary) {
@@ -633,11 +638,16 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
               if (entity.summary.upgradespendinggraph) {
                   this._series.summary_upgradespending.entities[_entity] = $.extend({data: entity.summary.upgradespendinggraph}, base_series);
               }
+
+              entity.summary.resource_collection_rate_adjusted = Math.round(entity.summary.resource_collection_rate*speed_multiplier)
           }
 
-          if(this.MineralsCurrent) {
-              this._series.replayincome.entities[_entity] = $.extend({data: statx(this.MineralsCollectionRate[entity.identity.id])}, base_series);
-              this._series.replaygasincome.entities[_entity] = $.extend({data: statx(this.VespeneCollectionRate[entity.identity.id])}, base_series);
+          if(this.MineralsCurrent && this.MineralsCurrent[entity.identity.id]) {
+              function getResourceCollectionRate(x) {
+                return x*speed_multiplier
+              }
+              this._series.replayincome.entities[_entity] = $.extend({data: statx(this.MineralsCollectionRate[entity.identity.id].map(getResourceCollectionRate))}, base_series);
+              this._series.replaygasincome.entities[_entity] = $.extend({data: statx(this.VespeneCollectionRate[entity.identity.id].map(getResourceCollectionRate))}, base_series);
               this._series.replaylost.entities[_entity] = $.extend({data: statx(this.Lost[entity.identity.id])}, base_series);
               this._series.replayminerals.entities[_entity] = $.extend({data: statx(this.MineralsCurrent[entity.identity.id])}, base_series);
               this._series.replaygas.entities[_entity] = $.extend({data: statx(this.VespeneCurrent[entity.identity.id])}, base_series);

app/views/home/econ_staircase.html

@@ -22,22 +22,22 @@
             <tbody>
               <tr><th>Saturation Speed</a></th><th ng-repeat="league in leagues"><span><league data-league="{{ league }}" data-size="small"></league></span></th></tr>
               <tr><td>
-                  <a href class="ggtipper2" title="When sixteen workers are mining from mineral patches, they gather 640 minerals per minute, which is the maximum income per worker.  This statistic shows when 640 minerals per minute income was first achieved." data-gravity="s">
-                    1 Base Mineral Income (640)</a></td><td ng-repeat="league in leagues">{{ es[league + key + '_mineral_saturation_1'][metric()] | minutes_seconds }}</td></tr> 
+                  <a href class="ggtipper2" title="When sixteen workers are mining from mineral patches, they gather 870 minerals per minute, which is the maximum income per worker.  This statistic shows when 870 minerals per minute income was first achieved." data-gravity="s">
+                    1 Base Mineral Income (870)</a></td><td ng-repeat="league in leagues">{{ es[league + key + '_mineral_saturation_1'][metric()] | minutes_seconds }}</td></tr> 
               <tr><td>
                   <a href class="ggtipper2" title="
 This statistic measures how long it takes from when the second mining base is
-completed, to when 2x640 = 1280 minerals per minute income is achieved." data-gravity="s">
-                  Time from 2nd Base Complete to 2 Base Mineral Income (1280)</a></td>
+completed, to when 2x870 = 1740 minerals per minute income is achieved." data-gravity="s">
+                  Time from 2nd Base Complete to 2 Base Mineral Income (1740)</a></td>
                 <td ng-repeat="league in leagues">
                   {{ es[league + key + '_mdelta2'][metric()] | minutes_seconds  }}
                 </td>
               </tr>
               <tr><td>
                   <a href class="ggtipper2" title="
 This statistic measures how long it take from when the third mining base is
-completed to when 3x640 = 1920 minerals per minute income is achieved." data-gravity="s">
-                  Time from 3rd Base Complete to 3 Base Mineral Income (1920)</a></td>
+completed to when 3x870 = 2610 minerals per minute income is achieved." data-gravity="s">
+                  Time from 3rd Base Complete to 3 Base Mineral Income (2610)</a></td>
                 <td ng-repeat="league in leagues">
                   {{ es[league + key + '_mdelta3'][metric()] | minutes_seconds }}
                 </td>

app/views/home/economy_stats.html

@@ -38,22 +38,22 @@
                 </td><td ng-repeat="league in leagues">{{ es[key][league].miningbase_3 | minutes_seconds}}</td></tr>
               <tr><th>Saturation Speed</a></th><th ng-repeat="league in leagues"></th></tr>
               <tr><td>
-                  <a href class="ggtipper2" title="When sixteen workers are mining from mineral patches, they gather 640 minerals per minute, which is the maximum income per worker.  This statistic shows when 640 minerals per minute income was first achieved." data-gravity="s">
-                    1 Base Mineral Income (640)</a></td><td ng-repeat="league in leagues">{{ es[key][league].mineral_saturation_1 | minutes_seconds }}</td></tr>
+                  <a href class="ggtipper2" title="When sixteen workers are mining from mineral patches, they gather 870 minerals per minute, which is the maximum income per worker.  This statistic shows when 870 minerals per minute income was first achieved." data-gravity="s">
+                    1 Base Mineral Income (870)</a></td><td ng-repeat="league in leagues">{{ es[key][league].mineral_saturation_1 | minutes_seconds }}</td></tr>
               <tr><td>
                   <a href class="ggtipper2" title="
 This statistic measures how long it takes from when the second mining base is
-completed, to when 2x640 = 1280 minerals per minute income is achieved." data-gravity="s">
-                  Time from 2nd Base Complete to 2 Base Mineral Income (1280)</a></td>
+completed, to when 2x870 = 1740 minerals per minute income is achieved." data-gravity="s">
+                  Time from 2nd Base Complete to 2 Base Mineral Income (1740)</a></td>
                 <td ng-repeat="league in leagues">
                   {{ es[key][league].mdelta2 | minutes_seconds  }}
                 </td>
               </tr>
               <tr><td>
                   <a href class="ggtipper2" title="
 This statistic measures how long it take from when the third mining base is
-completed to when 3x640 = 1920 minerals per minute income is achieved." data-gravity="s">
-                  Time from 3rd Base Complete to 3 Base Mineral Income (1920)</a></td>
+completed to when 3x870 = 2610 minerals per minute income is achieved." data-gravity="s">
+                  Time from 3rd Base Complete to 3 Base Mineral Income (2610)</a></td>
                 <td ng-repeat="league in leagues">
                   {{ es[key][league].mdelta3 | minutes_seconds }}
                 </td>

app/views/home/economy_stats2.html

@@ -37,22 +37,22 @@
                 </td><td ng-repeat="matchup in matchups">{{ es[matchup][league].miningbase_3 | minutes_seconds}}</td></tr>
               <tr><th>Saturation Speed</a></th><th ng-repeat="matchup in matchups"></th></tr>
               <tr><td>
-                  <a href class="ggtipper2" title="When sixteen workers are mining from mineral patches, they gather 640 minerals per minute, which is the maximum income per worker.  This statistic shows when 640 minerals per minute income was first achieved." data-gravity="s">
-                    1 Base Mineral Income (640)</a></td><td ng-repeat="matchup in matchups">{{ es[matchup][league].mineral_saturation_1 | minutes_seconds }}</td></tr>
+                  <a href class="ggtipper2" title="When sixteen workers are mining from mineral patches, they gather 870 minerals per minute, which is the maximum income per worker.  This statistic shows when 870 minerals per minute income was first achieved." data-gravity="s">
+                    1 Base Mineral Income (870)</a></td><td ng-repeat="matchup in matchups">{{ es[matchup][league].mineral_saturation_1 | minutes_seconds }}</td></tr>
               <tr><td>
                   <a href class="ggtipper2" title="
 This statistic measures how long it takes from when the second mining base is
-completed, to when 2x640 = 1280 minerals per minute income is achieved." data-gravity="s">
-                  Time from 2nd Base Complete to 2 Base Mineral Income (1280)</a></td>
+completed, to when 2x870 = 1740 minerals per minute income is achieved." data-gravity="s">
+                  Time from 2nd Base Complete to 2 Base Mineral Income (1740)</a></td>
                 <td ng-repeat="matchup in matchups">
                   {{ es[matchup][league].mdelta2 | minutes_seconds  }}
                 </td>
               </tr>
               <tr><td>
                   <a href class="ggtipper2" title="
 This statistic measures how long it take from when the third mining base is
-completed to when 3x640 = 1920 minerals per minute income is achieved." data-gravity="s">
-                  Time from 3rd Base Complete to 3 Base Mineral Income (1920)</a></td>
+completed to when 3x870 = 2610 minerals per minute income is achieved." data-gravity="s">
+                  Time from 3rd Base Complete to 3 Base Mineral Income (2610)</a></td>
                 <td ng-repeat="matchup in matchups">
                   {{ es[matchup][league].mdelta3 | minutes_seconds }}
                 </td>

app/views/home/saturation_speed.html

@@ -8,9 +8,9 @@
     <div class="static_inner">
       <h1>What is Saturation Speed?</h1>
 <p><b>Saturation Speed</b> measures how quickly you can ramp up your economy.  Higher-league players tend to be faster than lower-league players.  Although there are strategic reasons in particular games why you might delay your economy, on average higher-league players do get their economy up faster.  You can use Saturation Speed to keep tabs on the economic side of your game.</p>
-<p>Your <b>1st Base Saturation Speed</b> measures how quickly you can get to 640 mineral income.  That's the income you get from 16 workers mining minerals.  After the 16th worker, any additional workers do not mine as quickly.</p>
-<p>Your <b>2nd Base Saturation Speed</b> measures how quickly you can go from having your 2nd base complete, and in mining position, to having 1280 (2x640) mineral income.</p>
-<p>Your <b>3rd Base Saturation Speed</b> measures how quickly you can go from having your 3rd base complete, and in mining position, to having 1920 (3x640) mineral income.</p>
+<p>Your <b>1st Base Saturation Speed</b> measures how quickly you can get to 870 mineral income.  That's the income you get from 16 workers mining minerals.  After the 16th worker, any additional workers do not mine as quickly.</p>
+<p>Your <b>2nd Base Saturation Speed</b> measures how quickly you can go from having your 2nd base complete, and in mining position, to having 1740 (2x870) mineral income.</p>
+<p>Your <b>3rd Base Saturation Speed</b> measures how quickly you can go from having your 3rd base complete, and in mining position, to having 2610 (3x870) mineral income.</p>
 <br>
 <h1>How Can I See My Saturation Speed?</h1>
 <p>On any match page, click on the Economy button:</p>

app/views/matches/show.html.erb

@@ -137,7 +137,7 @@
               </td>
               <td ng-hide='match.entities[0].summary.workers_created == null'>{{ entity.summary.workers_created }}</td>
               <td>{{ entity.summary.structures_built }}</td>
-              <td>{{ entity.summary.resource_collection_rate }}</td>
+              <td>{{ entity.summary.resource_collection_rate_adjusted }}</td>
               <td>{{ entity.summary.average_unspent_resources }}</td>
               <td class="league"><a href class="ggtipper2" title="SQ: {{ entity.summary.spending_quotient.toFixed(0) }}"><league data-league="{{ entity.summary.spending_skill }}"></league></a></td>
               <td>{{ entity.summary.units_trained }}</td>
@@ -177,8 +177,8 @@
               </tr>
               <tr>
                 <td>
-                  <a href class="ggtipper2" title="When sixteen workers are mining from mineral patches, they gather 640 minerals per minute, which is the maximum income per worker.  This statistic shows when 640 minerals per minute income was first achieved." data-gravity="s">
-                    1 Base Mineral Income (640)</a>
+                  <a href class="ggtipper2" title="When sixteen workers are mining from mineral patches, they gather 870 minerals per minute, which is the maximum income per worker.  This statistic shows when 870 minerals per minute income was first achieved." data-gravity="s">
+                    1 Base Mineral Income (870)</a>
                 </td>
                 <td ng-repeat="entity in match.doubleents" ng-show="$index % 2 == 0 || user.view_mode == 1">
                   <span ng-show="$index % 2 == 0">{{ entity.stats.mineral_saturation_1 | minutes_seconds }}</span>
@@ -187,8 +187,8 @@
               <tr><td>
                   <a href class="ggtipper2" title="
 This statistic measures how long it takes from when the second mining base is
-completed, to when 2x640 = 1280 minerals per minute income is achieved." data-gravity="s">
-                  Time from 2nd Base Complete to 2 Base Mineral Income (1280)</a></td>
+completed, to when 2x870 = 1760 minerals per minute income is achieved." data-gravity="s">
+                  Time from 2nd Base Complete to 2 Base Mineral Income (1760)</a></td>
                 <td ng-repeat="entity in match.doubleents" ng-show="$index % 2 == 0 || user.view_mode == 1">
                   <span ng-show="$index % 2 == 0">{{ entity.mdelta2() | minutes_seconds  }}</span>
                   <span ng-show="$index % 2 == 1" ><league data-league="{{ entity.sat_2_skill }}"></league></span>
@@ -197,8 +197,8 @@ completed, to when 2x640 = 1280 minerals per minute income is achieved." data-gr
               <tr><td>
                   <a href class="ggtipper2" title="
 This statistic measures how long it take from when the third mining base is
-completed to when 3x640 = 1920 minerals per minute income is achieved." data-gravity="s">
-                  Time from 3rd Base Complete to 3 Base Mineral Income (1920)</a></td>
+completed to when 3x870 = 2610 minerals per minute income is achieved." data-gravity="s">
+                  Time from 3rd Base Complete to 3 Base Mineral Income (2610)</a></td>
                 <td ng-repeat="entity in match.doubleents" ng-show="$index % 2 == 0 || user.view_mode == 1">
                   <span ng-show="$index % 2 == 0">{{ entity.mdelta3() | minutes_seconds  }}</span>
                   <span ng-show="$index % 2 == 1" ><league data-league="{{ entity.sat_3_skill }}"></league></span>
@@ -258,7 +258,7 @@ completed to when 3x640 = 1920 minerals per minute income is achieved." data-gra
     <% if @match.replays_count > 0 %>
       <chart id="num_bases" class="djcloak grid_1" ng-show="$parent.match.num_bases.length > 0" data-series="match.series.bases.combined" data-condensed="condensed">
         <span class="title">
-          <a href class="ggtipper2" title="Number of bases.<br><br>Bases are considered alive 100 seconds after the build command (worker travel time is ignored).<br><br>They are considered dead after the last time they are selected." data-gravity="n">bases</a>
+          <a href class="ggtipper2" title="Number of bases.<br><br>Bases are considered alive 71 seconds after the build command (worker travel time is ignored).<br><br>They are considered dead after the last time they are selected." data-gravity="n">bases</a>
         </span>
       </chart>
 <macrochart class="grid_1" match="match" ng-show="show" ng-repeat="entity in match.race_entities('Z')">