Skills below Skills categories + skills rollable

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

@@ -15,7 +15,10 @@
         <button type="button" class="import-skillcats" title="Import" acotr_id="">{{ localize "rmss.pc_sheet.import_skillcat" }}</button>
       </div>
     </div>
+</div>
   {{#each skillcat as |skill_category id|}}
+  <div class="skillcat-grid-container">
+
       <div>{{skill_category.name}}</div>
       <div>{{skill_category.system.applicable_stats}}</div>
       <div>{{skill_category.system.development_cost}}</div>
@@ -39,5 +42,12 @@
         <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>
+    
+    {{#if (count skill_category.skills)}}
+      <div class="skill-box">
+        {{> "systems/fvtt-rolemaster-frp/templates/sheets/actors/parts/actor-skills.html" }}
+      </div>
+    {{/if}}
+
   {{/each}}
-</div>

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

@@ -10,10 +10,13 @@
     <div class="skills-grid-heading">{{ localize "rmss.pc_sheet_skills.special_bonus" }}</div>
     <div class="skills-grid-heading">{{ localize "rmss.pc_sheet_skills.total_bonus" }}</div>
     <div class="skills-grid-heading">
-      <!--<a class="item-create" title="Create Skill" data-type="skill"><i class="fas fa-plus"></i>{{ localize "rmss.pc_sheet_skills.add_skill" }}</a>-->
+      <a class="item-create" title="Create Skill" data-type="skill"><i class="fas fa-plus"></i>{{ localize "rmss.pc_sheet_skills.add_skill" }}</a>
     </div>
-  {{#each playerskill as |skill id|}}
-      {{#if skill.system.favorite}}
+</div>
+
+{{#each skills as |skill id|}}
+  <div class="skills-grid-container">
+    {{#if skill.system.favorite}}
         <div><a class="skill-favorite" data-item-id="{{skill._id}}"><i class="fa-regular fa-square-check"></i></a></div>
       {{else}}
         <div><a class="skill-favorite" data-item-id="{{skill._id}}"><i class="fa-regular fa-square"></i></a></div>
@@ -35,9 +38,11 @@
       <div>{{skill.system.special_bonus_1}}</div>
       <div>{{skill.system.special_bonus_2}}</div>
       <div>{{skill.system.total_bonus}}</div>
-      <div>
+      <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>
+  
   {{/each}}
-</div>

templates/sheets/actors/rmss-character-sheet.html

@@ -71,7 +71,6 @@
     {{!-- Default tab is specified in actor-sheet.mjs --}}
     <a class="item" data-tab="Record">{{ localize "rmss.pc_sheet_tabs.record" }}</a>
     <a class="item" data-tab="SkillCategory">{{ localize "rmss.pc_sheet_tabs.skill_categories" }}</a>
-    <a class="item" data-tab="Skills">{{ localize "rmss.pc_sheet_tabs.skills" }}</a>
     <a class="item" data-tab="Equipment">{{ localize "rmss.pc_sheet_tabs.equipment" }}</a>
     <a class="item" data-tab="Spells">{{ localize "rmss.pc_sheet_tabs.spells" }}</a>    
     <a class="item" data-tab="Background">{{ localize "rmss.pc_sheet_tabs.background" }}</a>
@@ -114,10 +113,6 @@
       {{> "systems/fvtt-rolemaster-frp/templates/sheets/actors/parts/actor-skill-categories.html" }}
     </div>
     
-    <div class="tab skills" data-group="primary" data-tab="Skills">
-      {{> "systems/fvtt-rolemaster-frp/templates/sheets/actors/parts/actor-skills.html" }}
-    </div>
-
     <div class="tab equipment" data-group="primary" data-tab="Equipment">
       <div class="container">
         <div class="equipment-container">

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

@@ -4,6 +4,11 @@
         <h1><input name="name" type="text" value="{{item.name}}" placeholder="{{ localize 'Name' }}"/></h1>
     </header>
     <div class="sheet-content">
+      <div>Rank Bonus Progression
+        <select 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 class="applicable-stats-grid-container">
             <div>
                 Applicable Stat 1

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

@@ -4,6 +4,11 @@
         <h1><input name="name" type="text" value="{{item.name}}" placeholder="{{ localize 'Name' }}"/></h1>
     </header>
     <div class="sheet-content">
+        <div>Rank Bonus Progression
+          <select 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>
             Skill Category
             <select name="system.category" class="app-stat-selector" value="{{system.category}}" itemid="{{ item._id }}">