Merge pull request #4 from fvtt-fria-ligan/v11

v11 compatibility plus compendium reorg.

Author: mcglincy

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.0.0
+
+- Foundry v11 compatibility.
+- Reorganize compendiums using Foundry folders.
+- Use classUuids array in config to list available classes for generator.
+
 # 1.0.1
 
 - Fix ChatMessage sound param when using DiceSoNice.

module/config.js

@@ -154,4 +154,27 @@ VG.tributeTypes = {
 VG.weaponTypes = {
   "melee": "VG.WeaponTypeMelee",
   "ranged": "VG.WeaponTypeRanged"
-};
+};
+
+// Config variables for the Scvmfactory character generator
+VG.scvmFactory = {
+  // modules wanting to add more character classes to the generator should append uuids to this list
+  classUuids: [
+    // Devout
+    "Compendium.vastgrimm.vast-grimm-items.Item.0O4qPm6FnmhBA264",
+    // EmoBot
+    "Compendium.vastgrimm.vast-grimm-items.Item.ig6NF53yqX9oMXrI",
+    // Harvester
+    "Compendium.vastgrimm.vast-grimm-items.Item.sRnn6JUlCqbRmglx",
+    // Lost Technomaniac
+    "Compendium.vastgrimm.vast-grimm-items.Item.apAIAVLMV2i0CV0N",
+    // MAnchiNe
+    "Compendium.vastgrimm.vast-grimm-items.Item.fdInjY5EDKKpuiCm",
+    // Soul Survivor
+    "Compendium.vastgrimm.vast-grimm-items.Item.9x8XQ0VcqBk0je06",
+    // Treacherous Merc
+    "Compendium.vastgrimm.vast-grimm-items.Item.JKAJz3RUXajVJtlQ",
+    // Twisted Biochemist
+    "Compendium.vastgrimm.vast-grimm-items.Item.eqcNCawo1aSlGvZQ"
+  ],
+};

module/packutils.js

@@ -0,0 +1,91 @@
+export const ACTORS_PACK = "vastgrimm.vast-grimm-actors";
+export const ITEMS_PACK = "vastgrimm.vast-grimm-items";
+export const MACROS_PACK = "vastgrimm.vast-grimm-macros";
+export const TABLES_PACK = "vastgrimm.vast-grimm-tables";
+
+export const documentFromPack = async (packName, docName) => {
+  const pack = game.packs.get(packName);
+  if (!pack) {
+    console.error(`Could not find pack ${packName}.`);
+    return;
+  }
+  const docs = await pack.getDocuments();
+  const doc = docs.find((i) => i.name === docName);
+  if (!doc) {
+    console.error(`Could not find doc ${docName} in pack ${packName}.`);
+  }
+  return doc;
+};
+
+export const drawFromTable = async (
+  packName,
+  tableName,
+  formula = null,
+  displayChat = false
+) => {
+  const table = await documentFromPack(packName, tableName);
+  if (!table) {
+    console.log(`Could not load ${tableName} from pack ${packName}`);
+    return;
+  }
+  const roll = formula ? new Roll(formula) : undefined;
+  const tableDraw = await table.draw({ displayChat, roll });
+  // TODO: decide if/how we want to handle multiple results
+  return tableDraw;
+};
+
+export const drawText = async (packName, tableName) => {
+  const draw = await drawFromTable(packName, tableName);
+  if (draw) {
+    return draw.results[0].text;
+  }
+};
+
+export const drawDocument = async (packName, tableName) => {
+  const draw = await drawFromTable(packName, tableName);
+  const doc = await documentFromDraw(draw);
+  return doc;
+};
+
+export const drawDocuments = async (packName, tableName) => {
+  const draw = await drawFromTable(packName, tableName);
+  const docs = await documentsFromDraw(draw);
+  return docs;
+};
+
+export const documentsFromDraw = async (draw) => {
+  const docResults = draw.results.filter((r) => r.type === 2);
+  return Promise.all(docResults.map((r) => documentFromResult(r)));
+};
+
+export const documentFromDraw = async (draw) => {
+  const doc = await documentFromResult(draw.results[0]);
+  return doc;
+};
+
+export const documentFromResult = async (result) => {
+  if (!result.documentCollection) {
+    console.log("No documentCollection for result; skipping");
+    return;
+  }
+  const collectionName =
+    result.type === 2
+      ? "Compendium." + result.documentCollection
+      : result.documentCollection;
+  const uuid = `${collectionName}.${result.documentId}`;
+  const doc = await fromUuid(uuid);
+  if (!doc) {
+    console.log(`Could not find ${uuid}`);
+    console.log(result);
+  }
+  return doc;
+};
+
+export const dupeData = (doc) => {
+  return {
+    data: doc.system,
+    img: doc.img,
+    name: doc.name,
+    type: doc.type,
+  };
+};

module/scvm/scvm-dialog.js

@@ -1,18 +1,18 @@
-import { classItemFromPack, createScvm, findClassPacks, scvmifyActor } from "./scvmfactory.js";
+import { createScvm, findClasses, scvmifyActor } from "./scvmfactory.js";
+import { byName, sample } from "../utils.js";
 
-export default class ScvmDialog extends Application {
+export const showScvmDialog = async (actor) => {
+  const dialog = new ScvmDialog();
+  dialog.actor = actor;
+  const classes = await findClasses();
+  classes.sort(byName);
+  dialog.classes = classes.map(x => {
+    return { name: x.name, uuid: x.uuid};
+  });
+  dialog.render(true);
+};
 
-    constructor(actor=null, options={}) {
-        super(options);
-        this.actor = actor;
-        const classPacks = findClassPacks();
-        this.classes = classPacks.map(p => {
-            return {
-                name: p.split("class-")[1].replace(/-/g, " "),
-                pack: p
-            }});
-        this.classes.sort((a, b) => (a.name > b.name) ? 1 : -1);
-    }
+export default class ScvmDialog extends Application {
 
     /** @override */
     static get defaultOptions() {
@@ -63,18 +63,16 @@ export default class ScvmDialog extends Application {
     async _onScvm(event) {
         event.preventDefault();
         const form = $(event.currentTarget).parents(".scvm-dialog")[0];
-        const selected = [];
+        const uuids = [];
         $(form).find("input:checked").each(function() {
-           selected.push($(this).attr("name"));
+           uuids.push($(this).attr("name"));
         });
-
-        if (selected.length === 0) {
+        if (uuids.length === 0) {
             // nothing selected, so bail
             return;
         }
-
-        const packName = selected[Math.floor(Math.random() * selected.length)];
-        const clazz = await classItemFromPack(packName);
+        const uuid = sample(uuids);
+        const clazz = await fromUuid(uuid);
         if (!clazz) {
             // couldn't find class item, so bail
             const err = `No class item found in compendium ${packName}`;

module/scvm/scvmfactory.js

@@ -1,6 +1,9 @@
 import {VGActor} from "../actor/actor.js";
+import { VG } from "../config.js";
 import {VGItem} from "../item/item.js";
 import {randomName} from "./names.js";
+import { TABLES_PACK } from "../packutils.js";
+import { sample } from "../utils.js";
 
 export const createRandomScvm = async () => {
     const clazz = await pickRandomClass();
@@ -18,40 +21,19 @@ export const scvmifyActor = async (actor, clazz) => {
 };
 
 const pickRandomClass = async () => {
-    const classPacks = findClassPacks();
-    if (classPacks.length === 0) {
-        // TODO: error on 0-length classPaths
-        return;
-    }
-    const packName = classPacks[Math.floor(Math.random() * classPacks.length)];
-    // TODO: debugging hardcodes
-    const pack = game.packs.get(packName);
-    let content = await pack.getDocuments();
-    return content.find(i => i.type === "class");
-};
-
-export const findClassPacks = () => {
-    const classPacks = [];
-    const packKeys = game.packs.keys();
-    for (const packKey of packKeys) {
-        // moduleOrSystemName.packName
-        const keyParts = packKey.split(".");
-        if (keyParts.length === 2) {
-            const packName = keyParts[1];
-            if (packName.startsWith("class-") && packName.length > 6) {
-                // class pack
-                classPacks.push(packKey);
-            }
-        }
-    }
-    return classPacks;
+  const uuid = sample(VG.scvmFactory.classUuids);
+  const clazz = await fromUuid(uuid);
+  return clazz;
 };
 
-export const classItemFromPack = async (packName) => { 
-    const pack = game.packs.get(packName); 
-    const content = await pack.getDocuments(); 
-    return content.find(i => i.type === "class");
-};
+export const findClasses = async () => {
+  const classes = [];
+  for (let uuid of VG.scvmFactory.classUuids) {
+    const clazz = await fromUuid(uuid);
+    classes.push(clazz);
+  }
+  return classes;
+}
 
 const rollScvmForClass = async (clazz) => {
     console.log(`Creating new ${clazz.name}`);
@@ -77,7 +59,7 @@ const rollScvmForClass = async (clazz) => {
     const hitPoints = Math.max(1, hpRoll.total + toughness);
     const neuromancyPoints = Math.max(0, neuromancyPointsRoll.total + presence);
 
-    const ccPack = game.packs.get("vastgrimm.character-creation");
+    const ccPack = game.packs.get(TABLES_PACK);
     const ccContent = await ccPack.getDocuments();
     const myTable = ccContent.find(i => i.name === "Misspent Youth");
     const bsTable = ccContent.find(i => i.name === "Battle Scars");
@@ -288,16 +270,13 @@ const docsFromResults = async (results) => {
         const doc = await docFromResult(result);
         if (doc) {            
             docs.push(doc);
-        } else {
-            console.log("No document from result:");
-            console.log(result);
         }
     }
     return docs;
 }
 
 const randomHackedTribute = async () => {
-    const collection = game.packs.get("vastgrimm.character-creation");
+    const collection = game.packs.get(TABLES_PACK);
     const content = await collection.getDocuments();
     const table = content.find(i => i.name === "Hacked Tributes");
     const draw = await table.draw({displayChat: false});
@@ -306,7 +285,7 @@ const randomHackedTribute = async () => {
 };
 
 const randomEncryptedTribute = async () => {
-    const collection = game.packs.get("vastgrimm.character-creation");
+    const collection = game.packs.get(TABLES_PACK);
     const content = await collection.getDocuments();
     const table = content.find(i => i.name === "Encrypted Tributes");
     const draw = await table.draw({displayChat: false});

module/utils.js

@@ -0,0 +1,9 @@
+export const byName = (a, b) =>
+  a.name > b.name ? 1 : b.name > a.name ? -1 : 0;
+
+export const sample = (array) => {
+  if (!array) {
+    return;
+  }
+  return array[Math.floor(Math.random() * array.length)];
+};

module/vastgrimm.js

@@ -12,7 +12,7 @@ import { VG } from "./config.js";
 import { VGItem } from "./item/item.js";
 import { VGItemSheet } from "./item/sheet/item-sheet.js";
 import { createVastGrimmMacro, rollItemMacro } from "./macros.js";
-import ScvmDialog from "./scvm/scvm-dialog.js";
+import { showScvmDialog } from "./scvm/scvm-dialog.js";
 import { registerSystemSettings } from "./settings.js";
 
 const VG_DOC_CLASS = "vastgrimm";
@@ -181,7 +181,7 @@ Hooks.on('renderActorDirectory', (app,  html, data) => {
       </div>
       `);
     section.querySelector('.create-scvm-button').addEventListener('click', (ev) => {
-      new ScvmDialog().render(true);
+      showScvmDialog();
     });  
   }
 });