Merge branch 'feat/ogres' into 'master'

Ogre PCs See merge request fmasa/wfrp-master!255
fmasa · Jun 20, 2022 · 07b81c5 · 07b81c5
2 parents a818527 + d8b658b
commit 07b81c5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/...n/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Race.kt b/...n/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Race.kt
@@ -10,10 +10,12 @@ enum class Race(override val nameResolver: (strings: Strings) -> String) : Named
     DWARF({ it.races.dwarf }),
     WOOD_ELF({ it.races.woodElf }),
     HALFLING({ it.races.halfling }),
-    GNOME({ it.races.gnome });
+    GNOME({ it.races.gnome }),
+    OGRE({ it.races.ogre });
 
     val size: Size get() = when(this) {
         HALFLING, GNOME -> Size.SMALL
+        OGRE -> Size.LARGE
         else -> Size.AVERAGE
     }
 }
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/localization/Strings.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/localization/Strings.kt
@@ -718,6 +718,7 @@ data class RaceStrings(
     val halfling: String = "Halfling",
     val human: String = "Human",
     val gnome: String = "Gnome",
+    val ogre: String = "Ogre",
 )
 
 @Immutable

diff --git a/firebase/firestore.rules b/firebase/firestore.rules
@@ -390,7 +390,7 @@ service cloud.firestore {
                         && character.motivation is string && character.motivation.size() <= 200
                         && character.mutation is string && character.mutation.size() <= 200
                         && character.socialClass is string && isNotBlank(character.socialClass) && character.socialClass.size() <= 50
-                        && character.race is string && character.race in ["HUMAN", "HIGH_ELF", "DWARF", "HALFLING", "WOOD_ELF", "GNOME"]
+                        && character.race is string && character.race in ["HUMAN", "HIGH_ELF", "DWARF", "HALFLING", "WOOD_ELF", "GNOME", "OGRE"]
                         && arePointsValid(character.points)
                         && areStatsValid(character.characteristicsBase)
                         && areStatsValid(character.characteristicsAdvances)