Compare commits
2 Commits
7c3404acb0
...
aec84dca5d
Author | SHA1 | Date | |
---|---|---|---|
aec84dca5d | |||
7082abcdf7 |
|
@ -34,8 +34,8 @@ export class AddGameComponent implements OnInit {
|
||||||
team: Team.CONTRA,
|
team: Team.CONTRA,
|
||||||
gamePoints: 0,
|
gamePoints: 0,
|
||||||
finalCardScore: 0,
|
finalCardScore: 0,
|
||||||
foxesCaught: 1,
|
// foxesCaught: 1,
|
||||||
wonLastTrickWithCharlie: true
|
// wonLastTrickWithCharlie: true
|
||||||
});
|
});
|
||||||
this.potentialPlayers.push({
|
this.potentialPlayers.push({
|
||||||
firebonkId: 2,
|
firebonkId: 2,
|
||||||
|
@ -384,17 +384,18 @@ export class AddGameComponent implements OnInit {
|
||||||
calculateCurrentScores(): void {
|
calculateCurrentScores(): void {
|
||||||
let gameScore: number = 0;
|
let gameScore: number = 0;
|
||||||
|
|
||||||
let winningTeamScore = this.getWinningTeamAndScore().score;
|
|
||||||
let winningTeam = this.getWinningTeamAndScore().team;
|
let winningTeam = this.getWinningTeamAndScore().team;
|
||||||
let unfulfilledAnnouncements = this.checkUnfulfilledAnnouncements(winningTeam, winningTeamScore);
|
let winningTeamScore = this.getWinningTeamAndScore().score;
|
||||||
let isSoloPlay = false;
|
let unfulfilledAnnouncementPoints = this.checkUnfulfilledAnnouncements(winningTeam, winningTeamScore);
|
||||||
|
let isSoloPlay = this.checkIfSolo();
|
||||||
|
|
||||||
// We are going to calculate the points for the winning team and then set all players points accordingly
|
// We are going to calculate the points for the winning team and then set all players points accordingly
|
||||||
|
|
||||||
if(!unfulfilledAnnouncements) {
|
if (unfulfilledAnnouncementPoints === 0) {
|
||||||
gameScore += this.calculateNormalScore(winningTeamScore, winningTeam);
|
gameScore += this.calculateNormalScore(winningTeamScore, winningTeam);
|
||||||
} else {
|
} else {
|
||||||
// TODO method to calculate game score for unfulfilled announcements
|
gameScore += unfulfilledAnnouncementPoints;
|
||||||
|
winningTeam = winningTeam === Team.RE ? Team.CONTRA : Team.RE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Double Score in case of announcement
|
// Double Score in case of announcement
|
||||||
|
@ -411,10 +412,15 @@ export class AddGameComponent implements OnInit {
|
||||||
gameScore += this.getCharliePoints(winningTeam);
|
gameScore += this.getCharliePoints(winningTeam);
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Game score in case of a solo
|
this.setGameScores(gameScore, winningTeam, isSoloPlay);
|
||||||
this.setGameScores(gameScore, winningTeam);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate the score according to card points and announcements in case of a "normal" game, so without unfulfilled announcements
|
||||||
|
* @param winningTeamScore
|
||||||
|
* @param winningTeam
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
private calculateNormalScore(winningTeamScore: number, winningTeam: Team): number {
|
private calculateNormalScore(winningTeamScore: number, winningTeam: Team): number {
|
||||||
let gameScore = 1; // 1 Point for Winning
|
let gameScore = 1; // 1 Point for Winning
|
||||||
|
|
||||||
|
@ -502,10 +508,14 @@ export class AddGameComponent implements OnInit {
|
||||||
* @param score The score to set
|
* @param score The score to set
|
||||||
* @param winningTeam The team that won
|
* @param winningTeam The team that won
|
||||||
*/
|
*/
|
||||||
setGameScores(score: number, winningTeam: Team) {
|
setGameScores(score: number, winningTeam: Team, isSolo: boolean) {
|
||||||
for (let player of this.actualPlayers) {
|
for (let player of this.actualPlayers) {
|
||||||
if (player.team === winningTeam) {
|
if (player.team === winningTeam) {
|
||||||
|
if(isSolo) {
|
||||||
|
player.gamePoints = score * 3;
|
||||||
|
} else {
|
||||||
player.gamePoints = score;
|
player.gamePoints = score;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
player.gamePoints = -score;
|
player.gamePoints = -score;
|
||||||
}
|
}
|
||||||
|
@ -566,34 +576,60 @@ export class AddGameComponent implements OnInit {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if the winning team has made announcements that have not been fulfilled
|
* Checks if the winning team has made announcements that have not been fulfilled.
|
||||||
|
* If so, returns the points that the "losing" team gets for these unfulfilled announcements
|
||||||
* @param normalWinningTeam The team that would have won under normal circumstances
|
* @param normalWinningTeam The team that would have won under normal circumstances
|
||||||
* @param normalWinningTeamScore The card score of said team
|
* @param normalWinningTeamScore The card score of said team
|
||||||
*/
|
*/
|
||||||
checkUnfulfilledAnnouncements(normalWinningTeam: Team, normalWinningTeamScore: number): boolean {
|
checkUnfulfilledAnnouncements(normalWinningTeam: Team, normalWinningTeamScore: number): number {
|
||||||
|
let gamePoints = 0;
|
||||||
|
|
||||||
if (normalWinningTeam === Team.RE) {
|
if (normalWinningTeam === Team.RE) {
|
||||||
if (this.checkAnnouncementActive(announcements.Announcement.RE_NO_NINETY) && normalWinningTeamScore < 151) {
|
if (this.checkAnnouncementActive(announcements.Announcement.RE_NO_NINETY) && normalWinningTeamScore < 151) {
|
||||||
return true;
|
gamePoints++;
|
||||||
}
|
}
|
||||||
if (this.checkAnnouncementActive(announcements.Announcement.RE_NO_SIXTY) && normalWinningTeamScore < 181) {
|
if (this.checkAnnouncementActive(announcements.Announcement.RE_NO_SIXTY) && normalWinningTeamScore < 181) {
|
||||||
return true;
|
gamePoints++;
|
||||||
}
|
}
|
||||||
if (this.checkAnnouncementActive(announcements.Announcement.RE_NO_THIRTY) && normalWinningTeamScore < 211) {
|
if (this.checkAnnouncementActive(announcements.Announcement.RE_NO_THIRTY) && normalWinningTeamScore < 211) {
|
||||||
return true;
|
gamePoints++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (normalWinningTeam === Team.CONTRA) {
|
if (normalWinningTeam === Team.CONTRA) {
|
||||||
if (this.checkAnnouncementActive(announcements.Announcement.CONTRA_NO_NINETY) && normalWinningTeamScore < 151) {
|
if (this.checkAnnouncementActive(announcements.Announcement.CONTRA_NO_NINETY) && normalWinningTeamScore < 151) {
|
||||||
return true;
|
gamePoints++;
|
||||||
}
|
}
|
||||||
if (this.checkAnnouncementActive(announcements.Announcement.CONTRA_NO_SIXTY) && normalWinningTeamScore < 181) {
|
if (this.checkAnnouncementActive(announcements.Announcement.CONTRA_NO_SIXTY) && normalWinningTeamScore < 181) {
|
||||||
return true;
|
gamePoints++;
|
||||||
}
|
}
|
||||||
if (this.checkAnnouncementActive(announcements.Announcement.CONTRA_NO_THIRTY) && normalWinningTeamScore < 211) {
|
if (this.checkAnnouncementActive(announcements.Announcement.CONTRA_NO_THIRTY) && normalWinningTeamScore < 211) {
|
||||||
return true;
|
gamePoints++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return gamePoints;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* _____ __
|
||||||
|
* / ___/____ / /___
|
||||||
|
* \__ \/ __ \/ / __ \
|
||||||
|
* ___/ / /_/ / / /_/ /
|
||||||
|
* /____/\____/_/\____/
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks, according to the assigned Teams, if this is a solo play
|
||||||
|
*/
|
||||||
|
checkIfSolo(): boolean {
|
||||||
|
let numberOfElders: number = 0;
|
||||||
|
|
||||||
|
for(let player of this.actualPlayers) {
|
||||||
|
if(player.team === Team.RE) {
|
||||||
|
numberOfElders++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return numberOfElders === 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user