ch/Schafkopf-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cost for wedding

Browse Source
This commit is contained in:
Christoph Hagen 2021-12-22 14:54:31 +01:00
parent cfba0fe467
commit dbac55e15d
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Sources/App/GameSummary/EnglishGameSummarizer.swift
View File

@ -61,6 +61,9 @@ struct EnglishGameSummarizer: GameSummarizer {
var components = [String]()
components.append("Game \(table.game.basicCost)")
if !table.isBettel {
if table.isHochzeit {
components.append("wedding")
}
if table.isSchwarz {
components.append("Schwarz")
} else if table.isSchneider {

3
Sources/App/GameSummary/GermanGameSummarizer.swift
View File

@ -61,6 +61,9 @@ struct GermanGameSummarizer: GameSummarizer {
var components = [String]()
components.append("Grundspiel \(table.game.basicCost)")
if !table.isBettel {
if table.isHochzeit {
components.append("Hochzeit")
}
if table.isSchwarz {
components.append("Schwarz")
} else if table.isSchneider {

8
Sources/App/Model/Tables/FinishedTable.swift
View File

@ -19,6 +19,10 @@ final class FinishedTable: AbstractTable<FinishedPlayer> {
cost += 5
}
cost += 5 * leadingTrumps
guard game != .hochzeit else {
// Wedding is doubled
return cost * 2^^(totalNumberOfDoubles + 1)
}
return cost * 2^^totalNumberOfDoubles
}
@ -46,6 +50,10 @@ final class FinishedTable: AbstractTable<FinishedPlayer> {
game == .bettel
}
var isHochzeit: Bool {
game == .hochzeit
}
var isSchwarz: Bool {
!isBettel && (selectorTeamPoints == 0 || selectorTeamPoints == 120)
}