Better import and various stuff

less/actor-sheet/actor-sheet-skills.less

@@ -45,4 +45,9 @@
     font-weight: bold;
     border-bottom: 1px solid;
     background-image: linear-gradient(rgba(0, 0, 0, 0.1) 0 0);
+}
+
+.skills-name-left-align {
+  text-align: left;
+  padding-left: 2px;
 }

module/documents/actor.js

@@ -27,6 +27,12 @@ export class RMSSActor extends Actor {
   _prepareCharacterData(actorData) {
     if (actorData.type !== "character") return;
 
+    console.log("*****Flag", this.getFlag("world", "importing"));
+    
+    if (this.getFlag("world", "importing")) {
+      return; // Don't calculate skill bonuses if we are importing
+    }
+
     this.calculateBasicStatBonus(actorData);
 
     // Calculate Stat Bonuses for the Actor
@@ -233,9 +239,7 @@ export class RMSSActor extends Actor {
     for (const item of this.items) {
       if (item.type === "skill") {
         console.log(`rmss | actor.js | Calculating skill bonus for Skill: ${item.name}`);
-        console.log(`rmss | actor.js | Updating Skill Category Bonus for Skill: ${item.name}`);
         item.calculateSelectedSkillCategoryBonus(item);
-        console.log(`rmss | actor.js | Updating Skill Total Bonus for Skill:  ${item.name}`);
         item.calculateSkillTotalBonus(item);
       }
     }

module/documents/item.js

@@ -46,10 +46,11 @@ export class RMSSItem extends Item {
   prepareDerivedData() {
     const itemData = this;
     const systemData = itemData.system;
-    const flags = itemData.flags.rmss || {};
 
+    if (this.parent?.getFlag("world", "importing")) {
+      return; // Don't calculate skill bonuses if we are importing
+    }
     // Make separate methods for each item type to keep things organized.
-
     if (itemData.type === "skill") {
       this._prepareSkillCategoryData(itemData);
     }
@@ -68,6 +69,7 @@ export class RMSSItem extends Item {
 
   _prepareSkillData(itemData) {
     if (itemData.type !== "skill") return;
+
     console.log(`rmss | item.js | Preparing Skill Data for: ${itemData.name}`);
     // Make modifications to data here. For example:
     // const systemData = itemData.system;
@@ -103,12 +105,18 @@ export class RMSSItem extends Item {
 
   calculateSelectedSkillCategoryBonus(itemData) {
     // Find the relevant skill category 
+    if (!this.parent) { return; } // Only if attached to an actor
+
     let skillC =  this.parent?.items || RFRPUtility.getSkillCategories();
     if (skillC) {
       let item = skillC.find(it => it.type == "skill_category" && it.name.toLowerCase() == itemData.system.category.toLowerCase());
-      this.system.category_bonus = item.system.total_bonus;
+      if (item) {
+        this.system.category_bonus = item.system.total_bonus;
+      } else {
+        ui.notifications.warn(`Skill Category ${itemData.system.category} not found for Skill ${itemData.name}`);
+      }
     } else {
-      ui.notifications.warn("No Skill Categories found. Please create a Skill Category.");
+      ui.notifications.info("No Skill Categories found. Please create a Skill Category.");
     }
   }
 }

module/rfrp-utility.js

@@ -18,6 +18,10 @@ export class RFRPUtility {
     this.skillCategories.sort((a, b) => a.name.localeCompare(b.name));
   }
 
+  static getGameSystem() {
+    return this.gameSystem;
+  }
+  
   /* -------------------------------------------- */
   static getSkillCategories() {
     return this.skillCategories

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;
@@ -251,7 +240,9 @@ export default class RMSSPlayerSheet extends ActorSheet {
 
       let selectOptions = {};
       for (const pack of game.packs) {
-        selectOptions[pack.metadata.id] = pack.metadata.label;
+        if (pack.metadata.type === "Item") {
+          selectOptions[pack.metadata.id] = pack.metadata.label;
+        }
       }
       new game.rmss.applications.RMSSToolsSCImporter(selectOptions, this.actor).render(true);
     });

module/sheets/apps/rmss_import_skill_categories.js

@@ -1,3 +1,5 @@
+import { RFRPUtility } from "../../rfrp-utility.js";
+
 export default class RMSSToolsSCImporter extends FormApplication {
 
   constructor(selectOptions, character) {
@@ -9,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"
@@ -27,30 +30,38 @@ export default class RMSSToolsSCImporter extends FormApplication {
   }
 
   async _updateObject(event, formData) {
-    console.log("Deleting Old Skill Categories.");
+    await this.character.setFlag("world", "importing", true); 
+
+    let itemType = event.submitter.value;
+    let toDelete = [];
     for (const item of this.character.items) {
-      if (item.type === "skill_category") {
-        item.delete();
+      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.
       }
     }
+    await this.character.deleteEmbeddedDocuments("Item", toDelete);
 
-    const pack = game.packs.get(formData.selectOptions);
+    let comp = (itemType == "skill") ? formData.selectOptionsSkills : formData.selectOptionsCategories;
+    const pack = game.packs.get(comp);
     const skillCategoryData = await pack.getIndex();
 
-    console.log("Importing New Skill Categories.");
-
+    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 = [];
-      if (newitem.type === "skill_category") {
-        console.log(newitem);
+      const newitem = await pack.getDocument(sc._id);      
+      if (newitem.type === itemType && (newitem.system.game_system === "common" || newitem.system.game_system === gameSystem)) {
         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); 
   }
 }
 

packs/skill_categories/CURRENT

@@ -1 +1 @@
-MANIFEST-000076
+MANIFEST-000137

packs/skill_categories/LOG

@@ -1,15 +1,15 @@
-2024/08/08-04:58:23.767734 7f33996006c0 Recovering log #74
-2024/08/08-04:58:23.828546 7f33996006c0 Delete type=3 #72
-2024/08/08-04:58:23.828601 7f33996006c0 Delete type=0 #74
-2024/08/08-05:04:31.857707 7f33978006c0 Level-0 table #79: started
-2024/08/08-05:04:31.861026 7f33978006c0 Level-0 table #79: 24481 bytes OK
-2024/08/08-05:04:31.868635 7f33978006c0 Delete type=0 #77
-2024/08/08-05:04:31.903805 7f33978006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
-2024/08/08-05:04:31.903951 7f33978006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at '!items!yRIFroc5VC9Oj3qY' @ 136 : 1
-2024/08/08-05:04:31.903973 7f33978006c0 Compacting 1@1 + 1@2 files
-2024/08/08-05:04:31.907992 7f33978006c0 Generated table #80@1: 56 keys, 24845 bytes
-2024/08/08-05:04:31.908019 7f33978006c0 Compacted 1@1 + 1@2 files => 24845 bytes
-2024/08/08-05:04:31.914722 7f33978006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
-2024/08/08-05:04:31.914879 7f33978006c0 Delete type=2 #5
-2024/08/08-05:04:31.915115 7f33978006c0 Delete type=2 #79
-2024/08/08-05:04:31.933903 7f33978006c0 Manual compaction at level-1 from '!items!yRIFroc5VC9Oj3qY' @ 136 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-08:47:18.899008 7f9286a006c0 Recovering log #135
+2024/08/10-08:47:18.967334 7f9286a006c0 Delete type=3 #133
+2024/08/10-08:47:18.967424 7f9286a006c0 Delete type=0 #135
+2024/08/10-09:47:32.985517 7f9285a006c0 Level-0 table #140: started
+2024/08/10-09:47:32.989699 7f9285a006c0 Level-0 table #140: 25092 bytes OK
+2024/08/10-09:47:32.997934 7f9285a006c0 Delete type=0 #138
+2024/08/10-09:47:33.008747 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-09:47:33.020954 7f9285a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at '!items!yRIFroc5VC9Oj3qY' @ 192 : 1
+2024/08/10-09:47:33.020989 7f9285a006c0 Compacting 1@1 + 1@2 files
+2024/08/10-09:47:33.025637 7f9285a006c0 Generated table #141@1: 57 keys, 26383 bytes
+2024/08/10-09:47:33.025675 7f9285a006c0 Compacted 1@1 + 1@2 files => 26383 bytes
+2024/08/10-09:47:33.032592 7f9285a006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/08/10-09:47:33.032827 7f9285a006c0 Delete type=2 #80
+2024/08/10-09:47:33.033191 7f9285a006c0 Delete type=2 #140
+2024/08/10-09:47:33.050945 7f9285a006c0 Manual compaction at level-1 from '!items!yRIFroc5VC9Oj3qY' @ 192 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)

packs/skill_categories/LOG.old

@@ -1,8 +1,8 @@
-2024/08/07-23:07:46.117612 7f33982006c0 Recovering log #70
-2024/08/07-23:07:46.128384 7f33982006c0 Delete type=3 #68
-2024/08/07-23:07:46.128478 7f33982006c0 Delete type=0 #70
-2024/08/07-23:08:55.204549 7f33978006c0 Level-0 table #75: started
-2024/08/07-23:08:55.204589 7f33978006c0 Level-0 table #75: 0 bytes OK
-2024/08/07-23:08:55.210948 7f33978006c0 Delete type=0 #73
-2024/08/07-23:08:55.211205 7f33978006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
-2024/08/07-23:08:55.238982 7f33978006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-00:31:40.615380 7f9287e006c0 Recovering log #131
+2024/08/10-00:31:40.668948 7f9287e006c0 Delete type=3 #129
+2024/08/10-00:31:40.669000 7f9287e006c0 Delete type=0 #131
+2024/08/10-08:46:35.462850 7f9285a006c0 Level-0 table #136: started
+2024/08/10-08:46:35.462903 7f9285a006c0 Level-0 table #136: 0 bytes OK
+2024/08/10-08:46:35.469319 7f9285a006c0 Delete type=0 #134
+2024/08/10-08:46:35.492643 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-08:46:35.510777 7f9285a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)

packs/skills-merp/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000010

packs/skills-merp/LOG

@@ -0,0 +1,8 @@
+2024/08/10-00:18:04.261355 7f92874006c0 Recovering log #8
+2024/08/10-00:18:04.271365 7f92874006c0 Delete type=3 #6
+2024/08/10-00:18:04.271415 7f92874006c0 Delete type=0 #8
+2024/08/10-00:18:22.906854 7f9285a006c0 Level-0 table #13: started
+2024/08/10-00:18:22.906926 7f9285a006c0 Level-0 table #13: 0 bytes OK
+2024/08/10-00:18:22.913782 7f9285a006c0 Delete type=0 #11
+2024/08/10-00:18:22.934544 7f9285a006c0 Manual compaction at level-0 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)
+2024/08/10-00:18:22.934626 7f9285a006c0 Manual compaction at level-1 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)

packs/skills-merp/LOG.old

@@ -0,0 +1,8 @@
+2024/08/10-00:16:16.693967 7f92874006c0 Recovering log #4
+2024/08/10-00:16:16.704014 7f92874006c0 Delete type=3 #2
+2024/08/10-00:16:16.704134 7f92874006c0 Delete type=0 #4
+2024/08/10-00:17:37.874387 7f9285a006c0 Level-0 table #9: started
+2024/08/10-00:17:37.874475 7f9285a006c0 Level-0 table #9: 0 bytes OK
+2024/08/10-00:17:37.881498 7f9285a006c0 Delete type=0 #7
+2024/08/10-00:17:37.894547 7f9285a006c0 Manual compaction at level-0 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)
+2024/08/10-00:17:37.894586 7f9285a006c0 Manual compaction at level-1 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)

packs/skills-rmfrp/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000010

packs/skills-rmfrp/LOG

@@ -0,0 +1,8 @@
+2024/08/10-00:18:04.273721 7f928cc006c0 Recovering log #8
+2024/08/10-00:18:04.284604 7f928cc006c0 Delete type=3 #6
+2024/08/10-00:18:04.284657 7f928cc006c0 Delete type=0 #8
+2024/08/10-00:18:22.934766 7f9285a006c0 Level-0 table #13: started
+2024/08/10-00:18:22.934803 7f9285a006c0 Level-0 table #13: 0 bytes OK
+2024/08/10-00:18:22.944819 7f9285a006c0 Delete type=0 #11
+2024/08/10-00:18:22.973938 7f9285a006c0 Manual compaction at level-0 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end)
+2024/08/10-00:18:22.973982 7f9285a006c0 Manual compaction at level-1 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end)

packs/skills-rmfrp/LOG.old

@@ -0,0 +1,8 @@
+2024/08/10-00:16:16.707097 7f9287e006c0 Recovering log #4
+2024/08/10-00:16:16.718136 7f9287e006c0 Delete type=3 #2
+2024/08/10-00:16:16.718187 7f9287e006c0 Delete type=0 #4
+2024/08/10-00:17:37.881615 7f9285a006c0 Level-0 table #9: started
+2024/08/10-00:17:37.881641 7f9285a006c0 Level-0 table #9: 0 bytes OK
+2024/08/10-00:17:37.888187 7f9285a006c0 Delete type=0 #7
+2024/08/10-00:17:37.894563 7f9285a006c0 Manual compaction at level-0 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end)
+2024/08/10-00:17:37.894604 7f9285a006c0 Manual compaction at level-1 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000043

packs/skills/LOG

@@ -0,0 +1,15 @@
+2024/08/10-08:47:18.971370 7f928cc006c0 Recovering log #41
+2024/08/10-08:47:19.065211 7f928cc006c0 Delete type=3 #39
+2024/08/10-08:47:19.065338 7f928cc006c0 Delete type=0 #41
+2024/08/10-09:47:33.068934 7f9285a006c0 Level-0 table #46: started
+2024/08/10-09:47:33.075322 7f9285a006c0 Level-0 table #46: 140828 bytes OK
+2024/08/10-09:47:33.081650 7f9285a006c0 Delete type=0 #44
+2024/08/10-09:47:33.090270 7f9285a006c0 Manual compaction at level-0 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)
+2024/08/10-09:47:33.097522 7f9285a006c0 Manual compaction at level-1 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at '!items!zYdJP3YQjsK9c3kh' @ 574 : 1
+2024/08/10-09:47:33.097537 7f9285a006c0 Compacting 1@1 + 1@2 files
+2024/08/10-09:47:33.105028 7f9285a006c0 Generated table #47@1: 260 keys, 146683 bytes
+2024/08/10-09:47:33.105065 7f9285a006c0 Compacted 1@1 + 1@2 files => 146683 bytes
+2024/08/10-09:47:33.111688 7f9285a006c0 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/08/10-09:47:33.111910 7f9285a006c0 Delete type=2 #10
+2024/08/10-09:47:33.112302 7f9285a006c0 Delete type=2 #46
+2024/08/10-09:47:33.126561 7f9285a006c0 Manual compaction at level-1 from '!items!zYdJP3YQjsK9c3kh' @ 574 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)

packs/skills/LOG.old

@@ -0,0 +1,8 @@
+2024/08/10-00:31:40.672178 7f9286a006c0 Recovering log #37
+2024/08/10-00:31:40.729626 7f9286a006c0 Delete type=3 #35
+2024/08/10-00:31:40.729689 7f9286a006c0 Delete type=0 #37
+2024/08/10-08:46:35.486154 7f9285a006c0 Level-0 table #42: started
+2024/08/10-08:46:35.486208 7f9285a006c0 Level-0 table #42: 0 bytes OK
+2024/08/10-08:46:35.492434 7f9285a006c0 Delete type=0 #40
+2024/08/10-08:46:35.510744 7f9285a006c0 Manual compaction at level-0 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)
+2024/08/10-08:46:35.510832 7f9285a006c0 Manual compaction at level-1 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)

rmss.css

@@ -232,6 +232,10 @@
   border-bottom: 1px solid;
   background-image: linear-gradient(rgba(0, 0, 0, 0.1) 0 0);
 }
+.skills-name-left-align {
+  text-align: left;
+  padding-left: 2px;
+}
 .money-column {
   flex-direction: column;
 }

system.json

@@ -3,7 +3,7 @@
   "title": "Rolemaster FRP System",
   "description": "The Rolemaster FRP system for FoundryVTT.",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-rolemaster-frp/raw/branch/develop/system.json",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-rolemaster-frp/archive/v12.0.10.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-rolemaster-frp/archive/v12.0.16.zip",
   "authors": [
     {
       "name": "Cynicide",
@@ -14,7 +14,7 @@
       "email": ""
     }
   ],
-  "version": "12.0.10",
+  "version": "12.0.16",
   "compatibility": {
     "minimum": "12",
     "verified": "12"
@@ -27,7 +27,14 @@
     "name": "skill_categories",
     "label": "Skill Categories",
     "system": "fvtt-rolemaster-frp",
-    "path": "./packs/skill_categories.db",
+    "path": "./packs/skill_categories",
+    "type": "Item"
+  },
+  {
+    "name": "skill",
+    "label": "Skills",
+    "system": "fvtt-rolemaster-frp",
+    "path": "./packs/skills",
     "type": "Item"
   }
   ],

templates/sheets/actors/parts/actor-skill-categories.html

@@ -19,7 +19,7 @@
   {{#each skillcat as |skill_category id|}}
   <div class="skillcat-grid-container">
 
-      <div>{{skill_category.name}}</div>
+      <div><a class="item-roll" title="Roll Check" data-item-id="{{skill_category._id}}">{{skill_category.name}}</a> <i class="fas fa-dice"></i></div>
       <div>{{skill_category.system.applicable_stats}}</div>
       <div>{{skill_category.system.development_cost}}</div>
       <div>{{skill_category.system.ranks}}</div>
@@ -39,8 +39,7 @@
       <div>{{skill_category.system.total_bonus}}</div>
       <div class="skillcat-icons">
         <a class="item-edit" title="Edit Category" data-item-id="{{skill_category._id}}"><i class="fas fa-edit"></i></a>
-        <a class="item-delete item" title="Delete Category" data-item-id="{{skill_category._id}}"><i class="fas fa-trash"></i></a>
-        <a class="item-roll" title="Roll Check" data-item-id="{{skill_category._id}}"><i class="fas fa-dice"></i></a>
+        <a class="item-delete item" title="Delete Category" data-item-id="{{skill_category._id}}"><i class="fas fa-trash"></i></a>        
       </div>    
     </div>
     

templates/sheets/actors/parts/actor-skills.html

@@ -22,7 +22,7 @@
         <div><a class="skill-favorite" data-item-id="{{skill._id}}"><i class="fa-regular fa-square"></i></a></div>
       {{/if}}
       <!--<div><input type="checkbox" name="system.favorite" {{checked skill.system.favorite}}/></div>-->
-      <div>{{skill.name}}</div>
+      <div class="skills-name-left-align"><a class="item-roll" title="Roll Check" data-item-id="{{skill._id}}">{{skill.name}}<i class="fas fa-dice"></i></a></div>
       <div>{{skill.system.ranks}}</div>
       <div>
         {{#switch skill.system.new_ranks.value}} 
@@ -41,7 +41,6 @@
       <div >
         <a class="item-edit" title="Edit Skill" data-item-id="{{skill._id}}"><i class="fas fa-edit"></i></a>
         <a class="item-delete" title="Delete Skill" data-item-id="{{skill._id}}"><i class="fas fa-trash"></i></a>
-        <a class="item-roll" title="Roll Check" data-item-id="{{skill._id}}"><i class="fas fa-dice"></i></a>
       </div>
   </div>
   

templates/sheets/apps/app_skill_category_importer.html

@@ -1,17 +1,28 @@
 <form>
 <div>
-    <h3>Import Skill Categories</h3>
+
+    <h3>Import Skill Categories/Skills</h3>
     <div>
-        WARNING: This will erase your existing Skill Categories and import all Skill Categories from the selected Compendium. 
+      <span>
+        WARNING: This will erase your existing Skill Categories or Skills and import all Skill Categories/Skills from the selected Compendium. 
+        Note that the import will select only skills and categories matching the "Common" items and the selected game system.
+      </span>
     </div>
-    <div>
-        Select Compendium:
-        <select name="selectOptions" class="compendium-selector" value="None" itemid="blah">
+    <div class="flexrow">
+        <span >Select Skill Categories Compendium:</span>
+        <select name="selectOptionsCategories" class="compendium-selector" value="None" itemid="blah">
             {{selectOptions selectOptions}}
-        </select></div>
-    <div>
-        <button class="import-skillcats" title="Import">Import</button>
+        </select>
+        <button class="import-skillcats" value="skill_category"  name="skill_category" title="Import">Import Skill Categories</button>
     </div>
 
+    <div class="flexrow">
+      <span>Select Skills Compendium:</span>
+      <select name="selectOptionsSkills" class="compendium-selector" value="None" itemid="blah">
+          {{selectOptions selectOptions}}
+      </select>
+      <button class="import-skills" value="skill" name="skill" title="Import">Import Skills</button>
+  </div>
+
 </div>
 </form>