Skip to content

Fix punt and kickoff return yard narration #50

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
CalebRose merged 1 commit into from
Jul 25, 2026
Merged

Fix punt and kickoff return yard narration #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 9 additions & 29 deletions managers/StatsManager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@ func generateResultsString(play structs.PlayByPlay, playType string, participant
if play.IsTouchback {
firstSegment += " Touchback. "
} else {
resultYdsStr := strconv.Itoa(int(100 - play.ResultYards))
resultYdsStr := strconv.Itoa(int(play.ResultYards))
resultYards := util.GetYardsString(play.ResultYards)
firstSegment += recLabel + " returns the ball " + resultYdsStr + resultYards
}
Expand All @@ -1528,17 +1528,8 @@ func generateResultsString(play structs.PlayByPlay, playType string, participant
distanceStr := util.GetYardsString(play.KickDistance)
verb := " punts for "
firstSegment = kickerLabel + verb + strconv.Itoa(int(play.KickDistance)) + distanceStr
los := play.LineOfScrimmage
if los > 50 {
los = 100 - los
}
outside := los + play.KickDistance
netReturnYards := outside - play.ResultYards
resultYdsStr := strconv.Itoa(int(netReturnYards))
resultYards := util.GetYardsString(netReturnYards)
if !play.IsTouchback {
resultYdsStr = strconv.Itoa(int(netReturnYards))
}
resultYdsStr := strconv.Itoa(int(play.ResultYards))
resultYards := util.GetYardsString(play.ResultYards)

if play.IsBlocked {
blockerLabel := getPlayerLabel(participantMap[turnID])
Expand Down Expand Up @@ -1729,10 +1720,9 @@ func generateStreamString(play structs.PlayByPlay, playType, playName, poa strin
if play.IsTouchback {
firstSegment += util.GetTouchbackStatement()
} else {
netReturnYards := int(play.ResultYards) - outside
resultYdsStr := strconv.Itoa(int(netReturnYards))
resultYards := util.GetYardsString(int8(netReturnYards))
verb := util.GetReturnVerb(netReturnYards, play.IsTouchdown, play.IsOutOfBounds)
resultYdsStr := strconv.Itoa(int(play.ResultYards))
resultYards := util.GetYardsString(play.ResultYards)
verb := util.GetReturnVerb(int(play.ResultYards), play.IsTouchdown, play.IsOutOfBounds)
firstSegment += recLabel + verb + resultYdsStr + resultYards
}
case "Punt":
Expand All @@ -1743,18 +1733,8 @@ func generateStreamString(play structs.PlayByPlay, playType, playName, poa strin
distanceStr := util.GetYardsString(play.KickDistance)
verb := util.GetPuntVerb()
firstSegment = kickerLabel + verb + strconv.Itoa(int(play.KickDistance)) + distanceStr
los := play.LineOfScrimmage
if los > 50 {
los = 100 - los
}
outside := los + play.KickDistance
// Line of Scrimmage + kick distance = ball spot // Result yards - ball spot = actual yards ran // Ball spot - yards ran = next line of scrimmage
netReturnYards := outside - play.ResultYards
resultYards := util.GetYardsString(netReturnYards)
resultYdsStr := strconv.Itoa(int(netReturnYards))
if !play.IsTouchback {
resultYdsStr = strconv.Itoa(int(netReturnYards))
}
resultYards := util.GetYardsString(play.ResultYards)
resultYdsStr := strconv.Itoa(int(play.ResultYards))
if play.IsBlocked {
blockerLabel := getPlayerLabel(participantMap[turnID])
verb := util.GetBlockedStatement(false)
Expand All @@ -1766,7 +1746,7 @@ func generateStreamString(play structs.PlayByPlay, playType, playName, poa strin
tb := util.GetTouchbackStatement()
firstSegment += tb
} else {
verb := util.GetReturnVerb(int(netReturnYards), play.IsTouchdown, play.IsOutOfBounds)
verb := util.GetReturnVerb(int(play.ResultYards), play.IsTouchdown, play.IsOutOfBounds)
firstSegment += recLabel + verb + resultYdsStr + resultYards
}
case "XP":
Expand Down
Loading