`\n\t});\n\n// confirm changes made in chat\n\tlet chatData = {\n\t\tuser: game.user.id,\n\t\tcontent: chatContent, \n\t\tflavor: game.i18n.localize(\"GMTOOLKIT.ResetFortune.Restored\") \n\t};\n\tChatMessage.create(chatData, {}); \n}\n\n// Calculate the Fortune target to be restored, based on Fate and Luck talent advances\nfunction getMaxFortune(target) {\n let advLuck = 0;\n let item = target.items.find(i => i.name === game.i18n.localize(\"NAME.Luck\") )\n\tif(!(item === undefined || item.data.data.advances.value < 1)) { \n\t\tfor (let item of target.items)\n\t\t\t{\n\t\t\t\tif (item.type === \"talent\" && item.name === game.i18n.localize(\"NAME.Luck\"))\n\t\t\t\t\t{\n\t\t\t\t\t\tadvLuck += item.data.data.advances.value;\n\t\t\t\t\t}\n\t\t\t}\n\t\t} \n return target.status.fate.value + advLuck\n}\n\n/* ==========\n * MACRO: Reset Fortune\n * VERSION: 0.9.4.3\n * UPDATED: 2022-07-31\n * DESCRIPTION: Restores Fortune to the Fate level of player character(s). Applies any Luck talent bonus.\n * TIP: Characters must be player assigned (if group setting is 'party') or player owned (if group setting is 'company'). \n ========== */","folder":null,"sort":0,"permission":{"default":0,"k5y1jEYMBqd9uLUx":3},"flags":{"wfrp4e-gm-toolkit":{"version":"0.9.4.3"}}} -{"_id":"roGO31Lo4pyL5kvg","name":"Send Dark Whispers","type":"script","author":"Zo7HSQ75uO8dWUkH","img":"modules/wfrp4e-gm-toolkit/assets/icons/dark-whispers.svg","scope":"global","command":"formDarkWhispers(); \n\nasync function formDarkWhispers() {\n // Non-GMs are not permitted to send Dark Whispers\n if (!game.user.isGM) { \n return ui.notifications.error(game.i18n.localize(\"GMTOOLKIT.Message.DarkWhispers.NoPermission\"));\n }\n\n // setup: determine group of actors to be whispered to \n const group = game.gmtoolkit.utility.getGroup(\"party\");\n const targeted = game.gmtoolkit.utility.getGroup(\"party\", {interaction : \"targeted\"});\n // setup: exit with notice if there are no player-assigned characters\n if (!group) { \n return ui.notifications.error(game.i18n.localize(\"GMTOOLKIT.Message.DarkWhispers.NoEligibleCharacters\"));\n }\n // setup: exit with notice if there are no player-assigned characters with Corruption\n if (!group.some(g => g.data.data?.status?.corruption?.value > 0)) {\n return ui.notifications.error(game.i18n.localize(\"GMTOOLKIT.Message.DarkWhispers.NoEligibleCharacters\"));\n }\n\n // Setup dialog content\n // Build list of characters to select via dialog\n const characterList = []\n group.forEach(g => { \n characterList.push({\n actorId: g?.actor?.id || g.id, \n name: g?.actor?.name || g.name, \n corruption: {\n value: g.data.data?.status?.corruption?.value, \n max: g.data.data?.status?.corruption?.max\n }, \n assignedUser: game.users.players.filter(p => p.character === g)[0],\n owners : game.users.players.filter(p => p.id in g.data.permission),\n targeted : targeted.includes(g)\n })\n });\n\n // Build dialog content\n let checkOptions = \"\";\n characterList.forEach(actor => {\n let canWhisperTo = (actor.corruption.value) ? `enabled title=\"${game.i18n.localize('GMTOOLKIT.Dialog.DarkWhispers.HasCorruption')}\"` : `disabled title=\"${game.i18n.localize('GMTOOLKIT.Dialog.DarkWhispers.NoCorruption')}\"`;\n let checked = (actor.targeted && actor.corruption.value) ? \"checked\" : \"\";\n let playerOwners = actor.owners.map(m => m.name).join(\", \")\n checkOptions +=`\n
\n \n \n \n
\n `\n });\n\n // Construct and show form\n let darkwhisper = (game.tables.getName(game.i18n.localize(\"GMTOOLKIT.Dialog.DarkWhispers.Title\"))) ? await game.wfrp4e.tables.rollTable(\"darkwhispers\") : game.i18n.format(\"GMTOOLKIT.Dialog.DarkWhispers.ImportTable\")\n\n let dialogContent = `\n \n \n
\n ${checkOptions} \n \n \n
\n \n \n
\n \n \n \n
\n `\n\n new Dialog({\n title: game.i18n.localize(\"GMTOOLKIT.Dialog.DarkWhispers.Title\"),\n content:dialogContent,\n buttons: {\n cancel: { \n label: game.i18n.localize(\"GMTOOLKIT.Dialog.Cancel\"),\n callback: (html) => abortWhisper()\n },\n whisper: { \n label: game.i18n.localize(\"GMTOOLKIT.Dialog.DarkWhispers.SendWhisper\"),\n callback: (html) => sendDarkWhispers(html, characterList, html.find('[name=\"sendToOwners\"]')[0].checked)\n }\n }\n }).render(true);\n}\n\nfunction sendDarkWhispers(html, characterList, sendToOwners) {\n // Build list of selected players ids for whispers target\n let characterTargets = []; \n let playerRecipients = []; \n\n for ( let character of characterList ) {\n if (html.find(`[name=\"${character.actorId}\"]`)[0].checked) {\n characterTargets.push(character.name);\n sendToOwners ? playerRecipients.push(...character.owners.map(m => m.id)) : playerRecipients.push(character.assignedUser.id)\n }\n }\n \n // check for whisper message \n darkwhisper = html.find('[name=\"message\"]')[0].value \n // abort if no whisper or character is selected \n if (!playerRecipients.length || !darkwhisper) return abortWhisper()\n\n // Construct and send message to whisper targets\n // Build the translation string based on the setting\n const messageTemplate = `GMTOOLKIT.Settings.DarkWhispers.message.${game.settings.get(\"wfrp4e-gm-toolkit\", \"messageDarkWhispers\")}`\n // Parse the translated message\n const whisperMessage = `${game.i18n.format(messageTemplate, {message: darkwhisper})}`\n // Add response buttons for chat card. data- attributes are used by listener.\n const responseButtons = `\n \n `\n // Post the message \n ChatMessage.create({\n content: whisperMessage + responseButtons,\n whisper: playerRecipients, \n flavor: characterTargets.join(', ') \n });\n}\n\nfunction abortWhisper() {\n return ui.notifications.error(game.i18n.format(\"GMTOOLKIT.Message.DarkWhispers.WhisperAborted\", {currentUser: game.user.name}));\n}\n\n\n/* ==========\n* MACRO: Send Dark Whispers\n* VERSION: 0.9.4\n* UPDATED: 2022-07-04\n* DESCRIPTION: Open a dialog to send a Dark Whisper (WFRP p183) to one or more selected player character(s).\n* TIP: Only player-assigned characters with Corruption can be sent a Dark Whisper. \n* TIP: The placeholder whisper is drawn from the Dark Whispers table. Change this for different random whispers. \n* TIP: The whisper can be edited in the dialog, regardless of what is pre-filled from the Dark Whispers table. \n* TIP: Actor tokens that are targeted in a scene are pre-selecteed in the Send Dark Whisper dialog.\n========== */","folder":null,"sort":0,"permission":{"default":0,"Zo7HSQ75uO8dWUkH":3},"flags":{"core":{"sourceId":"Macro.NsfnGgD7GMH7AMwI"},"wfrp4e-gm-toolkit":{"version":"0.9.4"}}}
+{"_id":"roGO31Lo4pyL5kvg","name":"Send Dark Whispers","type":"script","author":"Zo7HSQ75uO8dWUkH","img":"modules/wfrp4e-gm-toolkit/assets/icons/dark-whispers.svg","scope":"global","command":"formDarkWhispers(); \n\nasync function formDarkWhispers() {\n // Non-GMs are not permitted to send Dark Whispers\n if (!game.user.isGM) { \n return ui.notifications.error(game.i18n.localize(\"GMTOOLKIT.Message.DarkWhispers.NoPermission\"));\n }\n\n // setup: determine group of actors to be whispered to \n const group = game.gmtoolkit.utility.getGroup(game.settings.get(\"wfrp4e-gm-toolkit\", \"defaultGroupDarkWhispers\")).filter(g => g.type === \"character\")\n const targeted = game.gmtoolkit.utility.getGroup(game.settings.get(\"wfrp4e-gm-toolkit\", \"defaultGroupDarkWhispers\"), {interaction : \"targeted\"}).filter(g => g.type === \"character\");\n // setup: exit with notice if there are no player-assigned characters\n if (!group) { \n return ui.notifications.error(game.i18n.localize(\"GMTOOLKIT.Message.DarkWhispers.NoEligibleCharacters\"));\n }\n // setup: exit with notice if there are no player-assigned characters with Corruption\n if (!group.some(g => g.data.data?.status?.corruption?.value > 0)) {\n return ui.notifications.error(game.i18n.localize(\"GMTOOLKIT.Message.DarkWhispers.NoEligibleCharacters\"));\n }\n\n // Setup dialog content\n // Build list of characters to select via dialog\n const characterList = []\n group.forEach(g => { \n characterList.push({\n actorId: g?.actor?.id || g.id, \n name: g?.actor?.name || g.name, \n corruption: {\n value: g.data.data?.status?.corruption?.value, \n max: g.data.data?.status?.corruption?.max\n }, \n assignedUser: game.users.players.filter(p => p.character === g)[0],\n owners : game.users.players.filter(p => p.id in g.data.permission),\n targeted : targeted.includes(g)\n })\n });\n\n // Build dialog content\n let checkOptions = \"\";\n characterList.forEach(actor => {\n let canWhisperTo = (actor.corruption.value) ? `enabled title=\"${game.i18n.localize('GMTOOLKIT.Dialog.DarkWhispers.HasCorruption')}\"` : `disabled title=\"${game.i18n.localize('GMTOOLKIT.Dialog.DarkWhispers.NoCorruption')}\"`;\n let checked = (actor.targeted && actor.corruption.value) ? \"checked\" : \"\";\n let playerOwners = actor.owners.map(m => m.name).join(\", \")\n checkOptions +=`\n \n \n \n \n
\n `\n });\n\n // Construct and show form\n let darkwhisper = (game.tables.getName(game.i18n.localize(\"GMTOOLKIT.Dialog.DarkWhispers.Title\"))) ? await game.wfrp4e.tables.rollTable(\"darkwhispers\") : game.i18n.format(\"GMTOOLKIT.Dialog.DarkWhispers.ImportTable\")\n\n let dialogContent = `\n \n \n
\n ${checkOptions} \n \n \n
\n \n \n
\n \n \n \n
\n `\n\n new Dialog({\n title: game.i18n.localize(\"GMTOOLKIT.Dialog.DarkWhispers.Title\"),\n content:dialogContent,\n buttons: {\n cancel: { \n label: game.i18n.localize(\"GMTOOLKIT.Dialog.Cancel\"),\n callback: (html) => abortWhisper()\n },\n whisper: { \n label: game.i18n.localize(\"GMTOOLKIT.Dialog.DarkWhispers.SendWhisper\"),\n callback: (html) => sendDarkWhispers(html, characterList, html.find('[name=\"sendToOwners\"]')[0].checked)\n }\n }\n }).render(true);\n}\n\nfunction sendDarkWhispers(html, characterList, sendToOwners) {\n // Build list of selected players ids for whispers target\n let characterTargets = []; \n let playerRecipients = []; \n\n for ( let character of characterList ) {\n if (html.find(`[name=\"${character.actorId}\"]`)[0].checked) {\n characterTargets.push(character.name);\n sendToOwners ? playerRecipients.push(...character.owners.map(m => m.id)) : playerRecipients.push(character.assignedUser?.id)\n }\n }\n \n // check for whisper message \n darkwhisper = html.find('[name=\"message\"]')[0].value \n // abort if no whisper or character is selected \n if (playerRecipients.filter(p => p === undefined).length === playerRecipients.length || !playerRecipients.length || !darkwhisper) return abortWhisper()\n\n // Construct and send message to whisper targets\n // Build the translation string based on the setting\n const messageTemplate = `GMTOOLKIT.Settings.DarkWhispers.message.${game.settings.get(\"wfrp4e-gm-toolkit\", \"messageDarkWhispers\")}`\n // Parse the translated message\n const whisperMessage = `${game.i18n.format(messageTemplate, {message: darkwhisper})}`\n // Add response buttons for chat card. data- attributes are used by listener.\n const responseButtons = `\n \n `\n // Post the message \n ChatMessage.create({\n content: whisperMessage + responseButtons,\n whisper: playerRecipients, \n flavor: characterTargets.join(', ') \n });\n}\n\nfunction abortWhisper() {\n return ui.notifications.error(game.i18n.format(\"GMTOOLKIT.Message.DarkWhispers.WhisperAborted\", {currentUser: game.user.name}));\n}\n\n\n/* ==========\n* MACRO: Send Dark Whispers\n* VERSION: 0.9.4.3\n* UPDATED: 2022-07-31\n* DESCRIPTION: Open a dialog to send a Dark Whisper (WFRP p183) to one or more selected player character(s).\n* TIP: Only player-assigned or player-owned characters with Corruption can be sent a Dark Whisper. \n* TIP: The placeholder whisper is drawn from the Dark Whispers table. Change this for different random whispers. \n* TIP: The whisper can be edited in the dialog, regardless of what is pre-filled from the Dark Whispers table. \n* TIP: Actor tokens that are targeted in a scene are pre-selecteed in the Send Dark Whisper dialog.\n========== */","folder":null,"sort":0,"permission":{"default":0,"Zo7HSQ75uO8dWUkH":3},"flags":{"core":{"sourceId":"Macro.NsfnGgD7GMH7AMwI"},"wfrp4e-gm-toolkit":{"version":"0.9.4.3"}}}
{"_id":"rzKeTLKp0bOp5SK9","name":"Add XP","type":"script","author":"k5y1jEYMBqd9uLUx","img":"modules/wfrp4e-gm-toolkit/assets/icons/add-xp.svg","scope":"global","command":"addXP();\n\nasync function addXP() {\n\n // setup: determine group of actors to be awarded experience\n let awardees = []\n if (game.user.targets.size < 1) {\n // (1) all assigned player characters \n awardees = game.gmtoolkit.utility.getGroup(game.settings.get(\"wfrp4e-gm-toolkit\", \"defaultPartyGroupTest\")).filter(g => g.type === \"character\")\n } else {\n // (2) all targeted tokens of awardee selection\n awardees = game.gmtoolkit.utility.getGroup( game.settings.get(\"wfrp4e-gm-toolkit\", \"defaultPartyGroupTest\"), {interaction : \"targeted\"}).filter(g => g.type === \"character\")\n }\n \n // setup: exit with notice if there are no player-assigned characters\n if (awardees.length < 1) return ui.notifications.error(game.i18n.localize(\"GMTOOLKIT.Token.TargetPCs\"), {});\n\n // Get session ID/date, default XP award and default reason\n let XP = Number(game.settings.get(\"wfrp4e-gm-toolkit\", \"addXPDefaultAmount\"))\n let reason = (game.settings.get(\"wfrp4e-gm-toolkit\", \"addXPDefaultReason\"))\n if (reason == \"null\") {\n reason = \"\"\n } else {\n reason = (game.settings.get(\"wfrp4e-gm-toolkit\", \"addXPDefaultReason\")) \n let session = game.gmtoolkit.utility.getSession()\n reason = reason.replace(\"%date%\", session.date)\n if (session.id != \"null\" ) reason = reason.replace(\"%session%\", session.id)\n }\n\n // Prompt for XP if option is set\n if (game.settings.get(\"wfrp4e-gm-toolkit\", \"addXPPrompt\")) {\n let awardeeList = \"- \"\n awardees.forEach (pc => {\n awardeeList += `
- ${pc?.actor?.name || pc.name} ` \n })\n awardeeList += \"
\") })\n\n return // END OF FUNCTION\n\n function isEndOfRound() {\n const combat = game.combat\n if (!combat) return false\n if (combat.data.round != 0 && combat.turns && combat.data.active) {\n return (combat.current.turn > -1 && combat.current.turn == combat.turns.length - 1)\n }\n }\n\n async function processConditionTest(tokenActor, testOptions, condition, removedConditions) {\n if (tokenActor.actor.type === \"vehicle\" && condition !== \"ablaze\") return; // vehicles can burn, but not make condition tests\n const title = `${game.i18n.localize(game.wfrp4e.config.conditions[(condition)])}`\n const conditionCount = tokenActor.actor.hasCondition(condition).conditionValue;\n let conditionRemoved = \"\"\n let setupData = {};\n let conditionTest = {};\n let skill = {};\n // show the roll dialog for broken condition tests, so the difficulty can be correctly set\n // note: cancelling the roll dialog cancels any outstanding condition checks\n condition === \"broken\" ? testOptions.bypass = false : testOptions.bypass = true\n\n switch (condition) {\n case \"surprised\": // lose condition\n tokenActor.actor.removeCondition(condition);\n conditionRemoved = condition\n break;\n case \"ablaze\": // lose 1d10-TB-AP+(condition-1) (min 1) Wounds\n // doesn't consider the least protected hit location, but does show how much damage is absorbed by AP for manual adjustment if desired\n const ablazeDamage = await new Roll(`1d10 + ${conditionCount} - 1`).evaluate();\n console.log(ablazeDamage)\n tokenActor.actor.applyBasicDamage(ablazeDamage.total, {});\n break;\n case \"stunned\": // challenging Endurance: remove 1+SL (min 1) condition\n // fall through: \n case \"poisoned\": // challenging Endurance: remove 1+SL (min 1) condition \n skill = game.gmtoolkit.utility.hasSkill(tokenActor.actor, game.i18n.localize(\"NAME.Endurance\"), \"silent\");\n // setup test data\n if (skill !== undefined) { // prefer Endurance test\n testOptions.title = game.i18n.format(\"GMTOOLKIT.Dialog.CheckConditions.Skill\", {title: title, skill: game.i18n.localize(\"NAME.Endurance\")});\n setupData = await tokenActor.actor.setupSkill(skill, testOptions)\n } \n if (skill === undefined) { // fallback to Toughness if no Endurance skill\n testOptions.title = game.i18n.format(\"GMTOOLKIT.Dialog.CheckConditions.Fallback\", {title: title, char: game.i18n.localize(\"CHAR.T\")});\n setupData = await tokenActor.actor.setupCharacteristic(\"t\", testOptions) \n }\n // process test\n await processConditionTest();\n break;\n case \"broken\": // challenging Cool: remove 1+SL (min 1) condition\n skill = game.gmtoolkit.utility.hasSkill(tokenActor.actor, game.i18n.localize(\"NAME.Cool\"), \"silent\");\n // setup test data\n if (skill !== undefined) { // prefer Cool test\n testOptions.title = game.i18n.format(\"GMTOOLKIT.Dialog.CheckConditions.Skill\", {title: title, skill: game.i18n.localize(\"NAME.Cool\")});\n setupData = await tokenActor.actor.setupSkill(skill, testOptions)\n } \n if (skill === undefined) { // fallback to Willpower if no Cool skill\n testOptions.title = game.i18n.format(\"GMTOOLKIT.Dialog.CheckConditions.Fallback\", {title: title, char: game.i18n.localize(\"CHAR.WP\")});\n setupData = await tokenActor.actor.setupCharacteristic(\"t\", testOptions) \n }\n // process test\n await processConditionTest();\n break;\n default:\n break;\n } \n // collect removed conditions\n if (conditionRemoved !== \"\") {\n removedConditions.push(\n game.i18n.format(\"CHAT.RemovedConditions\", {\n condition: title,\n name: tokenActor.actor.name \n })\n )\n }\n\n async function processConditionTest() {\n conditionTest = await tokenActor.actor.basicTest(setupData);\n if (conditionTest.succeeded) {\n tokenActor.actor.removeCondition(condition, Math.min(Number(conditionTest.result.SL) + 1, conditionCount));\n conditionRemoved = condition;\n }\n return conditionTest\n }\n } // end processConditionTest\n}\n\n\n/* ==========\n* MACRO: Check Conditions\n* VERSION: 0.9.4.2\n* UPDATED: 2022-07-25\n* DESCRIPTION: Process end of round condition checks. Automatically handle removal of Surprised condition, tests to remove Poisoned, Stunned and Broken conditions, and Ablaze damage (including to vehicles).\n* TIP: Set `skipPCs = false` to automatically make condition checks for player-assigned characters. \n* TIP: Set `endOfCombatRoundsOnly = false` to use the macro in any combat round, or even outside combat. \n========== */","folder":null,"sort":0,"permission":{"default":0,"WpuDIfNQnefaTyuV":3},"flags":{"core":{"sourceId":"Macro.YSvf5jsBKPTkkULa"},"wfrp4e-gm-toolkit":{"version":"0.9.4-1"}}} diff --git a/scripts/macros/dark-whispers.js b/scripts/macros/dark-whispers.js index f7838ec..1ba6b98 100644 --- a/scripts/macros/dark-whispers.js +++ b/scripts/macros/dark-whispers.js @@ -7,8 +7,8 @@ async function formDarkWhispers() { } // setup: determine group of actors to be whispered to - const group = game.gmtoolkit.utility.getGroup("party"); - const targeted = game.gmtoolkit.utility.getGroup("party", {interaction : "targeted"}); + const group = game.gmtoolkit.utility.getGroup(game.settings.get("wfrp4e-gm-toolkit", "defaultGroupDarkWhispers")).filter(g => g.type === "character") + const targeted = game.gmtoolkit.utility.getGroup(game.settings.get("wfrp4e-gm-toolkit", "defaultGroupDarkWhispers"), {interaction : "targeted"}).filter(g => g.type === "character"); // setup: exit with notice if there are no player-assigned characters if (!group) { return ui.notifications.error(game.i18n.localize("GMTOOLKIT.Message.DarkWhispers.NoEligibleCharacters")); @@ -44,7 +44,7 @@ async function formDarkWhispers() { checkOptions +=`
-
+
`
@@ -94,14 +94,14 @@ function sendDarkWhispers(html, characterList, sendToOwners) {
for ( let character of characterList ) {
if (html.find(`[name="${character.actorId}"]`)[0].checked) {
characterTargets.push(character.name);
- sendToOwners ? playerRecipients.push(...character.owners.map(m => m.id)) : playerRecipients.push(character.assignedUser.id)
+ sendToOwners ? playerRecipients.push(...character.owners.map(m => m.id)) : playerRecipients.push(character.assignedUser?.id)
}
}
// check for whisper message
darkwhisper = html.find('[name="message"]')[0].value
// abort if no whisper or character is selected
- if (!playerRecipients.length || !darkwhisper) return abortWhisper()
+ if (playerRecipients.filter(p => p === undefined).length === playerRecipients.length || !playerRecipients.length || !darkwhisper) return abortWhisper()
// Construct and send message to whisper targets
// Build the translation string based on the setting
@@ -130,10 +130,10 @@ function abortWhisper() {
/* ==========
* MACRO: Send Dark Whispers
-* VERSION: 0.9.4
-* UPDATED: 2022-07-04
+* VERSION: 0.9.4.3
+* UPDATED: 2022-07-31
* DESCRIPTION: Open a dialog to send a Dark Whisper (WFRP p183) to one or more selected player character(s).
-* TIP: Only player-assigned characters with Corruption can be sent a Dark Whisper.
+* TIP: Only player-assigned or player-owned characters with Corruption can be sent a Dark Whisper.
* TIP: The placeholder whisper is drawn from the Dark Whispers table. Change this for different random whispers.
* TIP: The whisper can be edited in the dialog, regardless of what is pre-filled from the Dark Whispers table.
* TIP: Actor tokens that are targeted in a scene are pre-selecteed in the Send Dark Whisper dialog.