From 2d1f7d1494a47076840de891648b4b67189bc31f Mon Sep 17 00:00:00 2001
From: Adrienne Walker <enne@quisquo.us>
Date: Fri, 10 Nov 2023 14:52:11 -0800
Subject: [PATCH] raidboss/oopsy: support jobs instead of names in triggers
 (#5916)

You can now also write `${player.job}`, `${player.role}`,
`${player.nick}`, or `${player.name}` in triggers now as well if you
want to override output strings individually.

If the property isn't there (somebody not in your party, bugs, typos),
it will default to nickname.

Fixes #3000.
---
 ui/oopsyraidsy/oopsyraidsy_config.ts | 16 ++++++++++++++++
 ui/raidboss/raidboss_config.ts       | 22 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/ui/oopsyraidsy/oopsyraidsy_config.ts b/ui/oopsyraidsy/oopsyraidsy_config.ts
index 008768d26d..3e4f3d80b0 100644
--- a/ui/oopsyraidsy/oopsyraidsy_config.ts
+++ b/ui/oopsyraidsy/oopsyraidsy_config.ts
@@ -275,6 +275,22 @@ const templateOptions: OptionsTemplate = {
       debugOnly: true,
       default: false,
     },
+    {
+      id: 'DefaultPlayerLabel',
+      name: {
+        en: 'Default Player Label',
+      },
+      type: 'select',
+      options: {
+        en: {
+          'Nickname (Tini)': 'nick',
+          'Role (Tank)': 'role',
+          'Job (WAR)': 'job',
+          'Full Name (Tini Poutini)': 'name',
+        },
+      },
+      default: 'nick',
+    },
     {
       id: 'NumLiveListItemsInCombat',
       name: {
diff --git a/ui/raidboss/raidboss_config.ts b/ui/raidboss/raidboss_config.ts
index 351a7fc1f5..861b876c05 100644
--- a/ui/raidboss/raidboss_config.ts
+++ b/ui/raidboss/raidboss_config.ts
@@ -2146,6 +2146,28 @@ const templateOptions: OptionsTemplate = {
       type: 'checkbox',
       default: false,
     },
+    {
+      id: 'DefaultPlayerLabel',
+      comment: {
+        en: `The default way to specify players in trigger output. By default, it will use
+             nicknames/first names. This can be used to print out player jobs instead.
+             If you are not in a party or players are out of a party (or there are bugs),
+             it will default to the player's nickname if there's no other information.`,
+      },
+      name: {
+        en: 'Default Player Label',
+      },
+      type: 'select',
+      options: {
+        en: {
+          'Nickname (Tini)': 'nick',
+          'Role (Tank)': 'role',
+          'Job (WAR)': 'job',
+          'Full Name (Tini Poutini)': 'name',
+        },
+      },
+      default: 'nick',
+    },
     {
       id: 'ShowTimerBarsAtSeconds',
       name: {