Gestion de l'import skill/categories

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/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

@@ -251,7 +251,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) {
@@ -27,24 +29,28 @@ export default class RMSSToolsSCImporter extends FormApplication {
   }
 
   async _updateObject(event, formData) {
-    console.log("Deleting Old Skill Categories.");
+    //console.log("Update ", event, formData);
+    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);
       }
     }
+    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 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);
+      if (newitem.type === itemType && (newitem.system.game_system === "common" || newitem.system.game_system === gameSystem)) {
+        //console.log(newitem);
         newDocuments.push(newitem);
       }
       if (newDocuments.length > 0) {

packs/skill_categories/CURRENT

@@ -1 +1 @@
-MANIFEST-000076
+MANIFEST-000125

packs/skill_categories/LOG

@@ -1,15 +1,8 @@
-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-00:20:42.417666 7f9287e006c0 Recovering log #123
+2024/08/10-00:20:42.428409 7f9287e006c0 Delete type=3 #121
+2024/08/10-00:20:42.428461 7f9287e006c0 Delete type=0 #123
+2024/08/10-00:24:00.419073 7f9285a006c0 Level-0 table #128: started
+2024/08/10-00:24:00.419133 7f9285a006c0 Level-0 table #128: 0 bytes OK
+2024/08/10-00:24:00.425273 7f9285a006c0 Delete type=0 #126
+2024/08/10-00:24:00.455588 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-00:24:00.455633 7f9285a006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 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:18:04.248055 7f9286a006c0 Recovering log #119
+2024/08/10-00:18:04.258807 7f9286a006c0 Delete type=3 #117
+2024/08/10-00:18:04.258908 7f9286a006c0 Delete type=0 #119
+2024/08/10-00:18:22.913947 7f9285a006c0 Level-0 table #124: started
+2024/08/10-00:18:22.913981 7f9285a006c0 Level-0 table #124: 0 bytes OK
+2024/08/10-00:18:22.920952 7f9285a006c0 Delete type=0 #122
+2024/08/10-00:18:22.934571 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-00:18:22.934639 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-000031

packs/skills/LOG

@@ -0,0 +1,8 @@
+2024/08/10-00:20:42.430762 7f9286a006c0 Recovering log #29
+2024/08/10-00:20:42.440202 7f9286a006c0 Delete type=3 #27
+2024/08/10-00:20:42.440254 7f9286a006c0 Delete type=0 #29
+2024/08/10-00:24:00.432479 7f9285a006c0 Level-0 table #34: started
+2024/08/10-00:24:00.432516 7f9285a006c0 Level-0 table #34: 0 bytes OK
+2024/08/10-00:24:00.438691 7f9285a006c0 Delete type=0 #32
+2024/08/10-00:24:00.455614 7f9285a006c0 Manual compaction at level-0 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)
+2024/08/10-00:24:00.455646 7f9285a006c0 Manual compaction at level-1 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)

packs/skills/LOG.old

@@ -0,0 +1,8 @@
+2024/08/10-00:12:37.581095 7f928cc006c0 Recovering log #25
+2024/08/10-00:12:37.591191 7f928cc006c0 Delete type=3 #23
+2024/08/10-00:12:37.591242 7f928cc006c0 Delete type=0 #25
+2024/08/10-00:13:00.458023 7f9285a006c0 Level-0 table #30: started
+2024/08/10-00:13:00.458082 7f9285a006c0 Level-0 table #30: 0 bytes OK
+2024/08/10-00:13:00.464677 7f9285a006c0 Delete type=0 #28
+2024/08/10-00:13:00.478046 7f9285a006c0 Manual compaction at level-0 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)
+2024/08/10-00:13:00.478087 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.14.zip",
   "authors": [
     {
       "name": "Cynicide",
@@ -14,7 +14,7 @@
       "email": ""
     }
   ],
-  "version": "12.0.10",
+  "version": "12.0.14",
   "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_category._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,26 @@
 <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. 
+        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.
     </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>