From 631799b479c24609928a0907af662b6feab04216 Mon Sep 17 00:00:00 2001 From: Christian Basler Date: Sat, 3 Aug 2024 09:47:00 +0200 Subject: [PATCH] Update items - add Sweden - rename England to United Kingdom to match flag --- domain/src/main/kotlin/ch/dissem/yaep/domain/Game.kt | 4 ++-- domain/src/main/kotlin/ch/dissem/yaep/domain/items.kt | 3 ++- domain/src/test/kotlin/ch/dissem/yaep/domain/GameTest.kt | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/domain/src/main/kotlin/ch/dissem/yaep/domain/Game.kt b/domain/src/main/kotlin/ch/dissem/yaep/domain/Game.kt index d974df9..65e8b3a 100644 --- a/domain/src/main/kotlin/ch/dissem/yaep/domain/Game.kt +++ b/domain/src/main/kotlin/ch/dissem/yaep/domain/Game.kt @@ -25,7 +25,7 @@ import ch.dissem.yaep.domain.Fruit.PEAR import ch.dissem.yaep.domain.Fruit.PINEAPPLE import ch.dissem.yaep.domain.Fruit.WATERMELON 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.SPAIN import ch.dissem.yaep.domain.Nationality.SWITZERLAND @@ -88,7 +88,7 @@ class Game( listOf(ANT, DOG, GOAT, SLOTH, SNAIL, ZEBRA).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(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) } ) val optionMap = rowOptions.flatten().associateBy( diff --git a/domain/src/main/kotlin/ch/dissem/yaep/domain/items.kt b/domain/src/main/kotlin/ch/dissem/yaep/domain/items.kt index 3566f45..575fc8b 100644 --- a/domain/src/main/kotlin/ch/dissem/yaep/domain/items.kt +++ b/domain/src/main/kotlin/ch/dissem/yaep/domain/items.kt @@ -20,9 +20,10 @@ enum class Animal(symbol: String) : ItemClass { } enum class Nationality(symbol: String) : ItemClass { - ENGLAND("πŸ‡¬πŸ‡§"), + UNITED_KINGDOM("πŸ‡¬πŸ‡§"), UKRAINE("πŸ‡ΊπŸ‡¦"), SPAIN("πŸ‡ͺπŸ‡Έ"), + SWEDEN("πŸ‡ΈπŸ‡ͺ"), NORWAY("πŸ‡³πŸ‡΄"), JAPAN("πŸ‡―πŸ‡΅"), SWITZERLAND("πŸ‡¨πŸ‡­"), diff --git a/domain/src/test/kotlin/ch/dissem/yaep/domain/GameTest.kt b/domain/src/test/kotlin/ch/dissem/yaep/domain/GameTest.kt index d3a1a1d..2f4bb0d 100644 --- a/domain/src/test/kotlin/ch/dissem/yaep/domain/GameTest.kt +++ b/domain/src/test/kotlin/ch/dissem/yaep/domain/GameTest.kt @@ -159,7 +159,7 @@ class GameTest { * UKRAINE and SCIENTIST are in the same column * DOG is between the neighbours JAPAN and SWITZERLAND 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 * PINEAPPLE is between the neighbours TEACHER and GRAPES to both sides """.trimIndent())