jschaufuss/DiceCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'version-2' of https://github.com/ThaumRystra/DiceCloud into version-2

Browse Source
This commit is contained in:
Stefan Zermatten
2022-02-24 10:59:16 +02:00
parent 44d3fbc065 b1feb126df
commit 4fe3f30090
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/imports/ui/creature/character/characterSheetTabs/InventoryTab.vue
View File

@@ -31,12 +31,12 @@
<v-list-item-action> <v-list-item-action>
<v-list-item-title> <v-list-item-title>
<coin-value <coin-value
:value="creature.denormalizedStats.valueTotal || 0" :value="creature.variables && creature.variables.valueTotal && creature.variables.valueTotal.value|| 0"
/> />
</v-list-item-title> </v-list-item-title>
</v-list-item-action> </v-list-item-action>
</v-list-item> </v-list-item>
<v-list-item v-if="creature.denormalizedStats.itemsAttuned"> <v-list-item v-if="creature.variables && creature.variables.itemsAttuned && creature.variables.itemsAttuned.value">
<v-list-item-avatar> <v-list-item-avatar>
<v-icon>$vuetify.icons.spell</v-icon> <v-icon>$vuetify.icons.spell</v-icon>
</v-list-item-avatar> </v-list-item-avatar>
@@ -47,7 +47,7 @@
</v-list-item-content> </v-list-item-content>
<v-list-item-action> <v-list-item-action>
<v-list-item-title> <v-list-item-title>
{{ creature.denormalizedStats.itemsAttuned }} {{ creature.variables.itemsAttuned.value }}
</v-list-item-title> </v-list-item-title>
</v-list-item-action> </v-list-item-action>
</v-list-item> </v-list-item>
@@ -140,7 +140,7 @@ export default {
creature(){ creature(){
return Creatures.findOne(this.creatureId, {fields: { return Creatures.findOne(this.creatureId, {fields: {
color: 1, color: 1,
denormalizedStats: 1, variables: 1,
}}); }});
}, },
containersWithoutAncestorContainers(){ containersWithoutAncestorContainers(){
@@ -210,7 +210,9 @@ export default {
}, },
weightCarried(){ weightCarried(){
return stripFloatingPointOddities( return stripFloatingPointOddities(
this.creature.denormalizedStats.weightCarried || 0 this.creature.variables &&
this.creature.variables.weightCarried &&
this.creature.variables.weightCarried.value || 0
); );
}, },
}, },