diff --git a/app/src/main/java/com/pixelized/rplexicon/business/DiceThrowUseCase.kt b/app/src/main/java/com/pixelized/rplexicon/business/DiceThrowUseCase.kt index 173f0c7..a18a917 100644 --- a/app/src/main/java/com/pixelized/rplexicon/business/DiceThrowUseCase.kt +++ b/app/src/main/java/com/pixelized/rplexicon/business/DiceThrowUseCase.kt @@ -32,6 +32,7 @@ import com.pixelized.rplexicon.utilitary.extentions.local.isSavageAttacks import com.pixelized.rplexicon.utilitary.extentions.local.primary import com.pixelized.rplexicon.utilitary.extentions.local.secondary import com.pixelized.rplexicon.utilitary.extentions.local.sum +import com.pixelized.rplexicon.utilitary.extentions.local.tertiary import com.pixelized.rplexicon.utilitary.extentions.local.toStatus import com.pixelized.rplexicon.utilitary.extentions.masteryMultiplier import com.pixelized.rplexicon.utilitary.extentions.modifier @@ -1020,6 +1021,7 @@ class DiceThrowUseCase @Inject constructor( Property.LEVEL -> character.level.base Property.LEVEL_PC -> character.level.primary Property.LEVEL_SC -> character.level.secondary + Property.LEVEL_TC -> character.level.tertiary else -> null }?.let { value -> val titleLabel = if (this == Property.PROFICIENCY) { @@ -1035,6 +1037,7 @@ class DiceThrowUseCase @Inject constructor( Property.LEVEL -> context.getString(R.string.character_sheet_stat_level) Property.LEVEL_PC -> context.getString(R.string.character_sheet_stat_level_pc) Property.LEVEL_SC -> context.getString(R.string.character_sheet_stat_level_sc) + Property.LEVEL_TC -> context.getString(R.string.character_sheet_stat_level_tc) else -> "" } context.getString(R.string.dice_roll_bonus_detail, label) diff --git a/app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt b/app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt index 029e2f0..24bfece 100644 --- a/app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt +++ b/app/src/main/java/com/pixelized/rplexicon/data/model/Property.kt @@ -5,6 +5,7 @@ enum class Property(val key: String) { LEVEL("Niveau"), LEVEL_PC("NiveauPC"), LEVEL_SC("NiveauCS"), + LEVEL_TC("NiveauCT"), HIT_POINT("Point de vie"), ARMOR_CLASS("Classe d'armure"), SPEED("Vitesse"), diff --git a/app/src/main/java/com/pixelized/rplexicon/data/parser/roll/ModifierParser.kt b/app/src/main/java/com/pixelized/rplexicon/data/parser/roll/ModifierParser.kt index 0642c44..b08c221 100644 --- a/app/src/main/java/com/pixelized/rplexicon/data/parser/roll/ModifierParser.kt +++ b/app/src/main/java/com/pixelized/rplexicon/data/parser/roll/ModifierParser.kt @@ -13,6 +13,7 @@ class ModifierParser @Inject constructor( Property.PROFICIENCY, Property.LEVEL_PC, Property.LEVEL_SC, + Property.LEVEL_TC, Property.LEVEL, Property.STRENGTH, Property.DEXTERITY, diff --git a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/SkillFactoryUioFactory.kt b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/SkillFactoryUioFactory.kt index cf1e696..0042d33 100644 --- a/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/SkillFactoryUioFactory.kt +++ b/app/src/main/java/com/pixelized/rplexicon/ui/screens/character/factory/SkillFactoryUioFactory.kt @@ -10,6 +10,7 @@ import com.pixelized.rplexicon.utilitary.extentions.icon import com.pixelized.rplexicon.utilitary.extentions.local.base import com.pixelized.rplexicon.utilitary.extentions.local.primary import com.pixelized.rplexicon.utilitary.extentions.local.secondary +import com.pixelized.rplexicon.utilitary.extentions.local.tertiary import com.pixelized.rplexicon.utilitary.extentions.modifier import com.pixelized.rplexicon.utilitary.extentions.string.skillIcon import com.pixelized.rplexicon.utilitary.extentions.toLabel @@ -31,6 +32,7 @@ class SkillFactoryUioFactory @Inject constructor( Property.LEVEL -> character?.level?.base ?: 0 Property.LEVEL_PC -> character?.level?.primary ?: 0 Property.LEVEL_SC -> character?.level?.secondary ?: 0 + Property.LEVEL_TC -> character?.level?.tertiary ?: 0 Property.PROFICIENCY -> character?.proficiency ?: 0 Property.STRENGTH -> character?.strength?.modifier ?: 0 Property.DEXTERITY -> character?.dexterity?.modifier ?: 0 diff --git a/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/local/CharacterSheetEx.kt b/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/local/CharacterSheetEx.kt index e50bf2e..3485c28 100644 --- a/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/local/CharacterSheetEx.kt +++ b/app/src/main/java/com/pixelized/rplexicon/utilitary/extentions/local/CharacterSheetEx.kt @@ -48,4 +48,5 @@ fun CharacterSheet.firstSpellSlot(): Int? { val List.base: Int get() = sum() val List.primary: Int get() = getOrNull(0) ?: 0 -val List.secondary: Int get() = getOrNull(1) ?: 0 \ No newline at end of file +val List.secondary: Int get() = getOrNull(1) ?: 0 +val List.tertiary: Int get() = getOrNull(2) ?: 0 \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 00c38ff..eb2e101 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -143,6 +143,7 @@ Niveau Niveau de classe primaire Niveau de sous classe + Niveau de sous classe Force FOR Dextérité diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2dec333..b47864f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -149,6 +149,7 @@ Level Primary class level Secondary class level + Tertiary class level Strength STR Dexterity