Added experimental automation for classes

Added automation for saving throws and skills, prepared for adding item proficiencies and class feats.
Only class setup for this is sentinel

module/actor/entity.js

@@ -98,11 +98,17 @@ export default class Actor5e extends Actor {
       }
     }
 
+    // Class features
+    if (this.data.type === "character") this._prepareClassFeatures();
+
     // Ability modifiers and saves
     const dcBonus = Number.isNumeric(data.bonuses?.power?.dc) ? parseInt(data.bonuses.power.dc) : 0;
     const saveBonus = Number.isNumeric(bonuses.save) ? parseInt(bonuses.save) : 0;
     const checkBonus = Number.isNumeric(bonuses.check) ? parseInt(bonuses.check) : 0;
     for (let [id, abl] of Object.entries(data.abilities)) {
+      // Either proficient because the class says so, or the user has set it
+      abl.proficient = abl?.classProficient || abl.proficientOverride;
+
       abl.mod = Math.floor((abl.value - 10) / 2);
       abl.prof = (abl.proficient || 0) * data.attributes.prof;
       abl.saveBonus = saveBonus;
@@ -362,6 +368,49 @@ export default class Actor5e extends Actor {
 
   /* -------------------------------------------- */
 
+  /**
+   * Prepares the derived data from the character's classes
+   * @private
+   */
+  _prepareClassFeatures() {
+    let data = this.data.data;
+    // Automatic class data
+    for (let theClass of Object.values(this.classes)) {
+      // Only the original class provides the saving throws, skills, and most item proficiencies
+      if (theClass.data._id === data.details.originalClass) {
+        // Saving throws
+        for (let save of theClass.data.data.saves) {
+          data.abilities[save].classProficient = 1;
+        }
+
+        // Skills
+        for (let skill of theClass.data.data.skills.value) {
+          data.skills[skill].classValue = 1
+        }
+
+        // OG Item Proficiencies
+        // Armour
+        for (let item of theClass.data.data.itemProficiencies.armour) {
+
+        }
+
+        // Weapons
+        for (let item of theClass.data.data.itemProficiencies.weapons) {
+
+        }
+
+        // Items
+        for (let item of theClass.data.data.itemProficiencies.tools) {
+
+        }
+      } else {
+        // Multiclass Item Proficiencies
+      }
+    }
+  }
+
+  /* -------------------------------------------- */
+
   /**
    * Prepare skill checks.
    * @param actorData
@@ -383,6 +432,9 @@ export default class Actor5e extends Actor {
     const observant = flags.observantFeat;
     const skillBonus = Number.isNumeric(bonuses.skill) ? parseInt(bonuses.skill) :  0;
     for (let [id, skl] of Object.entries(data.skills)) {
+      // Use the highest out of the value provided by the class, and the value provided by the user
+      skl.value =  (skl?.classValue > skl.valueOverride ? skl?.classValue : skl.valueOverride);
+
       skl.value = Math.clamped(Number(skl.value).toNearest(0.5), 0, 2) ?? 0;
       let round = Math.floor;
 

module/actor/sheets/newSheet/base.js

@@ -538,22 +538,27 @@ export default class ActorSheet5e extends ActorSheet {
    */
   _onCycleSkillProficiency(event) {
     event.preventDefault();
-    const field = $(event.currentTarget).siblings('input[type="hidden"]');
+    // Like _onToggleAbilityProficiency
+    // const field = $(event.currentTarget).siblings('input[type="hidden"]');
+    const field = event.currentTarget.previousElementSibling;
 
     // Get the current level and the array of levels
-    const level = parseFloat(field.val());
-    const levels = [0, 1, 0.5, 2];
+    const level = parseFloat(field.value);
+    const levels = [0, 0.5, 1, 2];
     let idx = levels.indexOf(level);
 
     // Toggle next level - forward on click, backwards on right
     if ( event.type === "click" ) {
-      field.val(levels[(idx === levels.length - 1) ? 0 : idx + 1]);
+      field.value = (levels[(idx === levels.length - 1) ? 0 : idx + 1]);
     } else if ( event.type === "contextmenu" ) {
-      field.val(levels[(idx === 0) ? levels.length - 1 : idx - 1]);
+      field.value = (levels[(idx === 0) ? levels.length - 1 : idx - 1]);
     }
 
     // Update the field value and save the form
-    this._onSubmit(event);
+
+    // I've no idea why onsubmit was used, but it doesn't work if we want it to set a different value, thus we replace it with an actor update statement
+    // this._onSubmit(event);
+    return this.actor.update({[field.name + "Override"]: parseFloat(field.value)});
   }
 
   /* -------------------------------------------- */
@@ -922,7 +927,7 @@ _onItemCollapse(event) {
   _onToggleAbilityProficiency(event) {
     event.preventDefault();
     const field = event.currentTarget.previousElementSibling;
-    return this.actor.update({[field.name]: 1 - parseInt(field.value)});
+    return this.actor.update({[field.name + "Override"]: 1 - parseInt(field.value)});
   }
 
   /* -------------------------------------------- */

template.json

@@ -6,27 +6,33 @@
         "abilities": {
           "str": {
             "value": 10,
-            "proficient": 0
+            "proficient": 0,
+            "proficientOverride": 0
           },
           "dex": {
             "value": 10,
-            "proficient": 0
+            "proficient": 0,
+            "proficientOverride": 0
           },
           "con": {
             "value": 10,
-            "proficient": 0
+            "proficient": 0,
+            "proficientOverride": 0
           },
           "int": {
             "value": 10,
-            "proficient": 0
+            "proficient": 0,
+            "proficientOverride": 0
           },
           "wis": {
             "value": 10,
-            "proficient": 0
+            "proficient": 0,
+            "proficientOverride": 0
           },
           "cha": {
             "value": 10,
-            "proficient": 0
+            "proficient": 0,
+            "proficientOverride": 0
           }
         },
         "attributes": {
@@ -134,74 +140,92 @@
         "skills": {
           "acr": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "dex"
           },
           "ani": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "wis"
           },
           "ath": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "str"
           },
           "dec": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "cha"
           },
           "ins": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "wis"
           },
           "itm": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "cha"
           },
           "inv": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "int"
           },
           "lor": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "int"
           },
           "med": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "wis"
           },
           "nat": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "int"
           },
           "pil": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "int"
           },
           "prc": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "wis"
           },
           "prf": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "cha"
           },
           "per": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "cha"
           },
           "slt": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "dex"
           },
           "ste": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "dex"
           },
           "sur": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "wis"
           },
           "tec": {
             "value": 0,
+            "valueOverride": 0,
             "ability": "int"
           }
         },
@@ -882,7 +906,21 @@
     "class": {
       "templates": ["classDescription"],
       "className": "",
+      "classFeatures": {},
+      "itemProficiencies": {
+        "armour": [],
+        "weapons": [],
+        "tools": []
+      },
+      "multiclassProficiencies": {
+        "armour": [],
+        "weapons": [],
+        "tools": []
+      },
       "levels": 1,
+      "multiclassPrerequisite": [
+        []
+      ],
       "archetype": "",
       "hitDice": "d6",
       "hitDiceUsed": 0,