Fix more v12 breakage, for chargen abilities and items.

CHANGELOG.md

@@ -1,6 +1,10 @@
+# 3.0.2
+
+- Fix more v12 breakage, for chargen abilities and items.
+
 # 3.0.1
 
-- Fix more v12 breakage.
+- Fix more v12 breakage, for async rolls and enriched html.
 
 # 3.0.0
 

module/actor/character-sheet.js

@@ -34,6 +34,7 @@ export class CYCharacterSheet extends CYActorSheet {
   /** @override */
   async getData() {
     const superData = await super.getData();
+    console.log("character superdata", superData);
     // TODO: move this to prepareItems?
     superData.data.items.forEach(item => {
       item.system.equippable = (

module/generator/scvmfactory.js

@@ -51,7 +51,7 @@ async function randomNpc() {
   const armor = npcArmor();
   return {
     name,
-    data: {
+    system: {
       armor,
       attack,
       description,
@@ -133,7 +133,8 @@ export async function findAllowedClasses() {
 };
 
 async function abilityRoll(formula) {
-  return abilityBonus(await rollTotal(formula));
+  const total = await rollTotal(formula);
+  return abilityBonus(total);
 }
 
 const classStartingArmor = async (clazz) => {
@@ -261,7 +262,7 @@ async function startingEquipment(clazz) {
 
 function simpleData(e) {
   return {
-    data: e.system,
+    system: e.system,
     img: e.img,
     items: e.items?.map(i => simpleData(i)),
     name: e.name,
@@ -362,7 +363,6 @@ async function rollScvmForClass(clazz) {
   const npcData = npcs.map(n => simpleData(n));
 
   const strength = await abilityRoll(clazz.system.strength);
-  console.log("strength", strength);
   const agility = await abilityRoll(clazz.system.agility);
   const presence = await abilityRoll(clazz.system.presence);
   const toughness = await abilityRoll(clazz.system.toughness);
@@ -402,7 +402,7 @@ async function rollScvmForClass(clazz) {
 function scvmToActorData(s) {
   return {
     name: s.name,
-    data: {
+    system: {
       abilities: {
         strength: { value: s.strength },
         agility: { value: s.agility },

module/utils.js

@@ -57,7 +57,9 @@ export const articalize = (str) => {
 };
 
 export async function rollTotal(formula, rollData={}) {
-  return await new Roll(formula, rollData).evaluate().total;
+  const roll = new Roll(formula, rollData);
+  await roll.evaluate();
+  return roll.total;
 };
 
 // https://stackoverflow.com/questions/4959975/generate-random-number-between-two-numbers-in-javascript