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 announcer display for 2020.

Browse Source
This commit is contained in:
Patrick Fairbank
2020-03-21 14:49:49 -07:00
parent 9fd98b6af8
commit ab2fa93b2f
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game/score.go
View File

@@ -25,6 +25,7 @@ type ScoreSummary struct {
AutoPowerCellPoints int
AutoPoints int
TeleopPowerCellPoints int
PowerCellPoints int
ControlPanelPoints int
EndgamePoints int
FoulPoints int
@@ -97,6 +98,7 @@ func (score *Score) Summarize(opponentFouls []Foul, teleopStarted bool) *ScoreSu
summary.TeleopPowerCellPoints += 2 * score.TeleopCellsOuter[i]
summary.TeleopPowerCellPoints += 3 * score.TeleopCellsInner[i]
}
summary.PowerCellPoints = summary.AutoPowerCellPoints + summary.TeleopPowerCellPoints
// Calculate control panel points and stages.
for i := Stage1; i <= Stage3; i++ {

2
game/score_test.go
View File

@@ -17,6 +17,7 @@ func TestScoreSummary(t *testing.T) {
assert.Equal(t, 84, redSummary.AutoPowerCellPoints)
assert.Equal(t, 94, redSummary.AutoPoints)
assert.Equal(t, 38, redSummary.TeleopPowerCellPoints)
assert.Equal(t, 122, redSummary.PowerCellPoints)
assert.Equal(t, 10, redSummary.ControlPanelPoints)
assert.Equal(t, 75, redSummary.EndgamePoints)
assert.Equal(t, 0, redSummary.FoulPoints)
@@ -31,6 +32,7 @@ func TestScoreSummary(t *testing.T) {
assert.Equal(t, 12, blueSummary.AutoPowerCellPoints)
assert.Equal(t, 17, blueSummary.AutoPoints)
assert.Equal(t, 122, blueSummary.TeleopPowerCellPoints)
assert.Equal(t, 134, blueSummary.PowerCellPoints)
assert.Equal(t, 30, blueSummary.ControlPanelPoints)
assert.Equal(t, 50, blueSummary.EndgamePoints)
assert.Equal(t, 33, blueSummary.FoulPoints)

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.ScoreSummary.Score - data.Red.ScoreSummary.HabClimbPoints);
$("#blueScore").text(data.Blue.ScoreSummary.Score - data.Blue.ScoreSummary.HabClimbPoints);
$("#redScore").text(data.Red.ScoreSummary.Score - data.Red.ScoreSummary.EndgamePoints);
$("#blueScore").text(data.Blue.ScoreSummary.Score - data.Blue.ScoreSummary.EndgamePoints);
};
// Handles a websocket message to populate the final score data.

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">Sandstorm Bonus Points</div>
<div class="col-lg-2">{{"{{score.SandstormBonusPoints}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Initiation Line Points</div>
<div class="col-lg-2">{{"{{score.InitiationLinePoints}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Hatch Panel Points</div>
<div class="col-lg-2">{{"{{score.HatchPanelPoints}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Power Cell Points</div>
<div class="col-lg-2">{{"{{score.PowerCellPoints}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Cargo Points</div>
<div class="col-lg-2">{{"{{score.CargoPoints}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Control Panel Points</div>
<div class="col-lg-2">{{"{{score.ControlPanelPoints}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Hab Climb Points</div>
<div class="col-lg-2">{{"{{score.HabClimbPoints}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Endgame Points</div>
<div class="col-lg-2">{{"{{score.EndgamePoints}}"}}</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">Complete Rocket</div>
<div class="col-lg-2">{{"{{score.CompleteRocket}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Control Panel RP</div>
<div class="col-lg-2">{{"{{score.ControlPanelRankingPoint}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label">Hab Docking</div>
<div class="col-lg-2">{{"{{score.HabDocking}}"}}</div>
<div class="col-lg-7 col-lg-offset-1 control-label">Endgame RP</div>
<div class="col-lg-2">{{"{{score.EndgameRankingPoint}}"}}</div>
</div>
<div class="row">
<div class="col-lg-7 col-lg-offset-1 control-label"><b>Final Score</b></div>