Reduce ally/npc settings duplication across encounter components

- Remove duplicate displayNPCField from DamageHealing.vue, use trackEncounter mixin instead
- Replace manual ally/npc branch in Initiative.vue conditions check with displayNPCField
- Fix EditEntity.vue npcSettings computed to read ally settings for friendly NPC entities

Author: HarmlessHarm

src/components/drawers/encounter/EditEntity.vue

@@ -433,7 +433,10 @@ export default {
 			},
 		},
 		npcSettings() {
-			return this.userSettings && this.userSettings.track ? this.userSettings.track.npc : undefined;
+			if (!this.userSettings?.track) return undefined;
+			return this.entity?.friendly
+				? this.userSettings.track.ally
+				: this.userSettings.track.npc;
 		},
 	},
 	methods: {

src/components/drawers/trackCampaign/playerRequests/DamageHealing.vue

@@ -105,9 +105,11 @@
 <script>
 import { db } from "src/firebase";
 import { mapActions, mapGetters } from "vuex";
+import { trackEncounter } from "src/mixins/trackEncounter";
 
 export default {
 	name: "damageHealing",
+	mixins: [trackEncounter],
 	props: ["targeted", "player", "encounter", "npcSettings", "allySettings"],
 	data() {
 		return {
@@ -192,17 +194,7 @@ export default {
 			);
 			this.setDrawer({ show: false });
 		},
-		displayNPCField(field, entity) {
-			const defaults = { name: true, health: false, ac: false };
-			if (entity.settings && entity.settings[field] !== undefined) return entity.settings[field];
-
-			// Select global settings based on friendly flag
-			const globalSettings = entity.friendly ? this.allySettings : this.npcSettings;
-
-			if (!globalSettings || globalSettings[field] == undefined) return defaults[field]; // Default value
-			return globalSettings[field];
 		},
-	},
 };
 </script>
 

src/components/trackCampaign/live/Initiative.vue

@@ -188,7 +188,7 @@
 									v-if="
 										(playerSettings.conditions === undefined &&
 											(entity.entityType === 'player' ||
-												(entity.entityType == 'npc' && (entity.friendly ? (allySettings || {}).conditions : npcSettings.conditions) === undefined))) ||
+												(entity.entityType == 'npc' && displayNPCField('conditions', entity) === undefined))) ||
 										entity.entityType === 'companion'
 									"
 								>