Skip to content

Display base completion and saturation times on LotV time-scale. #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 28, 2017
Merged

Display base completion and saturation times on LotV time-scale. #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions app/assets/javascripts/angular/resources/match.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,20 +103,20 @@ Entity.prototype.race_macro_pretty = function() {

Entity.prototype.mdelta2 = function() {
if (this.stats == null ||
this.stats.mineral_saturation_2 == null ||
this.stats.miningbase_2 == null) {
this.stats.mineral_saturation_2_adjusted == null ||
this.stats.miningbase_2_adjusted == null) {
return null;
}
return Math.max(0, this.stats.mineral_saturation_2 - this.stats.miningbase_2);
return Math.max(0, this.stats.mineral_saturation_2_adjusted - this.stats.miningbase_2_adjusted);
}

Entity.prototype.mdelta3 = function() {
if (this.stats == null ||
this.stats.mineral_saturation_3 == null ||
this.stats.miningbase_3 == null) {
this.stats.mineral_saturation_3_adjusted == null ||
this.stats.miningbase_3_adjusted == null) {
return null;
}
return Math.max(0, this.stats.mineral_saturation_3 - this.stats.miningbase_3);
return Math.max(0, this.stats.mineral_saturation_3_adjusted - this.stats.miningbase_3_adjusted);
}

Entity.prototype.color_style = function() {
Expand Down Expand Up @@ -640,6 +640,22 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
}

entity.summary.resource_collection_rate_adjusted = Math.round(entity.summary.resource_collection_rate*speed_multiplier)
if (entity.stats.mineral_saturation_1 != null) {
entity.stats.mineral_saturation_1_adjusted = Math.round(entity.stats.mineral_saturation_1/speed_multiplier)
}
if (entity.stats.mineral_saturation_2 != null) {
entity.stats.mineral_saturation_2_adjusted = Math.round(entity.stats.mineral_saturation_2/speed_multiplier)
}
if (entity.stats.mineral_saturation_3 != null) {
entity.stats.mineral_saturation_3_adjusted = Math.round(entity.stats.mineral_saturation_3/speed_multiplier)
}

if (entity.stats.miningbase_2 != null) {
entity.stats.miningbase_2_adjusted = Math.round(entity.stats.miningbase_2/speed_multiplier)
}
if (entity.stats.miningbase_3 != null) {
entity.stats.miningbase_3_adjusted = Math.round(entity.stats.miningbase_3/speed_multiplier)
}
}

if(this.MineralsCurrent && this.MineralsCurrent[entity.identity.id]) {
Expand Down
6 changes: 3 additions & 3 deletions app/views/matches/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,12 @@
<a href class="ggtipper2" title="When a second base is completed, and located directly next to the mineral patches." data-gravity="s">
2nd Mining Base Complete
</a>
</td><td ng-repeat="entity in match.entities">{{ entity.stats.miningbase_2 | minutes_seconds }}</td></tr>
</td><td ng-repeat="entity in match.entities">{{ entity.stats.miningbase_2_adjusted | minutes_seconds }}</td></tr>
<tr><td>
<a href class="ggtipper2" title="When a third base is completed, and located directly next to the mineral patches." data-gravity="s">
3rd Mining Base Complete
</a>
</td><td ng-repeat="entity in match.entities">{{ entity.stats.miningbase_3 | minutes_seconds}}</td></tr>
</td><td ng-repeat="entity in match.entities">{{ entity.stats.miningbase_3_adjusted | minutes_seconds}}</td></tr>
<tr><th>Saturation Speed</a></th>
<th ng-repeat="entity in match.doubleents" ng-show="$index % 2 == 0 || user.view_mode == 1">
<span ng-show="$index % 2 == 0">{{ entity.identity.name }}</span>
Expand All @@ -181,7 +181,7 @@
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>
<span ng-show="$index % 2 == 0">{{ entity.stats.mineral_saturation_1_adjusted | minutes_seconds }}</span>
<span ng-show="$index % 2 == 1" ><league data-league="{{ entity.sat_1_skill }}"></league></span>
</td></tr>
<tr><td>
Expand Down