diff --git a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue b/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue index cffd8bc5..cba250c3 100644 --- a/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue +++ b/app/imports/ui/creature/character/printedCharacterSheet/CharacterSheetPrinted.vue @@ -31,14 +31,45 @@ v-else light > - - - - - +
+
+
+
+ {{ creature.name }} +
+
+
+ {{ creature.alignment }} {{ background }} +
+ + {{ race }} {{ creature.gender }} + +
+ Level {{ level }} {{ classes[0].name }} +
+
+ Level {{ level }} ({{ classes.map(c => `${c.name} ${c.level}`).join(', ') }}) +
+
+ +
+
+ {{ creatureUrl }} +
+ + + +
@@ -46,25 +77,59 @@ - - \ No newline at end of file diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue deleted file mode 100644 index c1bfc215..00000000 --- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedFeatures.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue index ea77fddd..53694a81 100644 --- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue +++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedInventory.vue @@ -1,90 +1,84 @@ @@ -93,22 +87,20 @@ import CreatureProperties from '/imports/api/creature/creatureProperties/CreatureProperties.js'; import Creatures from '/imports/api/creature/creatures/Creatures.js'; import ColumnLayout from '/imports/ui/components/ColumnLayout.vue'; -import ContainerCard from '/imports/ui/properties/components/inventory/ContainerCard.vue'; -import ToolbarCard from '/imports/ui/components/ToolbarCard.vue'; -import ItemList from '/imports/ui/properties/components/inventory/ItemList.vue'; import getParentRefByTag from '/imports/api/creature/creatureProperties/methods/getParentRefByTag.js'; import BUILT_IN_TAGS from '/imports/constants/BUILT_IN_TAGS.js'; import CoinValue from '/imports/ui/components/CoinValue.vue'; import stripFloatingPointOddities from '/imports/api/engine/computation/utility/stripFloatingPointOddities.js'; -import CreatureVariables from '../../../../api/creature/creatures/CreatureVariables'; +import PrintedItem from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue'; +import PrintedContainer from '/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue'; +import CreatureVariables from '/imports/api/creature/creatures/CreatureVariables.js'; export default { components: { ColumnLayout, - ContainerCard, - ToolbarCard, - ItemList, CoinValue, + PrintedItem, + PrintedContainer, }, props: { creatureId: { @@ -154,6 +146,17 @@ export default { inactive: { $ne: true }, }, { sort: { order: 1 }, + }).map(c => { + c.items = CreatureProperties.find({ + 'parent.id': c._id, + type: { $in: ['item', 'container'] }, + removed: { $ne: true }, + equipped: { $ne: true }, + deactivatedByAncestor: { $ne: true }, + }, { + sort: { order: 1 }, + }).fetch(); + return c; }); }, carriedItems() { @@ -229,5 +232,39 @@ export default { diff --git a/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue b/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue index a5e307cc..1d60374b 100644 --- a/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue +++ b/app/imports/ui/creature/character/printedCharacterSheet/PrintedSpells.vue @@ -1,23 +1,38 @@ @@ -25,14 +40,14 @@ diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue new file mode 100644 index 00000000..5f1adf07 --- /dev/null +++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedAction.vue @@ -0,0 +1,247 @@ + + + + + + + diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue new file mode 100644 index 00000000..a15ed8c8 --- /dev/null +++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedContainer.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue new file mode 100644 index 00000000..386aabcd --- /dev/null +++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedDamageMultipliers.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue new file mode 100644 index 00000000..ccc5b85d --- /dev/null +++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedItem.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue new file mode 100644 index 00000000..2920634c --- /dev/null +++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSkill.vue @@ -0,0 +1,105 @@ + + + + + diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue new file mode 100644 index 00000000..8367c2a0 --- /dev/null +++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpell.vue @@ -0,0 +1,82 @@ + + + + + diff --git a/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue new file mode 100644 index 00000000..0ee80376 --- /dev/null +++ b/app/imports/ui/creature/character/printedCharacterSheet/components/PrintedSpellList.vue @@ -0,0 +1,39 @@ + + + \ No newline at end of file diff --git a/app/package-lock.json b/app/package-lock.json index fcedb023..04d47295 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "dicecloud", - "version": "2.0.42", + "version": "2.0.43", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -594,9 +594,9 @@ } }, "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "base64-js": { "version": "1.5.1", @@ -893,12 +893,12 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "core-js": { "version": "2.6.12", @@ -958,7 +958,7 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==" + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decompress-response": { "version": "6.0.0", @@ -1005,7 +1005,7 @@ "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "detect-libc": { "version": "2.0.1", @@ -1715,7 +1715,7 @@ "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, "http-signature": { "version": "1.2.0", @@ -2090,7 +2090,7 @@ "lodash.omit": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", - "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==" + "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=" }, "lodash.template": { "version": "4.5.0", @@ -3008,9 +3008,9 @@ "integrity": "sha1-IBvZSSceGfbgrwodwMzFg95HxjA=" }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" } @@ -3156,7 +3156,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-inspect": { "version": "1.12.2", @@ -3352,6 +3352,11 @@ "yargs": "^15.3.1" } }, + "qrcode.vue": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/qrcode.vue/-/qrcode.vue-1.7.0.tgz", + "integrity": "sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g==" + }, "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", @@ -3396,7 +3401,7 @@ "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==" + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" } } }, @@ -3470,7 +3475,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-from-string": { "version": "2.0.2", @@ -3570,7 +3575,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "setimmediate": { "version": "1.0.5", @@ -3660,7 +3665,7 @@ "simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", "requires": { "is-arrayish": "^0.3.1" } @@ -4096,7 +4101,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { "version": "3.4.0", @@ -4243,7 +4248,7 @@ "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==" + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" }, "which-typed-array": { "version": "1.1.8", diff --git a/app/package.json b/app/package.json index 23f1e79f..52342baf 100644 --- a/app/package.json +++ b/app/package.json @@ -44,6 +44,7 @@ "ngraph.path": "^1.4.0", "pretty-bytes": "^6.0.0", "qrcode": "^1.5.1", + "qrcode.vue": "^1.7.0", "request": "^2.88.2", "sharp": "^0.30.7", "simpl-schema": "^1.13.1", @@ -124,4 +125,4 @@ "vuetify/no-deprecated-classes": "error" } } -} \ No newline at end of file +} diff --git a/app/public/images/print/octogonBorder.png b/app/public/images/print/octagonBorder.png similarity index 100% rename from app/public/images/print/octogonBorder.png rename to app/public/images/print/octagonBorder.png