Merge branch 'develop' into feature/dm_screen

HarmlessKey · Nov 17, 2023 · 7519d7a · 7519d7a
2 parents fbf7346 + 2b0e239
commit 7519d7a
Show file tree

Hide file tree

Showing 14 changed files with 914 additions and 266 deletions.
diff --git a/firebase-rules.json b/firebase-rules.json
diff --git a/src/components/ReminderForm.vue b/src/components/ReminderForm.vue
@@ -65,7 +65,7 @@
 					square
 					label="Rounds"
 					type="number"
-					v-model="reminder.rounds"
+					v-model.number="reminder.rounds"
 					min="1"
 					max="99"
 					hint="One round is 6 seconds"

diff --git a/src/components/compendium/Monster.vue b/src/components/compendium/Monster.vue
@@ -520,6 +520,9 @@ export default {
 	padding: 20px;
 	color: $black;
 	font-family: Helvetica, sans-serif, serif;
+	.hk-roll {
+		color: $black;
+	}
 
 	h2 {
 		color: #6e1d10;

diff --git a/src/components/drawers/encounter/reminders/TargetReminders.vue b/src/components/drawers/encounter/reminders/TargetReminders.vue
@@ -115,7 +115,7 @@
 				</q-tab-panel>
 				<q-tab-panel name="custom">
 					<ValidationObserver v-slot="{ handleSubmit, valid }">
-						<q-form @submit="handleSubmit(valid ? addReminder('custom') : null)">
+						<q-form @submit="handleSubmit(valid ? addReminder('custom') : invalidReminder)">
 							<reminder-form v-model="customReminder" :variables="false" />
 							<q-btn color="blue" class="full-width" no-caps type="submit" :disabled="!valid"
 								>Set reminder</q-btn
@@ -176,7 +176,7 @@ export default {
 	methods: {
 		...mapActions(["set_targetReminder"]),
 		...mapActions("reminders", ["get_full_reminders"]),
-		async addReminder(type, reminder = false, selectedVars = undefined, key = undefined) {
+		addReminder(type, reminder = false, selectedVars = undefined, key = undefined) {
 			if (type === "premade") {
 				for (const target of this.reminder_targets) {
 					key = key || reminder[".key"] || reminder.key;
@@ -187,7 +187,7 @@ export default {
 						reminder.selectedVars = selectedVars;
 					}
 
-					await this.set_targetReminder({
+					this.set_targetReminder({
 						action: "add",
 						entity: target,
 						key,
@@ -198,7 +198,7 @@ export default {
 				}
 			} else if (type === "custom") {
 				for (const target of this.reminder_targets) {
-					await this.set_targetReminder({
+					this.set_targetReminder({
 						action: "add",
 						entity: target,
 						type: "custom",
@@ -220,6 +220,9 @@ export default {
 			}
 			return title;
 		},
+		invalidReminder(obj) {
+			console.warn(obj);
+		},
 	},
 };
 </script>

diff --git a/src/components/userContent/ExportUserContent.vue b/src/components/userContent/ExportUserContent.vue
@@ -216,11 +216,13 @@ export default {
 						delete entity.tempHp;
 						delete entity.maxHpMod;
 						delete entity.ac_bonus;
+						delete entity.conditions;
 						delete entity.reminders;
 						delete entity.settings;
-						delete entity.surprised;
 						delete entity.tempHp;
 						delete entity.meters;
+						delete entity.limited_uses;
+
 						return [entity_id, entity];
 					});
 				encounter.entities = Object.fromEntries(entities);