This commit is contained in:
vita10gy 2013-02-23 17:23:00 -06:00
parent 4e445a7173
commit e835ed75ac
2 changed files with 15 additions and 6 deletions

View File

@ -520,7 +520,8 @@ window.renderField = function(ent) {
smoothFactor: 10, smoothFactor: 10,
vertices: ent[2].capturedRegion, vertices: ent[2].capturedRegion,
lastUpdate: ent[1], lastUpdate: ent[1],
guid: ent[0]}); guid: ent[0],
data: ent[2]});
if(!getPaddedBounds().intersects(poly.getBounds())) return; if(!getPaddedBounds().intersects(poly.getBounds())) return;

View File

@ -20,18 +20,24 @@ if(typeof window.plugin !== 'function') window.plugin = function() {};
// use own namespace for plugin // use own namespace for plugin
window.plugin.scoreboard = function() {}; window.plugin.scoreboard = function() {};
window.plugin.scoreboard.compileStats = function(){ window.plugin.scoreboard.compileStats = function(){
window.plugin.scoreboard.scores = {};
$.each(window.fields, function(qk, val) { $.each(window.fields, function(qk, val) {
console.log(val); console.log(val);
var team = val.options.data.controllingTeam.team; var team = val.options.data.controllingTeam.team;
if(window.plugin.muTotal.localScore[team]==undefined) if(window.plugin.scoreboard.scores[team]==undefined)
{ {
window.plugin.muTotal.localScore[team] = 0; window.plugin.scoreboard.scores[team] = {};
}
if(window.plugin.scoreboard.scores[team]['mu']==undefined)
{
window.plugin.scoreboard.scores[team]['mu'] = 0;
} }
if(window.portals[val.options.vertices.vertexA.guid]!==undefined || if(window.portals[val.options.vertices.vertexA.guid]!==undefined ||
window.portals[val.options.vertices.vertexB.guid]!==undefined || window.portals[val.options.vertices.vertexB.guid]!==undefined ||
window.portals[val.options.vertices.vertexC.guid]!==undefined ) { window.portals[val.options.vertices.vertexC.guid]!==undefined ) {
window.plugin.muTotal.localScore[team]+=parseInt(val.options.data.entityScore.entityScore); window.plugin.scoreboard.scores[team]['mu']+=parseInt(val.options.data.entityScore.entityScore);
//console.log(val.options.data.controllingTeam.team); //console.log(val.options.data.controllingTeam.team);
//console.log(val.options.data.entityScore.entityScore); //console.log(val.options.data.entityScore.entityScore);
@ -46,9 +52,11 @@ window.plugin.scoreboard.display = function() {
window.plugin.scoreboard.compileStats(); window.plugin.scoreboard.compileStats();
$('body').append('<div id="scoreboard">' + $('body').append('<div id="scoreboard">' +
'<p>This is the default dialog which is useful for displaying information. The dialog window can be moved,</p>' + '<p>This is the default dialog which is useful for displaying information. The dialog window can be moved,</p>' +
window.plugin.scoreboard.scores +
'</div>'); '</div>');
console.log(window.plugin.scoreboard.scores);
$( "#scoreboard" ).dialog({ autoOpen: true, $( "#scoreboard" ).dialog({ autoOpen: true,
modal: true,
buttons: [ { text: "Close", click: function() { $( this ).dialog( "close" ); } } ]}); buttons: [ { text: "Close", click: function() { $( this ).dialog( "close" ); } } ]});
} }