curiosite/DnDApplication
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add level modifier to throws and refactor usecase.

Browse source
This commit is contained in:
Thomas Andres Gomez 2023-11-28 16:30:11 +01:00
parent 601e1b086b
commit cbb0460bbf
6 changed files with 427 additions and 515 deletions
Download patch file Download diff file Expand all files Collapse all files

937
app/src/main/java/com/pixelized/rplexicon/business/DiceThrowUseCase.kt
View file

File diff suppressed because it is too large Load diff

1
app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt
View file

@ -2,6 +2,7 @@ package com.pixelized.rplexicon.data.model
enum class Property(val key: String) { enum class Property(val key: String) {
PROFICIENCY("Maîtrise"), PROFICIENCY("Maîtrise"),
LEVEL("Niveau"),
HIT_POINT("Point de vie"), HIT_POINT("Point de vie"),
ARMOR_CLASS("Classe d'armure"), ARMOR_CLASS("Classe d'armure"),
INITIATIVE("Initiative"), INITIATIVE("Initiative"),

1
app/src/main/java/com/pixelized/rplexicon/data/parser/roll/ModifierParser.kt
View file

@ -10,6 +10,7 @@ class ModifierParser @Inject constructor(
companion object { companion object {
private val MODIFIER_REGEX = Regex( private val MODIFIER_REGEX = Regex(
pattern = Property.PROFICIENCY.key + pattern = Property.PROFICIENCY.key +
"|${Property.LEVEL.key}" +
"|${Property.STRENGTH.key}" + "|${Property.STRENGTH.key}" +
"|${Property.DEXTERITY.key}" + "|${Property.DEXTERITY.key}" +
"|${Property.CONSTITUTION.key}" + "|${Property.CONSTITUTION.key}" +

1
app/src/main/java/com/pixelized/rplexicon/ui/screens/character/pages/actions/SkillsViewModel.kt
View file

@ -64,6 +64,7 @@ class SkillsViewModel @Inject constructor(
val description = descriptionRepository.find(name = skill.name) val description = descriptionRepository.find(name = skill.name)
val modifier = skill.effect?.modifier?.sumOf { val modifier = skill.effect?.modifier?.sumOf {
when (it) { when (it) {
Property.LEVEL -> character?.level ?: 0
Property.PROFICIENCY -> character?.proficiency ?: 0 Property.PROFICIENCY -> character?.proficiency ?: 0
Property.STRENGTH -> character?.strength?.modifier ?: 0 Property.STRENGTH -> character?.strength?.modifier ?: 0
Property.DEXTERITY -> character?.dexterity?.modifier ?: 0 Property.DEXTERITY -> character?.dexterity?.modifier ?: 0

1
app/src/main/res/values-fr/strings.xml
View file

@ -96,6 +96,7 @@
<string name="character_sheet_title_objects">Objets</string> <string name="character_sheet_title_objects">Objets</string>
<string name="character_sheet_title_inventory">Inventaire</string> <string name="character_sheet_title_inventory">Inventaire</string>
<string name="character_sheet_title_equipment">Equipement</string> <string name="character_sheet_title_equipment">Equipement</string>
<string name="character_sheet_stat_level">Niveau</string>
<string name="character_sheet_stat_strength">Force</string> <string name="character_sheet_stat_strength">Force</string>
<string name="character_sheet_stat_strength_short">FOR</string> <string name="character_sheet_stat_strength_short">FOR</string>
<string name="character_sheet_stat_dexterity">Dextérité</string> <string name="character_sheet_stat_dexterity">Dextérité</string>

1
app/src/main/res/values/strings.xml
View file

@ -104,6 +104,7 @@
<string name="character_sheet_title_skills">Skills</string> <string name="character_sheet_title_skills">Skills</string>
<string name="character_sheet_title_inventory">Inventory</string> <string name="character_sheet_title_inventory">Inventory</string>
<string name="character_sheet_title_equipment">Equipment</string> <string name="character_sheet_title_equipment">Equipment</string>
<string name="character_sheet_stat_level">Level</string>
<string name="character_sheet_stat_strength">Strength</string> <string name="character_sheet_stat_strength">Strength</string>
<string name="character_sheet_stat_strength_short">STR</string> <string name="character_sheet_stat_strength_short">STR</string>
<string name="character_sheet_stat_dexterity">Dexterity</string> <string name="character_sheet_stat_dexterity">Dexterity</string>