Better import and various stuff

module/sheets/actors/rmss_player_sheet.js

@@ -90,11 +90,11 @@ export default class RMSSPlayerSheet extends ActorSheet {
         context.system.attributes.power_points.modifier = "PP Exhaustion Penalty: -20 ";
         break;
       case (powerpointPercentage < 75):
-        console.log("Less than 75");
+        //console.log("Less than 75");
         context.system.attributes.power_points.modifier = "PP Exhaustion Penalty: -10 ";
         break;
       default:
-        console.log("Setting Default");
+        //console.log("Setting Default");
         context.system.attributes.power_points.modifier = "PP Exhaustion Penalty: 0 ";
     }
 
@@ -117,11 +117,11 @@ export default class RMSSPlayerSheet extends ActorSheet {
         context.system.attributes.exhaustion_points.modifier = "Exhaustion Penalty: -15 ";
         break;
       case (exhaustionPercentage < 75):
-        console.log("Less than 75");
+        //console.log("Less than 75");
         context.system.attributes.exhaustion_points.modifier = "Exhaustion Penalty: -5 ";
         break;
       default:
-        console.log("Setting Default");
+        //console.log("Setting Default");
         context.system.attributes.exhaustion_points.modifier = "Exhaustion Penalty: 0 ";
     }
 
@@ -175,28 +175,17 @@ export default class RMSSPlayerSheet extends ActorSheet {
           s.skills.push(sk);
         }
       }
+      // Sort skills with localcompare
+      s.skills.sort((a, b) => a.name.localeCompare(b.name));    
     }
 
-    // Sort Skill/Skillcat Arrays
-    skillcat.sort(function(a, b) {
-      if (a.name < b.name) {
-        return -1;
-      }
-      if (a.name > b.name) {
-        return 1;
-      }
-      return 0;
-    });
-
-    playerskill.sort(function(a, b) {
-      if (a.name < b.name) {
-        return -1;
-      }
-      if (a.name > b.name) {
-        return 1;
-      }
-      return 0;
-    });
+    // Sort all items
+    skillcat.sort((a, b) => a.name.localeCompare(b.name));
+    gear.sort((a, b) => a.name.localeCompare(b.name));
+    weapons.sort((a, b) => a.name.localeCompare(b.name));
+    armor.sort((a, b) => a.name.localeCompare(b.name));
+    herbs.sort((a, b) => a.name.localeCompare(b.name));
+    spells.sort((a, b) => a.name.localeCompare(b.name));
 
     // Assign and return
     context.gear = gear;

module/sheets/apps/rmss_import_skill_categories.js

@@ -11,6 +11,7 @@ export default class RMSSToolsSCImporter extends FormApplication {
   static get defaultOptions() {
     return foundry.utils.mergeObject(super.defaultOptions, {
       classes: ["form"],
+      width: 520,
       popOut: true,
       title: "Import Skill Categories",
       template: "systems/fvtt-rolemaster-frp/templates/sheets/apps/app_skill_category_importer.html"
@@ -29,34 +30,38 @@ export default class RMSSToolsSCImporter extends FormApplication {
   }
 
   async _updateObject(event, formData) {
-    //console.log("Update ", event, formData);
+    await this.character.setFlag("world", "importing", true); 
+
     let itemType = event.submitter.value;
     let toDelete = [];
     for (const item of this.character.items) {
       if (item.type === itemType) {
         toDelete.push(item.id);
       }
+      if (itemType == "skill_category" && item.type === "skill") {
+        toDelete.push(item.id); // Delete also skill when re-importing skill categories.
+      }
     }
-    this.character.deleteEmbeddedDocuments("Item", toDelete);
+    await this.character.deleteEmbeddedDocuments("Item", toDelete);
 
     let comp = (itemType == "skill") ? formData.selectOptionsSkills : formData.selectOptionsCategories;
     const pack = game.packs.get(comp);
     const skillCategoryData = await pack.getIndex();
 
     console.log("Importing New Skills/Skill Categories.");
+    let newDocuments = [];
     let gameSystem = RFRPUtility.getGameSystem();
     for (const sc of skillCategoryData) {
-      const newitem = await pack.getDocument(sc._id);
-      
-      let newDocuments = [];
+      const newitem = await pack.getDocument(sc._id);      
       if (newitem.type === itemType && (newitem.system.game_system === "common" || newitem.system.game_system === gameSystem)) {
-        //console.log(newitem);
         newDocuments.push(newitem);
       }
-      if (newDocuments.length > 0) {
-        await Item.createDocuments(newDocuments, {parent: this.character});
-      }
     }
+    if (newDocuments.length > 0) {
+      await Item.createDocuments(newDocuments, {parent: this.character});
+    }
+
+    await this.character.setFlag("world", "importing", false); 
   }
 }