Fix TS errors on remote

Djphoenix719 · Djphoenix719 · commit 74d6e564cdde · 2021-07-11T12:12:31.000-04:00
diff --git a/FVTT-Common b/FVTT-Common
@@ -1 +1 @@
-Subproject commit 6a5e69ac40f8d8d31d5a1bba3bde102eece95182
+Subproject commit 1eae41720f544162d49fcd0f5886090fbe483edd
diff --git a/module.json b/module.json
@@ -2,7 +2,7 @@
     "name": "pf2e-toolbox",
     "title": "PF2E Toolbox",
     "description": "A collection of utilities I made mostly for myself, but may be useful to others to run games in PF2E.",
-    "version": "1.7.10",
+    "version": "1.7.8",
     "author": "Andrew Cuccinello [DJ#1982]",
     "packs": [
         {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
         "@babel/plugin-transform-runtime": "^7.12.1",
         "@babel/preset-env": "^7.12.1",
         "@babel/preset-typescript": "^7.12.1",
-        "@league-of-foundry-developers/foundry-vtt-types": "^0.8.8-4",
+        "@league-of-foundry-developers/foundry-vtt-types": "^0.8.8-5",
         "@types/jquery": "^3.5.6",
         "@types/node": "^14.14.0",
         "babel-core": "7.0.0-bridge.0",
diff --git a/src/module/Utilities.ts b/src/module/Utilities.ts
@@ -17,23 +17,23 @@
 import { DiceRollMode } from '@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/constants.mjs';
 
 export function GetRollMode(): DiceRollMode {
-    return game.settings.get('core', 'rollMode');
+    return (game as Game).settings.get('core', 'rollMode');
 }
 
 export function getFolder(name: string): Folder | null {
-    return game?.folders?.getName(name) as Folder;
+    return (game as Game).folders?.getName(name) as Folder;
 }
 export function getFolderInFolder(name: string, parentName?: string) {
     let parent: any;
     if (parentName) {
-        parent = game?.folders?.getName(parentName);
+        parent = (game as Game).folders?.getName(parentName);
         return parent.getSubfolders().find((f) => f.name === name);
     } else {
         return getFolder(name);
     }
 }
 export function getActor(name: string, folder: string): Actor | undefined {
-    return game?.actors?.find((a) => a.name === name && a.folder?.name === folder) as any;
+    return (game as Game).actors?.find((a) => a.name === name && a.folder?.name === folder) as any;
 }
 
 export function GetFolderPath(name: string) {
diff --git a/src/module/commands/FixMaterials.ts b/src/module/commands/FixMaterials.ts
@@ -42,7 +42,7 @@ export async function fixMaterials() {
     };
 
     let count = 0;
-    for (const scene of (game.scenes as Scenes).values()) {
+    for (const scene of ((game as Game).scenes as Scenes).values()) {
         for (const token of scene.data.tokens.values()) {
             if (token.data.actorLink) {
                 continue;
@@ -59,7 +59,7 @@ export async function fixMaterials() {
         }
     }
 
-    for (const actor of game.actors as Actors) {
+    for (const actor of (game as Game).actors as Actors) {
         for (const item of actor.items) {
             if (isBad(item)) {
                 await fixItem(item);
@@ -68,7 +68,7 @@ export async function fixMaterials() {
         }
     }
 
-    for (const item of game.items as Items) {
+    for (const item of (game as Game).items as Items) {
         if (isBad(item)) {
             await fixItem(item);
             count += 1;
diff --git a/src/module/features/DefaultArt.ts b/src/module/features/DefaultArt.ts
@@ -18,7 +18,7 @@ import ModuleSettings from '../../../FVTT-Common/src/module/settings-app/ModuleS
 import { LAST_SEEN_SYSTEM } from '../Setup';
 
 export async function readyDefaultArt() {
-    if (game.system.data.version === ModuleSettings.instance.get(LAST_SEEN_SYSTEM)) {
+    if ((game as Game).system.data.version === ModuleSettings.instance.get(LAST_SEEN_SYSTEM)) {
         return;
     }
 
@@ -29,7 +29,7 @@ export async function readyDefaultArt() {
         hazard: 'systems/pf2e/icons/default-icons/hazard.svg',
     };
 
-    for (const entry of game.packs.values()) {
+    for (const entry of (game as Game).packs.values()) {
         const pack = entry as any;
 
         if (pack.metadata.system === 'pf2e' && pack.metadata.package === 'pf2e' && pack.metadata.entity === 'Actor') {
@@ -53,7 +53,7 @@ export async function readyDefaultArt() {
         }
     }
 
-    await ModuleSettings.instance.set(LAST_SEEN_SYSTEM, game.system.data.version);
+    await ModuleSettings.instance.set(LAST_SEEN_SYSTEM, (game as Game).system.data.version);
 
     ui.notifications?.info('All bestiary artwork has been updated!');
 }
diff --git a/src/module/features/FlattenProficiency.ts b/src/module/features/FlattenProficiency.ts
@@ -36,13 +36,13 @@ function onFlattenProficiencyContextHook(html: JQuery, buttons: any[]) {
         icon: '<i class="fas fa-level-down-alt"></i>',
         condition: (li: JQuery<HTMLLIElement>) => {
             const id = li.data('entity-id') as string;
-            const actor = game.actors?.get(id);
+            const actor = (game as Game).actors?.get(id);
 
             return actor?.data.type === 'npc' && !hasModifier(actor);
         },
         callback: async (li: JQuery<HTMLLIElement>) => {
             const id = li.data('entity-id') as string;
-            const actor = game.actors?.get(id);
+            const actor = (game as Game).actors?.get(id);
 
             const level = parseInt(actor?.data.data['details'].level.value);
             await (actor as any).addCustomModifier('all', modifierName, -level, 'untyped');
@@ -54,13 +54,13 @@ function onFlattenProficiencyContextHook(html: JQuery, buttons: any[]) {
         icon: '<i class="fas fa-level-up-alt"></i>',
         condition: (li: JQuery<HTMLLIElement>) => {
             const id = li.data('entity-id') as string;
-            const actor = game.actors?.get(id);
+            const actor = (game as Game).actors?.get(id);
 
             return actor?.data.type === 'npc' && hasModifier(actor);
         },
         callback: async (li: JQuery<HTMLLIElement>) => {
             const id = li.data('entity-id') as string;
-            const actor = game.actors?.get(id);
+            const actor = (game as Game).actors?.get(id);
 
             await (actor as any).removeCustomModifier('all', modifierName);
         },
diff --git a/src/module/features/HeroPoints.ts b/src/module/features/HeroPoints.ts
@@ -25,9 +25,6 @@ function onSheetRender(app: Application, html: JQuery, renderData: any) {
 
     const { rank, max }: { rank: number; max: number } = renderData.data.attributes.heroPoints;
 
-    console.warn(rank);
-    console.warn(max);
-
     const iconFilled = '<i class="fas fa-hospital-symbol"></i>';
     const iconEmpty = '<i class="far fa-circle"></i>';
 
diff --git a/src/module/features/NPCScaler.ts b/src/module/features/NPCScaler.ts
@@ -24,13 +24,13 @@ function onScaleNPCContextHook(html: JQuery, buttons: any[]) {
         icon: '<i class="fas fa-level-up-alt"></i>',
         condition: (li: JQuery<HTMLLIElement>) => {
             const id = li.data('entity-id') as string;
-            const actor = game.actors?.get(id) as Actor;
+            const actor = (game as Game).actors?.get(id) as Actor;
 
             return actor.data.type === 'npc';
         },
         callback: async (li: JQuery<HTMLLIElement>) => {
             const id = li.data('entity-id') as string;
-            const actor = game.actors?.get(id) as Actor;
+            const actor = (game as Game).actors?.get(id) as Actor;
 
             // const oldLevel = actor.data.data.details.level.value;
             const oldLevel = 24;
diff --git a/src/module/features/QuickUnidentify.ts b/src/module/features/QuickUnidentify.ts
@@ -25,7 +25,7 @@ export function readyQuickUnidentify() {
                 const existing = actor.items.map((i: Item) => i.id) as string[];
                 await super._onDrop(event);
 
-                if (event.altKey && game.user?.isGM) {
+                if (event.altKey && (game as Game).user?.isGM) {
                     const newItems = actor.items.filter((i: Item) => !existing.includes(i.id as string)) as Item[];
                     const updates: any[] = [];
                     for (const item of newItems) {
diff --git a/src/module/features/Tokens.ts b/src/module/features/Tokens.ts
@@ -25,13 +25,13 @@ function onSetupTokensContextHook(html: JQuery, buttons: any[]) {
         icon: '<i class="fas fa-wrench"></i>',
         condition: (li: JQuery<HTMLLIElement>) => {
             const id = li.data('entity-id') as string;
-            const actor = game?.actors?.get(id);
+            const actor = (game as Game).actors?.get(id);
 
             return actor?.data.type === 'npc';
         },
         callback: async (li: JQuery<HTMLLIElement>) => {
             const id = li.data('entity-id') as string;
-            const actor = game?.actors?.get(id);
+            const actor = (game as Game).actors?.get(id);
 
             await setupActorToken(actor as Actor);
         },
diff --git a/src/module/loot-app/LootApp.ts b/src/module/loot-app/LootApp.ts
@@ -97,7 +97,7 @@ export default function extendLootSheet() {
 
             const isEditable = this.actor.getFlag('pf2e', 'editLoot.value');
 
-            if (isEditable || game?.user?.isGM) {
+            if (isEditable || (game as Game).user?.isGM) {
                 return editableSheetPath;
             }
 
@@ -137,7 +137,7 @@ export default function extendLootSheet() {
                 return this.cacheContent;
             }
 
-            const equipment = game.packs.get('pf2e.equipment-srd') as unknown as Compendium;
+            const equipment = (game as Game).packs.get('pf2e.equipment-srd') as unknown as Compendium;
             this.cacheContent = (await equipment.getContent()) as unknown as Item[];
             return this.cacheContent;
         }
diff --git a/src/module/loot-app/LootAppUtil.ts b/src/module/loot-app/LootAppUtil.ts
@@ -15,13 +15,13 @@
  */
 
 export async function GetRollableTables() {
-    const pack = game.packs.get('pf2e.rollable-tables') as any;
+    const pack = (game as Game).packs.get('pf2e.rollable-tables') as any;
     const tables = (await pack.getContent()) as RollTable[];
     return { pack, tables };
 }
 
 export async function GetItemFromCollection(collectionId: string, itemId: string) {
-    const pack = (await game.packs.get(collectionId)) as any;
+    const pack = (await (game as Game).packs.get(collectionId)) as any;
     // @ts-ignore
     return await pack.get(itemId);
 }
diff --git a/src/module/macros/distribute-hero-points.ts b/src/module/macros/distribute-hero-points.ts
@@ -18,7 +18,7 @@ import ModuleSettings from '../../../FVTT-Common/src/module/settings-app/ModuleS
 import { MAX_HERO_POINTS } from '../Setup';
 
 export async function distributeHeroPoints(amount: number) {
-    const selected = canvas?.tokens.controlled as Token[];
+    const selected = (canvas as Canvas).tokens?.controlled as Token[];
     const max: number = ModuleSettings.instance.get(MAX_HERO_POINTS);
 
     const distribute = async (amount: number) => {
diff --git a/src/module/macros/group-saves.ts b/src/module/macros/group-saves.ts
@@ -26,7 +26,7 @@ enum SuccessLevel {
 }
 
 export async function groupSave(saveType?: SaveType) {
-    const selected = canvas?.tokens.controlled as Token[];
+    const selected = (canvas as Canvas).tokens?.controlled as Token[];
 
     const roll = async (saveType: SaveType, dc?: number, damage?: number) => {
         let message = '<div class="pf2e-toolbox.group-roll">';
@@ -45,9 +45,9 @@ export async function groupSave(saveType?: SaveType) {
         message += '</div>';
 
         await ChatMessage.create({
-            user: game.user?.id,
+            user: (game as Game).user?.id,
             content: message,
-            whisper: [game.user?.id as string],
+            whisper: [(game as Game).user?.id as string],
         });
     };
 
@@ -131,7 +131,7 @@ function formatRowOutput(token: Token, mod: number, breakdown: string, dc?: numb
     const successLevel = getSuccessLevel(totalValue, dc);
 
     // @ts-ignore
-    const sceneId: number = game.scenes.viewed.id;
+    const sceneId: number = (game as Game).scenes.viewed.id;
 
     const flexStyle = `
         display: flex;
@@ -171,7 +171,7 @@ export function registerGroupSaveHooks() {
         const content = html.children('div.message-content').children('div');
 
         const apply = async (tokenId: string, sceneId: string, amount: number, shieldBlock: boolean) => {
-            const scene = game?.scenes?.get(sceneId);
+            const scene = (game as Game).scenes?.get(sceneId);
             // @ts-ignore
             const token = scene.getEmbeddedDocument('Token', tokenId) as Token;
 
@@ -181,7 +181,7 @@ export function registerGroupSaveHooks() {
 
             let actorData = token.actor?.data as ActorData;
 
-            let actor = game.actors?.get(token['actorId']) as Actor;
+            let actor = (game as Game).actors?.get(token['actorId']) as Actor;
             if (isObjectEmpty(actorData) || token['actorLink'] || actorData?.data['attributes']['hp'].value === undefined) {
                 actorData = actor.data;
             }
@@ -234,7 +234,7 @@ export function registerGroupSaveHooks() {
                 const damage = jElement.data('damage');
 
                 // @ts-ignore
-                const token = game.scenes.get(sceneId).getEmbeddedDocument('Token', tokenId) as Token;
+                const token = (game as Game).scenes.get(sceneId).getEmbeddedDocument('Token', tokenId) as Token;
 
                 if (damage !== 'undefined') {
                     const container = jElement.children('span.dmgBtn-container');
diff --git a/src/module/macros/secret-skill-roll.ts b/src/module/macros/secret-skill-roll.ts
@@ -34,7 +34,7 @@ const SKILL_DICTIONARY = Object.freeze({
 });
 
 export default async function secretSkillRoll(skillName?: string) {
-    let actor: Actor = canvas?.tokens.controlled[0]?.actor ?? (game?.user?.character as Actor);
+    let actor: Actor = (canvas as Canvas).tokens?.controlled[0]?.actor ?? ((game as Game).user?.character as Actor);
 
     if (actor === null || actor === undefined) {
         ui.notifications?.error('You must set your active character in the player configuration or select a token.');
diff --git a/src/module/roll-app/RollApp.ts b/src/module/roll-app/RollApp.ts
@@ -75,7 +75,7 @@ export default class RollApp extends Application {
         const handler = (event) => {
             const target = $(event.target);
             const rollName = target.data('rollname') as string;
-            const token = canvas?.tokens.controlled[0];
+            const token = (canvas as Canvas).tokens?.controlled[0];
             let formula = target.data('formula') as string | number | undefined;
 
             if (formula) {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"name": "pf2e-toolbox",`
`3`	`3`	`"title": "PF2E Toolbox",`
`4`	`4`	`"description": "A collection of utilities I made mostly for myself, but may be useful to others to run games in PF2E.",`
`5`		`- "version": "1.7.10",`
	`5`	`+ "version": "1.7.8",`
`6`	`6`	`"author": "Andrew Cuccinello [DJ#1982]",`
`7`	`7`	`"packs": [`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,23 +17,23 @@`
`17`	`17`	`import { DiceRollMode } from '@league-of-foundry-developers/foundry-vtt-types/src/foundry/common/constants.mjs';`
`18`	`18`
`19`	`19`	`export function GetRollMode(): DiceRollMode {`
`20`		`- return game.settings.get('core', 'rollMode');`
	`20`	`+ return (game as Game).settings.get('core', 'rollMode');`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`export function getFolder(name: string): Folder \| null {`
`24`		`- return game?.folders?.getName(name) as Folder;`
	`24`	`+ return (game as Game).folders?.getName(name) as Folder;`
`25`	`25`	`}`
`26`	`26`	`export function getFolderInFolder(name: string, parentName?: string) {`
`27`	`27`	`let parent: any;`
`28`	`28`	`if (parentName) {`
`29`		`- parent = game?.folders?.getName(parentName);`
	`29`	`+ parent = (game as Game).folders?.getName(parentName);`
`30`	`30`	`return parent.getSubfolders().find((f) => f.name === name);`
`31`	`31`	`} else {`
`32`	`32`	`return getFolder(name);`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`export function getActor(name: string, folder: string): Actor \| undefined {`
`36`		`- return game?.actors?.find((a) => a.name === name && a.folder?.name === folder) as any;`
	`36`	`+ return (game as Game).actors?.find((a) => a.name === name && a.folder?.name === folder) as any;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`export function GetFolderPath(name: string) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export async function fixMaterials() {`
`42`	`42`	`};`
`43`	`43`
`44`	`44`	`let count = 0;`
`45`		`- for (const scene of (game.scenes as Scenes).values()) {`
	`45`	`+ for (const scene of ((game as Game).scenes as Scenes).values()) {`
`46`	`46`	`for (const token of scene.data.tokens.values()) {`
`47`	`47`	`if (token.data.actorLink) {`
`48`	`48`	`continue;`
`@@ -59,7 +59,7 @@ export async function fixMaterials() {`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- for (const actor of game.actors as Actors) {`
	`62`	`+ for (const actor of (game as Game).actors as Actors) {`
`63`	`63`	`for (const item of actor.items) {`
`64`	`64`	`if (isBad(item)) {`
`65`	`65`	`await fixItem(item);`
`@@ -68,7 +68,7 @@ export async function fixMaterials() {`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- for (const item of game.items as Items) {`
	`71`	`+ for (const item of (game as Game).items as Items) {`
`72`	`72`	`if (isBad(item)) {`
`73`	`73`	`await fixItem(item);`
`74`	`74`	`count += 1;`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import ModuleSettings from '../../../FVTT-Common/src/module/settings-app/ModuleS`
`18`	`18`	`import { LAST_SEEN_SYSTEM } from '../Setup';`
`19`	`19`
`20`	`20`	`export async function readyDefaultArt() {`
`21`		`- if (game.system.data.version === ModuleSettings.instance.get(LAST_SEEN_SYSTEM)) {`
	`21`	`+ if ((game as Game).system.data.version === ModuleSettings.instance.get(LAST_SEEN_SYSTEM)) {`
`22`	`22`	`return;`
`23`	`23`	`}`
`24`	`24`
`@@ -29,7 +29,7 @@ export async function readyDefaultArt() {`
`29`	`29`	`hazard: 'systems/pf2e/icons/default-icons/hazard.svg',`
`30`	`30`	`};`
`31`	`31`
`32`		`- for (const entry of game.packs.values()) {`
	`32`	`+ for (const entry of (game as Game).packs.values()) {`
`33`	`33`	`const pack = entry as any;`
`34`	`34`
`35`	`35`	`if (pack.metadata.system === 'pf2e' && pack.metadata.package === 'pf2e' && pack.metadata.entity === 'Actor') {`
`@@ -53,7 +53,7 @@ export async function readyDefaultArt() {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- await ModuleSettings.instance.set(LAST_SEEN_SYSTEM, game.system.data.version);`
	`56`	`+ await ModuleSettings.instance.set(LAST_SEEN_SYSTEM, (game as Game).system.data.version);`
`57`	`57`
`58`	`58`	`ui.notifications?.info('All bestiary artwork has been updated!');`
`59`	`59`	`}`