Merge branch 'master' of https://github.com/ultrakorne/better-rolltables

ultrakorne · Aug 29, 2021 · bc8c228 · bc8c228
2 parents f3a9fda + da37e23
commit bc8c228
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 11 deletions.
diff --git a/lang/de.json b/lang/de.json
@@ -42,5 +42,7 @@
     "BRT.Settings.RollTableFromJournal.Title": "Add roll button to tables in journal entries?",
     "BRT.Settings.RollTableFromJournal.Description": "If enabled, a roll button is added to linked tables in journal entries.",
     "BRT.Settings.ShareCurrencyButton.Title": "Show share currency button?",
-    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)"
+    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Title": "Always show generated loot to actor as message",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Description": "If enabled, generated loot added to an actor is also displayed as a message."
 }
diff --git a/lang/en.json b/lang/en.json
@@ -42,5 +42,7 @@
     "BRT.Settings.RollTableFromJournal.Title": "Add roll button to tables in journal entries?",
     "BRT.Settings.RollTableFromJournal.Description": "If enabled, a roll button is added to linked tables in journal entries.",
     "BRT.Settings.ShareCurrencyButton.Title": "Show share currency button?",
-    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)"
+    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Title": "Always show generated loot to actor as message",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Description": "If enabled, generated loot added to an actor is also displayed as a message."
 }
diff --git a/lang/es-ES.json b/lang/es-ES.json
@@ -42,5 +42,7 @@
     "BRT.Settings.RollTableFromJournal.Title": "Add roll button to tables in journal entries?",
     "BRT.Settings.RollTableFromJournal.Description": "If enabled, a roll button is added to linked tables in journal entries.",
     "BRT.Settings.ShareCurrencyButton.Title": "Show share currency button?",
-    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)"
+    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Title": "Always show generated loot to actor as message",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Description": "If enabled, generated loot added to an actor is also displayed as a message."
 }
diff --git a/lang/fr.json b/lang/fr.json
@@ -42,5 +42,7 @@
     "BRT.Settings.RollTableFromJournal.Title": "Ajouter un bouton de lancer aux tables dans les journaux ?",
     "BRT.Settings.RollTableFromJournal.Description": "Si activé, un bouton pour lancer un tirage sur une table est ajouté aux tables liées dans un journal.",
     "BRT.Settings.ShareCurrencyButton.Title": "Afficher le bouton de distribution des monnaires ?",
-    "BRT.Settings.ShareCurrencyButton.Description": "Affihe un bouton sur les messages pour distribuer les monnaies (s'il y en a)(dnd5e uniquement)"
+    "BRT.Settings.ShareCurrencyButton.Description": "Affihe un bouton sur les messages pour distribuer les monnaies (s'il y en a)(dnd5e uniquement)",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Title": "Toujours afficher le butin généré sur un acteur comme un message",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Description": "Si actif, le butin généré et ajouté à un acteur sera aussi affiché den tant que message."
 }
diff --git a/lang/ko.json b/lang/ko.json
@@ -42,5 +42,7 @@
     "BRT.Settings.RollTableFromJournal.Title": "Add roll button to tables in journal entries?",
     "BRT.Settings.RollTableFromJournal.Description": "If enabled, a roll button is added to linked tables in journal entries.",
     "BRT.Settings.ShareCurrencyButton.Title": "Show share currency button?",
-    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)"
+    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Title": "Always show generated loot to actor as message",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Description": "If enabled, generated loot added to an actor is also displayed as a message."
 }
diff --git a/lang/pt-BR.json b/lang/pt-BR.json
@@ -42,5 +42,7 @@
     "BRT.Settings.RollTableFromJournal.Title": "Add roll button to tables in journal entries?",
     "BRT.Settings.RollTableFromJournal.Description": "If enabled, a roll button is added to linked tables in journal entries.",
     "BRT.Settings.ShareCurrencyButton.Title": "Show share currency button?",
-    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)"
+    "BRT.Settings.ShareCurrencyButton.Description": "Show a button on mesage to share currency (if any) (dnde only)",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Title": "Always show generated loot to actor as message",
+    "BRT.Settings.AlwaysShowGeneratedLootAsMessage.Description": "If enabled, generated loot added to an actor is also displayed as a message."
 }
diff --git a/scripts/better-tables.js b/scripts/better-tables.js
@@ -35,9 +35,11 @@ export class BetterTables {
     await lootCreator.addCurrenciesToActor()
     await lootCreator.addItemsToActor()
 
-    const lootChatCard = new LootChatCard(betterResults, currencyData)
-    await lootChatCard.createChatCard(tableEntity)
-  }
+    if (game.settings.get(BRTCONFIG.NAMESPACE, BRTCONFIG.ALWAYS_SHOW_GENERATED_LOOT_AS_MESSAGE)) {
+      const lootChatCard = new LootChatCard(betterResults, currencyData)
+      await lootChatCard.createChatCard(tableEntity)
+    }
+}
 
   async addLootToSelectedToken (tableEntity) {
     // VaderDojo: Only allow if tokens are selected
@@ -175,7 +177,7 @@ export class BetterTables {
       if (!pack || pack === defaultPack) {
         const spellCompendium = game.packs.get(defaultPack)
         const spellCompendiumIndex = await spellCompendium.getIndex({ fields: ['data.level', 'img'] })
-        this._spellCache = spellCompendiumIndex.map(i => mergeObject(i, { collection: spellCompendium.collection }))
+        this._spellCache = spellCompendiumIndex.filter(entry => entry.type === "spell").map(i => mergeObject(i, { collection: spellCompendium.collection }))
       }
     }
   }

diff --git a/scripts/brt-main.js b/scripts/brt-main.js
@@ -140,6 +140,15 @@ function registerSettings () {
     default: false,
     type: Boolean
   })
+
+
+  game.settings.register(BRTCONFIG.NAMESPACE, BRTCONFIG.ALWAYS_SHOW_GENERATED_LOOT_AS_MESSAGE, {
+    name: i18n('BRT.Settings.AlwaysShowGeneratedLootAsMessage.Title'),
+    hint: i18n('BRT.Settings.AlwaysShowGeneratedLootAsMessage.Description'),
+    config: true,
+    default: false,
+    type: Boolean
+  })
 }
 
 function registerHandlebarsHelpers () {

diff --git a/scripts/core/config.js b/scripts/core/config.js
@@ -25,6 +25,7 @@ export const BRTCONFIG = {
     STICK_ROLLTABLE_HEADER: 'stick-rolltable-header',
     ROLL_TABLE_FROM_JOURNAL: 'roll-table-from-journal',
     SHOW_CURRENCY_SHARE_BUTTON: 'show-currency-share-button',
+    ALWAYS_SHOW_GENERATED_LOOT_AS_MESSAGE:'always-show-generated-loot-as-message',
 
 
     // in fp2e quantity is in data.data.quantity.value , in 5e data.data.quantity

diff --git a/scripts/story/story-builder.js b/scripts/story/story-builder.js
@@ -25,7 +25,7 @@ export class StoryBuilder {
     for (const entry of draw.results) {
       /** entity type 2 is when an entity in the world is linked */
       if (entry.data.type === 1 && entry.data.collection === 'JournalEntry') {
-        const storyJournal = game.journal.get(entry.resultId)
+        const storyJournal = game.journal.get(entry.data.resultId)
         if (storyJournal) {
           journalContent = storyJournal.data.content
         } else {