Merge branch 'develop'

module.json

@@ -2,7 +2,7 @@
     "name": "better-rolltables",
     "title": "Better Roll Tables",
     "description": "Adding functionality to roll tables, especially to roll treasure and magic items",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "author": "Ultrakorne#6240",
     "esmodules": [
         "./scripts/brt-main.js"
@@ -40,5 +40,5 @@
     ],
     "url": "https://github.com/ultrakorne/better-rolltables",
     "manifest": "https://raw.githubusercontent.com/ultrakorne/better-rolltables/master/module.json",
-    "download": "https://github.com/ultrakorne/better-rolltables/releases/download/v1.0.0/better-rolltables.zip"
+    "download": "https://github.com/ultrakorne/better-rolltables/releases/download/v1.1.0/better-rolltables.zip"
 }

scripts/better-table-view.js

@@ -1,10 +1,6 @@
 import { i18n } from './utils.js';
-import { LootBuilder } from './loot-builder.js'
 import { BRTCONFIG } from './config.js';
-import { LootCreator } from './loot-creator.js';
-import { LootChatCard } from './loot-chat-card.js';
-import { StoryBuilder } from './story/story-builder.js';
-import { StoryChatCard } from './story/story-chat-card.js';
+import { BetterTables } from './better-tables.js';
 
 export class BetterRT {
     static async enhanceRollTableView(rollTableConfig, html, rollTable) {
@@ -197,33 +193,21 @@ export class BetterRT {
     }
 
     static async generateLoot(tableEntity) {
-        const lootBuilder = new LootBuilder(tableEntity);
-        const generatedLoot = await lootBuilder.generateLoot();
-        const lootCreator = new LootCreator(generatedLoot);
-        await lootCreator.createActor();
-        await lootCreator.addCurrenciesToActor();
-        await lootCreator.addItemsToActor();
+        const betterTables = new BetterTables();
+        await betterTables.generateLoot(tableEntity);
     }
 
     static async onOptionTypeChanged(value, tableEntity) {
         await tableEntity.setFlag(BRTCONFIG.NAMESPACE, BRTCONFIG.TABLE_TYPE_KEY, value);
     }
 
     static async onLootRollClicked(tableEntity) {
-        const lootBuilder = new LootBuilder(tableEntity);
-        const generatedLoot = await lootBuilder.generateLoot();
-        const lootChatCard = new LootChatCard(generatedLoot);
-        await lootChatCard.createChatCard(tableEntity);
+        const betterTables = new BetterTables();
+        await betterTables.generateChatLoot(tableEntity);
     }
 
     static async onStoryRollClicked(tableEntity) {
-        const storyBuilder = new StoryBuilder(tableEntity);
-        await storyBuilder.drawStory();
-        const storyHtml = storyBuilder.generatedStory();
-        const storyGMHtml = storyBuilder.generatedStoryGM();
-
-        const storyChat = new StoryChatCard(tableEntity);
-        storyChat.createChatCard(storyHtml);
-        storyChat.createChatCard(storyGMHtml, {gmOnly: true});
+        const betterTables = new BetterTables();
+        await betterTables.generateChatStory(tableEntity);
     }
 }

scripts/better-tables.js

@@ -0,0 +1,33 @@
+import { LootCreator } from './loot-creator.js';
+import { LootBuilder } from './loot-builder.js'
+import { LootChatCard } from './loot-chat-card.js';
+import { StoryBuilder } from './story/story-builder.js';
+import { StoryChatCard } from './story/story-chat-card.js';
+
+export class BetterTables {
+    async generateLoot(tableEntity) {
+        const lootBuilder = new LootBuilder(tableEntity);
+        const generatedLoot = await lootBuilder.generateLoot();
+        const lootCreator = new LootCreator(generatedLoot);
+        await lootCreator.createActor();
+        await lootCreator.addCurrenciesToActor();
+        await lootCreator.addItemsToActor();
+    }
+
+    async generateChatLoot(tableEntity) {
+        const lootBuilder = new LootBuilder(tableEntity);
+        const generatedLoot = await lootBuilder.generateLoot();
+        const lootChatCard = new LootChatCard(generatedLoot);
+        await lootChatCard.createChatCard(tableEntity);
+    }
+
+    async generateChatStory(tableEntity) {
+        const storyBuilder = new StoryBuilder(tableEntity);
+        await storyBuilder.drawStory();
+        const storyHtml = storyBuilder.generatedStory();
+        const storyGMHtml = storyBuilder.generatedStoryGM();
+        const storyChat = new StoryChatCard(tableEntity);
+        storyChat.createChatCard(storyHtml);
+        storyChat.createChatCard(storyGMHtml, { gmOnly: true });
+    }
+}

scripts/brt-main.js

@@ -1,6 +1,7 @@
 import { BetterRT } from './better-table-view.js';
 import { BRTCONFIG } from './config.js';
 import { i18n } from './utils.js';
+import { BetterTables } from './better-tables.js';
 
 // CONFIG.debug.hooks = true;
 
@@ -11,6 +12,8 @@ Hooks.on("init", function () {
   });
 
   registerSettings();
+
+  game.betterTables = new BetterTables();
 });
 
 Hooks.on("renderRollTableConfig", BetterRT.enhanceRollTableView);
@@ -48,3 +51,6 @@ function registerSettings() {
     type: String
   });
 }
+
+
+

scripts/utils.js

@@ -25,8 +25,6 @@ export async function findInCompendiumByName(compendiumName, entityName){
 }
 
 export async function findInCompendiumById(compendiumName, entityId){
-    console.log("findInCompendiumById compendiumName ", compendiumName);
-    console.log("findInCompendiumById entityId ", entityId);
     const compendium = game.packs.find(t => t.collection === compendiumName);
     if(compendium) {
         const compendiumIndex = await compendium.getIndex();