Add default group option for Send Dark Whispers

CHANGELOG.md

@@ -9,6 +9,9 @@ See [Issue Backlog](../../issues) and [Roadmap](../../milestones).
 - *Added* new option to set 'party' (player-assigned: default) or 'company' (player-owned) actors as default group type for Session Turnover macros. [#151](https://github.com/Jagusti/fvtt-wfrp4e-gmtoolkit/issues/151)
   - The Reset Fortune and Add XP macros use the Session Turnover Default Group Selection option. 
   - Actors who are not character type, but are player-owned (ie, NPC, vehicle and creature type actors) are ignored whe processing Session Turnover macros.
+- *Added* new option to set 'party' (player-assigned: default) or 'company' (player-owned) actors as default group type for Dark Whispers macros. [#151](https://github.com/Jagusti/fvtt-wfrp4e-gmtoolkit/issues/151)
+  - When using 'company' as the default group, it is possible to select unassigned players. In this case, no whisper is sent unless the 'Send to player owners' option is selected in the Send Dark Whispers dialog.
+- *Added* new localisation keys to support additional dialog and settings options for default group selections. #151](https://github.com/Jagusti/fvtt-wfrp4e-gmtoolkit/issues/151)
 
 ## [Version 0.9.4.2](https://github.com/Jagusti/fvtt-wfrp4e-gmtoolkit/releases/tag/v0.9.4.2)  (2022-07-29)
 - *Added* localization improvements for Condition Check and Secret Group Test macros. (Thanks @Txus5012!) [[#141](https://github.com/Jagusti/fvtt-wfrp4e-gmtoolkit/pull/141)] 

lang/de.json

@@ -37,6 +37,8 @@
 
     "GMTOOLKIT.Dialog.Apply": "Änderungen anwenden",    
     "GMTOOLKIT.Dialog.Cancel" : "Abbrechen",
+    "GMTOOLKIT.Dialog.None" : "None",
+    "GMTOOLKIT.Dialog.NotAssigned" : "Not Assigned",
 
     "GMTOOLKIT.Token.Select": "Bitte wählen Sie zuerst ein oder mehrere Token aus.",
     "GMTOOLKIT.Token.SingleSelect": "Bitte wählen Sie zunächst einen einzelnen Token aus.",
@@ -241,6 +243,8 @@
     "GMTOOLKIT.Settings.DarkWhispers.message.hint" : "Wählen Sie den Ton von Dunkles Geflüster, der zu Ihrem Spiel passt.", 
     "GMTOOLKIT.Settings.DarkWhispers.message.taunt" : "<p><strong>Die dunklen Götter können sehen, dass du beunruhigt bist.</strong></p><p><em>Für einen diskreten Gefallen können sie dich von 1 Verderbnis befreien.</em></p><blockquote>{message}</blockquote><p>Welchen Schaden kann es anrichten? Nehmen Sie das Angebot an und treten Sie vom Rande des Chaos zurück.</p>",
     "GMTOOLKIT.Settings.DarkWhispers.message.threat" : "<p><strong>Dunkles Flüstern in deinen Ohren ... </strong></p><p><em>Geben Sie auf keinen Fall preis, dass Du diese Nachricht erhalten hast.</em></p><blockquote>{message}</blockquote><p>Wenn du die Anweisung befolgst, wird deine Verderbnis insgesamt um 1 reduziert.</p>", 
+    "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.name" : "Default Group Selection",
+    "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.hint" : "Choose 'party' (default) to only include characters assigned to players, or 'company' to also include player-owned characters (such as hirelings, henchmen and familiars). Individual characters can be de-selected in the Group Test dialog.", 
     "GMTOOLKIT.Notification.NoActor" : "Kein Charakter ist ausgewählt oder verbunden mit {currentuser}.",
     "GMTOOLKIT.Notification.UserMustBePlayer" : "Nur Spielercharaktere können {action}.", 
 

lang/en.json

@@ -37,6 +37,8 @@
 
     "GMTOOLKIT.Dialog.Apply": "Apply Changes",    
     "GMTOOLKIT.Dialog.Cancel" : "Cancel",
+    "GMTOOLKIT.Dialog.None" : "None",
+    "GMTOOLKIT.Dialog.NotAssigned" : "Not Assigned",
 
     "GMTOOLKIT.Token.Select": "Please select one or more tokens first.",
     "GMTOOLKIT.Token.SingleSelect": "Please select a single token first.",
@@ -241,6 +243,8 @@
     "GMTOOLKIT.Settings.DarkWhispers.message.hint" : "Choose the tone of Dark Whisper to suit your game.", 
     "GMTOOLKIT.Settings.DarkWhispers.message.taunt" : "<p><strong>The Dark Gods can see you are troubled.</strong></p><p><em>For a discrete favour they can unburden you of 1 Corruption.</em></p><blockquote>{message}</blockquote><p>What harm can it do? Take the offer and step back from the brink of Chaos.</p>",
     "GMTOOLKIT.Settings.DarkWhispers.message.threat" : "<p><strong>Dark Whispers Linger In Your Ears ... </strong></p><p><em>Do not in any way reveal that you have received this message.</em></p><blockquote>{message}</blockquote><p>If you do as directed, your Corruption total will be reduced by 1.</p>", 
+    "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.name" : "Default Group Selection",
+    "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.hint" : "Choose 'party' (default) to only include characters assigned to players, or 'company' to also include player-owned characters (such as hirelings, henchmen and familiars). Individual characters can be de-selected in the Group Test dialog.", 
     "GMTOOLKIT.Notification.NoActor" : "No Character is selected or associated with {currentuser}.",
     "GMTOOLKIT.Notification.UserMustBePlayer" : "Only player characters can {action}.", 
 

lang/fr.json

@@ -37,6 +37,8 @@
 
     "GMTOOLKIT.Dialog.Apply" : "Appliquer les changements",
     "GMTOOLKIT.Dialog.Cancel" : "Annuler",
+    "GMTOOLKIT.Dialog.None" : "None",
+    "GMTOOLKIT.Dialog.NotAssigned" : "Not Assigned",
 
     "GMTOOLKIT.Token.Select": "Veuillez selectionner 1 ou 2 Pions.",
     "GMTOOLKIT.Token.SingleSelect": "Veuillez sélectioner 1 Pion seulement.",
@@ -241,6 +243,8 @@
     "GMTOOLKIT.Settings.DarkWhispers.message.hint" : "Choisissez le ton des Sombres murmures correspondant à votre partie.",
     "GMTOOLKIT.Settings.DarkWhispers.message.taunt" : "<p><strong>Les Dieux Noirs peuvent voir que vous êtes troublé.</strong></p><p><em>Contre une petite faveur, ils peuvent vous soulager d'1 point de Corruption.</em></p><blockquote>{message}</blockquote><p>Quel mal cela pourrait-il faire ? Acceptez cette offre et éloignez-vous de l'abîme chaotique.</p>",
     "GMTOOLKIT.Settings.DarkWhispers.message.threat" : "<p><strong>De Sombres murmures persistent dans vos oreilles... </strong></p><p><em>Ne révélez d'aucune manière que vous avez reçu ce message.</em></p><blockquote>{message}</blockquote><p>Si vous faites tel qu'il vous a été enjoint de faire, votre total de points de Corruption sera réduit de 1.</p>",
+    "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.name" : "Default Group Selection",
+    "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.hint" : "Choose 'party' (default) to only include characters assigned to players, or 'company' to also include player-owned characters (such as hirelings, henchmen and familiars). Individual characters can be de-selected in the Group Test dialog.", 
     "GMTOOLKIT.Notification.NoActor" : "Aucune Personnage n'est sélectionné ou n'est associé à {currentuser}.",
     "GMTOOLKIT.Notification.UserMustBePlayer" : "Seuls les Personnages Joueurs peuvent {action}.",
 

lang/ja.json

@@ -37,6 +37,8 @@
 
     "GMTOOLKIT.Dialog.Apply": "変更を適用",
     "GMTOOLKIT.Dialog.Cancel" : "取消",
+    "GMTOOLKIT.Dialog.None" : "None",
+    "GMTOOLKIT.Dialog.NotAssigned" : "Not Assigned",
 
     "GMTOOLKIT.Token.Select": "最初にトークンを一つ以上選択してください。",
     "GMTOOLKIT.Token.SingleSelect": "最初にトークンを一つ選択してください。",
@@ -241,6 +243,8 @@
     "GMTOOLKIT.Settings.DarkWhispers.message.hint" : "ゲームに合わせて「暗黒のささやき」の音色を選んでください。",
     "GMTOOLKIT.Settings.DarkWhispers.message.taunt" : "<p><strong>闇の神々はあなたが悩んでいるのを見ている。</strong></p><p><em>些細な好意で、あなたの堕落を一つ解放してくれるだろう。</em></p><blockquote>{message}</blockquote><p>それにどんな害が有るのだろうか？この申し出を受けて、混沌の瀬戸際から一歩戻るのだ。</p>",
     "GMTOOLKIT.Settings.DarkWhispers.message.threat" : "<p><strong>「暗黒のささやき」が耳にから離れない。。。 </strong></p><p><em>このメッセージを受け取ったことは、誰にも明かしてはいけない。</em></p><blockquote>{message}</blockquote><p>指示に従えば、君は堕落ポイントを１減らせるだろう。</p>",
+    "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.name" : "Default Group Selection",
+    "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.hint" : "Choose 'party' (default) to only include characters assigned to players, or 'company' to also include player-owned characters (such as hirelings, henchmen and familiars). Individual characters can be de-selected in the Group Test dialog.", 
     "GMTOOLKIT.Notification.NoActor" : "キャラクターが選択されていないか、{currentuser}に割り当てられていない。",
     "GMTOOLKIT.Notification.UserMustBePlayer" : "「{action}」はプレイヤーだけが実行できる。",
 

modules/gm-toolkit-settings.mjs

@@ -260,6 +260,19 @@ export class GMToolkitSettings {
       restricted: true                 
     });
     // Settings for Send Dark Whispers Macro
+    game.settings.register(GMToolkit.MODULE_ID, "defaultGroupDarkWhispers", {
+      name: "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.name",
+      hint: "GMTOOLKIT.Settings.DarkWhispers.DefaultGroup.hint",
+      scope: "world",
+      config: false,
+      default: "party",
+      type: String,
+      choices: {
+        party: "GMTOOLKIT.Group.Type.party",
+        company: "GMTOOLKIT.Group.Type.company"
+      },
+      feature: "darkwhispers"
+    });
     game.settings.register(GMToolkit.MODULE_ID, "messageDarkWhispers", {
       name: "GMTOOLKIT.Settings.DarkWhispers.message.name",
       hint: "GMTOOLKIT.Settings.DarkWhispers.message.hint",