1.0.69 changes

ironmonk88 · Jul 24, 2022 · a038cea · a038cea
1 parent 5491b33
commit a038cea
Show file tree

Hide file tree

Showing 33 changed files with 386 additions and 319 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+# exclude .gitignore and similar from the generated tarball
+.git*           export-ignore
+/screenshots    export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Version 1.0.69
+
+Added v10 support.
+
 ## Version 1.0.68
 
 Update assign xp so it only adds actors that are owned by players.

diff --git a/apps/assignxp.js b/apps/assignxp.js
@@ -20,7 +20,7 @@ export class AssignXPApp extends Application {
             //get the actors
             let monsters = [];
             for (let combatant of entity.combatants) {
-                if (combatant.token?.data.disposition == 1 && combatant.actor && combatant.actor.hasPlayerOwner) {
+                if (combatant.token?.document.disposition == 1 && combatant.actor && combatant.actor.hasPlayerOwner) {
                     let actor = (combatant.actor.isPolymorphed ? game.actors.find(a => a.id == combatant.actor.getFlag(game.system.id, 'originalActor')) : combatant.actor);
                     this.actors.push({
                         actor: actor,
@@ -29,7 +29,7 @@ export class AssignXPApp extends Application {
                     });
 
                     apl.count = apl.count + 1;
-                    apl.levels = apl.levels + (actor.data.data.details.level?.value || actor.data.data.details.level);
+                    apl.levels = apl.levels + (actor.system.details.level?.value || actor.system.details.level);
                 } else
                     monsters.push(combatant);
             };
@@ -40,16 +40,16 @@ export class AssignXPApp extends Application {
             //get the monster xp
             let combatxp = 0;
             for (let combatant of monsters) {
-                if (combatant.token?.data.disposition != 1 && combatant.actor && !combatant.actor.hasPlayerOwner) {
+                if (combatant.token?.document.disposition != 1 && combatant.actor && !combatant.actor.hasPlayerOwner) {
                     if (game.system.id == 'pf2e') {
-                        let monstLevel = parseInt(combatant?.actor.data.data.details?.level?.value);
+                        let monstLevel = parseInt(combatant?.actor.system.details?.level?.value);
                         let monstXP = this.xpchart[Math.clamped(4 + (monstLevel - calcAPL), 0, this.xpchart.length - 1)];
                         combatxp += monstXP;
                     }else
-                        combatxp += (combatant.actor?.data.data.details?.xp?.value || 0);
+                        combatxp += (combatant.actor?.system.details?.xp?.value || 0);
                 }
             };
-            //xp += (combatant?.actor.data.data.details?.xp?.value || MonksLittleDetails.xpchart[Math.clamped(parseInt(combatant?.actor.data.data.details?.level?.value), 0, MonksLittleDetails.xpchart.length - 1)] || 0);
+            //xp += (combatant?.actor.system.details?.xp?.value || MonksLittleDetails.xpchart[Math.clamped(parseInt(combatant?.actor.system.details?.level?.value), 0, MonksLittleDetails.xpchart.length - 1)] || 0);
             this.xp = this.xp || combatxp;
             this.reason = this.reason || i18n("MonksTokenBar.CombatExperience");
         } else {
@@ -59,7 +59,7 @@ export class AssignXPApp extends Application {
                 .map(t => {
                     if (!t.actor)
                         return null;
-                    return (t.actor.hasPlayerOwner && (t.actor.data.type == 'character' || t.actor?.data.type == 'Player Character') ? t.actor : null)
+                    return (t.actor.hasPlayerOwner && (t.actor.type == 'character' || t.actor?.type == 'Player Character') ? t.actor : null)
                 })
                 .filter((a, index, self) => {
                     if (!a)
@@ -179,8 +179,8 @@ export class AssignXPApp extends Application {
               return {
                   id: a.actor.id,
                   //actor: a.actor,
-                  icon: a.actor.data.img,
-                  name: a.actor.data.name,
+                  icon: a.actor.img,
+                  name: a.actor.name,
                   xp: a.xp,
                   assigned: false
               }

diff --git a/apps/contestedroll.js b/apps/contestedroll.js
@@ -94,10 +94,10 @@ export class ContestedRollApp extends Application {
                     requesttype: requesttype,
                     request: request,
                     requestname: requestname,
-                    icon: (VideoHelper.hasVideoExtension(item.token.data.img) ? item.token.actor.data.img : item.token.data.img),
+                    icon: (VideoHelper.hasVideoExtension(item.token.document.texture.src) ? item.token.actor.img : item.token.document.texture.src),
                     name: item.token.name,
                     showname: item.token.actor.hasPlayerOwner || this.hidenpcname !== true,
-                    showtoken: item.token.actor.hasPlayerOwner || item.token.data.hidden !== true,
+                    showtoken: item.token.actor.hasPlayerOwner || item.token.document.hidden !== true,
                     npc: item.token.actor.hasPlayerOwner,
                     passed: 'waiting',
                     keys: item.keys,
@@ -128,8 +128,8 @@ export class ContestedRollApp extends Application {
             for (let i = 0; i < 2; i++) {
                 let token = this.entries[i].token;
                 if (token.actor != undefined) {
-                    for (var key in token.actor.data.permission) {
-                        if (key != 'default' && token.actor.data.permission[key] >= CONST.ENTITY_PERMISSIONS.OWNER) {
+                    for (var key in token.actor.ownership) {
+                        if (key != 'default' && token.actor.ownership[key] >= CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER) {
                             if (requestedPlayers.find(t => t == key) == undefined)
                                 requestedPlayers.push(key);
                         }
@@ -201,9 +201,14 @@ export class ContestedRollApp extends Application {
     async saveToMacro() {
         let name = "Contested Roll";
 
-        let macroCmd = `game.MonksTokenBar.requestContestedRoll({token:'${this.entries[0].token?.name}', request:'${this.entries[0].request}'},{token:'${this.entries[1].token?.name}', request:'${this.entries[1].request}'},{silent:false, fastForward:false${this.flavor != undefined ? ", flavor:'" + this.flavor + "'" : ''}, rollMode:'${this.rollmode}'})`;
+        let folder = game.folders.find(f => { return f.type == "Macro" && f.name == "Monk's Tokenbar" });
+        if (!folder) {
+            folder = await Folder.create(new Folder({ "type": "Macro", "folder": null, "name": "Monk's Tokenbar", "color": null, "sorting": "a" }));
+        }
+
+        let macroCmd = `game.MonksTokenBar.requestContestedRoll({token:${this.entries[0].token ? `'${this.entries[0].token?.name}'` : "null"}, request:'${this.entries[0].request}'},{token:${this.entries[1].token ? `'${this.entries[1].token?.name}'` : "null"}, request:'${this.entries[1].request}'},{silent:false, fastForward:false${this.flavor != undefined ? ", flavor:'" + this.flavor + "'" : ''}, rollMode:'${this.rollmode}'})`;
 
-        const macro = await Macro.create({ name: name, type: "script", scope: "global", command: macroCmd });
+        const macro = await Macro.create({ name: name, type: "script", scope: "global", command: macroCmd, folder: folder.id });
         macro.sheet.render(true);
     }
 }
@@ -273,7 +278,7 @@ export class ContestedRoll {
         if (!$.isArray(ids))
             ids = [ids];
 
-        let flags = message.data.flags['monks-tokenbar'];
+        let flags = message.flags['monks-tokenbar'];
         let rollmode = message.getFlag('monks-tokenbar', 'rollmode');
 
         let promises = [];
@@ -330,7 +335,7 @@ export class ContestedRoll {
     static async updateMessage(updates, message, reveal = true) {
         if (updates == undefined) return;
 
-        let content = $(message.data.content);
+        let content = $(message.content);
 
         let flags = {};
         let promises = [];
@@ -393,7 +398,7 @@ export class ContestedRoll {
 
         let count = 0;
         let winner = null;
-        let tokenresults = Object.entries(message.data.flags['monks-tokenbar'])
+        let tokenresults = Object.entries(message.flags['monks-tokenbar'])
             .filter(([k, v]) => {
                 return k.startsWith('token')
             })
@@ -468,7 +473,7 @@ export class ContestedRoll {
 
     static getTokens(message) {
         let tokens = [];
-        for (let [k, v] of Object.entries(message.data.flags['monks-tokenbar'])) {
+        for (let [k, v] of Object.entries(message.flags['monks-tokenbar'])) {
             if (k.startsWith('token')) tokens.push(v);
         }
         return tokens;
@@ -526,7 +531,7 @@ export class ContestedRoll {
 
     static async onRollAll(tokentype, message, e) {
         if (game.user.isGM) {
-            let flags = message.data.flags['monks-tokenbar'];
+            let flags = message.flags['monks-tokenbar'];
             let tokens = Object.keys(flags)
                 .filter(key => key.startsWith('token'))
                 .map(key => flags[key]);

diff --git a/apps/editstats.js b/apps/editstats.js