chris/YAEP
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update items

Browse Source 
- add Sweden
- rename England to United Kingdom to match flag
This commit is contained in:
Christian Basler
2024-08-03 09:47:00 +02:00
parent 3a2865f199
commit 631799b479
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
domain/src/main/kotlin/ch/dissem/yaep/domain/Game.kt
View File

@@ -25,7 +25,7 @@ import ch.dissem.yaep.domain.Fruit.PEAR
import ch.dissem.yaep.domain.Fruit.PINEAPPLE import ch.dissem.yaep.domain.Fruit.PINEAPPLE
import ch.dissem.yaep.domain.Fruit.WATERMELON import ch.dissem.yaep.domain.Fruit.WATERMELON
import ch.dissem.yaep.domain.Nationality.CANADA import ch.dissem.yaep.domain.Nationality.CANADA
import ch.dissem.yaep.domain.Nationality.ENGLAND import ch.dissem.yaep.domain.Nationality.UNITED_KINGDOM
import ch.dissem.yaep.domain.Nationality.JAPAN import ch.dissem.yaep.domain.Nationality.JAPAN
import ch.dissem.yaep.domain.Nationality.SPAIN import ch.dissem.yaep.domain.Nationality.SPAIN
import ch.dissem.yaep.domain.Nationality.SWITZERLAND import ch.dissem.yaep.domain.Nationality.SWITZERLAND
@@ -88,7 +88,7 @@ class Game(
listOf(ANT, DOG, GOAT, SLOTH, SNAIL, ZEBRA).map { Item(it) }, listOf(ANT, DOG, GOAT, SLOTH, SNAIL, ZEBRA).map { Item(it) },
listOf(WATERMELON, MANGO, PEAR, GRAPES, PINEAPPLE, BANANA).map { Item(it) }, listOf(WATERMELON, MANGO, PEAR, GRAPES, PINEAPPLE, BANANA).map { Item(it) },
listOf(CUPCAKE, ICE_CREAM, DOUGHNUT, CAKE, PIE, CUSTARD).map { Item(it) }, listOf(CUPCAKE, ICE_CREAM, DOUGHNUT, CAKE, PIE, CUSTARD).map { Item(it) },
listOf(SWITZERLAND, ENGLAND, JAPAN, UKRAINE, CANADA, SPAIN).map { Item(it) }, listOf(SWITZERLAND, UNITED_KINGDOM, JAPAN, UKRAINE, CANADA, SPAIN).map { Item(it) },
listOf(WINE, BEVERAGE, BEER, COFFEE, TEA, MILK).map { Item(it) } listOf(WINE, BEVERAGE, BEER, COFFEE, TEA, MILK).map { Item(it) }
) )
val optionMap = rowOptions.flatten().associateBy( val optionMap = rowOptions.flatten().associateBy(

3
domain/src/main/kotlin/ch/dissem/yaep/domain/items.kt
View File

@@ -20,9 +20,10 @@ enum class Animal(symbol: String) : ItemClass<Animal> {
} }
enum class Nationality(symbol: String) : ItemClass<Nationality> { enum class Nationality(symbol: String) : ItemClass<Nationality> {
ENGLAND("🇬🇧"), UNITED_KINGDOM("🇬🇧"),
UKRAINE("🇺🇦"), UKRAINE("🇺🇦"),
SPAIN("🇪🇸"), SPAIN("🇪🇸"),
SWEDEN("🇸🇪"),
NORWAY("🇳🇴"), NORWAY("🇳🇴"),
JAPAN("🇯🇵"), JAPAN("🇯🇵"),
SWITZERLAND("🇨🇭"), SWITZERLAND("🇨🇭"),

2
domain/src/test/kotlin/ch/dissem/yaep/domain/GameTest.kt
View File

@@ -159,7 +159,7 @@ class GameTest {
* UKRAINE and SCIENTIST are in the same column * UKRAINE and SCIENTIST are in the same column
* DOG is between the neighbours JAPAN and SWITZERLAND to both sides * DOG is between the neighbours JAPAN and SWITZERLAND to both sides
* SLOTH is between the neighbours GOAT and TEA to both sides * SLOTH is between the neighbours GOAT and TEA to both sides
* ROCK_STAR and ENGLAND are in the same column * ROCK_STAR and UNITED_KINGDOM are in the same column
* ROCK_STAR is next to DOUGHNUT * ROCK_STAR is next to DOUGHNUT
* PINEAPPLE is between the neighbours TEACHER and GRAPES to both sides * PINEAPPLE is between the neighbours TEACHER and GRAPES to both sides
""".trimIndent()) """.trimIndent())