Skip to content

Commit 07b81c5

Browse files
committed
Merge branch 'feat/ogres' into 'master'
Ogre PCs See merge request fmasa/wfrp-master!255
2 parents a818527 + d8b658b commit 07b81c5

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Race.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ enum class Race(override val nameResolver: (strings: Strings) -> String) : Named
1010
DWARF({ it.races.dwarf }),
1111
WOOD_ELF({ it.races.woodElf }),
1212
HALFLING({ it.races.halfling }),
13-
GNOME({ it.races.gnome });
13+
GNOME({ it.races.gnome }),
14+
OGRE({ it.races.ogre });
1415

1516
val size: Size get() = when(this) {
1617
HALFLING, GNOME -> Size.SMALL
18+
OGRE -> Size.LARGE
1719
else -> Size.AVERAGE
1820
}
1921
}

common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/localization/Strings.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,7 @@ data class RaceStrings(
718718
val halfling: String = "Halfling",
719719
val human: String = "Human",
720720
val gnome: String = "Gnome",
721+
val ogre: String = "Ogre",
721722
)
722723

723724
@Immutable

firebase/firestore.rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ service cloud.firestore {
390390
&& character.motivation is string && character.motivation.size() <= 200
391391
&& character.mutation is string && character.mutation.size() <= 200
392392
&& character.socialClass is string && isNotBlank(character.socialClass) && character.socialClass.size() <= 50
393-
&& character.race is string && character.race in ["HUMAN", "HIGH_ELF", "DWARF", "HALFLING", "WOOD_ELF", "GNOME"]
393+
&& character.race is string && character.race in ["HUMAN", "HIGH_ELF", "DWARF", "HALFLING", "WOOD_ELF", "GNOME", "OGRE"]
394394
&& arePointsValid(character.points)
395395
&& areStatsValid(character.characteristicsBase)
396396
&& areStatsValid(character.characteristicsAdvances)

0 commit comments

Comments
 (0)