diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/app/ui/MainUiComponents.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/app/ui/MainUiComponents.kt index 400eaa1..4b3ddcd 100644 --- a/src/main/kotlin/com/github/xetra11/ck3workbench/app/ui/MainUiComponents.kt +++ b/src/main/kotlin/com/github/xetra11/ck3workbench/app/ui/MainUiComponents.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.preferredSize import androidx.compose.foundation.layout.preferredWidth import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/TraitSelection.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/TraitSelection.kt index 8d3674e..b8d4080 100644 --- a/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/TraitSelection.kt +++ b/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/TraitSelection.kt @@ -34,6 +34,14 @@ class TraitSelection { interface LeveledTrait : Trait + enum class ChildhoodTrait(override val code: String, override val label: String) : LeveledTrait { + BOSSY("bossy", "Bossy"), + CHARMING("charming", "Charming"), + CURIOUS("curious", "Curious"), + PENSIVE("pensive", "Pensive"), + ROWDY("rowdy", "Rowdy"), + } + enum class CopingTrait(override val code: String, override val label: String) : LeveledTrait { DRUNKARD("drunkard", "Drunkard"), FLAGELLANT("flagellant", "Flagellant"), @@ -196,6 +204,20 @@ class TraitSelection { SADISTIC("sadistic", "Sadistic"), } + @Composable + fun ChildhoodTraits( + selectionState: SnapshotStateMap + ) { + val chunks = enumValues().toList().chunked(5) + chunks.forEach { + Row { + it.forEach { + TraitIcon(it, selectionState) + } + } + } + } + @Composable fun CopingTraits( selectionState: SnapshotStateMap @@ -281,7 +303,7 @@ class TraitSelection { fun LeveledLifestyleTraits(selectionState: SnapshotStateMap) { Row { enumValues().forEach { trait -> - TraitIcon(trait, selectionState, 3) + TraitIcon(trait, selectionState, 3) } } } diff --git a/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/view/CharacterFactoryView.kt b/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/view/CharacterFactoryView.kt index 557bdeb..f062f5a 100644 --- a/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/view/CharacterFactoryView.kt +++ b/src/main/kotlin/com/github/xetra11/ck3workbench/module/character/view/CharacterFactoryView.kt @@ -53,6 +53,7 @@ fun CharacterFactoryView() { val commanderTraitSelectionState = remember { mutableStateMapOf() } val criminalTraitSelectionState = remember { mutableStateMapOf() } val copingTraitSelectionState = remember { mutableStateMapOf() } + val childhoodTraitSelectionState = remember { mutableStateMapOf() } val educationalTraitSelectionState = remember { mutableStateMapOf() } val leveledLifestyleTraitSelectionState = remember { mutableStateMapOf() } @@ -120,6 +121,9 @@ fun CharacterFactoryView() { TraitSection("Coping Traits") { traitSelection.CopingTraits(copingTraitSelectionState) } + TraitSection("Childhood Traits") { + traitSelection.ChildhoodTraits(childhoodTraitSelectionState) + } TraitSection("Educational Traits") { traitSelection.EducationalTraits(educationalTraitSelectionState) } diff --git a/src/main/resources/icons/trait_icons/trait_bossy.png b/src/main/resources/icons/trait_icons/trait_bossy.png new file mode 100644 index 0000000..bda4294 Binary files /dev/null and b/src/main/resources/icons/trait_icons/trait_bossy.png differ diff --git a/src/main/resources/icons/trait_icons/trait_charming.png b/src/main/resources/icons/trait_icons/trait_charming.png new file mode 100644 index 0000000..f33f9c7 Binary files /dev/null and b/src/main/resources/icons/trait_icons/trait_charming.png differ diff --git a/src/main/resources/icons/trait_icons/trait_curious.png b/src/main/resources/icons/trait_icons/trait_curious.png new file mode 100644 index 0000000..a04d504 Binary files /dev/null and b/src/main/resources/icons/trait_icons/trait_curious.png differ diff --git a/src/main/resources/icons/trait_icons/trait_pensive.png b/src/main/resources/icons/trait_icons/trait_pensive.png new file mode 100644 index 0000000..0c19ce2 Binary files /dev/null and b/src/main/resources/icons/trait_icons/trait_pensive.png differ diff --git a/src/main/resources/icons/trait_icons/trait_rowdy.png b/src/main/resources/icons/trait_icons/trait_rowdy.png new file mode 100644 index 0000000..d0e6181 Binary files /dev/null and b/src/main/resources/icons/trait_icons/trait_rowdy.png differ