Add Alteration display in the ProficiencyPage.
This commit is contained in:
parent
073b8ac61d
commit
0f3d3b8300
2 changed files with 50 additions and 41 deletions
|
|
@ -23,9 +23,9 @@ class DescriptionParser @Inject constructor() {
|
||||||
}
|
}
|
||||||
|
|
||||||
item is List<*> -> {
|
item is List<*> -> {
|
||||||
val name = item[structure.getValue(NAME)] as? String
|
val name = item.getOrNull(structure.getValue(NAME)) as? String
|
||||||
val translate = item[structure.getValue(TRANSLATE)] as? String
|
val translate = item.getOrNull(structure.getValue(TRANSLATE)) as? String
|
||||||
val description = item[structure.getValue(DESCRIPTION)] as? String
|
val description = item.getOrNull(structure.getValue(DESCRIPTION)) as? String
|
||||||
|
|
||||||
if (name != null && translate != null && description != null) {
|
if (name != null && translate != null && description != null) {
|
||||||
values[name] = Description(
|
values[name] = Description(
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ import com.pixelized.rplexicon.ui.screens.character.composable.character.LabelPo
|
||||||
import com.pixelized.rplexicon.ui.screens.character.composable.character.ProficiencyUio
|
import com.pixelized.rplexicon.ui.screens.character.composable.character.ProficiencyUio
|
||||||
import com.pixelized.rplexicon.ui.screens.character.composable.character.StatUio
|
import com.pixelized.rplexicon.ui.screens.character.composable.character.StatUio
|
||||||
import com.pixelized.rplexicon.ui.screens.character.pages.proficiency.CharacterSheetUio
|
import com.pixelized.rplexicon.ui.screens.character.pages.proficiency.CharacterSheetUio
|
||||||
|
import com.pixelized.rplexicon.utilitary.extentions.local.sum
|
||||||
import com.pixelized.rplexicon.utilitary.extentions.modifier
|
import com.pixelized.rplexicon.utilitary.extentions.modifier
|
||||||
import com.pixelized.rplexicon.utilitary.extentions.toLabel
|
import com.pixelized.rplexicon.utilitary.extentions.toLabel
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
@ -16,168 +17,176 @@ class CharacterSheetUioFactory @Inject constructor() {
|
||||||
|
|
||||||
fun convert(
|
fun convert(
|
||||||
sheet: CharacterSheet,
|
sheet: CharacterSheet,
|
||||||
alterations: Map<Property, List<Alteration.Status>>, // TODO use this param to reflect on the character sheet
|
alterations: Map<Property, List<Alteration.Status>>,
|
||||||
): CharacterSheetUio {
|
): CharacterSheetUio {
|
||||||
|
val proficiency = (sheet.proficiency + alterations[Property.PROFICIENCY].sum)
|
||||||
|
val strength = sheet.strength + alterations[Property.STRENGTH].sum
|
||||||
|
val dexterity = sheet.dexterity + alterations[Property.DEXTERITY].sum
|
||||||
|
val constitution = sheet.constitution + alterations[Property.CONSTITUTION].sum
|
||||||
|
val intelligence = sheet.intelligence + alterations[Property.INTELLIGENCE].sum
|
||||||
|
val wisdom = sheet.wisdom + alterations[Property.WISDOM].sum
|
||||||
|
val charisma = sheet.charisma + alterations[Property.CHARISMA].sum
|
||||||
|
|
||||||
return CharacterSheetUio(
|
return CharacterSheetUio(
|
||||||
initiative = LabelPointUio(
|
initiative = LabelPointUio(
|
||||||
label = R.string.character_sheet_title_initiative,
|
label = R.string.character_sheet_title_initiative,
|
||||||
value = sheet.dexterity.modifier.toLabel(),
|
value = (dexterity.modifier + alterations[Property.INITIATIVE].sum).toLabel(),
|
||||||
max = null,
|
max = null,
|
||||||
),
|
),
|
||||||
stats = listOf(
|
stats = listOf(
|
||||||
StatUio(
|
StatUio(
|
||||||
id = StatUio.ID.STRENGTH,
|
id = StatUio.ID.STRENGTH,
|
||||||
value = sheet.strength,
|
value = strength,
|
||||||
modifier = sheet.strength.modifier,
|
modifier = strength.modifier + alterations[Property.STRENGTH_THROW].sum,
|
||||||
),
|
),
|
||||||
StatUio(
|
StatUio(
|
||||||
id = StatUio.ID.DEXTERITY,
|
id = StatUio.ID.DEXTERITY,
|
||||||
value = sheet.dexterity,
|
value = dexterity,
|
||||||
modifier = sheet.dexterity.modifier,
|
modifier = dexterity.modifier + alterations[Property.DEXTERITY_THROW].sum,
|
||||||
),
|
),
|
||||||
StatUio(
|
StatUio(
|
||||||
id = StatUio.ID.CONSTITUTION,
|
id = StatUio.ID.CONSTITUTION,
|
||||||
value = sheet.constitution,
|
value = constitution,
|
||||||
modifier = sheet.constitution.modifier,
|
modifier = constitution.modifier + alterations[Property.CONSTITUTION_THROW].sum,
|
||||||
),
|
),
|
||||||
StatUio(
|
StatUio(
|
||||||
id = StatUio.ID.INTELLIGENCE,
|
id = StatUio.ID.INTELLIGENCE,
|
||||||
value = sheet.intelligence,
|
value = intelligence,
|
||||||
modifier = sheet.intelligence.modifier,
|
modifier = intelligence.modifier + alterations[Property.INTELLIGENCE_THROW].sum,
|
||||||
),
|
),
|
||||||
StatUio(
|
StatUio(
|
||||||
id = StatUio.ID.WISDOM,
|
id = StatUio.ID.WISDOM,
|
||||||
value = sheet.wisdom,
|
value = wisdom,
|
||||||
modifier = sheet.wisdom.modifier,
|
modifier = wisdom.modifier + alterations[Property.WISDOM_THROW].sum,
|
||||||
),
|
),
|
||||||
StatUio(
|
StatUio(
|
||||||
id = StatUio.ID.CHARISMA,
|
id = StatUio.ID.CHARISMA,
|
||||||
value = sheet.charisma,
|
value = charisma,
|
||||||
modifier = sheet.charisma.modifier,
|
modifier = charisma.modifier + alterations[Property.CHARISMA_THROW].sum,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
savingThrows = listOf(
|
savingThrows = listOf(
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.STRENGTH_SAVING_THROW,
|
id = ProficiencyUio.ID.STRENGTH_SAVING_THROW,
|
||||||
multiplier = sheet.strengthSavingThrows,
|
multiplier = sheet.strengthSavingThrows,
|
||||||
modifier = sheet.strength.modifier + sheet.strengthSavingThrows * sheet.proficiency,
|
modifier = strength.modifier + alterations[Property.STRENGTH_SAVING_THROW].sum + sheet.strengthSavingThrows * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.DEXTERITY_SAVING_THROW,
|
id = ProficiencyUio.ID.DEXTERITY_SAVING_THROW,
|
||||||
multiplier = sheet.dexteritySavingThrows,
|
multiplier = sheet.dexteritySavingThrows,
|
||||||
modifier = sheet.dexterity.modifier + sheet.dexteritySavingThrows * sheet.proficiency,
|
modifier = dexterity.modifier + alterations[Property.DEXTERITY_SAVING_THROW].sum + sheet.dexteritySavingThrows * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.CONSTITUTION_SAVING_THROW,
|
id = ProficiencyUio.ID.CONSTITUTION_SAVING_THROW,
|
||||||
multiplier = sheet.constitutionSavingThrows,
|
multiplier = sheet.constitutionSavingThrows,
|
||||||
modifier = sheet.constitution.modifier + sheet.constitutionSavingThrows * sheet.proficiency,
|
modifier = constitution.modifier + alterations[Property.CONSTITUTION_SAVING_THROW].sum + sheet.constitutionSavingThrows * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.INTELLIGENCE_SAVING_THROW,
|
id = ProficiencyUio.ID.INTELLIGENCE_SAVING_THROW,
|
||||||
multiplier = sheet.intelligenceSavingThrows,
|
multiplier = sheet.intelligenceSavingThrows,
|
||||||
modifier = sheet.intelligence.modifier + sheet.intelligenceSavingThrows * sheet.proficiency,
|
modifier = intelligence.modifier + alterations[Property.INTELLIGENCE_SAVING_THROW].sum + sheet.intelligenceSavingThrows * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.WISDOM_SAVING_THROW,
|
id = ProficiencyUio.ID.WISDOM_SAVING_THROW,
|
||||||
multiplier = sheet.wisdomSavingThrows,
|
multiplier = sheet.wisdomSavingThrows,
|
||||||
modifier = sheet.wisdom.modifier + sheet.wisdomSavingThrows * sheet.proficiency,
|
modifier = wisdom.modifier + alterations[Property.WISDOM_SAVING_THROW].sum + sheet.wisdomSavingThrows * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.CHARISMA_SAVING_THROW,
|
id = ProficiencyUio.ID.CHARISMA_SAVING_THROW,
|
||||||
multiplier = sheet.charismaSavingThrows,
|
multiplier = sheet.charismaSavingThrows,
|
||||||
modifier = sheet.charisma.modifier + sheet.charismaSavingThrows * sheet.proficiency,
|
modifier = charisma.modifier + alterations[Property.CHARISMA_SAVING_THROW].sum + sheet.charismaSavingThrows * proficiency,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
proficiencies = listOf(
|
proficiencies = listOf(
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.ACROBATICS,
|
id = ProficiencyUio.ID.ACROBATICS,
|
||||||
multiplier = sheet.acrobatics,
|
multiplier = sheet.acrobatics,
|
||||||
modifier = sheet.dexterity.modifier + sheet.acrobatics * sheet.proficiency,
|
modifier = dexterity.modifier + alterations[Property.ACROBATICS].sum + sheet.acrobatics * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.ARCANA,
|
id = ProficiencyUio.ID.ARCANA,
|
||||||
multiplier = sheet.arcana,
|
multiplier = sheet.arcana,
|
||||||
modifier = sheet.intelligence.modifier + sheet.arcana * sheet.proficiency,
|
modifier = intelligence.modifier + alterations[Property.ARCANA].sum + sheet.arcana * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.ATHLETICS,
|
id = ProficiencyUio.ID.ATHLETICS,
|
||||||
multiplier = sheet.athletics,
|
multiplier = sheet.athletics,
|
||||||
modifier = sheet.strength.modifier + sheet.athletics * sheet.proficiency,
|
modifier = strength.modifier + alterations[Property.ATHLETICS].sum + sheet.athletics * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.STEALTH,
|
id = ProficiencyUio.ID.STEALTH,
|
||||||
multiplier = sheet.stealth,
|
multiplier = sheet.stealth,
|
||||||
modifier = sheet.dexterity.modifier + sheet.stealth * sheet.proficiency,
|
modifier = dexterity.modifier + alterations[Property.STEALTH].sum + sheet.stealth * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.ANIMAL_HANDLING,
|
id = ProficiencyUio.ID.ANIMAL_HANDLING,
|
||||||
multiplier = sheet.animalHandling,
|
multiplier = sheet.animalHandling,
|
||||||
modifier = sheet.wisdom.modifier + sheet.animalHandling * sheet.proficiency,
|
modifier = wisdom.modifier + alterations[Property.ANIMAL_HANDLING].sum + sheet.animalHandling * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.SLEIGHT_OF_HAND,
|
id = ProficiencyUio.ID.SLEIGHT_OF_HAND,
|
||||||
multiplier = sheet.sleightOfHand,
|
multiplier = sheet.sleightOfHand,
|
||||||
modifier = sheet.dexterity.modifier + sheet.sleightOfHand * sheet.proficiency,
|
modifier = dexterity.modifier + alterations[Property.SLEIGHT_OF_HAND].sum + sheet.sleightOfHand * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.HISTORY,
|
id = ProficiencyUio.ID.HISTORY,
|
||||||
multiplier = sheet.history,
|
multiplier = sheet.history,
|
||||||
modifier = sheet.intelligence.modifier + sheet.history * sheet.proficiency,
|
modifier = intelligence.modifier + alterations[Property.HISTORY].sum + sheet.history * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.INTIMIDATION,
|
id = ProficiencyUio.ID.INTIMIDATION,
|
||||||
multiplier = sheet.intimidation,
|
multiplier = sheet.intimidation,
|
||||||
modifier = sheet.charisma.modifier + sheet.intimidation * sheet.proficiency,
|
modifier = charisma.modifier + alterations[Property.INTIMIDATION].sum + sheet.intimidation * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.INSIGHT,
|
id = ProficiencyUio.ID.INSIGHT,
|
||||||
multiplier = sheet.insight,
|
multiplier = sheet.insight,
|
||||||
modifier = sheet.wisdom.modifier + sheet.insight * sheet.proficiency,
|
modifier = wisdom.modifier + alterations[Property.INSIGHT].sum + sheet.insight * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.INVESTIGATION,
|
id = ProficiencyUio.ID.INVESTIGATION,
|
||||||
multiplier = sheet.investigation,
|
multiplier = sheet.investigation,
|
||||||
modifier = sheet.intelligence.modifier + sheet.investigation * sheet.proficiency,
|
modifier = intelligence.modifier + alterations[Property.INVESTIGATION].sum + sheet.investigation * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.MEDICINE,
|
id = ProficiencyUio.ID.MEDICINE,
|
||||||
multiplier = sheet.medicine,
|
multiplier = sheet.medicine,
|
||||||
modifier = sheet.wisdom.modifier + sheet.medicine * sheet.proficiency,
|
modifier = wisdom.modifier + alterations[Property.MEDICINE].sum + sheet.medicine * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.NATURE,
|
id = ProficiencyUio.ID.NATURE,
|
||||||
multiplier = sheet.nature,
|
multiplier = sheet.nature,
|
||||||
modifier = sheet.intelligence.modifier + sheet.nature * sheet.proficiency,
|
modifier = intelligence.modifier + alterations[Property.NATURE].sum + sheet.nature * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.PERCEPTION,
|
id = ProficiencyUio.ID.PERCEPTION,
|
||||||
multiplier = sheet.perception,
|
multiplier = sheet.perception,
|
||||||
modifier = sheet.wisdom.modifier + sheet.perception * sheet.proficiency,
|
modifier = wisdom.modifier + alterations[Property.PERCEPTION].sum + sheet.perception * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.PERSUASION,
|
id = ProficiencyUio.ID.PERSUASION,
|
||||||
multiplier = sheet.persuasion,
|
multiplier = sheet.persuasion,
|
||||||
modifier = sheet.charisma.modifier + sheet.persuasion * sheet.proficiency,
|
modifier = charisma.modifier + alterations[Property.PERSUASION].sum + sheet.persuasion * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.RELIGION,
|
id = ProficiencyUio.ID.RELIGION,
|
||||||
multiplier = sheet.religion,
|
multiplier = sheet.religion,
|
||||||
modifier = sheet.intelligence.modifier + sheet.religion * sheet.proficiency,
|
modifier = intelligence.modifier + alterations[Property.RELIGION].sum + sheet.religion * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.PERFORMANCE,
|
id = ProficiencyUio.ID.PERFORMANCE,
|
||||||
multiplier = sheet.performance,
|
multiplier = sheet.performance,
|
||||||
modifier = sheet.charisma.modifier + sheet.performance * sheet.proficiency,
|
modifier = charisma.modifier + alterations[Property.PERFORMANCE].sum + sheet.performance * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.SURVIVAL,
|
id = ProficiencyUio.ID.SURVIVAL,
|
||||||
multiplier = sheet.survival,
|
multiplier = sheet.survival,
|
||||||
modifier = sheet.wisdom.modifier + sheet.survival * sheet.proficiency,
|
modifier = wisdom.modifier + alterations[Property.SURVIVAL].sum + sheet.survival * proficiency,
|
||||||
),
|
),
|
||||||
ProficiencyUio(
|
ProficiencyUio(
|
||||||
id = ProficiencyUio.ID.DECEPTION,
|
id = ProficiencyUio.ID.DECEPTION,
|
||||||
multiplier = sheet.deception,
|
multiplier = sheet.deception,
|
||||||
modifier = sheet.charisma.modifier + sheet.deception * sheet.proficiency,
|
modifier = charisma.modifier + alterations[Property.DECEPTION].sum + sheet.deception * proficiency,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue