code cleanup, skill added using new actor.reset method

Author: misthero

CHANGELOG.md

@@ -11,3 +11,4 @@
 - v1.0.8: Fixed regression with tidy 5e sheet.
 - v1.1.0: First FVTT v10 release.
 - v1.1.1: Changed inner skill structure to reflect dnd5e system latest update + bugfix
+- v1.1.2: Using new core actor.reset() to apply skills. Code cleanup.

dnd5e-custom-skills.js

@@ -14,6 +14,7 @@ Handlebars.registerHelper("inObject", (object, value) => {
  *  ▄▀▀░█▒█░▄▀▀░▀█▀░▄▀▄░█▄▒▄█░░░▄▀▀░█▄▀░█░█▒░░█▒░░▄▀▀░░▒▄▀▄▒█▀▄▒█▀▄░█▒░░█░▄▀▀▒▄▀▄░▀█▀░█░▄▀▄░█▄░█░░░▄▀▀▒██▀░▀█▀░▀█▀░█░█▄░█░▄▀▒░▄▀▀░░▒█▀░▄▀▄▒█▀▄░█▄▒▄█
 ░*  ▀▄▄░▀▄█▒▄██░▒█▒░▀▄▀░█▒▀▒█▒░▒▄██░█▒█░█▒█▄▄▒█▄▄▒▄██▒░░█▀█░█▀▒░█▀▒▒█▄▄░█░▀▄▄░█▀█░▒█▒░█░▀▄▀░█▒▀█▒░▒▄██░█▄▄░▒█▒░▒█▒░█░█▒▀█░▀▄█▒▄██▒░░█▀░▀▄▀░█▀▄░█▒▀▒█
  */
+ 
 class CustomSkillsForm extends FormApplication {
 
   static get defaultOptions() {
@@ -31,7 +32,6 @@ class CustomSkillsForm extends FormApplication {
         { abilities: CONFIG.DND5E.abilities, skills: CONFIG.DND5E.skills },
         this.reset ? mergeObject(CustomSkills.defaultSettings, {requireSave:true}) : mergeObject(CustomSkills.settings, {requireSave:false}));
       this.reset = false;
-      // console.log('getData', data);
       return data;
   }
 
@@ -76,43 +76,26 @@ class CustomSkillsForm extends FormApplication {
     } else {
       newAbilities = mergeObject(oldSettings.customAbilitiesList, Form.customAbilitiesList, { insertKeys: true, insertValues: true, overwrite:true });
     };
-
+    // modify system variables
+    CustomSkills.applyToSystem();
+    
     await this.update(newSkills, newAbilities);
 
     return this.render();
   }
 
   async update(newSkills, newAbilities) {
-    const keys_sk = Object.keys(newSkills);
-    const keys_ab = Object.keys(newAbilities);
-  
-    const total = keys_sk.length + keys_ab.length;
-
-    let message = game.i18n.localize(MODULE_NAME + '.processingSkills');;
-    let percent = 0;
-    let count = 0;
-    
-    // finally add skills and abilities to actors
+    // add skills and abilities to actors
     for (let s in newSkills) {
       if(newSkills[s].applied)
         CustomSkills.addSkillToActors(s);
-      count++;
-      percent = Math.round((count / total) * 100);
-      SceneNavigation.displayProgressBar({label: message, pct: percent });
     }
 
-    message = game.i18n.localize(MODULE_NAME + '.processingAbilities');
     for (let a in newAbilities) {
       if(newAbilities[a].applied == true)
         CustomSkills.addAbilityToActor(a);
-      count++;
-      percent = Math.round((count / total) * 100);
-      SceneNavigation.displayProgressBar({label: message, pct: percent });
     }
 
-    // modify system variables
-    CustomSkills.applyToSystem();
-    
     // clean leftovers on players actors
     await CustomSkills.cleanActors();
     ui.notifications.info(game.i18n.localize(MODULE_NAME + '.updateDone'));
@@ -289,19 +272,7 @@ class CustomSkills {
   }
 
   static getBaseSkill() {
-    return {
-      value: 0,
-      ability: "str",
-      bonuses: {
-        check: '',
-        passive: '',
-      },
-      mod: 0,
-      passive: 0,
-      total: 0,
-      label: "",
-      applied: 0
-    };
+    return foundry.utils.deepClone(game.system.template.Actor.templates.creature.skills.acr);
   }
 
   static debug(string) {
@@ -527,10 +498,7 @@ class CustomSkills {
     if (total > 0) {
       keys.forEach((key, index) => {
         let Actor = charactersToAddSkill[key];
-        let updatedData = {
-            [`system.skills.${skillCode}`]: skillToAdd
-        };
-        Actor.update(updatedData);
+        Actor.reset();
       })
     }
   }
@@ -546,7 +514,6 @@ class CustomSkills {
     }
 
     let characters = this.getPlayerActors();
-    //console.log('CHARACTErS:',characters);
     let charactersToAddAbility = characters.filter(s => s.system.abilities.hasOwnProperty(abilityCode) == false);
     const keys = Object.keys(charactersToAddAbility);
 
@@ -586,7 +553,6 @@ class CustomSkills {
 }
 
 function addLabels(app, html, data) {
-  //console.log(data);
   // new classes for ui and css purposes
   html.find(".skills-list").addClass("custom-skills");
   html.find(".ability-scores").addClass("custom-abilities");
@@ -596,8 +562,6 @@ function addLabels(app, html, data) {
   const hiddenAbilities = CustomSkills.getHiddenAbilities();
   const skillRowSelector = ".skills-list .skill";
 
-  //console.log(skillList);
-  
   html.find(skillRowSelector).each(function() {
     const skillElem = $(this);
     const skillKey = $(this).attr("data-skill");

lang/en.json

@@ -15,6 +15,6 @@
     "dnd5e-custom-skills.hideAbilities": "Hide Abilities",
     "dnd5e-custom-skills.save": "Apply changes to world",
     "dnd5e-custom-skills.reset": "Reset",
-    "dnd5e-custom-skills.afterReset": "Please click 'Apply changes to world' after reset."
-
+    "dnd5e-custom-skills.afterReset": "Please click 'Apply changes to world' after reset.",
+    "dnd5e-custom-skills.updateDone": "Update Completed."
 }

lang/it.json

@@ -15,6 +15,7 @@
     "dnd5e-custom-skills.hideAbilities": "Nascondi Caratteristiche",
     "dnd5e-custom-skills.save": "Applica modifiche al Mondo",
     "dnd5e-custom-skills.reset": "Reset",
-    "dnd5e-custom-skills.afterReset": "Dopo il 'Reset' clicca di nuovo su 'Applica modifiche al mondo'."
+    "dnd5e-custom-skills.afterReset": "Dopo il 'Reset' clicca di nuovo su 'Applica modifiche al mondo'.",
+    "dnd5e-custom-skills.updateDone": "Aggiornamento completato."
 
 }

module.json

@@ -2,10 +2,21 @@
     "id": "dnd5e-custom-skills",
     "title": "5e - Custom Abilities & Skills",
     "description": "FoundryVTT module for adding new character skills and abilities",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "compatibility": {
         "minimum": "10",
-        "maximum": "10"
+        "maximum": "10",
+        "verified": "10.285"
+    },
+    "relationships": {
+        "systems": [{
+            "id": "dnd5e",
+            "type": "system",
+            "manifest": "https://raw.githubusercontent.com/foundryvtt/dnd5e/master/system.json",
+            "compatibility": {
+                "verified": "2.0.3"
+            }
+        }]
     },
     "url": "https://github.com/misthero/dnd5e-custom-skills",
     "manifest": "https://raw.githubusercontent.com/misthero/dnd5e-custom-skills/main/module.json",