Merge branch 'release/2.17.0' into main

.github/release.yml

@@ -0,0 +1,13 @@
+changelog:
+  categories:
+    - title: New Features 🚀
+      labels:
+        - "Feature"
+    - title: Improvements 🦾
+      labels:
+        - "improvement"
+        - "enhancement"
+    - title: Bugfixes 🐛
+      labels:
+        - "bugfix"
+        - "bug"

package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.16.0",
+	"version": "2.17.0",
 	"name": "harmless_key",
 	"description": "A Dungeons and Dragons Combat Tracker",
 	"productName": "Harmless Key",

src/components/Footer.vue

@@ -11,6 +11,7 @@
 						<h2 class="neutral-2">Quick Links</h2>
 						<ul>
 							<li><router-link to="/compendium">Compendium</router-link></li>
+							<li><router-link to="/support">Support</router-link></li>
 							<li><router-link to="/feedback">Feedback</router-link></li>
 							<li><router-link to="/changelog">Changelog</router-link></li>
 							<li><router-link to="/documentation">Documentation</router-link></li>

src/components/Sidebar.vue

@@ -209,6 +209,19 @@
 							Compendium
 						</q-tooltip>
 					</q-item>
+					<q-item clickable v-ripple to="/support">
+						<q-item-section avatar>
+							<i aria-hidden="true" class="fas fa-user-headset" />
+						</q-item-section>
+						<q-item-section class="title">Support</q-item-section>
+						<q-tooltip
+							v-if="$store.getters.side_collapsed"
+							anchor="center right"
+							self="center left"
+						>
+							Support
+						</q-tooltip>
+					</q-item>
 					<q-item clickable v-ripple to="/feedback">
 						<q-item-section avatar>
 							<i aria-hidden="true" class="fas fa-comment-alt" />

src/components/combat/side/Side.vue

@@ -11,7 +11,8 @@
 		>
 			<q-tab name="log" icon="fas fa fa-scroll-old" />
 			<q-tab name="damage" icon="fas fa-swords" />
-			<q-tab name="requests" icon="fas fa-bell">
+			<q-tab v-if="!demo && !test" name="inventory" icon="fas fa-treasure-chest" />
+			<q-tab v-if="!demo && !test" name="requests" icon="fas fa-bell">
 				<div
 					class="notifications bg-red white animated zoomIn"
 					v-if="requests && Object.keys(requests).length"
@@ -28,7 +29,10 @@
 				<q-tab-panel name="damage">
 					<Dmg />
 				</q-tab-panel>
-				<q-tab-panel name="requests">
+				<q-tab-panel v-if="!demo && !test" name="inventory">
+					<Inventory />
+				</q-tab-panel>
+				<q-tab-panel v-if="!demo && !test" name="requests">
 					<Requests />
 				</q-tab-panel>
 			</q-tab-panels>
@@ -40,6 +44,7 @@
 import Dmg from "src/components/combat/side/Dmg.vue";
 import Log from "src/components/combat/side/Log.vue";
 import Requests from "src/components/combat/side/Requests.vue";
+import Inventory from "src/components/slides/party/Inventory.vue";
 import { mapGetters } from "vuex";
 
 export default {
@@ -48,14 +53,15 @@ export default {
 		Dmg,
 		Log,
 		Requests,
+		Inventory,
 	},
 	data() {
 		return {
 			tab: "log",
 		};
 	},
 	computed: {
-		...mapGetters(["encounter", "requests"]),
+		...mapGetters(["encounter", "requests", "demo", "test"]),
 	},
 };
 </script>

src/components/hk-components/hk-action-rolls/hk-roll-action.vue

@@ -106,7 +106,7 @@ export default {
 			}
 			const projectiles = this.projectileScaling(config);
 
-			if (this.$listeners["roll"]) {
+			if (this.$listeners && this.$listeners["roll"]) {
 				this.$emit("roll", e, projectiles, option);
 			} else {
 				[...Array(projectiles).keys()].forEach(() => {

src/css/variables.scss

@@ -31,7 +31,7 @@
 	--red: #cc3e4a;
 	--red-hover: #e8414f;
 	--patreon-red: #e85b46;
-	--discord-purple: #7289da;
+	--discord-purple: #5865F2;
 	--orange: #e76d3b;
 	--yellow: #c1b947;
 	--purple: #9b7aba;

src/mixins/runEncounter.js

@@ -124,8 +124,8 @@ export const runEncounter = {
 				action.rolls.forEach((item, roll_index) => {
 					share.notification.actions[action_index].rolls[roll_index] = {
 						damage_type: item.damage_type || null,
-						roll: item.modifierRoll.roll,
-						total: item.modifierRoll.total,
+						roll: item.rollResult.roll,
+						total: item.rollResult.total,
 					};
 				});
 			});

src/router/routes.js

@@ -1205,6 +1205,25 @@ const routes = [
 			description: "Documentation for Harmless Key, a Combat Tracker for D&D.",
 		},
 	},
+	{
+		path: "/support",
+		component: () => import("src/layouts/default"),
+		meta: {
+			offline: true,
+			title: "Support",
+		},
+		children: [
+			{
+				path: "",
+				name: "Support",
+				component: () => import("src/views/Pages/Support"),
+				meta: {
+					title: "Support",
+					description: "Get support with Harmless Key issues.",
+				},
+			},
+		],
+	},
 	{
 		path: "/feedback",
 		component: () => import("src/layouts/default"),