Gestion de l'import skill/categories

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

@@ -46,3 +46,8 @@
     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

@@ -14,6 +14,8 @@ export class RFRPUtility {
 
     const skillCategories = await RFRPUtility.loadCompendium("fvtt-rolemaster-frp.skill_categories")
     this.skillCategories = skillCategories.map(i => i.toObject()).filter( i => i.system.game_system == "common" || i.system.game_system == this.gameSystem);
+    // Sort skill categories by name
+    this.skillCategories.sort((a, b) => a.name.localeCompare(b.name));
   }
 
   /* -------------------------------------------- */

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

@@ -27,23 +27,27 @@ 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.");
 
     for (const sc of skillCategoryData) {
       const newitem = await pack.getDocument(sc._id);
 
       let newDocuments = [];
-      if (newitem.type === "skill_category") {
+      if (newitem.type === itemType) {
         console.log(newitem);
         newDocuments.push(newitem);
       }

packs/skill_categories/CURRENT

@@ -1 +1 @@
-MANIFEST-000068
+MANIFEST-000113

packs/skill_categories/LOG

@@ -1,8 +1,8 @@
-2024/08/07-17:16:18.797577 7f33982006c0 Recovering log #66
-2024/08/07-17:16:18.808374 7f33982006c0 Delete type=3 #64
-2024/08/07-17:16:18.808471 7f33982006c0 Delete type=0 #66
-2024/08/07-17:26:53.698667 7f33978006c0 Level-0 table #71: started
-2024/08/07-17:26:53.698733 7f33978006c0 Level-0 table #71: 0 bytes OK
-2024/08/07-17:26:53.705983 7f33978006c0 Delete type=0 #69
-2024/08/07-17:26:53.706219 7f33978006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
-2024/08/07-17:26:53.706260 7f33978006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-00:13:42.653716 7f9286a006c0 Recovering log #111
+2024/08/10-00:13:42.702147 7f9286a006c0 Delete type=3 #109
+2024/08/10-00:13:42.702252 7f9286a006c0 Delete type=0 #111
+2024/08/10-00:15:09.358300 7f9285a006c0 Level-0 table #116: started
+2024/08/10-00:15:09.358337 7f9285a006c0 Level-0 table #116: 0 bytes OK
+2024/08/10-00:15:09.364353 7f9285a006c0 Delete type=0 #114
+2024/08/10-00:15:09.392733 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-00:15:09.392780 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-16:51:16.599301 7f33996006c0 Recovering log #62
-2024/08/07-16:51:16.610580 7f33996006c0 Delete type=3 #60
-2024/08/07-16:51:16.610673 7f33996006c0 Delete type=0 #62
-2024/08/07-17:16:03.322418 7f33978006c0 Level-0 table #67: started
-2024/08/07-17:16:03.322491 7f33978006c0 Level-0 table #67: 0 bytes OK
-2024/08/07-17:16:03.329046 7f33978006c0 Delete type=0 #65
-2024/08/07-17:16:03.356030 7f33978006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
-2024/08/07-17:16:03.395552 7f33978006c0 Manual compaction at level-1 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-00:12:37.568139 7f9287e006c0 Recovering log #107
+2024/08/10-00:12:37.578251 7f9287e006c0 Delete type=3 #105
+2024/08/10-00:12:37.578313 7f9287e006c0 Delete type=0 #107
+2024/08/10-00:13:00.464797 7f9285a006c0 Level-0 table #112: started
+2024/08/10-00:13:00.464827 7f9285a006c0 Level-0 table #112: 0 bytes OK
+2024/08/10-00:13:00.471404 7f9285a006c0 Delete type=0 #110
+2024/08/10-00:13:00.478060 7f9285a006c0 Manual compaction at level-0 from '!items!1HevhbCbvMonyQXe' @ 72057594037927935 : 1 .. '!items!yRIFroc5VC9Oj3qY' @ 0 : 0; will stop at (end)
+2024/08/10-00:13:00.478094 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-000002

packs/skills-merp/LOG

@@ -0,0 +1,5 @@
+2024/08/10-00:13:42.782130 7f9287e006c0 Delete type=3 #1
+2024/08/10-00:15:09.364559 7f9285a006c0 Level-0 table #5: started
+2024/08/10-00:15:09.368108 7f9285a006c0 Level-0 table #5: 33871 bytes OK
+2024/08/10-00:15:09.374591 7f9285a006c0 Delete type=0 #3
+2024/08/10-00:15:09.392750 7f9285a006c0 Manual compaction at level-0 from '!items!5Sg9t8YQubtRoghF' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)

packs/skills-rmfrp/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000002

packs/skills-rmfrp/LOG

@@ -0,0 +1,5 @@
+2024/08/10-00:13:42.844297 7f9286a006c0 Delete type=3 #1
+2024/08/10-00:15:09.374814 7f9285a006c0 Level-0 table #5: started
+2024/08/10-00:15:09.380438 7f9285a006c0 Level-0 table #5: 109466 bytes OK
+2024/08/10-00:15:09.386532 7f9285a006c0 Delete type=0 #3
+2024/08/10-00:15:09.392760 7f9285a006c0 Manual compaction at level-0 from '!items!03BgTdeYE7TYk9LN' @ 72057594037927935 : 1 .. '!items!zYdJP3YQjsK9c3kh' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000027

packs/skills/LOG

@@ -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)

packs/skills/LOG.old

@@ -0,0 +1,8 @@
+2024/08/10-00:09:58.191133 7f9287e006c0 Recovering log #21
+2024/08/10-00:09:58.202000 7f9287e006c0 Delete type=3 #19
+2024/08/10-00:09:58.202091 7f9287e006c0 Delete type=0 #21
+2024/08/10-00:12:27.849269 7f9285a006c0 Level-0 table #26: started
+2024/08/10-00:12:27.849334 7f9285a006c0 Level-0 table #26: 0 bytes OK
+2024/08/10-00:12:27.856159 7f9285a006c0 Delete type=0 #24
+2024/08/10-00:12:27.862891 7f9285a006c0 Manual compaction at level-0 from '!folders!Lr9SCthdWWHecwEI' @ 72057594037927935 : 1 .. '!items!zvdsAxlRZnL6gqms' @ 0 : 0; will stop at (end)
+2024/08/10-00:12:27.862915 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.8.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-rolemaster-frp/archive/v12.0.13.zip",
   "authors": [
     {
       "name": "Cynicide",
@@ -14,7 +14,7 @@
       "email": ""
     }
   ],
-  "version": "12.0.8",
+  "version": "12.0.13",
   "compatibility": {
     "minimum": "12",
     "verified": "12"
@@ -27,7 +27,21 @@
     "name": "skill_categories",
     "label": "Skill Categories",
     "system": "fvtt-rolemaster-frp",
-    "path": "./packs/skill_categories.db",
+    "path": "./packs/skill_categories",
+    "type": "Item"
+  },
+  {
+    "name": "skill-merp",
+    "label": "Skills (MERP)",
+    "system": "fvtt-rolemaster-frp",
+    "path": "./packs/skills-merp",
+    "type": "Item"
+  },
+  {
+    "name": "skill-rmfrp",
+    "label": "Skills (RMFRP)",
+    "system": "fvtt-rolemaster-frp",
+    "path": "./packs/skills-rmfrp",
     "type": "Item"
   }
   ],

template.json

@@ -313,6 +313,7 @@
     "skill": {
       "templates": ["base"],
       "category" : "",
+      "game_system": "common",
       "ranks": 0,
       "new_ranks": {
         "value": 0,

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>
@@ -40,7 +40,6 @@
       <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>
       </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,25 @@
 <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. 
     </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>

templates/sheets/skills/rmss-skill-sheet.html

@@ -4,12 +4,19 @@
         <h1><input name="name" type="text" value="{{item.name}}" placeholder="{{ localize 'Name' }}"/></h1>
     </header>
     <div class="sheet-content">
+      <div class="flexrow">
         <div>Rank Bonus Progression
-          <select name="system.bonus_progression" value="{{system.bonus_progression}}" itemid="{{ item._id }}">
+          <select class="select-fixed-width" name="system.bonus_progression" value="{{system.bonus_progression}}" itemid="{{ item._id }}">
               {{selectOptions config.rankBonusProgressionList selected=system.bonus_progression valueAttr="key" labelAttr="label"}}
           </select>
         </div>
-        <div>
+        <div>Game system
+          <select class="select-fixed-width" name="system.game_system" value="{{system.game_system}}" itemid="{{ item._id }}">
+              {{selectOptions config.gameSystems selected=system.game_system valueAttr="key" labelAttr="label"}}
+          </select>
+        </div>
+      </div>
+      <div>
             Skill Category
             <select name="system.category" class="app-stat-selector" value="{{system.category}}">
                 {{selectOptions owned_skillcats selected=selected_skillcat nameAttr="name" valueAttr="name" labelAttr="name"}}