diff --git a/field/arena_notifiers.go b/field/arena_notifiers.go index d9fec98..7cfbe44 100644 --- a/field/arena_notifiers.go +++ b/field/arena_notifiers.go @@ -46,8 +46,8 @@ type MatchTimeMessage struct { } type audienceAllianceScoreFields struct { - Score int - RealtimeScore *RealtimeScore + Score *game.Score + ScoreSummary *game.ScoreSummary } // Instantiates notifiers and configures their message producing methods. @@ -225,8 +225,8 @@ func (arena *Arena) generateScoringStatusMessage() interface{} { func getAudienceAllianceScoreFields(allianceScore *RealtimeScore, allianceScoreSummary *game.ScoreSummary) *audienceAllianceScoreFields { fields := new(audienceAllianceScoreFields) - fields.RealtimeScore = allianceScore - fields.Score = allianceScoreSummary.Score + fields.Score = &allianceScore.CurrentScore + fields.ScoreSummary = allianceScoreSummary return fields } diff --git a/static/css/audience_display.css b/static/css/audience_display.css index 0f946ae..003f4b0 100644 --- a/static/css/audience_display.css +++ b/static/css/audience_display.css @@ -93,7 +93,7 @@ html { } .score-number { float: left; - width: 45%; + width: 60%; margin: 0px 5px; text-align: center; font-family: "FuturaLTBold"; diff --git a/static/js/alliance_station_display.js b/static/js/alliance_station_display.js index f675c1a..472f91f 100644 --- a/static/js/alliance_station_display.js +++ b/static/js/alliance_station_display.js @@ -98,8 +98,8 @@ var handleMatchTime = function(data) { // Handles a websocket message to update the match score. var handleRealtimeScore = function(data) { - $("#redScore").text(data.Red.Score); - $("#blueScore").text(data.Blue.Score); + $("#redScore").text(data.Red.ScoreSummary.Score - data.Red.ScoreSummary.HabClimbPoints); + $("#blueScore").text(data.Blue.ScoreSummary.Score - data.Blue.ScoreSummary.HabClimbPoints); }; $(function() { diff --git a/static/js/announcer_display.js b/static/js/announcer_display.js index 907c9ab..71a167a 100644 --- a/static/js/announcer_display.js +++ b/static/js/announcer_display.js @@ -44,8 +44,8 @@ var handleMatchTime = function(data) { // Handles a websocket message to update the match score. var handleRealtimeScore = function(data) { - $("#redScore").text(data.Red.Score); - $("#blueScore").text(data.Blue.Score); + $("#redScore").text(data.Red.ScoreSummary.Score - data.Red.ScoreSummary.HabClimbPoints); + $("#blueScore").text(data.Blue.ScoreSummary.Score - data.Blue.ScoreSummary.HabClimbPoints); }; // Handles a websocket message to populate the final score data. diff --git a/static/js/audience_display.js b/static/js/audience_display.js index 9205bf6..c61844f 100644 --- a/static/js/audience_display.js +++ b/static/js/audience_display.js @@ -20,7 +20,7 @@ var logoUp = "-3px"; var logoDown = $("#logo").css("top"); var scoreIn = $(".score").css("width"); var scoreMid = "120px"; -var scoreOut = "275px"; +var scoreOut = "220px"; var teamsIn = $(".teams").css("width"); var teamsOut = "65px"; @@ -77,38 +77,8 @@ var handleMatchTime = function(data) { // Handles a websocket message to update the match score. var handleRealtimeScore = function(data) { - var redScoreBreakdown = data.Red.RealtimeScore.CurrentScore; - $("#" + redSide + "ScoreNumber").text(data.Red.Score); - $("#" + redSide + "ForceCubesIcon").attr("data-state", data.Red.ForceState); - $("#" + redSide + "ForceCubes").text(redScoreBreakdown.ForceCubes).attr("data-state", data.Red.ForceState); - $("#" + redSide + "LevitateCubesIcon").attr("data-state", data.Red.LevitateState); - $("#" + redSide + "LevitateCubes").text(redScoreBreakdown.LevitateCubes).attr("data-state", data.Red.LevitateState); - $("#" + redSide + "BoostCubesIcon").attr("data-state", data.Red.BoostState); - $("#" + redSide + "BoostCubes").text(redScoreBreakdown.BoostCubes).attr("data-state", data.Red.BoostState); - - var blueScoreBreakdown = data.Blue.RealtimeScore.CurrentScore; - $("#" + blueSide + "ScoreNumber").text(data.Blue.Score); - $("#" + blueSide + "ForceCubesIcon").attr("data-state", data.Blue.ForceState); - $("#" + blueSide + "ForceCubes").text(blueScoreBreakdown.ForceCubes).attr("data-state", data.Blue.ForceState); - $("#" + blueSide + "LevitateCubesIcon").attr("data-state", data.Blue.LevitateState); - $("#" + blueSide + "LevitateCubes").text(blueScoreBreakdown.LevitateCubes).attr("data-state", data.Blue.LevitateState); - $("#" + blueSide + "BoostCubesIcon").attr("data-state", data.Blue.BoostState); - $("#" + blueSide + "BoostCubes").text(blueScoreBreakdown.BoostCubes).attr("data-state", data.Blue.BoostState); - - // Switch/scale indicators. - $("#scaleIndicator").attr("data-owned-by", data.ScaleOwnedBy); - $("#" + redSide + "SwitchIndicator").attr("data-owned-by", data.Red.SwitchOwnedBy); - $("#" + blueSide + "SwitchIndicator").attr("data-owned-by", data.Blue.SwitchOwnedBy); - - // Power up progress bars. - if ((data.Red.ForceState === 2 || data.Red.BoostState === 2) && $("#" + redSide + "Progress").height() === 0) { - $("#" + redSide + "Progress").height(85); - $("#" + redSide + "Progress").transition({queue: false, height: 0}, 10000, "linear"); - } - if ((data.Blue.ForceState === 2 || data.Blue.BoostState === 2) && $("#" + blueSide + "Progress").height() === 0) { - $("#" + blueSide + "Progress").height(85); - $("#" + blueSide + "Progress").transition({queue: false, height: 0}, 10000, "linear"); - } + $("#" + redSide + "ScoreNumber").text(data.Red.ScoreSummary.Score - data.Red.ScoreSummary.HabClimbPoints); + $("#" + blueSide + "ScoreNumber").text(data.Blue.ScoreSummary.Score - data.Blue.ScoreSummary.HabClimbPoints); }; // Handles a websocket message to populate the final score data. diff --git a/static/js/match_play.js b/static/js/match_play.js index 93f0255..43baaf8 100644 --- a/static/js/match_play.js +++ b/static/js/match_play.js @@ -199,8 +199,8 @@ var handleMatchTime = function(data) { // Handles a websocket message to update the match score. var handleRealtimeScore = function(data) { - $("#redScore").text(data.Red.Score); - $("#blueScore").text(data.Blue.Score); + $("#redScore").text(data.Red.ScoreSummary.Score); + $("#blueScore").text(data.Blue.ScoreSummary.Score); }; // Handles a websocket message to update the audience display screen selector. diff --git a/templates/announcer_display.html b/templates/announcer_display.html index 6cef4f3..901752f 100644 --- a/templates/announcer_display.html +++ b/templates/announcer_display.html @@ -62,32 +62,32 @@