Merge pull request #517 from arcos/v12compat

anthonyronda · web-flow · commit f2029c4465ad · 2024-07-01T11:17:39.000-04:00
v12 compatibility fixes
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,7 @@
 node_modules
 foundryconfig.json
+foundryconfig_*.json
+ose-dev.lock
 dist
 .DS_Store
 .env
diff --git a/src/module/actor/__tests__/data-model-character.test.ts b/src/module/actor/__tests__/data-model-character.test.ts
@@ -19,16 +19,22 @@ export default ({ describe, it, expect, after, before }: QuenchMethods) => {
   const dataModel = new OseDataModelCharacter();
   const ascendingACSetting = game.settings.get(game.system.id, "ascendingAC");
   const initiativeSetting = game.settings.get(game.system.id, "initiative");
+  const encumbranceSetting = game.settings.get(
+    game.system.id,
+    "encumbranceOption"
+  );
 
   after(() => {
     game.settings.set(game.system.id, "ascendingAC", ascendingACSetting);
     game.settings.set(game.system.id, "initiative", initiativeSetting);
+    game.settings.set(game.system.id, "encumbranceOption", encumbranceSetting);
     cleanUpActorsByKey(key);
   });
 
   // @todo: Can this be tested without creating an actor?
   describe("prepareDerivedData()", () => {
     before(async () => {
+      await game.settings.set(game.system.id, "encumbranceOption", "detailed");
       await createMockActor();
     });
 
@@ -60,9 +66,9 @@ export default ({ describe, it, expect, after, before }: QuenchMethods) => {
       expect(actor?.system.encumbrance.steps).not.undefined;
       expect(actor?.system.encumbrance.value).not.undefined;
       expect(actor?.system.encumbrance.max).not.undefined;
-      expect(actor?.system.encumbrance.atHalfEncumbered).not.undefined;
-      expect(actor?.system.encumbrance.atQuarterEncumbered).not.undefined;
-      expect(actor?.system.encumbrance.atEighthEncumbered).not.undefined;
+      expect(actor?.system.encumbrance.steps).not.undefined;
+      //expect(actor?.system.encumbrance.atQuarterEncumbered).not.undefined;
+      //expect(actor?.system.encumbrance.atEighthEncumbered).not.undefined;
     });
 
     it("has movement", async () => {
diff --git a/src/module/actor/character-sheet.js b/src/module/actor/character-sheet.js
@@ -80,6 +80,7 @@ export default class OseActorSheetCharacter extends OseActorSheet {
    */
   async getData() {
     const data = super.getData();
+    
     // Prepare owned items
     this._prepareItems(data);
 
@@ -241,6 +242,7 @@ export default class OseActorSheetCharacter extends OseActorSheet {
           equipped: !item.system.equipped,
         },
       });
+
     });
 
     html.find("a[data-action='generate-scores']").click((ev) => {
diff --git a/src/module/actor/data-model-character.js b/src/module/actor/data-model-character.js
@@ -11,7 +11,7 @@ const getItemsOfActorOfType = (actor, filterType, filterFn = null) =>
     .filter(({ type }) => type === filterType)
     .filter(filterFn || (() => true));
 
-export default class OseDataModelCharacter extends foundry.abstract.DataModel {
+export default class OseDataModelCharacter extends foundry.abstract.TypeDataModel {
   prepareDerivedData() {
     this.scores = new OseDataModelCharacterScores(this.scores);
 
diff --git a/src/module/actor/data-model-classes/__tests__/data-model-character-encumbrance.test.ts b/src/module/actor/data-model-classes/__tests__/data-model-character-encumbrance.test.ts
@@ -15,7 +15,7 @@ export const options = {
 };
 
 const toPct = (value: number, max: number) =>
-  Math.clamped((100 * value) / max, 0, 100);
+  Math.clamp((100 * value) / max, 0, 100);
 const createMockItem = (
   type: string,
   weight: number,
diff --git a/src/module/actor/data-model-classes/data-model-character-encumbrance-item-based.ts b/src/module/actor/data-model-classes/data-model-character-encumbrance-item-based.ts
@@ -61,6 +61,7 @@ export default class OseDataModelCharacterEncumbranceItemBased
 
   #packedWeight;
 
+  // eslint-disable-next-line sonarjs/cognitive-complexity, @typescript-eslint/no-unused-vars
   constructor(max = 16, items: Item[] = []) {
     super(OseDataModelCharacterEncumbranceItemBased.type, max);
 
@@ -90,22 +91,13 @@ export default class OseDataModelCharacterEncumbranceItemBased
         0
       )
     );
-    this.#weight = this.usingEquippedEncumbrance
-      ? this.#equippedWeight
-      : this.#packedWeight;
-
-    this.#max = this.usingEquippedEncumbrance
-      ? this.#equippedMax
-      : this.#packedMax;
-
     this.#atFiveEighths = this.#weight > this.#max * (OseDataModelCharacterEncumbranceItemBased.packedEncumbranceSteps.fiveEighths / 100);
     this.#atThreeQuarters = this.#weight > this.#max * (OseDataModelCharacterEncumbranceItemBased.packedEncumbranceSteps.threeQuarters / 100);
     this.#atSevenEights = this.#weight > this.#max * (OseDataModelCharacterEncumbranceItemBased.packedEncumbranceSteps.sevenEighths / 100);
-  
+
     this.#atOneThird = this.#weight > this.#max * (OseDataModelCharacterEncumbranceItemBased.equippedEncumbranceSteps.oneThird / 100);
     this.#atFiveNinths = this.#weight > this.#max * (OseDataModelCharacterEncumbranceItemBased.equippedEncumbranceSteps.fiveNinths / 100);
     this.#atSevenNinths = this.#weight > this.#max * (OseDataModelCharacterEncumbranceItemBased.equippedEncumbranceSteps.sevenNinths / 100);
-      
   }
 
   // eslint-disable-next-line class-methods-use-this
@@ -130,9 +122,9 @@ export default class OseDataModelCharacterEncumbranceItemBased
       (step) => step > (this.#equippedWeight / this.#equippedMax) * 100
     );
     equippedIndex = equippedIndex === -1 ? 4 : equippedIndex;
+
     let packedIndex = packedValues.findIndex(
-      (step) => step > (this.#packedWeight / this.#packedMax) * 100
-    );
+      (step) => step > (this.#packedWeight / this.#packedMax) * 100);
     packedIndex = packedIndex === -1 ? 4 : packedIndex;
     return !!(equippedIndex >= packedIndex);
   }
diff --git a/src/module/actor/data-model-classes/data-model-character-encumbrance.ts b/src/module/actor/data-model-classes/data-model-character-encumbrance.ts
@@ -59,7 +59,7 @@ export default class OseDataModelCharacterEncumbrance
   }
 
   get pct() {
-    return Math.clamped((100 * this.value) / this.max, 0, 100);
+    return Math.clamp((100 * this.value) / this.max, 0, 100);
   }
 
   get encumbered() {
diff --git a/src/module/actor/data-model-monster.js b/src/module/actor/data-model-monster.js
@@ -11,7 +11,7 @@ const getItemsOfActorOfType = (actor, filterType, filterFn = null) =>
     .filter(({ type }) => type === filterType)
     .filter(filterFn || (() => true));
 
-export default class OseDataModelMonster extends foundry.abstract.DataModel {
+export default class OseDataModelMonster extends foundry.abstract.TypeDataModel {
   prepareDerivedData() {
     this.encumbrance = new OseDataModelCharacterEncumbranceDisabled();
     this.spells = new OseDataModelCharacterSpells(this.spells, this.#spellList);
diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js
@@ -42,7 +42,6 @@ export default class OseActor extends Actor {
       "system.thac0.bba": bbaValue,
       "system.thac0.value": thac0Value,
     } = newData;
-
     // Compute AAC from AC
     if (acValue) {
       newData["system.aac.value"] = 19 - acValue;
@@ -317,6 +316,7 @@ export default class OseActor extends Actor {
 
     const label = game.i18n.localize(`OSE.roll.hd`);
     const rollParts = [actorData.hp.hd];
+    
     if (actorType === "character") {
       rollParts.push(actorData.scores.con.mod * actorData.details.level);
     }
@@ -550,7 +550,7 @@ export default class OseActor extends Actor {
 
     // Update the Actor
     return this.update({
-      "system.hp.value": Math.clamped(value - amount, 0, max),
+      "system.hp.value": Math.clamp(value - amount, 0, max),
     });
   }
 }
diff --git a/src/module/actor/monster-sheet.js b/src/module/actor/monster-sheet.js
@@ -69,7 +69,7 @@ export default class OseActorSheetMonster extends OseActorSheet {
     );
     data.isNew = this.actor.isNew();
 
-    if (isNewerVersion(game.version, "10.264")) {
+    if (foundry.utils.isNewerVersion(game.version, "10.264")) {
       data.enrichedBiography = await TextEditor.enrichHTML(
         this.object.system.details.biography,
         { async: true }
diff --git a/src/module/combat.js b/src/module/combat.js
@@ -29,7 +29,8 @@ const OseCombat = {
     // Roll init
     for (const group in groups) {
       // Object.keys(groups).forEach((group) => {
-      const roll = new Roll("1d6").evaluate({ async: false });
+      const roll = new Roll("1d6");
+      await roll.evaluate();
       await roll.toMessage({
         flavor: game.i18n.format("OSE.roll.initiative", {
           group: CONFIG.OSE.colors[group],
diff --git a/src/module/dialog/character-creation.js b/src/module/dialog/character-creation.js
@@ -89,7 +89,7 @@ export default class OseCharacterCreator extends FormApplication {
     };
   }
 
-  rollScore(score, options = {}) {
+  async rollScore(score, options = {}) {
     // Increase counter
     this.counters[score] += 1;
 
@@ -102,7 +102,8 @@ export default class OseCharacterCreator extends FormApplication {
       roll: {},
     };
     if (options.skipMessage) {
-      return new Roll(rollParts[0]).evaluate({ async: false });
+      const skipMessagRoll = new Roll(rollParts[0]);
+      await skipMessagRoll.evaluate();
     }
     // Roll and return
     return OseDice.Roll({
diff --git a/src/module/helpers-dice.js b/src/module/helpers-dice.js
@@ -32,8 +32,8 @@ const OseDice = {
       parts.push(form.bonus.value);
     }
 
-    // ;
-    const roll = new Roll(parts.join("+"), data).evaluate({ async: false });
+    const roll = new Roll(parts.join("+"), data);
+    await roll.evaluate({allowStrings: true});
 
     // Convert the roll to a chat message and return the roll
     let rollMode = game.settings.get("core", "rollMode");
@@ -234,7 +234,7 @@ const OseDice = {
       }
     } else if (this.attackIsSuccess(roll, result.target, targetAc)) {
       // Answer is bounded betweewn AC -3 and 9 (unarmored) and is shown in chat card
-      const value = Math.clamped(result.target - roll.total, -3, 9);
+      const value = Math.clamp(result.target - roll.total, -3, 9);
       result.details = game.i18n.format("OSE.messages.AttackSuccess", {
         result: value,
         bonus: result.target,
@@ -302,10 +302,10 @@ const OseDice = {
     // Optionally include a situational bonus
     if (form !== null && form.bonus.value) parts.push(form.bonus.value);
 
-    const roll = new Roll(parts.join("+"), data).evaluate({ async: false });
-    const dmgRoll = new Roll(data.roll.dmg.join("+"), data).evaluate({
-      async: false,
-    });
+    const roll = new Roll(parts.join("+"), data);
+    await roll.evaluate();
+    const dmgRoll = new Roll(data.roll.dmg.join("+"), data);
+    await dmgRoll.evaluate();
 
     // Convert the roll to a chat message and return the roll
     let rollMode = game.settings.get("core", "rollMode");
diff --git a/src/module/helpers-handlebars.ts b/src/module/helpers-handlebars.ts
@@ -51,8 +51,8 @@ const registerHelpers = async () => {
 
   Handlebars.registerHelper("counter", (status, value, max) =>
     status
-      ? Math.clamped((100 * value) / max, 0, 100)
-      : Math.clamped(100 - (100 * value) / max, 0, 100)
+      ? Math.clamp((100 * value) / max, 0, 100)
+      : Math.clamp(100 - (100 * value) / max, 0, 100)
   );
 
   Handlebars.registerHelper("times", (n, block) => {
diff --git a/src/module/helpers-treasure.js b/src/module/helpers-treasure.js
@@ -61,15 +61,15 @@ export const augmentTable = (table, html) => {
  * @param data
  */
 async function drawTreasure(table, data) {
-  const percent = (chance) => {
+  const percent = async (chance) => {
     const roll = new Roll("1d100");
-    roll.evaluate({ async: false });
+    await roll.evaluate();
     return roll.total <= chance;
   };
   data.treasure = {};
   if (table.getFlag(game.system.id, "treasure")) {
     table.results.forEach(async (r) => {
-      if (percent(r.weight)) {
+      if (await percent(r.weight)) {
         const text = r.getChatText(r);
         data.treasure[r.id] = {
           img: r.img,
diff --git a/src/module/item/data-model-ability.js b/src/module/item/data-model-ability.js
@@ -3,7 +3,7 @@
  */
 import OseTags from "../helpers-tags";
 
-export default class OseDataModelAbility extends foundry.abstract.DataModel {
+export default class OseDataModelAbility extends foundry.abstract.TypeDataModel {
   static defineSchema() {
     const { StringField, NumberField, BooleanField, ArrayField, ObjectField } =
       foundry.data.fields;
diff --git a/src/module/item/data-model-armor.js b/src/module/item/data-model-armor.js
@@ -1,7 +1,7 @@
 /**
  * @file The data model for Items of type Armor
  */
-export default class OseDataModelArmor extends foundry.abstract.DataModel {
+export default class OseDataModelArmor extends foundry.abstract.TypeDataModel {
   static ArmorTypes = {
     unarmored: "OSE.armor.unarmored",
     light: "OSE.armor.light",
diff --git a/src/module/item/data-model-container.js b/src/module/item/data-model-container.js
@@ -1,7 +1,7 @@
 /**
  * @file The data model for Items of type Container
  */
-export default class OseDataModelContainer extends foundry.abstract.DataModel {
+export default class OseDataModelContainer extends foundry.abstract.TypeDataModel {
   static defineSchema() {
     const {
       SchemaField,
diff --git a/src/module/item/data-model-item.js b/src/module/item/data-model-item.js
@@ -1,7 +1,7 @@
 /**
  * @file The data model for Items of type Ability
  */
-export default class OseDataModelItem extends foundry.abstract.DataModel {
+export default class OseDataModelItem extends foundry.abstract.TypeDataModel {
   static defineSchema() {
     const {
       SchemaField,
diff --git a/src/module/item/data-model-spell.js b/src/module/item/data-model-spell.js
@@ -3,7 +3,7 @@
  */
 import OseTags from "../helpers-tags";
 
-export default class OseDataModelSpell extends foundry.abstract.DataModel {
+export default class OseDataModelSpell extends foundry.abstract.TypeDataModel {
   static defineSchema() {
     const { StringField, NumberField, ArrayField, ObjectField } =
       foundry.data.fields;
diff --git a/src/module/item/data-model-weapon.js b/src/module/item/data-model-weapon.js
@@ -1,7 +1,7 @@
 /**
  * @file The data model for Items of type Weapon
  */
-export default class OseDataModelWeapon extends foundry.abstract.DataModel {
+export default class OseDataModelWeapon extends foundry.abstract.TypeDataModel {
   static defineSchema() {
     const {
       SchemaField,
diff --git a/src/module/item/entity.js b/src/module/item/entity.js
@@ -399,7 +399,7 @@ export default class OseItem extends Item {
     // Basic chat message data
     const chatData = {
       user: game.user.id,
-      type: CONST.CHAT_MESSAGE_TYPES.OTHER,
+      type: CONST.CHAT_MESSAGE_STYLES.OTHER,
       content: html,
       speaker: {
         actor: this.actor.id,
diff --git a/src/module/polyfill.ts b/src/module/polyfill.ts
@@ -0,0 +1,11 @@
+/**
+ * @file Polyfills for the system
+ */
+
+export default () => {
+  // @ts-ignore - Math.clamp is not a standard JS function
+  if (typeof Math.clamp !== "function") {
+    // @ts-ignore - Math.clamp is not a standard JS function
+    Math.clamp = Math.clamped;
+  }
+};
diff --git a/src/ose.js b/src/ose.js
@@ -31,6 +31,10 @@ import registerSettings from "./module/settings";
 import * as treasure from "./module/helpers-treasure";
 
 import "./e2e";
+import polyfill from "./module/polyfill";
+
+
+polyfill();
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
diff --git a/system.json b/system.json
@@ -5,11 +5,11 @@
   "description": "Simple, robust rules compatible with decades of Basic/Expert material",
   "version": "AUTOMATICALLY REPLACED BY GITHUB WORKFLOW ACTION",
   "minimumCoreVersion": "10",
-  "compatibleCoreVersion": "11",
+  "compatibleCoreVersion": "12",
   "compatibility": {
     "minimum": "10",
     "verified": "11",
-    "maximum": "11"
+    "maximum": "12"
   },
   "author": "Maintained by VTT Red with 18 contributors",
   "authors": [

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ export default class OseDataModelCharacterEncumbrance`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`get pct() {`
`62`		`- return Math.clamped((100 * this.value) / this.max, 0, 100);`
	`62`	`+ return Math.clamp((100 * this.value) / this.max, 0, 100);`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`get encumbered() {`