Skip to content

Display units in comparison graph for 1v1 AI #15

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
dsjoerg merged 2 commits into from
Aug 3, 2015
Merged

Display units in comparison graph for 1v1 AI #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90b7c52
Configure simplecov to ignore spec folder
eric-hu Jul 22, 2015
c9e3560
Add unit display on timeline for AI (1v1 only)
eric-hu Aug 3, 2015
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
4 changes: 4 additions & 0 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 @@ -245,6 +245,8 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
this.entityIds = [];
this.teams = {};

var twoPlayerMatch = this.playerCount === 2;

for(var ei in this.entities) {
// console.log("ei", ei, this.armies_by_frame, this.entities, this.entities[ei].identity.name);
if (this.armies_by_frame && this.entities[ei].identity) {
Expand All @@ -255,6 +257,8 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
} else if (this.entities[ei].identity.id in this.armies_by_frame) {
entityArmy = this.armies_by_frame[this.entities[ei].identity.id];
// console.log("got abf for ei by id", ei, entityArmy);
} else if (this.entities[ei].identity.name.match(/A.I./) && twoPlayerMatch) {
entityArmy = this.armies_by_frame[0];
}
this.entities[ei].armies_by_frame = entityArmy;
}
Expand Down
4 changes: 3 additions & 1 deletion spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# SimpleCov is ..rcov for 1.9+
# https://github.com/colszowka/simplecov
require 'simplecov'
SimpleCov.start
SimpleCov.start do
add_filter "/spec/"
end

# This file is copied to spec/ when you run 'rails generate rspec:install'
ENV["RAILS_ENV"] ||= 'test'
Expand Down