From ab69cdb9808998b1b9ce859d4e6b99903b3f101a Mon Sep 17 00:00:00 2001
From: Harm Manders <harmmanders@gmail.com>
Date: Wed, 4 Mar 2026 23:00:26 +0100
Subject: [PATCH 1/5] Add NPC bonus actions support

Split the actions array display into regular and bonus action sections
by filtering on an optional timing field. Bonus actions share the
existing actions[] array; timing: "bonus_action" routes items to a
separate UI section with its own header, add button, and draggable list.

- hk-npc-schema.json: allow timing field on action items
- npcs/Actions.vue: 5-entry config, filtered draggables, timing dropdown
- CardActions.vue: split entity.actions into two labeled sections
- Monster.vue: same split for compendium display
---
 .../combat/entities/Card/CardActions.vue      | 310 +++++++++++++++++-
 src/components/compendium/Monster.vue         | 100 +++++-
 src/components/npcs/Actions.vue               | 103 +++++-
 src/schemas/hk-npc-schema.json                |   7 +-
 4 files changed, 499 insertions(+), 21 deletions(-)

diff --git a/src/components/combat/entities/Card/CardActions.vue b/src/components/combat/entities/Card/CardActions.vue
index f53b81449..2085fcdc5 100644
--- a/src/components/combat/entities/Card/CardActions.vue
+++ b/src/components/combat/entities/Card/CardActions.vue
@@ -1,7 +1,307 @@
 <template>
 	<div class="card-actions">
 		<div v-for="{ category, name } in actions" :key="category">
-			<template v-if="entity[category] && entity[category].length > 0">
+			<template v-if="category === 'actions'">
+				<!-- Regular actions -->
+				<template v-if="regularActions.length > 0">
+					<h3 class="label d-flex justify-content-between">Actions</h3>
+					<div
+						v-for="(action, action_index) in regularActions"
+						:key="`action-${action_index}`"
+						class="card-action"
+					>
+						<div class="card-action-title">
+							<template
+								v-if="
+									rollable &&
+									action.action_list &&
+									action.action_list[0] &&
+									action.action_list[0].type !== 'other' &&
+									action.action_list[0].rolls &&
+									action.action_list[0].rolls.length
+								"
+							>
+								<hk-roll-action
+									:action="action"
+									:tooltip="`Roll ${action.name}`"
+									@roll="startRoll(...arguments, action_index, action, category)"
+									:disabled="!checkAvailable(category, action_index, action)"
+								>
+									<span class="roll-button" />
+								</hk-roll-action>
+							</template>
+							<div class="card-action-title__name">
+								<strong
+									><em>
+										{{ action.name }}
+										{{
+											action.recharge
+												? `(Recharge ${
+														action.recharge === "rest"
+															? "after a Short or Long Rest"
+															: action.recharge
+													})`
+												: ``
+										}}
+										{{
+											action.limit
+												? `(${action.limit}/${
+														action.limit_type ? action.limit_type.capitalize() : `Day`
+													})`
+												: ``
+										}}
+										{{ action.legendary_cost > 1 ? `(Costs ${action.legendary_cost} Actions)` : `` }}
+									</em></strong
+								>
+
+								<template v-if="action.limit || action.recharge || action.legendary_cost">
+									<template v-if="action.legendary_cost || action.recharge">
+										<div
+											v-if="checkAvailable(category, action_index, action)"
+											class="btn btn-xs btn-clear"
+											@click.stop="
+												spendLimited(
+													category,
+													action.legendary_cost ? 'legendaries_used' : action_index,
+													false,
+													action.legendary_cost ? action.legendary_cost : 1
+												)
+											"
+										>
+											Spend
+										</div>
+										<i aria-hidden="true" v-else class="fas fa-ban neutral-2" />
+									</template>
+									<LimitedUseCounter
+										v-else
+										:entity="entity"
+										:limited_type="category"
+										:limited_index="action_index"
+										:limited_max="action.limit"
+									/>
+								</template>
+							</div>
+						</div>
+						<!-- Roll Summary -->
+						<div
+							v-if="
+								action.action_list && action.action_list[0] && action.action_list[0].type !== 'other'
+							"
+						>
+							<span v-if="action.action_list[0].rolls">
+								<span
+									v-for="(roll, roll_index) in action.action_list[0].rolls"
+									:key="`roll-${action_index}-${roll_index}`"
+								>
+									(<i
+										aria-hidden="true"
+										:class="[
+											action.action_list[0].type === 'healing'
+												? 'fas fa-heart green'
+												: damage_type_icons[roll.damage_type],
+											roll.damage_type,
+										]"
+									/>
+									{{ roll.dice_count || "" }}{{ roll.dice_type ? `d${roll.dice_type}` : `` }}
+									<template v-if="roll.fixed_val && roll.dice_count">
+										{{
+											// eslint-disable-next-line vue/no-parsing-error
+											roll.fixed_val < 0 ? `- ${Math.abs(roll.fixed_val)}` : `+ ${roll.fixed_val}`
+										}})
+									</template>
+									<template v-else>{{ roll.fixed_val }})</template>
+									<!-- eslint-disable-next-line vue/no-parsing-error -->
+									{{ roll_index + 1 < action.action_list[0].rolls.length ? "+" : "" }}
+									<q-tooltip anchor="top middle" self="center middle">
+										{{
+											action.action_list[0].type === "healing"
+												? "Healing"
+												: `${roll.damage_type.capitalize()} damage`
+										}}
+									</q-tooltip>
+								</span>
+							</span>
+							<!-- Reach -->
+							<span v-if="action.reach">
+								<span class="blue">|</span> {{ action.reach }}<small class="neutral-2">ft.</small>
+								<q-tooltip anchor="top middle" self="center middle"> Reach </q-tooltip>
+							</span>
+							<!-- Range -->
+							<span v-if="action.range">
+								<span class="blue">|</span> {{ action.range }}<small class="neutral-2">ft.</small>
+								<q-tooltip anchor="top middle" self="center middle"> Range </q-tooltip>
+							</span>
+							<!-- Saving throw -->
+							<span v-if="action.action_list[0].type === 'save' && action.action_list[0].save_dc">
+								<span class="blue">|</span>
+								<span v-if="action.action_list[0].save_ability">
+									{{ action.action_list[0].save_ability.substring(0, 3).toUpperCase() }}
+								</span>
+								{{ action.action_list[0].save_dc }}
+							</span>
+							<!-- AOE -->
+							<span v-if="action.aoe_type">
+								<span class="blue">|</span>
+								{{ action.aoe_size }}<small class="neutral-2">ft.</small>
+								{{ action.aoe_type.capitalize() }}
+								<q-tooltip anchor="top middle" self="center middle"> Area of effect </q-tooltip>
+							</span>
+						</div>
+						<hk-dice-text v-if="action.desc" :input_text="action.desc" />
+					</div>
+				</template>
+
+				<!-- Bonus actions -->
+				<template v-if="bonusActions.length > 0">
+					<h3 class="label d-flex justify-content-between">Bonus Actions</h3>
+					<div
+						v-for="(action, action_index) in bonusActions"
+						:key="`bonus-${action_index}`"
+						class="card-action"
+					>
+						<div class="card-action-title">
+							<template
+								v-if="
+									rollable &&
+									action.action_list &&
+									action.action_list[0] &&
+									action.action_list[0].type !== 'other' &&
+									action.action_list[0].rolls &&
+									action.action_list[0].rolls.length
+								"
+							>
+								<hk-roll-action
+									:action="action"
+									:tooltip="`Roll ${action.name}`"
+									@roll="startRoll(...arguments, action_index, action, category)"
+									:disabled="!checkAvailable(category, action_index, action)"
+								>
+									<span class="roll-button" />
+								</hk-roll-action>
+							</template>
+							<div class="card-action-title__name">
+								<strong
+									><em>
+										{{ action.name }}
+										{{
+											action.recharge
+												? `(Recharge ${
+														action.recharge === "rest"
+															? "after a Short or Long Rest"
+															: action.recharge
+													})`
+												: ``
+										}}
+										{{
+											action.limit
+												? `(${action.limit}/${
+														action.limit_type ? action.limit_type.capitalize() : `Day`
+													})`
+												: ``
+										}}
+										{{ action.legendary_cost > 1 ? `(Costs ${action.legendary_cost} Actions)` : `` }}
+									</em></strong
+								>
+
+								<template v-if="action.limit || action.recharge || action.legendary_cost">
+									<template v-if="action.legendary_cost || action.recharge">
+										<div
+											v-if="checkAvailable(category, action_index, action)"
+											class="btn btn-xs btn-clear"
+											@click.stop="
+												spendLimited(
+													category,
+													action.legendary_cost ? 'legendaries_used' : action_index,
+													false,
+													action.legendary_cost ? action.legendary_cost : 1
+												)
+											"
+										>
+											Spend
+										</div>
+										<i aria-hidden="true" v-else class="fas fa-ban neutral-2" />
+									</template>
+									<LimitedUseCounter
+										v-else
+										:entity="entity"
+										:limited_type="category"
+										:limited_index="action_index"
+										:limited_max="action.limit"
+									/>
+								</template>
+							</div>
+						</div>
+						<!-- Roll Summary -->
+						<div
+							v-if="
+								action.action_list && action.action_list[0] && action.action_list[0].type !== 'other'
+							"
+						>
+							<span v-if="action.action_list[0].rolls">
+								<span
+									v-for="(roll, roll_index) in action.action_list[0].rolls"
+									:key="`roll-${action_index}-${roll_index}`"
+								>
+									(<i
+										aria-hidden="true"
+										:class="[
+											action.action_list[0].type === 'healing'
+												? 'fas fa-heart green'
+												: damage_type_icons[roll.damage_type],
+											roll.damage_type,
+										]"
+									/>
+									{{ roll.dice_count || "" }}{{ roll.dice_type ? `d${roll.dice_type}` : `` }}
+									<template v-if="roll.fixed_val && roll.dice_count">
+										{{
+											// eslint-disable-next-line vue/no-parsing-error
+											roll.fixed_val < 0 ? `- ${Math.abs(roll.fixed_val)}` : `+ ${roll.fixed_val}`
+										}})
+									</template>
+									<template v-else>{{ roll.fixed_val }})</template>
+									<!-- eslint-disable-next-line vue/no-parsing-error -->
+									{{ roll_index + 1 < action.action_list[0].rolls.length ? "+" : "" }}
+									<q-tooltip anchor="top middle" self="center middle">
+										{{
+											action.action_list[0].type === "healing"
+												? "Healing"
+												: `${roll.damage_type.capitalize()} damage`
+										}}
+									</q-tooltip>
+								</span>
+							</span>
+							<!-- Reach -->
+							<span v-if="action.reach">
+								<span class="blue">|</span> {{ action.reach }}<small class="neutral-2">ft.</small>
+								<q-tooltip anchor="top middle" self="center middle"> Reach </q-tooltip>
+							</span>
+							<!-- Range -->
+							<span v-if="action.range">
+								<span class="blue">|</span> {{ action.range }}<small class="neutral-2">ft.</small>
+								<q-tooltip anchor="top middle" self="center middle"> Range </q-tooltip>
+							</span>
+							<!-- Saving throw -->
+							<span v-if="action.action_list[0].type === 'save' && action.action_list[0].save_dc">
+								<span class="blue">|</span>
+								<span v-if="action.action_list[0].save_ability">
+									{{ action.action_list[0].save_ability.substring(0, 3).toUpperCase() }}
+								</span>
+								{{ action.action_list[0].save_dc }}
+							</span>
+							<!-- AOE -->
+							<span v-if="action.aoe_type">
+								<span class="blue">|</span>
+								{{ action.aoe_size }}<small class="neutral-2">ft.</small>
+								{{ action.aoe_type.capitalize() }}
+								<q-tooltip anchor="top middle" self="center middle"> Area of effect </q-tooltip>
+							</span>
+						</div>
+						<hk-dice-text v-if="action.desc" :input_text="action.desc" />
+					</div>
+				</template>
+			</template>
+
+			<template v-else-if="entity[category] && entity[category].length > 0">
 				<h3 v-if="category !== 'special_abilities'" class="label d-flex justify-content-between">
 					{{ name }}
 					<LimitedUseCounter
@@ -216,6 +516,14 @@ export default {
 	},
 	computed: {
 		...mapGetters(["targeted"]),
+		regularActions() {
+			return (this.entity.actions || []).filter(
+				(a) => !a.timing || a.timing === "action"
+			);
+		},
+		bonusActions() {
+			return (this.entity.actions || []).filter((a) => a.timing === "bonus_action");
+		},
 	},
 	methods: {
 		startRoll(e, projectiles, option, action_index, action, category) {
diff --git a/src/components/compendium/Monster.vue b/src/components/compendium/Monster.vue
index 857d36237..147c24051 100644
--- a/src/components/compendium/Monster.vue
+++ b/src/components/compendium/Monster.vue
@@ -306,9 +306,97 @@
 				</p>
 			</template>
 
-			<div class="monster-card__traits">
+						<div class="monster-card__traits">
 				<div v-for="{ category, name } in actions" :key="category">
-					<template v-if="monster[category] && monster[category].length > 0">
+					<template v-if="category === 'actions'">
+						<!-- Regular actions -->
+						<template v-if="regularActions.length > 0">
+							<h2>Actions</h2>
+							<template v-for="(ability, index) in regularActions">
+								<hk-dice-text
+									v-if="ability.desc"
+									:key="`action-${index}`"
+									class="monster-card__traits-description"
+									:input_text="ability.desc"
+									><template
+										v-if="
+											ability.action_list &&
+											ability.action_list[0] &&
+											ability.action_list[0].type !== 'other' &&
+											ability.action_list[0].rolls &&
+											ability.action_list[0].rolls.length
+										"
+										><hk-roll-action :tooltip="`Roll ${ability.name}`" :action="ability"
+											><span class="roll-button" /></hk-roll-action></template
+									><span class="monster-card__traits-description__title"
+										>{{ ability.name
+										}}{{
+											ability.recharge
+												? ` (Recharge ${
+														ability.recharge === "rest"
+															? "after a Short or Long Rest"
+															: ability.recharge
+													})`
+												: ``
+										}}{{
+											ability.limit
+												? ` (${ability.limit}/${
+														ability.limit_type ? ability.limit_type.capitalize() : `Day`
+													})`
+												: ``
+										}}{{
+											ability.legendary_cost > 1 ? ` (Costs ${ability.legendary_cost} Actions)` : ``
+										}}.
+									</span></hk-dice-text
+								>
+							</template>
+						</template>
+
+						<!-- Bonus actions -->
+						<template v-if="bonusActions.length > 0">
+							<h2>Bonus Actions</h2>
+							<template v-for="(ability, index) in bonusActions">
+								<hk-dice-text
+									v-if="ability.desc"
+									:key="`bonus-${index}`"
+									class="monster-card__traits-description"
+									:input_text="ability.desc"
+									><template
+										v-if="
+											ability.action_list &&
+											ability.action_list[0] &&
+											ability.action_list[0].type !== 'other' &&
+											ability.action_list[0].rolls &&
+											ability.action_list[0].rolls.length
+										"
+										><hk-roll-action :tooltip="`Roll ${ability.name}`" :action="ability"
+											><span class="roll-button" /></hk-roll-action></template
+									><span class="monster-card__traits-description__title"
+										>{{ ability.name
+										}}{{
+											ability.recharge
+												? ` (Recharge ${
+														ability.recharge === "rest"
+															? "after a Short or Long Rest"
+															: ability.recharge
+													})`
+												: ``
+										}}{{
+											ability.limit
+												? ` (${ability.limit}/${
+														ability.limit_type ? ability.limit_type.capitalize() : `Day`
+													})`
+												: ``
+										}}{{
+											ability.legendary_cost > 1 ? ` (Costs ${ability.legendary_cost} Actions)` : ``
+										}}.
+									</span></hk-dice-text
+								>
+							</template>
+						</template>
+					</template>
+
+					<template v-else-if="monster[category] && monster[category].length > 0">
 						<h2>{{ name }}</h2>
 						<p
 							v-if="monster.legendary_count && category === 'legendary_actions'"
@@ -487,6 +575,14 @@ export default {
 		shares() {
 			return this.broadcast.shares || [];
 		},
+		regularActions() {
+			return (this.monster.actions || []).filter(
+				(a) => !a.timing || a.timing === "action"
+			);
+		},
+		bonusActions() {
+			return (this.monster.actions || []).filter((a) => a.timing === "bonus_action");
+		},
 		caster_spell_levels() {
 			if (this.monster.caster_spells) {
 				let levels = [];
diff --git a/src/components/npcs/Actions.vue b/src/components/npcs/Actions.vue
index bc000d336..6f704f515 100644
--- a/src/components/npcs/Actions.vue
+++ b/src/components/npcs/Actions.vue
@@ -11,11 +11,11 @@
 						<div class="bg-neutral-9">
 							<q-list>
 								<q-item
-									v-for="{ category, name_single } in actions"
-									:key="`add-${category}`"
+									v-for="{ category, name_single, timing } in actions"
+									:key="`add-${category}-${timing || 'default'}`"
 									clickable
 									v-close-popup
-									@click="add(category)"
+									@click="add(category, timing)"
 								>
 									<q-item-section avatar>
 										<i aria-hidden="true" class="fas fa-plus"></i>
@@ -29,11 +29,11 @@
 			</div>
 
 			<div class="card-body -mt-3">
-				<template v-for="{ name, category, name_single } in actions">
-					<div v-if="npc[category] && npc[category].length > 0" :key="category">
+				<template v-for="{ name, category, name_single, timing } in actions">
+					<div v-if="sectionItems(category, timing).length > 0" :key="`${category}-${timing || 'default'}`">
 						<h3 class="d-flex justify-content-between mt-3">
 							{{ name }}
-							<a class="btn btn-sm btn-clear" @click="add(category)">
+							<a class="btn btn-sm btn-clear" @click="add(category, timing)">
 								<i aria-hidden="true" class="fas fa-plus green"></i>
 								<span class="d-none d-md-inline ml-1">Add {{ name_single }}</span>
 							</a>
@@ -62,13 +62,15 @@
 						<!-- ABILITIES -->
 						<draggable
 							tag="div"
-							v-model="npc[category]"
+							:list="sectionItems(category, timing)"
 							:animation="200"
 							class="accordion"
 							handle=".drag-handle"
 							ghost-class="drag-ghost"
 							drag-class="drag-dragging"
 							:force-fallback="true"
+							:group="{ name: `${category}-${timing || 'default'}`, pull: false, put: false }"
+							@change="category === 'actions' ? onDraggableChange($event, category, timing) : null"
 						>
 							<transition-group
 								type="transition"
@@ -77,8 +79,8 @@
 								leave-active-class="animated animate__fadeOut"
 							>
 								<div
-									v-for="(ability, ability_index) in npc[category]"
-									:key="`ability-${ability_index}`"
+									v-for="(ability, filtered_index) in sectionItems(category, timing)"
+									:key="`${category}-${timing || 'default'}-${getActionIndex(ability, category) >= 0 ? getActionIndex(ability, category) : filtered_index}`"
 								>
 									<ValidationObserver v-slot="{ valid }">
 										<q-expansion-item
@@ -137,7 +139,7 @@
 													</hk-roll-action>
 												</q-item-section>
 												<q-item-section avatar>
-													<a @click.stop="remove(ability_index, category)" class="remove">
+													<a @click.stop="remove(getActionIndex(ability, category), category)" class="remove">
 														<i aria-hidden="true" class="fas fa-trash-alt red" />
 														<q-tooltip anchor="top middle" self="center middle"> Remove </q-tooltip>
 													</a>
@@ -188,6 +190,23 @@
 													/>
 												</ValidationProvider>
 
+												<q-select
+													v-if="category === 'actions'"
+													:dark="$store.getters.theme === 'dark'"
+													filled
+													square
+													class="mb-3"
+													:value="ability.timing || 'action'"
+													:options="[
+														{ label: 'Action', value: 'action' },
+														{ label: 'Bonus Action', value: 'bonus_action' },
+													]"
+													label="Timing"
+													emit-value
+													map-options
+													@input="val => { $set(ability, 'timing', val); $forceUpdate(); }"
+												/>
+
 												<div
 													class="row q-col-gutter-md mb-2"
 													v-if="category !== 'legendary_actions'"
@@ -369,7 +388,7 @@
 														"
 														class="mb-4"
 														@new-value="addOption"
-														@remove="removeOption($event, category, ability_index)"
+														@remove="removeOption($event, category, getActionIndex(ability, category))"
 														@input="$forceUpdate()"
 													>
 														<hk-popover slot="append" header="Action options">
@@ -488,7 +507,7 @@
 																		class="btn btn-sm bg-neutral-5"
 																		@click="
 																			newRoll(
-																				ability_index,
+																				getActionIndex(ability, category),
 																				ability,
 																				category,
 																				action_index,
@@ -514,7 +533,7 @@
 																	@edit="
 																		editRoll(
 																			$event,
-																			ability_index,
+																			getActionIndex(ability, category),
 																			ability,
 																			category,
 																			action_index,
@@ -522,7 +541,7 @@
 																		)
 																	"
 																	@delete="
-																		deleteRoll($event, ability_index, category, action_index)
+																		deleteRoll($event, getActionIndex(ability, category), category, action_index)
 																	"
 																/>
 															</div>
@@ -608,6 +627,12 @@ export default {
 					name_single: "Special ability",
 				},
 				{ category: "actions", name: "Actions", name_single: "Action" },
+				{
+					category: "actions",
+					name: "Bonus Actions",
+					name_single: "Bonus action",
+					timing: "bonus_action",
+				},
 				{
 					category: "legendary_actions",
 					name: "Legendary Actions",
@@ -636,6 +661,14 @@ export default {
 				this.$emit("input", newValue);
 			},
 		},
+		regularActions() {
+			return (this.npc.actions || []).filter(
+				(a) => !a.timing || a.timing === "action"
+			);
+		},
+		bonusActions() {
+			return (this.npc.actions || []).filter((a) => a.timing === "bonus_action");
+		},
 	},
 	methods: {
 		...mapActions(["setActionRoll"]),
@@ -646,14 +679,46 @@ export default {
 				this.$set(object, property, parseInt(value));
 			}
 		},
+		/**
+		 * Returns the items for a given section, filtered by timing for the actions category.
+		 */
+		sectionItems(category, timing) {
+			if (category !== "actions") return this.npc[category] || [];
+			return timing ? this.bonusActions : this.regularActions;
+		},
+		/**
+		 * Maps a filtered-loop item back to its real index in npc[category].
+		 */
+		getActionIndex(action, category) {
+			return (this.npc[category] || []).indexOf(action);
+		},
+		/**
+		 * Handles drag reorder for filtered action sections (regular or bonus).
+		 */
+		onDraggableChange(event, category, timing) {
+			if (!event.moved) return;
+			const { oldIndex, newIndex } = event.moved;
+			const slots = (this.npc[category] || [])
+				.map((a, i) => i)
+				.filter((i) =>
+					timing
+						? this.npc[category][i].timing === timing
+						: !this.npc[category][i].timing || this.npc[category][i].timing === "action"
+				);
+			const arr = [...this.npc[category]];
+			const [item] = arr.splice(slots[oldIndex], 1);
+			arr.splice(slots[newIndex], 0, item);
+			this.npc[category] = arr;
+		},
 		/**
 		 * Add a new action
 		 *
-		 * @param {string} category actions / lengedary_actions / special_abilities
+		 * @param {string} category actions / legendary_actions / special_abilities
+		 * @param {string} timing optional timing value for bonus actions
 		 */
-		add(category) {
+		add(category, timing = null) {
 			let type;
-			if (category === "actions") {
+			if (category === "actions" && !timing) {
 				type = "melee_weapon";
 			} else if (category === "legendary_actions") {
 				type = "save";
@@ -670,6 +735,10 @@ export default {
 				],
 			};
 
+			if (timing) {
+				action.timing = timing;
+			}
+
 			if (this.npc[category] === undefined) {
 				this.npc[category] = [];
 			}
diff --git a/src/schemas/hk-npc-schema.json b/src/schemas/hk-npc-schema.json
index e425a76e9..ef2bf89b0 100644
--- a/src/schemas/hk-npc-schema.json
+++ b/src/schemas/hk-npc-schema.json
@@ -534,7 +534,12 @@
 					"aoe_type": { "$ref": "#/$defs/action-aoe-type" },
 					"aoe_size": { "$ref": "#/$defs/action-aoe-size" },
 					"options": { "$ref": "#/$defs/action-options" },
-					"action_list": { "$ref": "#/$defs/action-list" }
+					"action_list": { "$ref": "#/$defs/action-list" },
+					"timing": {
+						"title": "Action timing",
+						"type": "string",
+						"enum": ["action", "bonus_action"]
+					}
 				},
 				"required": ["name"]
 			}

From 4f547ca21b2ef1bf8aad19873d2ab48e03a0cde5 Mon Sep 17 00:00:00 2001
From: Harm Manders <harmmanders@gmail.com>
Date: Wed, 11 Mar 2026 09:01:54 +0100
Subject: [PATCH 2/5] removed rules from git

---
 firebase-rules.json | 1873 -------------------------------------------
 1 file changed, 1873 deletions(-)
 delete mode 100644 firebase-rules.json

diff --git a/firebase-rules.json b/firebase-rules.json
deleted file mode 100644
index 9836a25f4..000000000
--- a/firebase-rules.json
+++ /dev/null
@@ -1,1873 +0,0 @@
-{
-	"rules": {
-		"campaigns": {
-			"$uid": {
-				".write": "$uid === auth.uid || root.child('users').child(auth.uid).child('admin').exists()",
-				".indexOn": "private",
-				"$campaignId": {
-					".validate": "newData.hasChildren(['name'])",
-					"timestamp": {
-						".validate": "newData.isNumber()"
-					},
-					"harmless_key": {
-						".validate": "newData.isString() && newData.val().length <= 100"
-					},
-					"name": {
-						".validate": "newData.isString() && newData.val().length <= 200"
-					},
-					"advancement": {
-						".validate": true
-					},
-					"private": {
-						".validate": "newData.isBoolean()"
-					},
-					"background": {
-						".validate": "newData.isString() && newData.val().length <= 2000"
-					},
-					"hk_background": {
-						".validate": "newData.isString() && newData.val().length <= 2000"
-					},
-					"inventory": {
-						"currency": {
-							".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 4294967295"
-						},
-						"items": { ".validate": true }
-					},
-					"temporary_background": {
-						"image": { ".validate": "newData.isString() && newData.val().length <= 2000" },
-						"youtube": { ".validate": "newData.isString() && newData.val().length <= 2000" },
-						"video": { ".validate": "newData.isString() && newData.val().length <= 2000" }
-					},
-					"sharing": {
-						"image": { ".validate": "newData.isString() && newData.val().length <= 2000" },
-						"youtube": { ".validate": "newData.isString() && newData.val().length <= 2000" },
-						"message": { ".validate": "newData.isString() && newData.val().length <= 9999" }
-					},
-					"weather": {
-						"$idx": {
-							".validate": "$idx.matches(/^(ash|fog|hail|lightning|quake|rain|sand|smoke|snow)$/)"
-						}
-					},
-					"companions": {
-						"$companionId": {
-							"curHp": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-							},
-							"tempHp": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-							},
-							"ac_bonus": {
-								".validate": "newData.isNumber() && newData.val() >= -999 && newData.val() <= 999"
-							},
-							"maxHpMod": {
-								".validate": "newData.isNumber() && newData.val() >= -9999 && newData.val() <= 9999"
-							},
-							"saves": {
-								"$idx": {
-									".validate": "newData.isString() && newData.val().matches(/^(succes|fail)$/)"
-								}
-							},
-							"dead": { ".validate": "newData.isBoolean()" },
-							"stable": { ".validate": "newData.isBoolean()" },
-							"meters": {
-								"damage": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"damageTaken": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"overkill": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"overkillTaken": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"healing": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"healingTaken": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"overhealing": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"overhealingTaken": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								}
-							},
-							"transformed": {
-								"curHp": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-								},
-								"maxHp": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-								},
-								"ac": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-								}
-							},
-							"$other": { ".validate": false }
-						}
-					},
-					"players": {
-						"$playerId": {
-							"curHp": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-							},
-							"tempHp": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-							},
-							"ac_bonus": {
-								".validate": "newData.isNumber() && newData.val() >= -999 && newData.val() <= 999"
-							},
-							"maxHpMod": {
-								".validate": "newData.isNumber() && newData.val() >= -9999 && newData.val() <= 9999"
-							},
-							"saves": {
-								"$idx": {
-									".validate": "newData.isString() && newData.val().matches(/^(succes|fail)$/)"
-								}
-							},
-							"dead": { ".validate": "newData.isBoolean()" },
-							"stable": { ".validate": "newData.isBoolean()" },
-							"meters": {
-								"damage": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"damageTaken": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"overkill": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"overkillTaken": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"healing": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"healingTaken": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"overhealing": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								},
-								"overhealingTaken": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-								}
-							},
-							"transformed": {
-								"curHp": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-								},
-								"maxHp": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-								},
-								"ac": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-								}
-							},
-							"$other": { ".validate": false }
-						}
-					},
-					"player_count": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-					},
-					"shares": { ".validate": true },
-					"$other": { ".validate": false }
-				}
-			},
-			".read": true
-		},
-		"search_campaigns": {
-			".read": true,
-			"$uid": {
-				".write": "$uid === auth.uid",
-				"results": {
-					".indexOn": ["name"]
-				}
-			}
-		},
-		"campaign_notes": {
-			"$uid": {
-				"$campaignId": {
-					"$noteId": {
-						"title": {
-							".validate": "newData.isString() && newData.val().length <= 100"
-						},
-						"description": {
-							".validate": "newData.isString() && newData.val().length <= 1000"
-						},
-						"created": {
-							".validate": "newData.isNumber()"
-						}
-					},
-					".indexOn": ["created"]
-				},
-				".read": "$uid === auth.uid",
-				".write": "$uid === auth.uid"
-			}
-		},
-		"users": {
-			"$uid": {
-				"username": {
-					".write": "$uid === auth.uid || root.child('users').child(auth.uid).child('admin').exists()"
-				},
-				"email": {
-					".write": "$uid === auth.uid || root.child('users').child(auth.uid).child('admin').exists()"
-				},
-				"active_campaign": {
-					".write": "$uid === auth.uid || root.child('users').child(auth.uid).child('admin').exists()"
-				},
-				"admin": {
-					".write": false
-				},
-				"contribute": {
-					".write": "root.child('users').child(auth.uid).child('admin').exists()"
-				},
-				"follow": {
-					".write": "$uid === auth.uid"
-				},
-				"voucher": {
-					".write": "$uid === auth.uid || root.child('users').child(auth.uid).child('admin').exists()"
-				},
-				"patreon_email": {
-					".write": "root.child('users').child(auth.uid).child('admin').exists()"
-				}
-			},
-			".read": true,
-			".indexOn": ["username", "email", "admin", "contribute"]
-		},
-		"search_users": {
-			".read": true,
-			"$uid": {
-				".write": "$uid === auth.uid"
-			},
-			".indexOn": ["username", "email"]
-		},
-		"status": {
-			".write": true,
-			".read": true,
-			".indexOn": "state"
-		},
-		"posters": {
-			".write": true,
-			".read": true
-		},
-		"patrons": {
-			".write": true,
-			".read": true,
-			".indexOn": "email"
-		},
-		"new_patrons": {
-			".write": true,
-			".read": true,
-			".indexOn": "email"
-		},
-		"patreon_data": {
-			".write": true,
-			".read": true,
-			".indexOn": "timestamp"
-		},
-		"tiers": {
-			".write": true,
-			".read": true
-		},
-		"settings": {
-			"$uid": {
-				".write": "$uid === auth.uid",
-				".read": true
-			}
-		},
-		"players": {
-			"$uid": {
-				"$playerid": {
-					".write": "$uid === auth.uid || root.child('character_control').child(auth.uid).child($playerid).child('user').val() === $uid",
-					".validate": "newData.hasChildren(['player_name', 'character_name', 'maxHp', 'ac'])",
-					"sync_character": {
-						".validate": "newData.isString() && newData.val().length <= 2000"
-					},
-					"created": {
-						".validate": "newData.isNumber()"
-					},
-					"updated": {
-						".validate": "newData.isNumber()"
-					},
-					"control": {
-						".validate": "newData.isString() && newData.val().length <= 100"
-					},
-					"campaign_id": {
-						".validate": "newData.isString() && newData.val().length <= 100"
-					},
-					"player_name": {
-						".validate": "newData.isString() && newData.val().length <= 100"
-					},
-					"character_name": {
-						".validate": "newData.isString() && newData.val().length <= 100"
-					},
-					"avatar": {
-						".validate": "newData.isString() && newData.val().length <= 2000"
-					},
-					"storage_avatar": {
-						".validate": "newData.isString() && newData.val().length <= 2000"
-					},
-					"experience": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 355000"
-					},
-					"level": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-					},
-					"maxHp": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 999"
-					},
-					"ac": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"spell_save_dc": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"speed": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-					},
-					"initiative": {
-						".validate": "newData.isNumber() && newData.val() >= -10 && newData.val() <= 99"
-					},
-					"strength": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"dexterity": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"constitution": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"intelligence": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"wisdom": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"charisma": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"strength-save-profficient": {
-						".validate": "newData.isBoolean()"
-					},
-					"dexterity-save-profficient": {
-						".validate": "newData.isBoolean()"
-					},
-					"constitution-save-profficient": {
-						".validate": "newData.isBoolean()"
-					},
-					"intelligence-save-profficient": {
-						".validate": "newData.isBoolean()"
-					},
-					"wisdom-save-profficient": {
-						".validate": "newData.isBoolean()"
-					},
-					"charisma-save-profficient": {
-						".validate": "newData.isBoolean()"
-					},
-					"passive_insight": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"passive_investigation": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"passive_perception": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"damage_vulnerabilities": {
-						"$vulnerabilityIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-						}
-					},
-					"damage_resistances": {
-						"$resistanceIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-						}
-					},
-					"damage_immunities": {
-						"$immunityIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-						}
-					},
-					"condition_immunities": {
-						"$conditionImmunityIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(blinded|charmed|deafened|exhaustion|frightened|grappled|incapacitated|invisible|paralyzed|petrified|poisoned|prone|restrained|stunned|unconscious)$/)"
-						}
-					},
-					"skills": {
-						"$skillIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acrobatics|animal Handling|arcana|athletics|deception|history|insight|intimidation|investigation|medicine|nature|perception|performance|persuasion|religion|sleight of Hand|stealth|survival)$/)"
-						}
-					},
-					"skills_expertise": {
-						"$skillIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acrobatics|animal Handling|arcana|athletics|deception|history|insight|intimidation|investigation|medicine|nature|perception|performance|persuasion|religion|sleight of Hand|stealth|survival)$/)"
-						}
-					},
-					"skills_jack_of_all_trades": {
-						".validate": "newData.isBoolean()"
-					},
-					"companions": {
-						"$npcId": {
-							".validate": "newData.isBoolean()"
-						}
-					},
-					"$other": { ".validate": false }
-				},
-				".read": true
-			},
-			".read": "root.child('users').child(auth.uid).child('admin').exists()"
-		},
-		"search_players": {
-			".read": true,
-			"$uid": {
-				".write": "$uid === auth.uid",
-				"results": {
-					"$playerid": {
-						".write": "$uid === auth.uid || root.child('character_control').child(auth.uid).child($playerid).child('user').val() === $uid"
-					},
-					".indexOn": ["character_name"]
-				}
-			}
-		},
-		"characters": {
-			"$uid": {
-				"$characterId": {
-					".write": "$uid === auth.uid || root.child('character_control').child(auth.uid).child($characterId).child('user').val() === $uid"
-				},
-				".read": true
-			}
-		},
-		"search_characters": {
-			".read": true,
-			"$uid": {
-				".write": "$uid === auth.uid",
-				"results": {
-					".indexOn": ["character_name"]
-				}
-			}
-		},
-		"character_control": {
-			"$uid": {
-				"$playerid": {
-					".write": "data.exists() || newData.child('user').val() === auth.uid || data.child('user').val() === auth.uid"
-				},
-				".read": true
-			}
-		},
-		"npcs": {
-			"$uid": {
-				"$npcId": {
-					".write": "$uid === auth.uid || root.child('character_control').child(auth.uid).child( data.child('player_id').val() ).child('user').val() === $uid",
-					".validate": "newData.hasChildren(['name', 'size', 'type', 'challenge_rating', 'armor_class', 'hit_points', 'strength', 'dexterity', 'constitution', 'intelligence', 'wisdom', 'charisma'])",
-					"created": {
-						".validate": "newData.isNumber()"
-					},
-					"updated": {
-						".validate": "newData.isNumber()"
-					},
-					"harmless_key": {
-						".validate": "newData.isString() && newData.val().length <= 100"
-					},
-					"name": {
-						".validate": "newData.isString() && newData.val().length <= 100"
-					},
-					"source": {
-						".validate": "newData.isString() && newData.val().length <= 20"
-					},
-					"avatar": {
-						".validate": "newData.isString() && newData.val().length <= 2000"
-					},
-					"storage_avatar": {
-						".validate": "newData.isString() && newData.val().length <= 2000"
-					},
-					"size": {
-						".validate": "newData.isString() && newData.val().matches(/^(Tiny|Small|Medium|Large|Huge|Gargantuan)$/)"
-					},
-					"type": {
-						".validate": "newData.isString() && newData.val().matches(/^(Aberration|Beast|Celestial|Construct|Dragon|Elemental|Fey|Fiend|Giant|Humanoid|Monstrosity|Ooze|Plant|Swarm of tiny beasts|Undead)$/)"
-					},
-					"subtype": {
-						".validate": "newData.isString() && newData.val().length <= 25"
-					},
-					"alignment": {
-						".validate": "newData.isString() && newData.val().matches(/^(Any|Any alignment|Unaligned|Lawful Good|Neutral Good|Chaotic Good|Lawful neutral|Neutral|Chaotic neutral|Lawful evil|Neutral evil|Chaotic evil)$/i)"
-					},
-					"walk_speed": {
-						".validate": "newData.isNumber()  && newData.val() >= 0 && newData.val() <= 999"
-					},
-					"swim_speed": {
-						".validate": "newData.isNumber()  && newData.val() >= 0 && newData.val() <= 999"
-					},
-					"fly_speed": {
-						".validate": "newData.isNumber()  && newData.val() >= 0 && newData.val() <= 999"
-					},
-					"burrow_speed": {
-						".validate": "newData.isNumber()  && newData.val() >= 0 && newData.val() <= 999"
-					},
-					"climb_speed": {
-						".validate": "newData.isNumber()  && newData.val() >= 0 && newData.val() <= 999"
-					},
-					"languages": {
-						"$langugeIndex": {
-							".validate": "newData.isString() && newData.val().length <= 100"
-						}
-					},
-					"challenge_rating": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 30"
-					},
-					"proficiency": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 10"
-					},
-					"friendly": {
-						".validate": "newData.isBoolean()"
-					},
-					"player_id": {
-						".validate": "newData.isString() && newData.val().length <= 50"
-					},
-					"armor_class": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"hit_points": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 9999"
-					},
-					"hit_dice": {
-						".validate": "newData.isString() && newData.val().length <= 10 && (newData.val().length === 0 ||newData.val().matches(/^[0-9]+d[0-9]+$/))"
-					},
-
-					"senses": {
-						"blindsight": {
-							"blindsight": {
-								".validate": "newData.isBoolean()"
-							},
-							"range": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"comments": {
-								".validate": "newData.isString() && newData.val().length <= 999"
-							},
-							"$other": { ".validate": false }
-						},
-						"darkvision": {
-							"darkvision": {
-								".validate": "newData.isBoolean()"
-							},
-							"range": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"comments": {
-								".validate": "newData.isString() && newData.val().length <= 999"
-							},
-							"$other": { ".validate": false }
-						},
-						"tremorsense": {
-							"tremorsense": {
-								".validate": "newData.isBoolean()"
-							},
-							"range": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"comments": {
-								".validate": "newData.isString() && newData.val().length <= 999"
-							},
-							"$other": { ".validate": false }
-						},
-						"truesight": {
-							"truesight": {
-								".validate": "newData.isBoolean()"
-							},
-							"range": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"comments": {
-								".validate": "newData.isString() && newData.val().length <= 999"
-							},
-							"$other": { ".validate": false }
-						}
-					},
-
-					"strength": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 99"
-					},
-					"dexterity": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 99"
-					},
-					"constitution": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 99"
-					},
-					"intelligence": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 99"
-					},
-					"wisdom": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 99"
-					},
-					"charisma": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 99"
-					},
-
-					"saving_throws": {
-						"$savingIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(strength|dexterity|constitution|intelligence|wisdom|charisma)$/)"
-						}
-					},
-
-					"skills": {
-						"$skillIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acrobatics|animal Handling|arcana|athletics|deception|history|insight|intimidation|investigation|medicine|nature|perception|performance|persuasion|religion|sleight of Hand|stealth|survival)$/)"
-						}
-					},
-					"skills_expertise": {
-						"$skillIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acrobatics|animal Handling|arcana|athletics|deception|history|insight|intimidation|investigation|medicine|nature|perception|performance|persuasion|religion|sleight of Hand|stealth|survival)$/)"
-						}
-					},
-					"skill_modifiers": {
-						"acrobatics": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"animal Handling": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"arcana": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"athletics": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"deception": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"history": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"insight": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"intimidation": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"investigation": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"medicine": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"nature": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"perception": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"performance": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"persuasion": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"religion": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"sleight of Hand": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"stealth": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"survival": {
-							".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-						},
-						"$other": {
-							".validate": false
-						}
-					},
-
-					"damage_vulnerabilities": {
-						"$vulnerabilityIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-						}
-					},
-					"damage_resistances": {
-						"$resistanceIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-						}
-					},
-					"damage_immunities": {
-						"$immunityIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-						}
-					},
-					"condition_immunities": {
-						"$conditionImmunityIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(blinded|charmed|deafened|exhaustion|frightened|grappled|incapacitated|invisible|paralyzed|petrified|poisoned|prone|restrained|stunned|unconscious)$/)"
-						}
-					},
-
-					"caster_ability": {
-						".validate": "newData.isString() && newData.val().matches(/^(strength|dexterity|constitution|intelligence|wisdom|charisma)$/)"
-					},
-					"caster_level": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-					},
-					"caster_save_dc": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"caster_spell_attack": {
-						".validate": "newData.isNumber() && newData.val() >= -10 && newData.val() <= 99"
-					},
-					"caster_spell_slots": {
-						"$slotIndex": {
-							".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 9"
-						}
-					},
-					"caster_spells": {
-						"$spellId": {
-							"level": {
-								".validate": "newData.isNumber() && newData.val() >= -1 && newData.val() <= 9"
-							},
-							"name": {
-								".validate": "newData.isString() && newData.val().length <= 50"
-							},
-							"custom": {
-								".validate": "newData.isBoolean()"
-							},
-							"$other": { ".validate": false }
-						}
-					},
-
-					"innate_ability": {
-						".validate": "newData.isString() && newData.val().matches(/^(strength|dexterity|constitution|intelligence|wisdom|charisma)$/)"
-					},
-					"innate_save_dc": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"innate_spell_attack": {
-						".validate": "newData.isNumber() && newData.val() >= -10 && newData.val() <= 99"
-					},
-					"innate_spells": {
-						"$spellId": {
-							"limit": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 10"
-							},
-							"name": {
-								".validate": "newData.isString() && newData.val().length <= 50"
-							},
-							"custom": {
-								".validate": "newData.isBoolean()"
-							},
-
-							"$other": { ".validate": false }
-						}
-					},
-
-					"special_abilities": {
-						"$abilityIndex": {
-							".validate": "newData.hasChildren(['name'])",
-							"name": {
-								".validate": "newData.isString() && newData.val().length <= 50"
-							},
-							"recharge": {
-								".validate": "newData.isString() && (newData.val().length === 0 || newData.val().matches(/^[0-9]+(-[0-9]+)*$/) || newData.val().matches(/^(rest)$/))"
-							},
-							"limit": {
-								".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 9"
-							},
-							"limit_type": {
-								".validate": "newData.isString() && newData.val().matches(/^(day|turn)$/)"
-							},
-							"desc": {
-								".validate": "newData.isString() && newData.val().length <= 2000"
-							},
-							"reach": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"range": {
-								".validate": "newData.isString() && (newData.val().length === 0 || newData.val().matches(/^[0-9]+(\\/[0-9]+)*$/))"
-							},
-							"aoe_type": {
-								".validate": "newData.isString() && newData.val().matches(/^(cone|cube|cylinder|line|sphere|square|square feet)$/)"
-							},
-							"aoe_size": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"versatile": {
-								".validate": "newData.isBoolean()"
-							},
-							"versatile_one": {
-								".validate": "newData.isString() && newData.val().length <= 25"
-							},
-							"versatile_two": {
-								".validate": "newData.isString() && newData.val().length <= 25"
-							},
-							"options": {
-								"$optionIndex": {
-									".validate": "newData.isString() && newData.val().length <= 30"
-								}
-							},
-							"action_list": {
-								"$listIndex": {
-									"type": {
-										".validate": "newData.isString() && newData.val().matches(/^(melee_weapon|ranged_weapon|spell_attack|save|damage|healing|other)$/)"
-									},
-									"attack_bonus": {
-										".validate": "newData.isNumber() && newData.val() >= -10 && newData.val() <= 99"
-									},
-									"save_ability": {
-										".validate": "newData.isString() && newData.val().matches(/^(strength|dexterity|constitution|intelligence|wisdom|charisma)$/)"
-									},
-									"save_dc": {
-										".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-									},
-									"rolls": {
-										"$rollIndex": {
-											"damage_type": {
-												".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-											},
-											"magical": {
-												".validate": "newData.isBoolean()"
-											},
-											"dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"dice_type": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"versatile_damage_type": {
-												".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-											},
-											"versatile_magical": {
-												".validate": "newData.isBoolean()"
-											},
-											"versatile_dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"versatile_dice_type": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"versatile_fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"options": {
-												"$optionKey": {
-													"damage_type": {
-														".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-													},
-													"magical": {
-														".validate": "newData.isBoolean()"
-													},
-													"dice_count": {
-														".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-													},
-													"dice_type": {
-														".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-													},
-													"fixed_val": {
-														".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-													},
-													"ignore": {
-														".validate": "newData.isBoolean()"
-													}
-												}
-											},
-											"projectile_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"miss_mod": {
-												".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-											},
-											"save_fail_mod": {
-												".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-											},
-											"special": {
-												"$specialIndex": {
-													".validate": "newData.isString() && newData.val().matches(/^(siphon_full|siphon_half|drain)$/)"
-												}
-											},
-											"$other": { ".validate": false }
-										}
-									},
-									"$other": { ".validate": false }
-								}
-							},
-							"$other": { ".validate": false }
-						}
-					},
-
-					"actions": {
-						"$actionIndex": {
-							".validate": "newData.hasChildren(['name'])",
-							"name": {
-								".validate": "newData.isString() && newData.val().length <= 50"
-							},
-							"recharge": {
-								".validate": "newData.isString() && (newData.val().length === 0 || newData.val().matches(/^[0-9]+(-[0-9]+)*$/) || newData.val().matches(/^(rest)$/))"
-							},
-							"limit": {
-								".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 9"
-							},
-							"limit_type": {
-								".validate": "newData.isString() && newData.val().matches(/^(day|turn)$/)"
-							},
-							"desc": {
-								".validate": "newData.isString() && newData.val().length <= 2000"
-							},
-							"reach": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"range": {
-								".validate": "newData.isString() && (newData.val().length === 0 || newData.val().matches(/^[0-9]+(\\/[0-9]+)*$/))"
-							},
-							"aoe_type": {
-								".validate": "newData.isString() && newData.val().matches(/^(cone|cube|cylinder|line|sphere|square|square feet)$/)"
-							},
-							"aoe_size": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"versatile": {
-								".validate": "newData.isBoolean()"
-							},
-							"versatile_one": {
-								".validate": "newData.isString() && newData.val().length <= 25"
-							},
-							"versatile_two": {
-								".validate": "newData.isString() && newData.val().length <= 25"
-							},
-							"options": {
-								"$optionIndex": {
-									".validate": "newData.isString() && newData.val().length <= 30"
-								}
-							},
-							"action_list": {
-								"$listIndex": {
-									"type": {
-										".validate": "newData.isString() && newData.val().matches(/^(melee_weapon|ranged_weapon|spell_attack|save|damage|healing|other)$/)"
-									},
-									"attack_bonus": {
-										".validate": "newData.isNumber() && newData.val() >= -10 && newData.val() <= 99"
-									},
-									"save_ability": {
-										".validate": "newData.isString() && newData.val().matches(/^(strength|dexterity|constitution|intelligence|wisdom|charisma)$/)"
-									},
-									"save_dc": {
-										".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-									},
-									"rolls": {
-										"$rollIndex": {
-											"damage_type": {
-												".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-											},
-											"magical": {
-												".validate": "newData.isBoolean()"
-											},
-											"dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"dice_type": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"versatile_damage_type": {
-												".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-											},
-											"versatile_magical": {
-												".validate": "newData.isBoolean()"
-											},
-											"versatile_dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"versatile_dice_type": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"versatile_fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"options": {
-												"$optionKey": {
-													"damage_type": {
-														".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-													},
-													"magical": {
-														".validate": "newData.isBoolean()"
-													},
-													"dice_count": {
-														".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-													},
-													"dice_type": {
-														".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-													},
-													"fixed_val": {
-														".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-													},
-													"ignore": {
-														".validate": "newData.isBoolean()"
-													}
-												}
-											},
-											"projectile_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"miss_mod": {
-												".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-											},
-											"save_fail_mod": {
-												".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-											},
-											"special": {
-												"$specialIndex": {
-													".validate": "newData.isString() && newData.val().matches(/^(siphon_full|siphon_half|drain)$/)"
-												}
-											},
-											"$other": { ".validate": false }
-										}
-									},
-									"$other": { ".validate": false }
-								}
-							},
-							"$other": { ".validate": false }
-						}
-					},
-
-					"legendary_count": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 9"
-					},
-					"legendary_actions": {
-						"$legendaryIndex": {
-							".validate": "newData.hasChildren(['name', 'legendary_cost'])",
-							"legendary_cost": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9"
-							},
-							"name": {
-								".validate": "newData.isString() && newData.val().length <= 50"
-							},
-							"recharge": {
-								".validate": "newData.isString() && (newData.val().length === 0 || newData.val().matches(/^[0-9]+(-[0-9]+)*$/) || newData.val().matches(/^(rest)$/))"
-							},
-							"limit": {
-								".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 9"
-							},
-							"limit_type": {
-								".validate": "newData.isString() && newData.val().matches(/^(day|turn)$/)"
-							},
-							"desc": {
-								".validate": "newData.isString() && newData.val().length <= 2000"
-							},
-							"reach": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"range": {
-								".validate": "newData.isString() && (newData.val().length === 0 || newData.val().matches(/^[0-9]+(\\/[0-9]+)*$/))"
-							},
-							"aoe_type": {
-								".validate": "newData.isString() && newData.val().matches(/^(cone|cube|cylinder|line|sphere|square|square feet)$/)"
-							},
-							"aoe_size": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"versatile": {
-								".validate": "newData.isBoolean()"
-							},
-							"versatile_one": {
-								".validate": "newData.isString() && newData.val().length <= 25"
-							},
-							"versatile_two": {
-								".validate": "newData.isString() && newData.val().length <= 25"
-							},
-							"options": {
-								"$optionIndex": {
-									".validate": "newData.isString() && newData.val().length <= 30"
-								}
-							},
-							"action_list": {
-								"$listIndex": {
-									"type": {
-										".validate": "newData.isString() && newData.val().matches(/^(melee_weapon|ranged_weapon|spell_attack|save|damage|healing|other)$/)"
-									},
-									"attack_bonus": {
-										".validate": "newData.isNumber() && newData.val() >= -10 && newData.val() <= 99"
-									},
-									"save_ability": {
-										".validate": "newData.isString() && newData.val().matches(/^(strength|dexterity|constitution|intelligence|wisdom|charisma)$/)"
-									},
-									"save_dc": {
-										".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-									},
-									"rolls": {
-										"$rollIndex": {
-											"damage_type": {
-												".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-											},
-											"magical": {
-												".validate": "newData.isBoolean()"
-											},
-											"dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"dice_type": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"versatile_damage_type": {
-												".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-											},
-											"versatile_magical": {
-												".validate": "newData.isBoolean()"
-											},
-											"versatile_dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"versatile_dice_type": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"versatile_fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"options": {
-												"$optionKey": {
-													"damage_type": {
-														".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-													},
-													"magical": {
-														".validate": "newData.isBoolean()"
-													},
-													"dice_count": {
-														".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-													},
-													"dice_type": {
-														".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-													},
-													"fixed_val": {
-														".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-													},
-													"ignore": {
-														".validate": "newData.isBoolean()"
-													}
-												}
-											},
-											"projectile_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"miss_mod": {
-												".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-											},
-											"save_fail_mod": {
-												".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-											},
-											"special": {
-												"$specialIndex": {
-													".validate": "newData.isString() && newData.val().matches(/^(siphon_full|siphon_half|drain)$/)"
-												}
-											},
-											"$other": { ".validate": false }
-										}
-									},
-									"$other": { ".validate": false }
-								}
-							},
-							"$other": { ".validate": false }
-						}
-					},
-
-					"reactions": {
-						"$reactionIndex": {
-							".validate": "newData.hasChildren(['name'])",
-							"name": {
-								".validate": "newData.isString() && newData.val().length <= 50"
-							},
-							"recharge": {
-								".validate": "newData.isString() && (newData.val().length === 0 || newData.val().matches(/^[0-9]+(-[0-9]+)*$/) || newData.val().matches(/^(rest)$/))"
-							},
-							"limit": {
-								".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 9"
-							},
-							"limit_type": {
-								".validate": "newData.isString() && newData.val().matches(/^(day|turn)$/)"
-							},
-							"desc": {
-								".validate": "newData.isString() && newData.val().length <= 2000"
-							},
-							"reach": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"range": {
-								".validate": "newData.isString() && (newData.val().length === 0 || newData.val().matches(/^[0-9]+(\\/[0-9]+)*$/))"
-							},
-							"aoe_type": {
-								".validate": "newData.isString() && newData.val().matches(/^(cone|cube|cylinder|line|sphere|square|square feet)$/)"
-							},
-							"aoe_size": {
-								".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-							},
-							"versatile": {
-								".validate": "newData.isBoolean()"
-							},
-							"versatile_one": {
-								".validate": "newData.isString() && newData.val().length <= 25"
-							},
-							"versatile_two": {
-								".validate": "newData.isString() && newData.val().length <= 25"
-							},
-							"options": {
-								"$optionIndex": {
-									".validate": "newData.isString() && newData.val().length <= 30"
-								}
-							},
-							"action_list": {
-								"$listIndex": {
-									"type": {
-										".validate": "newData.isString() && newData.val().matches(/^(melee_weapon|ranged_weapon|spell_attack|save|damage|healing|other)$/)"
-									},
-									"attack_bonus": {
-										".validate": "newData.isNumber() && newData.val() >= -10 && newData.val() <= 99"
-									},
-									"save_ability": {
-										".validate": "newData.isString() && newData.val().matches(/^(strength|dexterity|constitution|intelligence|wisdom|charisma)$/)"
-									},
-									"save_dc": {
-										".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-									},
-									"rolls": {
-										"$rollIndex": {
-											"damage_type": {
-												".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-											},
-											"magical": {
-												".validate": "newData.isBoolean()"
-											},
-											"dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"dice_type": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"versatile_damage_type": {
-												".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-											},
-											"versatile_magical": {
-												".validate": "newData.isBoolean()"
-											},
-											"versatile_dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"versatile_dice_type": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"versatile_fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"options": {
-												"$optionKey": {
-													"damage_type": {
-														".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-													},
-													"magical": {
-														".validate": "newData.isBoolean()"
-													},
-													"dice_count": {
-														".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-													},
-													"dice_type": {
-														".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-													},
-													"fixed_val": {
-														".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-													},
-													"ignore": {
-														".validate": "newData.isBoolean()"
-													}
-												}
-											},
-											"projectile_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"miss_mod": {
-												".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-											},
-											"save_fail_mod": {
-												".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-											},
-											"special": {
-												"$specialIndex": {
-													".validate": "newData.isString() && newData.val().matches(/^(siphon_full|siphon_half|drain)$/)"
-												}
-											},
-											"$other": { ".validate": false }
-										}
-									},
-									"$other": { ".validate": false }
-								}
-							},
-							"$other": { ".validate": false }
-						}
-					},
-					"$other": { ".validate": false }
-				},
-				".write": "root.child('users').child(auth.uid).child('admin').exists()",
-				".read": true,
-				".indexOn": ["name", "harmless_key"]
-			},
-			".read": "root.child('users').child(auth.uid).child('admin').exists()"
-		},
-		"search_npcs": {
-			".read": true,
-			"$uid": {
-				".write": "$uid === auth.uid",
-				"results": {
-					".indexOn": ["name", "challenge_rating", "type"]
-				}
-			}
-		},
-		"custom_items": {
-			"$uid": {
-				".write": "$uid === auth.uid",
-				".read": true
-			},
-			".read": "root.child('users').child(auth.uid).child('admin').exists()"
-		},
-		"search_custom_items": {
-			".read": true,
-			"$uid": {
-				".write": "$uid === auth.uid",
-				"results": {
-					".indexOn": ["name"]
-				}
-			}
-		},
-		"encounters": {
-			"$uid": {
-				".write": "$uid === auth.uid || root.child('users').child(auth.uid).child('admin').exists()",
-				".read": true,
-
-				"$campaignId": {
-					".indexOn": "entities/id",
-					"$encounterId": {
-						"timestamp": {
-							".validate": "newData.isNumber()"
-						},
-						"name": {
-							".validate": "newData.isString() && newData.val().length <= 200"
-						},
-						"encounter": {
-							".validate": "newData.isString() && newData.val().length <= 200"
-						},
-						"turn": {
-							".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-						},
-						"round": {
-							".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999"
-						},
-						"finished": {
-							".validate": "newData.isBoolean()"
-						},
-						"audio": {
-							".validate": "newData.isString() && newData.val().length <= 2000"
-						},
-						"background": {
-							".validate": "newData.isString() && newData.val().length <= 2000"
-						},
-						"hk_background": {
-							".validate": "newData.isString() && newData.val().length <= 2000"
-						},
-						"currency": {
-							"$coin": {
-								".validate": "$coin.matches(/^(cp|sp|ep|gp|pp)$/)"
-							}
-						},
-						"loot": {
-							"$itemId": {
-								"linked_item": {
-									"custom": {
-										".validate": "newData.isBoolean()"
-									},
-									"key": {
-										".validate": "newData.isString() && newData.val().length <= 100"
-									}
-								},
-								"public_name": {
-									".validate": "newData.isString() && newData.val().length <= 100"
-								},
-								"public_description": {
-									".validate": "newData.isString() && newData.val().length <= 9999"
-								}
-							}
-						},
-						"xp": {
-							"calculated": {
-								".validate": "newData.isNumber() && newData.val() >= 0"
-							},
-							"overwrite": {
-								".validate": "newData.isString() || newData.isNumber()"
-							}
-						},
-						"weather": {
-							"$idx": {
-								".validate": "$idx.matches(/^(ash|fog|hail|lightning|quake|rain|sand|smoke|snow)$/)"
-							}
-						},
-						"entities": {
-							"$entityId": {
-								"id": {
-									".validate": "newData.isString() && newData.val().length <= 100"
-								},
-								"key": {
-									".validate": "newData.isString() && newData.val().length <= 100"
-								},
-								"entityType": {
-									".validate": "newData.isString() && newData.val().matches(/^(player|npc|companion)$/)"
-								},
-								"npc": {
-									".validate": "newData.isString() && newData.val().matches(/^(srd|custom|api)$/)"
-								},
-								"name": {
-									".validate": "newData.isString() && newData.val().length <= 200"
-								},
-								"active": {
-									".validate": "newData.isBoolean()"
-								},
-								"hidden": {
-									".validate": "newData.isBoolean()"
-								},
-								"initiative": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-								},
-								"ac": {
-									".validate": "(newData.isNumber() && newData.val() >= 1 && newData.val() <= 9999) || (newData.isString() && newData.val().length <= 10)"
-								},
-								"ac_bonus": {
-									".validate": "newData.isNumber() && newData.val() >= -999 && newData.val() <= 9999"
-								},
-								"curHp": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-								},
-								"maxHp": {
-									".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 9999"
-								},
-								"maxHpMod": {
-									".validate": "newData.isNumber() && newData.val() >= -9999 && newData.val() <= 9999"
-								},
-								"tempHp": {
-									".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999"
-								},
-								"color_label": {
-									".validate": "newData.isString() && newData.val().length <= 10"
-								},
-								"conditions": {
-									"exhaustion": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 6"
-									},
-									"$condition": {
-										".validate": "newData.isBoolean() && $condition.matches(/^(blinded|charmed|deafened|exhaustion|frightened|grappled|incapacitated|invisible|paralyzed|petrified|poisoned|prone|restrained|stunned|unconscious)$/)"
-									}
-								},
-								"reminders": {
-									"$remindId": {
-										"action": {
-											".validate": "newData.isString() && newData.val().matches(/^(remove|notify)$/)"
-										},
-										"color": {
-											".validate": "newData.isString() && newData.val().matches(/^(green-light|yellow-light|orange-light|red-light|purple|blue-light)$/)"
-										},
-										"trigger": {
-											".validate": "newData.isString() && newData.val().matches(/^(endTurn|startTurn|damage|timed)$/)"
-										},
-										"rounds": {
-											".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 99"
-										},
-										"title": {
-											".validate": "newData.isString() && newData.val().length <= 999"
-										},
-										"notify": {
-											".validate": "newData.isString() && newData.val().length <= 999"
-										},
-										"variables": {
-											"$varName": {
-												"$vi": {
-													".validate": "newData.isString() && newData.val().length <= 5"
-												}
-											}
-										}
-									}
-								},
-								"settings": {
-									"ac": {
-										".validate": "newData.isBoolean()"
-									},
-									"health": {
-										".validate": "newData.isBoolean() || newData.val().matches(/^(obscured)$/)"
-									},
-									"name": {
-										".validate": "newData.isBoolean()"
-									}
-								},
-								"meters": {
-									"damage": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-									},
-									"damageTaken": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-									},
-									"overkill": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-									},
-									"overkillTaken": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-									},
-									"healing": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-									},
-									"healingTaken": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-									},
-									"overhealing": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-									},
-									"overhealingTaken": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 999999"
-									}
-								},
-								"limited_uses": {
-									"caster": {
-										"$lvl": {
-											".validate": "newData.isNumber() && newData.val() <= 100"
-										}
-									},
-									"innate": {
-										"$spellId": {
-											".validate": "newData.isNumber() && newData.val() <= 100"
-										}
-									},
-									"actions": {
-										"$actionId": {
-											".validate": "newData.isNumber() && newData.val() <= 100"
-										}
-									},
-									"legendary_actions": {
-										"legendaries_used": {
-											".validate": "newData.isNumber() && newData.val() <= 100"
-										}
-									}
-								}
-							}
-						},
-						"requests": {
-							".write": true
-						},
-						"$other": { ".validate": false }
-					}
-				}
-			},
-			".read": "root.child('users').child(auth.uid).child('admin').exists()"
-		},
-		"search_encounters": {
-			".read": true,
-			"$uid": {
-				".write": "$uid === auth.uid",
-				"results": {
-					"$campaignId": {
-						".indexOn": ["name", "finished"]
-					}
-				}
-			}
-		},
-		"meters": {
-			"$uid": {
-				".write": "$uid === auth.uid",
-				".read": true
-			}
-		},
-		"track": {
-			"$uid": {
-				".write": true
-			},
-			".read": true
-		},
-		"broadcast": {
-			"$uid": {
-				".write": "$uid === auth.uid"
-			},
-			".read": true
-		},
-		"conditions": {
-			".write": false,
-			".read": true
-		},
-		"items": {
-			".write": false,
-			".read": true
-		},
-		"abilities": {
-			".write": false,
-			".read": true
-		},
-		"spells": {
-			"$uid": {
-				"$spellId": {
-					".validate": "newData.hasChildren(['name', 'level', 'school', 'cast_time', 'cast_time_type', 'range_type', 'duration_type', 'aoe_type', 'scaling'])",
-					"harmless_key": {
-						".validate": "newData.isString() && newData.val().length <= 100"
-					},
-					"created": {
-						".validate": "newData.isNumber()"
-					},
-					"updated": {
-						".validate": "newData.isNumber()"
-					},
-					"name": {
-						".validate": "newData.isString() && newData.val().length <= 100"
-					},
-					"source": {
-						".validate": "newData.isString() && newData.val().length <= 30"
-					},
-					"level": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9"
-					},
-					"school": {
-						".validate": "newData.isString() && newData.val().matches(/^(abjuration|conjuration|divination|enchantment|evocation|illusion|necromancy|transmutation)$/i)"
-					},
-					"cast_time": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 999"
-					},
-					"cast_time_type": {
-						".validate": "newData.isString() && newData.val().matches(/^(action|bonus_action|reaction|minute|hour|no_action|special)$/i)"
-					},
-					"cast_time_react_desc": {
-						".validate": "newData.isString() && newData.val().length <= 200"
-					},
-					"components": {
-						"$componentIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(verbal|somatic|material)$/i)"
-						}
-					},
-					"material_description": {
-						".validate": "newData.isString() && newData.val().length <= 500"
-					},
-					"range_type": {
-						".validate": "newData.isString() && newData.val().matches(/^(self|touch|ranged|sight|unlimited|special)$/i)"
-					},
-					"range": {
-						".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 9999999"
-					},
-					"classes": {
-						"$classIndex": {
-							".validate": "newData.isString() && newData.val().matches(/^(bard|barbarian|cleric|druid|fighter|monk|paladin|ranger|rogue|sorcerer|warlock|wizard)$/i)"
-						}
-					},
-					"duration_type": {
-						".validate": "newData.isString() && newData.val().matches(/^(concentration|instantaneous|special|time|until_dispelled|until_dispelled_or_triggered)$/i)"
-					},
-					"duration": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 999"
-					},
-					"duration_scale": {
-						".validate": "newData.isString() && newData.val().matches(/^(round|minute|hour|day)$/i)"
-					},
-					"aoe_type": {
-						".validate": "newData.isString() && newData.val().matches(/^(none|cone|cube|cylinder|line|radius|sphere|square|square feet)$/i)"
-					},
-					"aoe_size": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99999"
-					},
-					"ritual": {
-						".validate": "newData.isBoolean()"
-					},
-					"scaling": {
-						".validate": "newData.isString() && newData.val().matches(/^(none|character_level|spell_scale|spell_level)$/i)"
-					},
-					"description": {
-						".validate": "newData.isString() && newData.val().length <= 5000"
-					},
-					"higher_level": {
-						".validate": "newData.isString() && newData.val().length <= 1000"
-					},
-					"projectiles": {
-						".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-					},
-					"projectile_scaling": {
-						"$scalingIndex": {
-							".validate": "newData.hasChildren(['level'])",
-							"level": {
-								".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-							},
-							"projectile_count": {
-								".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 25"
-							},
-							"$other": { ".validate": false }
-						}
-					},
-					"options": {
-						"$optionIndex": {
-							".validate": "newData.isString() && newData.val().length <= 30"
-						}
-					},
-					"actions": {
-						"$actionIndex": {
-							"name": {
-								".validate": "newData.isString() && newData.val().length <= 100"
-							},
-							"type": {
-								".validate": "newData.isString() && newData.val().matches(/^(melee_weapon|ranged_weapon|spell_attack|save|damage|healing|other)$/)"
-							},
-							"save_ability": {
-								".validate": "newData.isString() && newData.val().matches(/^(strength|dexterity|constitution|intelligence|wisdom|charisma)$/)"
-							},
-							"optional": {
-								".validate": "newData.isBoolean()"
-							},
-							"rolls": {
-								"$rollIndex": {
-									"damage_type": {
-										".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-									},
-									"magical": {
-										".validate": "newData.isBoolean()"
-									},
-									"dice_count": {
-										".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-									},
-									"dice_type": {
-										".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-									},
-									"fixed_val": {
-										".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-									},
-									"options": {
-										"$optionKey": {
-											"damage_type": {
-												".validate": "newData.isString() && newData.val().matches(/^(acid|bludgeoning|cold|fire|force|lightning|necrotic|piercing|poison|psychic|radiant|slashing|thunder|non_magical_bludgeoning|non_magical_piercing|non_magical_slashing)$/)"
-											},
-											"magical": {
-												".validate": "newData.isBoolean()"
-											},
-											"dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"dice_type": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"ignore": {
-												".validate": "newData.isBoolean()"
-											}
-										}
-									},
-									"primary": {
-										".validate": "newData.isBoolean()"
-									},
-									"miss_mod": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-									},
-									"save_fail_mod": {
-										".validate": "newData.isNumber() && newData.val() >= 0 && newData.val() <= 2"
-									},
-									"special": {
-										"$specialIndex": {
-											".validate": "newData.isString() && newData.val().matches(/^(siphon_full|siphon_half|drain)$/)"
-										}
-									},
-									"scaling": {
-										"$scalingIndex": {
-											".validate": "newData.hasChildren(['level'])",
-											"level": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 20"
-											},
-											"dice_count": {
-												".validate": "newData.isNumber() && newData.val() >= 1 && newData.val() <= 99"
-											},
-											"fixed_val": {
-												".validate": "newData.isNumber() && newData.val() >= -99 && newData.val() <= 99"
-											},
-											"$other": { ".validate": false }
-										}
-									},
-									"$other": { ".validate": false }
-								}
-							},
-							"$other": { ".validate": false }
-						}
-					},
-					"$other": { ".validate": false },
-					".write": "$uid === auth.uid"
-				},
-				".write": "root.child('users').child(auth.uid).child('admin').exists()",
-				".read": true,
-				".indexOn": ["metadata/tagged", "metadata/finished"]
-			}
-		},
-		"search_spells": {
-			".read": true,
-			"$uid": {
-				".write": "$uid === auth.uid",
-				"results": {
-					".indexOn": ["name"]
-				}
-			}
-		},
-		"reminders": {
-			"$uid": {
-				".write": "$uid === auth.uid",
-				".read": true
-			},
-			".read": "root.child('users').child(auth.uid).child('admin').exists()"
-		},
-		"search_reminders": {
-			".read": true,
-			"$uid": {
-				".write": "$uid === auth.uid",
-				"results": {
-					".indexOn": ["name"]
-				}
-			}
-		},
-		"vouchers": {
-			"$voucherId": {
-				"times_used": {
-					".write": true
-				}
-			},
-			".read": true,
-			".write": "root.child('users').child(auth.uid).child('admin').exists()"
-		},
-		"voucher_history": {
-			"$uid": {
-				".read": "$uid === auth.uid",
-				".write": "$uid === auth.uid"
-			}
-		},
-		"soundboard": {
-			"$uid": {
-				"$soundboardId": {
-					".validate": "newData.hasChildren(['type', 'name', 'url'])",
-					"type": {
-						".validate": "newData.isString() && newData.val().matches(/^(music|ambience)$/)"
-					},
-					"name": {
-						".validate": "newData.isString() && newData.val().length <= 20"
-					},
-					"url": {
-						".validate": "newData.isString() && newData.val().length <= 2000"
-					},
-					"image": {
-						".validate": "newData.isString() && newData.val().length <= 2000"
-					},
-					"$other": { ".validate": false }
-				},
-				".indexOn": ["type"],
-				".read": "$uid === auth.uid",
-				".write": "$uid === auth.uid"
-			}
-		}
-	}
-}

From 1c9f29b21175bd7703af970df7a3b50b3b2178ba Mon Sep 17 00:00:00 2001
From: Harm Manders <harmmanders@gmail.com>
Date: Fri, 13 Mar 2026 16:17:08 +0100
Subject: [PATCH 3/5] Award XP outside encounters and fix calcColspan crash

Enable the "Award XP" button on the campaign Players view by converting
isXpAdvancement from a hardcoded false to a computed property that checks
campaign.advancement !== "milestone". Also fix calcColspan referencing
undefined this.settings instead of this.userSettings.general, and use
optional chaining throughout both computed properties.

Refs #332
---
 src/components/campaign/Players.vue | 36 +++++++++--------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/components/campaign/Players.vue b/src/components/campaign/Players.vue
index ce5b97e09..abf3b82a5 100644
--- a/src/components/campaign/Players.vue
+++ b/src/components/campaign/Players.vue
@@ -499,7 +499,6 @@ export default {
 			is_large: false,
 			viewerId: this.$store.getters.user ? this.$store.getters.user.uid : undefined,
 			loading: false,
-			isXpAdvancement: false,
 			rest_dialog: false,
 			resets: [
 				{
@@ -542,6 +541,9 @@ export default {
 	computed: {
 		...mapGetters(["overencumbered"]),
 		...mapGetters(["userSettings", "tier", "extensionInstalled"]),
+		isXpAdvancement() {
+			return this.campaign && this.campaign.advancement !== "milestone";
+		},
 		viewerIsUser() {
 			//If the viewer is the user that runs the campaign
 			//Edit functions are enabled
@@ -571,32 +573,16 @@ export default {
 		templateColumns() {
 			let templateColumns = "max-content max-content auto ";
 
-			if (
-				this.userSettings.general &&
-				this.userSettings.general.passive_perception === undefined &&
-				!this.is_medium
-			) {
+			if (this.userSettings.general?.passive_perception === undefined && !this.is_medium) {
 				templateColumns = templateColumns.concat(" max-content");
 			}
-			if (
-				this.userSettings.general &&
-				this.userSettings.general.passive_investigation === undefined &&
-				!this.is_medium
-			) {
+			if (this.userSettings.general?.passive_investigation === undefined && !this.is_medium) {
 				templateColumns = templateColumns.concat(" max-content");
 			}
-			if (
-				this.userSettings.general &&
-				this.userSettings.general.passive_insight === undefined &&
-				!this.is_medium
-			) {
+			if (this.userSettings.general?.passive_insight === undefined && !this.is_medium) {
 				templateColumns = templateColumns.concat(" max-content");
 			}
-			if (
-				this.userSettings.general &&
-				this.userSettings.general.save_dc === undefined &&
-				!this.is_medium
-			) {
+			if (this.userSettings.general?.save_dc === undefined && !this.is_medium) {
 				templateColumns = templateColumns.concat(" max-content");
 			}
 			if (this.viewerIsUser) {
@@ -609,16 +595,16 @@ export default {
 		calcColspan() {
 			let colspan = this.viewerIsUser ? 4 : 3;
 
-			if (this.settings.passive_perception === undefined && !this.is_medium) {
+			if (this.userSettings.general?.passive_perception === undefined && !this.is_medium) {
 				colspan++;
 			}
-			if (this.settings.passive_investigation === undefined && !this.is_medium) {
+			if (this.userSettings.general?.passive_investigation === undefined && !this.is_medium) {
 				colspan++;
 			}
-			if (this.settings.passive_insight === undefined && !this.is_medium) {
+			if (this.userSettings.general?.passive_insight === undefined && !this.is_medium) {
 				colspan++;
 			}
-			if (this.settings.save_dc === undefined && !this.is_medium) {
+			if (this.userSettings.general?.save_dc === undefined && !this.is_medium) {
 				colspan++;
 			}
 

From 99b6a746a71424f369b9fc35b8933fc47336943d Mon Sep 17 00:00:00 2001
From: Harm Manders <harmmanders@gmail.com>
Date: Wed, 18 Mar 2026 09:02:54 +0100
Subject: [PATCH 4/5] Remove NPC bonus actions changes from feature branch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert CardActions.vue, Monster.vue, Actions.vue, and hk-npc-schema.json
to develop state — these changes belong to the NPC bonus actions feature,
not to issue #332 (award XP outside encounters).
---
 .../combat/entities/Card/CardActions.vue      | 310 +-----------------
 src/components/compendium/Monster.vue         | 100 +-----
 src/components/npcs/Actions.vue               | 103 +-----
 src/schemas/hk-npc-schema.json                |   7 +-
 4 files changed, 21 insertions(+), 499 deletions(-)

diff --git a/src/components/combat/entities/Card/CardActions.vue b/src/components/combat/entities/Card/CardActions.vue
index 2085fcdc5..f53b81449 100644
--- a/src/components/combat/entities/Card/CardActions.vue
+++ b/src/components/combat/entities/Card/CardActions.vue
@@ -1,307 +1,7 @@
 <template>
 	<div class="card-actions">
 		<div v-for="{ category, name } in actions" :key="category">
-			<template v-if="category === 'actions'">
-				<!-- Regular actions -->
-				<template v-if="regularActions.length > 0">
-					<h3 class="label d-flex justify-content-between">Actions</h3>
-					<div
-						v-for="(action, action_index) in regularActions"
-						:key="`action-${action_index}`"
-						class="card-action"
-					>
-						<div class="card-action-title">
-							<template
-								v-if="
-									rollable &&
-									action.action_list &&
-									action.action_list[0] &&
-									action.action_list[0].type !== 'other' &&
-									action.action_list[0].rolls &&
-									action.action_list[0].rolls.length
-								"
-							>
-								<hk-roll-action
-									:action="action"
-									:tooltip="`Roll ${action.name}`"
-									@roll="startRoll(...arguments, action_index, action, category)"
-									:disabled="!checkAvailable(category, action_index, action)"
-								>
-									<span class="roll-button" />
-								</hk-roll-action>
-							</template>
-							<div class="card-action-title__name">
-								<strong
-									><em>
-										{{ action.name }}
-										{{
-											action.recharge
-												? `(Recharge ${
-														action.recharge === "rest"
-															? "after a Short or Long Rest"
-															: action.recharge
-													})`
-												: ``
-										}}
-										{{
-											action.limit
-												? `(${action.limit}/${
-														action.limit_type ? action.limit_type.capitalize() : `Day`
-													})`
-												: ``
-										}}
-										{{ action.legendary_cost > 1 ? `(Costs ${action.legendary_cost} Actions)` : `` }}
-									</em></strong
-								>
-
-								<template v-if="action.limit || action.recharge || action.legendary_cost">
-									<template v-if="action.legendary_cost || action.recharge">
-										<div
-											v-if="checkAvailable(category, action_index, action)"
-											class="btn btn-xs btn-clear"
-											@click.stop="
-												spendLimited(
-													category,
-													action.legendary_cost ? 'legendaries_used' : action_index,
-													false,
-													action.legendary_cost ? action.legendary_cost : 1
-												)
-											"
-										>
-											Spend
-										</div>
-										<i aria-hidden="true" v-else class="fas fa-ban neutral-2" />
-									</template>
-									<LimitedUseCounter
-										v-else
-										:entity="entity"
-										:limited_type="category"
-										:limited_index="action_index"
-										:limited_max="action.limit"
-									/>
-								</template>
-							</div>
-						</div>
-						<!-- Roll Summary -->
-						<div
-							v-if="
-								action.action_list && action.action_list[0] && action.action_list[0].type !== 'other'
-							"
-						>
-							<span v-if="action.action_list[0].rolls">
-								<span
-									v-for="(roll, roll_index) in action.action_list[0].rolls"
-									:key="`roll-${action_index}-${roll_index}`"
-								>
-									(<i
-										aria-hidden="true"
-										:class="[
-											action.action_list[0].type === 'healing'
-												? 'fas fa-heart green'
-												: damage_type_icons[roll.damage_type],
-											roll.damage_type,
-										]"
-									/>
-									{{ roll.dice_count || "" }}{{ roll.dice_type ? `d${roll.dice_type}` : `` }}
-									<template v-if="roll.fixed_val && roll.dice_count">
-										{{
-											// eslint-disable-next-line vue/no-parsing-error
-											roll.fixed_val < 0 ? `- ${Math.abs(roll.fixed_val)}` : `+ ${roll.fixed_val}`
-										}})
-									</template>
-									<template v-else>{{ roll.fixed_val }})</template>
-									<!-- eslint-disable-next-line vue/no-parsing-error -->
-									{{ roll_index + 1 < action.action_list[0].rolls.length ? "+" : "" }}
-									<q-tooltip anchor="top middle" self="center middle">
-										{{
-											action.action_list[0].type === "healing"
-												? "Healing"
-												: `${roll.damage_type.capitalize()} damage`
-										}}
-									</q-tooltip>
-								</span>
-							</span>
-							<!-- Reach -->
-							<span v-if="action.reach">
-								<span class="blue">|</span> {{ action.reach }}<small class="neutral-2">ft.</small>
-								<q-tooltip anchor="top middle" self="center middle"> Reach </q-tooltip>
-							</span>
-							<!-- Range -->
-							<span v-if="action.range">
-								<span class="blue">|</span> {{ action.range }}<small class="neutral-2">ft.</small>
-								<q-tooltip anchor="top middle" self="center middle"> Range </q-tooltip>
-							</span>
-							<!-- Saving throw -->
-							<span v-if="action.action_list[0].type === 'save' && action.action_list[0].save_dc">
-								<span class="blue">|</span>
-								<span v-if="action.action_list[0].save_ability">
-									{{ action.action_list[0].save_ability.substring(0, 3).toUpperCase() }}
-								</span>
-								{{ action.action_list[0].save_dc }}
-							</span>
-							<!-- AOE -->
-							<span v-if="action.aoe_type">
-								<span class="blue">|</span>
-								{{ action.aoe_size }}<small class="neutral-2">ft.</small>
-								{{ action.aoe_type.capitalize() }}
-								<q-tooltip anchor="top middle" self="center middle"> Area of effect </q-tooltip>
-							</span>
-						</div>
-						<hk-dice-text v-if="action.desc" :input_text="action.desc" />
-					</div>
-				</template>
-
-				<!-- Bonus actions -->
-				<template v-if="bonusActions.length > 0">
-					<h3 class="label d-flex justify-content-between">Bonus Actions</h3>
-					<div
-						v-for="(action, action_index) in bonusActions"
-						:key="`bonus-${action_index}`"
-						class="card-action"
-					>
-						<div class="card-action-title">
-							<template
-								v-if="
-									rollable &&
-									action.action_list &&
-									action.action_list[0] &&
-									action.action_list[0].type !== 'other' &&
-									action.action_list[0].rolls &&
-									action.action_list[0].rolls.length
-								"
-							>
-								<hk-roll-action
-									:action="action"
-									:tooltip="`Roll ${action.name}`"
-									@roll="startRoll(...arguments, action_index, action, category)"
-									:disabled="!checkAvailable(category, action_index, action)"
-								>
-									<span class="roll-button" />
-								</hk-roll-action>
-							</template>
-							<div class="card-action-title__name">
-								<strong
-									><em>
-										{{ action.name }}
-										{{
-											action.recharge
-												? `(Recharge ${
-														action.recharge === "rest"
-															? "after a Short or Long Rest"
-															: action.recharge
-													})`
-												: ``
-										}}
-										{{
-											action.limit
-												? `(${action.limit}/${
-														action.limit_type ? action.limit_type.capitalize() : `Day`
-													})`
-												: ``
-										}}
-										{{ action.legendary_cost > 1 ? `(Costs ${action.legendary_cost} Actions)` : `` }}
-									</em></strong
-								>
-
-								<template v-if="action.limit || action.recharge || action.legendary_cost">
-									<template v-if="action.legendary_cost || action.recharge">
-										<div
-											v-if="checkAvailable(category, action_index, action)"
-											class="btn btn-xs btn-clear"
-											@click.stop="
-												spendLimited(
-													category,
-													action.legendary_cost ? 'legendaries_used' : action_index,
-													false,
-													action.legendary_cost ? action.legendary_cost : 1
-												)
-											"
-										>
-											Spend
-										</div>
-										<i aria-hidden="true" v-else class="fas fa-ban neutral-2" />
-									</template>
-									<LimitedUseCounter
-										v-else
-										:entity="entity"
-										:limited_type="category"
-										:limited_index="action_index"
-										:limited_max="action.limit"
-									/>
-								</template>
-							</div>
-						</div>
-						<!-- Roll Summary -->
-						<div
-							v-if="
-								action.action_list && action.action_list[0] && action.action_list[0].type !== 'other'
-							"
-						>
-							<span v-if="action.action_list[0].rolls">
-								<span
-									v-for="(roll, roll_index) in action.action_list[0].rolls"
-									:key="`roll-${action_index}-${roll_index}`"
-								>
-									(<i
-										aria-hidden="true"
-										:class="[
-											action.action_list[0].type === 'healing'
-												? 'fas fa-heart green'
-												: damage_type_icons[roll.damage_type],
-											roll.damage_type,
-										]"
-									/>
-									{{ roll.dice_count || "" }}{{ roll.dice_type ? `d${roll.dice_type}` : `` }}
-									<template v-if="roll.fixed_val && roll.dice_count">
-										{{
-											// eslint-disable-next-line vue/no-parsing-error
-											roll.fixed_val < 0 ? `- ${Math.abs(roll.fixed_val)}` : `+ ${roll.fixed_val}`
-										}})
-									</template>
-									<template v-else>{{ roll.fixed_val }})</template>
-									<!-- eslint-disable-next-line vue/no-parsing-error -->
-									{{ roll_index + 1 < action.action_list[0].rolls.length ? "+" : "" }}
-									<q-tooltip anchor="top middle" self="center middle">
-										{{
-											action.action_list[0].type === "healing"
-												? "Healing"
-												: `${roll.damage_type.capitalize()} damage`
-										}}
-									</q-tooltip>
-								</span>
-							</span>
-							<!-- Reach -->
-							<span v-if="action.reach">
-								<span class="blue">|</span> {{ action.reach }}<small class="neutral-2">ft.</small>
-								<q-tooltip anchor="top middle" self="center middle"> Reach </q-tooltip>
-							</span>
-							<!-- Range -->
-							<span v-if="action.range">
-								<span class="blue">|</span> {{ action.range }}<small class="neutral-2">ft.</small>
-								<q-tooltip anchor="top middle" self="center middle"> Range </q-tooltip>
-							</span>
-							<!-- Saving throw -->
-							<span v-if="action.action_list[0].type === 'save' && action.action_list[0].save_dc">
-								<span class="blue">|</span>
-								<span v-if="action.action_list[0].save_ability">
-									{{ action.action_list[0].save_ability.substring(0, 3).toUpperCase() }}
-								</span>
-								{{ action.action_list[0].save_dc }}
-							</span>
-							<!-- AOE -->
-							<span v-if="action.aoe_type">
-								<span class="blue">|</span>
-								{{ action.aoe_size }}<small class="neutral-2">ft.</small>
-								{{ action.aoe_type.capitalize() }}
-								<q-tooltip anchor="top middle" self="center middle"> Area of effect </q-tooltip>
-							</span>
-						</div>
-						<hk-dice-text v-if="action.desc" :input_text="action.desc" />
-					</div>
-				</template>
-			</template>
-
-			<template v-else-if="entity[category] && entity[category].length > 0">
+			<template v-if="entity[category] && entity[category].length > 0">
 				<h3 v-if="category !== 'special_abilities'" class="label d-flex justify-content-between">
 					{{ name }}
 					<LimitedUseCounter
@@ -516,14 +216,6 @@ export default {
 	},
 	computed: {
 		...mapGetters(["targeted"]),
-		regularActions() {
-			return (this.entity.actions || []).filter(
-				(a) => !a.timing || a.timing === "action"
-			);
-		},
-		bonusActions() {
-			return (this.entity.actions || []).filter((a) => a.timing === "bonus_action");
-		},
 	},
 	methods: {
 		startRoll(e, projectiles, option, action_index, action, category) {
diff --git a/src/components/compendium/Monster.vue b/src/components/compendium/Monster.vue
index 147c24051..857d36237 100644
--- a/src/components/compendium/Monster.vue
+++ b/src/components/compendium/Monster.vue
@@ -306,97 +306,9 @@
 				</p>
 			</template>
 
-						<div class="monster-card__traits">
+			<div class="monster-card__traits">
 				<div v-for="{ category, name } in actions" :key="category">
-					<template v-if="category === 'actions'">
-						<!-- Regular actions -->
-						<template v-if="regularActions.length > 0">
-							<h2>Actions</h2>
-							<template v-for="(ability, index) in regularActions">
-								<hk-dice-text
-									v-if="ability.desc"
-									:key="`action-${index}`"
-									class="monster-card__traits-description"
-									:input_text="ability.desc"
-									><template
-										v-if="
-											ability.action_list &&
-											ability.action_list[0] &&
-											ability.action_list[0].type !== 'other' &&
-											ability.action_list[0].rolls &&
-											ability.action_list[0].rolls.length
-										"
-										><hk-roll-action :tooltip="`Roll ${ability.name}`" :action="ability"
-											><span class="roll-button" /></hk-roll-action></template
-									><span class="monster-card__traits-description__title"
-										>{{ ability.name
-										}}{{
-											ability.recharge
-												? ` (Recharge ${
-														ability.recharge === "rest"
-															? "after a Short or Long Rest"
-															: ability.recharge
-													})`
-												: ``
-										}}{{
-											ability.limit
-												? ` (${ability.limit}/${
-														ability.limit_type ? ability.limit_type.capitalize() : `Day`
-													})`
-												: ``
-										}}{{
-											ability.legendary_cost > 1 ? ` (Costs ${ability.legendary_cost} Actions)` : ``
-										}}.
-									</span></hk-dice-text
-								>
-							</template>
-						</template>
-
-						<!-- Bonus actions -->
-						<template v-if="bonusActions.length > 0">
-							<h2>Bonus Actions</h2>
-							<template v-for="(ability, index) in bonusActions">
-								<hk-dice-text
-									v-if="ability.desc"
-									:key="`bonus-${index}`"
-									class="monster-card__traits-description"
-									:input_text="ability.desc"
-									><template
-										v-if="
-											ability.action_list &&
-											ability.action_list[0] &&
-											ability.action_list[0].type !== 'other' &&
-											ability.action_list[0].rolls &&
-											ability.action_list[0].rolls.length
-										"
-										><hk-roll-action :tooltip="`Roll ${ability.name}`" :action="ability"
-											><span class="roll-button" /></hk-roll-action></template
-									><span class="monster-card__traits-description__title"
-										>{{ ability.name
-										}}{{
-											ability.recharge
-												? ` (Recharge ${
-														ability.recharge === "rest"
-															? "after a Short or Long Rest"
-															: ability.recharge
-													})`
-												: ``
-										}}{{
-											ability.limit
-												? ` (${ability.limit}/${
-														ability.limit_type ? ability.limit_type.capitalize() : `Day`
-													})`
-												: ``
-										}}{{
-											ability.legendary_cost > 1 ? ` (Costs ${ability.legendary_cost} Actions)` : ``
-										}}.
-									</span></hk-dice-text
-								>
-							</template>
-						</template>
-					</template>
-
-					<template v-else-if="monster[category] && monster[category].length > 0">
+					<template v-if="monster[category] && monster[category].length > 0">
 						<h2>{{ name }}</h2>
 						<p
 							v-if="monster.legendary_count && category === 'legendary_actions'"
@@ -575,14 +487,6 @@ export default {
 		shares() {
 			return this.broadcast.shares || [];
 		},
-		regularActions() {
-			return (this.monster.actions || []).filter(
-				(a) => !a.timing || a.timing === "action"
-			);
-		},
-		bonusActions() {
-			return (this.monster.actions || []).filter((a) => a.timing === "bonus_action");
-		},
 		caster_spell_levels() {
 			if (this.monster.caster_spells) {
 				let levels = [];
diff --git a/src/components/npcs/Actions.vue b/src/components/npcs/Actions.vue
index 6f704f515..bc000d336 100644
--- a/src/components/npcs/Actions.vue
+++ b/src/components/npcs/Actions.vue
@@ -11,11 +11,11 @@
 						<div class="bg-neutral-9">
 							<q-list>
 								<q-item
-									v-for="{ category, name_single, timing } in actions"
-									:key="`add-${category}-${timing || 'default'}`"
+									v-for="{ category, name_single } in actions"
+									:key="`add-${category}`"
 									clickable
 									v-close-popup
-									@click="add(category, timing)"
+									@click="add(category)"
 								>
 									<q-item-section avatar>
 										<i aria-hidden="true" class="fas fa-plus"></i>
@@ -29,11 +29,11 @@
 			</div>
 
 			<div class="card-body -mt-3">
-				<template v-for="{ name, category, name_single, timing } in actions">
-					<div v-if="sectionItems(category, timing).length > 0" :key="`${category}-${timing || 'default'}`">
+				<template v-for="{ name, category, name_single } in actions">
+					<div v-if="npc[category] && npc[category].length > 0" :key="category">
 						<h3 class="d-flex justify-content-between mt-3">
 							{{ name }}
-							<a class="btn btn-sm btn-clear" @click="add(category, timing)">
+							<a class="btn btn-sm btn-clear" @click="add(category)">
 								<i aria-hidden="true" class="fas fa-plus green"></i>
 								<span class="d-none d-md-inline ml-1">Add {{ name_single }}</span>
 							</a>
@@ -62,15 +62,13 @@
 						<!-- ABILITIES -->
 						<draggable
 							tag="div"
-							:list="sectionItems(category, timing)"
+							v-model="npc[category]"
 							:animation="200"
 							class="accordion"
 							handle=".drag-handle"
 							ghost-class="drag-ghost"
 							drag-class="drag-dragging"
 							:force-fallback="true"
-							:group="{ name: `${category}-${timing || 'default'}`, pull: false, put: false }"
-							@change="category === 'actions' ? onDraggableChange($event, category, timing) : null"
 						>
 							<transition-group
 								type="transition"
@@ -79,8 +77,8 @@
 								leave-active-class="animated animate__fadeOut"
 							>
 								<div
-									v-for="(ability, filtered_index) in sectionItems(category, timing)"
-									:key="`${category}-${timing || 'default'}-${getActionIndex(ability, category) >= 0 ? getActionIndex(ability, category) : filtered_index}`"
+									v-for="(ability, ability_index) in npc[category]"
+									:key="`ability-${ability_index}`"
 								>
 									<ValidationObserver v-slot="{ valid }">
 										<q-expansion-item
@@ -139,7 +137,7 @@
 													</hk-roll-action>
 												</q-item-section>
 												<q-item-section avatar>
-													<a @click.stop="remove(getActionIndex(ability, category), category)" class="remove">
+													<a @click.stop="remove(ability_index, category)" class="remove">
 														<i aria-hidden="true" class="fas fa-trash-alt red" />
 														<q-tooltip anchor="top middle" self="center middle"> Remove </q-tooltip>
 													</a>
@@ -190,23 +188,6 @@
 													/>
 												</ValidationProvider>
 
-												<q-select
-													v-if="category === 'actions'"
-													:dark="$store.getters.theme === 'dark'"
-													filled
-													square
-													class="mb-3"
-													:value="ability.timing || 'action'"
-													:options="[
-														{ label: 'Action', value: 'action' },
-														{ label: 'Bonus Action', value: 'bonus_action' },
-													]"
-													label="Timing"
-													emit-value
-													map-options
-													@input="val => { $set(ability, 'timing', val); $forceUpdate(); }"
-												/>
-
 												<div
 													class="row q-col-gutter-md mb-2"
 													v-if="category !== 'legendary_actions'"
@@ -388,7 +369,7 @@
 														"
 														class="mb-4"
 														@new-value="addOption"
-														@remove="removeOption($event, category, getActionIndex(ability, category))"
+														@remove="removeOption($event, category, ability_index)"
 														@input="$forceUpdate()"
 													>
 														<hk-popover slot="append" header="Action options">
@@ -507,7 +488,7 @@
 																		class="btn btn-sm bg-neutral-5"
 																		@click="
 																			newRoll(
-																				getActionIndex(ability, category),
+																				ability_index,
 																				ability,
 																				category,
 																				action_index,
@@ -533,7 +514,7 @@
 																	@edit="
 																		editRoll(
 																			$event,
-																			getActionIndex(ability, category),
+																			ability_index,
 																			ability,
 																			category,
 																			action_index,
@@ -541,7 +522,7 @@
 																		)
 																	"
 																	@delete="
-																		deleteRoll($event, getActionIndex(ability, category), category, action_index)
+																		deleteRoll($event, ability_index, category, action_index)
 																	"
 																/>
 															</div>
@@ -627,12 +608,6 @@ export default {
 					name_single: "Special ability",
 				},
 				{ category: "actions", name: "Actions", name_single: "Action" },
-				{
-					category: "actions",
-					name: "Bonus Actions",
-					name_single: "Bonus action",
-					timing: "bonus_action",
-				},
 				{
 					category: "legendary_actions",
 					name: "Legendary Actions",
@@ -661,14 +636,6 @@ export default {
 				this.$emit("input", newValue);
 			},
 		},
-		regularActions() {
-			return (this.npc.actions || []).filter(
-				(a) => !a.timing || a.timing === "action"
-			);
-		},
-		bonusActions() {
-			return (this.npc.actions || []).filter((a) => a.timing === "bonus_action");
-		},
 	},
 	methods: {
 		...mapActions(["setActionRoll"]),
@@ -679,46 +646,14 @@ export default {
 				this.$set(object, property, parseInt(value));
 			}
 		},
-		/**
-		 * Returns the items for a given section, filtered by timing for the actions category.
-		 */
-		sectionItems(category, timing) {
-			if (category !== "actions") return this.npc[category] || [];
-			return timing ? this.bonusActions : this.regularActions;
-		},
-		/**
-		 * Maps a filtered-loop item back to its real index in npc[category].
-		 */
-		getActionIndex(action, category) {
-			return (this.npc[category] || []).indexOf(action);
-		},
-		/**
-		 * Handles drag reorder for filtered action sections (regular or bonus).
-		 */
-		onDraggableChange(event, category, timing) {
-			if (!event.moved) return;
-			const { oldIndex, newIndex } = event.moved;
-			const slots = (this.npc[category] || [])
-				.map((a, i) => i)
-				.filter((i) =>
-					timing
-						? this.npc[category][i].timing === timing
-						: !this.npc[category][i].timing || this.npc[category][i].timing === "action"
-				);
-			const arr = [...this.npc[category]];
-			const [item] = arr.splice(slots[oldIndex], 1);
-			arr.splice(slots[newIndex], 0, item);
-			this.npc[category] = arr;
-		},
 		/**
 		 * Add a new action
 		 *
-		 * @param {string} category actions / legendary_actions / special_abilities
-		 * @param {string} timing optional timing value for bonus actions
+		 * @param {string} category actions / lengedary_actions / special_abilities
 		 */
-		add(category, timing = null) {
+		add(category) {
 			let type;
-			if (category === "actions" && !timing) {
+			if (category === "actions") {
 				type = "melee_weapon";
 			} else if (category === "legendary_actions") {
 				type = "save";
@@ -735,10 +670,6 @@ export default {
 				],
 			};
 
-			if (timing) {
-				action.timing = timing;
-			}
-
 			if (this.npc[category] === undefined) {
 				this.npc[category] = [];
 			}
diff --git a/src/schemas/hk-npc-schema.json b/src/schemas/hk-npc-schema.json
index ef2bf89b0..e425a76e9 100644
--- a/src/schemas/hk-npc-schema.json
+++ b/src/schemas/hk-npc-schema.json
@@ -534,12 +534,7 @@
 					"aoe_type": { "$ref": "#/$defs/action-aoe-type" },
 					"aoe_size": { "$ref": "#/$defs/action-aoe-size" },
 					"options": { "$ref": "#/$defs/action-options" },
-					"action_list": { "$ref": "#/$defs/action-list" },
-					"timing": {
-						"title": "Action timing",
-						"type": "string",
-						"enum": ["action", "bonus_action"]
-					}
+					"action_list": { "$ref": "#/$defs/action-list" }
 				},
 				"required": ["name"]
 			}

From 3afb9aa49a66e78af5407ba60df68fc1d9d2423a Mon Sep 17 00:00:00 2001
From: Harm Manders <harmmanders@gmail.com>
Date: Sat, 21 Mar 2026 10:27:04 +0100
Subject: [PATCH 5/5] 2 button xp drawer no toggle

---
 src/components/campaign/Players.vue |  2 +-
 src/components/drawers/party/xp.vue | 46 +++++++++++------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/components/campaign/Players.vue b/src/components/campaign/Players.vue
index abf3b82a5..aa3c4d2b8 100644
--- a/src/components/campaign/Players.vue
+++ b/src/components/campaign/Players.vue
@@ -77,7 +77,7 @@
 						<q-tooltip anchor="top middle" self="center middle">Edit Group Health</q-tooltip>
 					</button>
 					<button
-						class="btn btn-sm mr-1"
+						class="btn btn-sm mr-1 bg-neutral-5"
 						v-if="isXpAdvancement"
 						@click="
 							setDrawer({
diff --git a/src/components/drawers/party/xp.vue b/src/components/drawers/party/xp.vue
index c7a28ed99..edd66ea83 100644
--- a/src/components/drawers/party/xp.vue
+++ b/src/components/drawers/party/xp.vue
@@ -15,23 +15,24 @@
 		<div v-for="(player, key) in players" :key="key">
 			<q-checkbox :dark="$store.getters.theme === 'dark'" v-model="awardTo" :val="key">
 				{{ player.character_name }}
-				<span v-if="amount && awardTo.includes(key)" class="ml-2 blue">
-					({{ ((awardPlayer() &lt; 0) ? "" : "+") + awardPlayer() }})
-				</span>
 			</q-checkbox>
 		</div>
 
-		<q-btn-toggle
-			v-model="awardType"
-			spread
-			no-caps
-			class="mt-4"
-			:dark="$store.getters.theme === 'dark'"
-			:options="options"
-			toggle-color="green"
-		/>
-
-		<button class="btn btn-block my-3" @click="awardXP()">Award XP</button>
+		<div class="d-flex gap-1 mt-4">
+			<q-btn
+				class="full-width bg-neutral-5"
+				no-caps
+				label="Divide over players"
+				@click="awardXP('divide')"
+			/>
+			<q-btn
+				class="full-width"
+				color="primary"
+				no-caps
+				label="Award to all"
+				@click="awardXP('toAll')"
+			/>
+		</div>
 	</div>
 </template>
 
@@ -62,11 +63,6 @@ export default {
 			players: {},
 			allSelected: true,
 			indeterminate: false,
-			options: [
-				{ label: "Divide over", value: "divide" },
-				{ label: "Award to all", value: "toAll" },
-			],
-			awardType: "divide",
 		};
 	},
 	computed: {
@@ -117,18 +113,10 @@ export default {
 		...mapActions("campaigns", ["get_campaign", "set_share"]),
 		...mapActions("players", ["get_player", "set_player_prop"]),
 		...mapActions("encounters", ["set_xp", "update_encounter_prop"]),
-		awardPlayer() {
-			let amount = this.amount;
-
-			if (this.awardType === "divide") {
-				amount = Math.floor(this.amount / this.awardTo.length);
-			}
-			return parseInt(amount);
-		},
-		awardXP() {
+		awardXP(awardType) {
 			let amount = parseInt(this.amount);
 
-			if (this.awardType === "divide") {
+			if (awardType === "divide") {
 				amount = Math.floor(this.amount / this.awardTo.length);
 			}