diff --git a/app/imports/ui/properties/viewers/AdjustmentViewer.vue b/app/imports/ui/properties/viewers/AdjustmentViewer.vue index 817cb3aa..d4dafdab 100644 --- a/app/imports/ui/properties/viewers/AdjustmentViewer.vue +++ b/app/imports/ui/properties/viewers/AdjustmentViewer.vue @@ -40,27 +40,32 @@ computed: { effectIcon(){ let effectOp = this.model.operation === 'increment' ? 'add' : 'base'; - let value = this.model.amountResult; + let value = this.value; if (typeof value === 'string'){ value = 1; } return getEffectIcon(effectOp, -value); }, + value(){ + return 'amountResult' in this.model ? + this.model.amountResult : + this.model.amount; + }, displayedValue(){ if ( - typeof this.model.amountResult === 'number' && + typeof this.value === 'number' && this.model.operation !== 'set' ){ - return Math.abs(this.model.amountResult); + return Math.abs(this.value); } else { - return this.model.amountResult; + return this.value; } }, tooltip(){ if (this.model.operation === 'increment'){ if ( - typeof this.model.amountResult === 'string' || - this.model.amountResult >= 0 + typeof this.value === 'string' || + this.value >= 0 ){ return 'Minus'; } else { diff --git a/app/imports/ui/properties/viewers/RollViewer.vue b/app/imports/ui/properties/viewers/RollViewer.vue index 789b80e5..c77d8b10 100644 --- a/app/imports/ui/properties/viewers/RollViewer.vue +++ b/app/imports/ui/properties/viewers/RollViewer.vue @@ -4,7 +4,7 @@ diff --git a/app/imports/ui/properties/viewers/SavingThrowViewer.vue b/app/imports/ui/properties/viewers/SavingThrowViewer.vue new file mode 100644 index 00000000..f55c354d --- /dev/null +++ b/app/imports/ui/properties/viewers/SavingThrowViewer.vue @@ -0,0 +1,21 @@ + + + diff --git a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js index 4db79add..8fe203c8 100644 --- a/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js +++ b/app/imports/ui/properties/viewers/shared/propertyViewerIndex.js @@ -16,6 +16,7 @@ import NoteViewer from '/imports/ui/properties/viewers/NoteViewer.vue'; import ProficiencyViewer from '/imports/ui/properties/viewers/ProficiencyViewer.vue'; import RollViewer from '/imports/ui/properties/viewers/RollViewer.vue'; import SkillViewer from '/imports/ui/properties/viewers/SkillViewer.vue'; +import SavingThrowViewer from '/imports/ui/properties/viewers/SavingThrowViewer.vue'; import SpellListViewer from '/imports/ui/properties/viewers/SpellListViewer.vue'; import SpellViewer from '/imports/ui/properties/viewers/SpellViewer.vue'; @@ -37,6 +38,7 @@ export default { note: NoteViewer, proficiency: ProficiencyViewer, roll: RollViewer, + savingThrow: SavingThrowViewer, skill: SkillViewer, spellList: SpellListViewer, spell: SpellViewer,