NCGEARS/cheesy-arena-lite
1
0
Fork 0
mirror of https://github.com/Team254/cheesy-arena-lite.git synced 2026-03-09 13:46:44 -04:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Update audience display score overlay for 2019.

Browse Source
This commit is contained in:
Patrick Fairbank
2019-07-27 14:57:02 -07:00
parent 7dc8ea00da
commit f601d1d391
8 changed files with 28 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
field/arena_notifiers.go
View File

@@ -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
}

2
static/css/audience_display.css
View File

@@ -93,7 +93,7 @@ html {
}
.score-number {
float: left;
width: 45%;
width: 60%;
margin: 0px 5px;
text-align: center;
font-family: "FuturaLTBold";

4
static/js/alliance_station_display.js
View File

@@ -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() {

4
static/js/announcer_display.js
View File

@@ -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.

36
static/js/audience_display.js
View File

@@ -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.

4
static/js/match_play.js
View File

@@ -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.

24
templates/announcer_display.html
View File

@@ -62,32 +62,32 @@
<script id="matchResultTemplate" type="text/x-handlebars-template">
<h4>Score</h4>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Auto Run Points</div>
<div class="col-lg-2">{{"{{score.AutoRunPoints}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Sandstorm Bonus Points</div>
<div class="col-lg-2">{{"{{score.SandstormBonusPoints}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Ownership Points</div>
<div class="col-lg-2">{{"{{score.OwnershipPoints}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Hatch Panel Points</div>
<div class="col-lg-2">{{"{{score.HatchPanelPoints}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Vault Points</div>
<div class="col-lg-2">{{"{{score.VaultPoints}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Cargo Points</div>
<div class="col-lg-2">{{"{{score.CargoPoints}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Park/Climb Points</div>
<div class="col-lg-2">{{"{{score.ParkClimbPoints}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Hab Climb Points</div>
<div class="col-lg-2">{{"{{score.HabClimbPoints}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Foul Points</div>
<div class="col-lg-2">{{"{{score.FoulPoints}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Auto Quest</div>
<div class="col-lg-2">{{"{{score.AutoQuest}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Complete Rocket</div>
<div class="col-lg-2">{{"{{score.CompleteRocket}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Face the Boss</div>
<div class="col-lg-2">{{"{{score.FaceTheBoss}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Hab Docking</div>
<div class="col-lg-2">{{"{{score.HabDocking}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label"><b>Final Score</b></div>

38
templates/audience_display.html
View File

@@ -29,23 +29,6 @@
<img class="avatar" id="leftTeam2Avatar" src="" /><br />
<img class="avatar" id="leftTeam3Avatar" src="" />
</div>
<div class="score-fields score-fields-icons">
<span class="valign-cell">
<span class="power-up" id="leftForceCubesIcon">F</span><br />
<span class="power-up" id="leftLevitateCubesIcon">L</span><br />
<span class="power-up" id="leftBoostCubesIcon">B</span>
</span>
</div>
<div class="score-fields score-fields-text">
<span class="valign-cell">
<span class="power-up" id="leftForceCubes"></span><br />
<span class="power-up" id="leftLevitateCubes"></span><br />
<span class="power-up" id="leftBoostCubes"></span>
</span>
</div>
<div class="powerup-progress">
<div id="leftProgress"></div>
</div>
<div class="score-number" id="leftScoreNumber">&nbsp;</div>
</div>
<div class="score reversible-right" id="rightScore">
@@ -54,23 +37,6 @@
<img class="avatar" id="rightTeam2Avatar" src="" /><br />
<img class="avatar" id="rightTeam3Avatar" src="" />
</div>
<div class="score-fields score-fields-icons pull-right">
<span class="valign-cell">
<span class="power-up" id="rightForceCubesIcon">F</span><br />
<span class="power-up" id="rightLevitateCubesIcon">L</span><br />
<span class="power-up" id="rightBoostCubesIcon">B</span>
</span>
</div>
<div class="score-fields score-fields-text pull-right" style="direction: rtl;">
<span class="valign-cell" style="text-align: right;">
<span class="power-up" id="rightForceCubes"></span><br />
<span class="power-up" id="rightLevitateCubes"></span><br />
<span class="power-up" id="rightBoostCubes"></span>
</span>
</div>
<div class="powerup-progress pull-right">
<div id="rightProgress"></div>
</div>
<div class="score-number pull-right" id="rightScoreNumber">&nbsp;</div>
</div>
<div class="teams" id="rightTeams">
@@ -81,7 +47,7 @@
</span>
</div>
<div id="eventMatchInfo">
<span>{{.EventSettings.Name}}{{if lt (len .EventSettings.Name) 16}} 2018{{end}}</span>
<span>{{.EventSettings.Name}}{{if lt (len .EventSettings.Name) 16}} 2019{{end}}</span>
<span class="pull-right" id="matchName"></span>
</div>
</div>
@@ -141,7 +107,7 @@
</span>
</div>
<div id="finalEventMatchInfo">
<div class="final-footer">{{.EventSettings.Name}}{{if lt (len .EventSettings.Name) 22}} 2018{{end}}</div>
<div class="final-footer">{{.EventSettings.Name}}{{if lt (len .EventSettings.Name) 22}} 2019{{end}}</div>
<div class="final-footer" id="finalSeriesStatus">&nbsp;</div>
<div class="final-footer" id="finalMatchName">&nbsp;</div>
</div>