Add module data path

modules/avd12-actor-sheet.js

@@ -134,7 +134,10 @@ export class Avd12ActorSheet extends ActorSheet {
       const li = $(event.currentTarget).parents(".item");
       this.actor.rollCrafting( li.data("item-id") )
     });    
-
+    html.find('.roll-universal').click((event) => {
+      let skillKey = $(event.currentTarget).data("skill-key")
+      this.actor.rollUniversal(skillKey)
+    });    
     
     html.find('.roll-weapon').click((event) => {
       const li = $(event.currentTarget).parents(".item");

modules/avd12-actor.js

@@ -494,12 +494,21 @@ export class Avd12Actor extends Actor {
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
+
+  /* -------------------------------------------- */
+  clearInitiative(){
+    this.getFlag("world", "initiative", -1)
+  }
   /* -------------------------------------------- */
   getInitiativeScore(combatId, combatantId) {
     if (this.type == 'character') {
-      this.rollMR(true, combatId, combatantId)
+      let init = this.getFlag("world", "initiative" )
+      console.log("INIT", init)
+      if (!init || init == -1) {
+        ChatMessage.create( { content: "Roll your initiative for this combat"} )
+      }
+      return init
     }
-    console.log("Init required !!!!")
     return -1;
   }
 
@@ -667,6 +676,23 @@ export class Avd12Actor extends Actor {
       skill.attr = duplicate(attr)
       let rollData = this.getCommonRollData()
       rollData.mode = "skill"
+      rollMode.skillKey = skillKey
+      rollData.skill = skill
+      rollData.title = "Roll Skill " + skill.name 
+      rollData.img = skill.img
+      this.startRoll(rollData)
+    }
+  }
+
+  /* -------------------------------------------- */
+  rollUniversal(skillKey) {
+    let skill = this.system.universal.skills[skillKey]
+    if (skill) {
+      skill = duplicate(skill)
+      skill.name = Avd12Utility.upperFirst(skillKey)
+      let rollData = this.getCommonRollData()
+      rollData.mode = "universal"
+      rollData.skillKey = skillKey
       rollData.skill = skill
       rollData.title = "Roll Skill " + skill.name 
       rollData.img = skill.img

modules/avd12-combat.js

@@ -27,4 +27,14 @@ export class Avd12Combat extends Combat {
     }
   }
 
+  /* -------------------------------------------- */
+  _onDelete() {
+    let combatants = this.combatants.contents
+    for (let c of combatants) {
+      let actor = game.actors.get(c.actorId)
+      actor.clearInitiative()
+    }
+    super._onDelete()
+  }
+
 }

modules/avd12-item-sheet.js

@@ -52,8 +52,12 @@ export class Avd12ItemSheet extends ItemSheet {
     // Specific case for formating descriptions of sub-items
     if (this.object.type == "module") {
       for (let level of this.object.system.levels) {
-        for (let id in level.features) {
-          level.features[id].descriptionHTML = await TextEditor.enrichHTML(level.features[id].system.description, { async: true })
+        if ( level && level.features) {
+          for (let id in level.features) {
+            if ( level.features[id] ) {
+              level.features[id].descriptionHTML = await TextEditor.enrichHTML(level.features[id].system.description, { async: true })
+            }
+          }
         }
       }
     }
@@ -249,6 +253,12 @@ export class Avd12ItemSheet extends ItemSheet {
       levels[levelIndex].choices[choiceIndex].features[featureId] = undefined
       this.object.update({ 'system.levels': levels })
     })
+    html.find('.module-level-delete').click(ev => {
+      let levels = duplicate(this.object.system.levels)
+      let levelIndex = Number($(ev.currentTarget).data("level-index"))
+      levels.splice(levelIndex,levelIndex)
+      this.object.update({ 'system.levels': levels })
+    })
       
     html.find('.choice-level-selected').change(ev =>  {
       this.processChoiceLevelSelection(ev)

modules/avd12-utility.js

@@ -568,6 +568,10 @@ export class Avd12Utility {
       content: await renderTemplate(`systems/fvtt-avd12/templates/chat/chat-generic-result.hbs`, rollData)
     })
     msg.setFlag("world", "rolldata", rollData)
+    if (rollData.skillKey == "initiative") {
+      console.log("REGISTERED")
+      actor.setFlag("world", "initiative", myRoll.total) 
+    }
 
     console.log("Rolldata result", rollData)
   }

styles/simple.css

@@ -1320,10 +1320,37 @@ ul, li {
   min-width:2rem;
   max-width: 2rem;
 }
-
+.attribute-label {
+  font-weight: bold;
+}
+.flexrow-no-expand {
+  flex-grow: 0;  
+}
+.item-input-small {
+  max-width: 16px;
+  max-height: 12px;
+}
 .drop-module-step {
   background: linear-gradient(to bottom, #6c95b9fc 5%, #105177ab 100%);
   background-color: #7d5d3b00;
   border-radius: 3px;
   border: 2px ridge #846109;
 }
+.module-level-box {
+  background: linear-gradient(to bottom, #6c95b9fc 5%, #105177ab 100%);
+  border-radius: 5px;
+  padding: 4px;
+  margin-bottom: 8px;
+  margin-left: 12px;
+  border: 2px ridge #846109;
+  max-width: 45%;
+  min-height: 64px;
+  align-content: center;
+}
+.color-selected {
+  background: linear-gradient(to bottom, #9ae470fc 5%, #247e30ab 100%);
+}
+.flex-center {
+  align-items: center;
+  align-content: space-between;
+}

system.json

@@ -64,7 +64,7 @@
   ],
   "title": "AnyVenture D12 RPG",
   "url": "https://www.uberwald.me/gitea/public/fvtt-avd12",
-  "version": "10.0.23",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-avd12/archive/fvtt-avd12-v10.0.23.zip",
+  "version": "10.0.25",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-avd12/archive/fvtt-avd12-v10.0.25.zip",
   "background": "systems/fvtt-avd12/images/ui/avd12_welcome_page.webp"
 }

template.json

@@ -164,11 +164,13 @@
         "universal": {
           "skills": {
             "search": {
+              "label": "Search",
               "modifier": 0,
               "finalvalue": 0,
               "good": false
             },
             "initiative": {
+              "label": "Initiative",
               "modifier": 0,
               "finalvalue": 0,
               "good": false

templates/actors/actor-sheet.hbs

@@ -11,26 +11,45 @@
           <div class="flexrow">
             {{#each system.attributes as |attr attrKey|}}
               <div class="flexcol">
-                <div class="flerow">
-                  <span>{{attr.label}}</span>
+                <div class="flexrow flexrow-no-expand">
+                  <span class="attribute-label">{{attr.label}}</span>
                   <input type="text" class="item-field-label-short" name="system.attributes.{{attrKey}}.value" value="{{attr.value}}" data-dtype="Number"/>
                 </div>
-                  {{#each attr.skills as |skill skillKey|}}
-                  <div class="flexrow">
-                      <span class="item-field-skill skill-label"><a class="roll-skill" data-attr-key="{{attrKey}}" data-skill-key="{{skillKey}}"><i class="fa-solid fa-dice-d12"></i> {{upperFirst skillKey}} {{skill.finalvalue}}</a></span>
-                      <input type="checkbox" class="skill-good-checkbox" name="system.attributes.{{attrKey}}.skills.{{skillKey}}.good" {{checked skill.good}} />
+                {{#each attr.skills as |skill skillKey|}}
+                <div class="flexrow flexrow-no-expand">
+                  <span class="item-field-skill skill-label">
+                    <a class="roll-skill" data-attr-key="{{attrKey}}" data-skill-key="{{skillKey}}">
+                    <i class="fa-solid fa-dice-d12"></i> {{upperFirst skillKey}} {{skill.finalvalue}}</a>
+                  </span>
+                  <input type="checkbox" class="skill-good-checkbox" name="system.attributes.{{attrKey}}.skills.{{skillKey}}.good" {{checked skill.good}} />
+                </div>
+                {{/each}}
+                <div class="flexrow flexrow-no-expand">
+                  <span class="attribute-label">&nbsp;</span>
+                </div>
+                {{#if (eq attrKey "might")}}
+                  <div class="flexrow flexrow-no-expand">
+                    <span class="attribute-label">Universal</span>
+                  </div>
+                  {{#each @root.system.universal.skills as |skill skillKey|}}
+                  <div class="flexrow flexrow-no-expand">
+                    <span class="item-field-skill skill-label">
+                      <a class="roll-universal" data-skill-key="{{skillKey}}">
+                        <i class="fa-solid fa-dice-d12"></i> {{upperFirst skillKey}}
+                      </a>
+                    </span>
+                    <input type="text" class="item-input-small" name="system.universal.skills.{{skillKey}}.finalvalue" value="{{skill.finalvalue}}" data-dtype="Number"/>
                   </div>
                   {{/each}}
+                {{else}}
+                  <div class="flexrow">
+                  </div>
+                {{/if}}
               </div>              
             {{/each}}
+
           </div>
 
-            <div class="ability-item">
-            </div>
-
-            <div class="ability-item status-block">
-            </div>
-
           </div>
         </div>
       </div>

templates/dialogs/roll-dialog-generic.hbs

@@ -61,22 +61,26 @@
         </select>        
       </div>
 
-      {{#if (or spell weapon)}} 
+      {{#if (eq skillKey "initiative") }}
 
       {{else}}
-      <div class="flexrow">
-        <span class="roll-dialog-label">Target check : </span>
-        <select id="targetCheck" name="targetCheck">
-          {{#select targetCheck}} 
-            <option value="none">None</option>
-            <option value="5">5 (Trivial)</option>
-            <option value="7">7 (Easy)</option>
-            <option value="10">10 (Regular)</option>
-            <option value="14">14 (Difficult)</option>
-            <option value="20">20 (Heroic)</option>
-          {{/select}}
-        </select>        
-      </div>
+        {{#if (or spell weapon)}} 
+
+        {{else}}
+        <div class="flexrow">
+          <span class="roll-dialog-label">Target check : </span>
+          <select id="targetCheck" name="targetCheck">
+            {{#select targetCheck}} 
+              <option value="none">None</option>
+              <option value="5">5 (Trivial)</option>
+              <option value="7">7 (Easy)</option>
+              <option value="10">10 (Regular)</option>
+              <option value="14">14 (Difficult)</option>
+              <option value="20">20 (Heroic)</option>
+            {{/select}}
+          </select>        
+        </div>
+        {{/if}}
       {{/if}}
 
   </div>

templates/items/item-module-sheet.hbs

@@ -15,7 +15,23 @@
     {{> systems/fvtt-avd12/templates/items/partial-item-description.hbs}}
 
     <div class="tab details" data-group="primary" data-tab="details">
-      TODO : The tre of module choices will be displayed here for players, with the "selected" option only
+      
+      <div class="flexcol">
+        {{#each system.levels as |level index|}}
+          <div class="flexrow flex-center">
+            {{#each level.choices as |choice choiceIndex|}}
+              <span class="module-level-box {{#if choice.selected}}color-selected{{/if}}">
+                <ul>
+                  {{#each choice.features as |feature id|}}
+                    <li>{{feature.name}}</li>
+                  {{/each}}
+                </ul>                  
+              </span>
+          {{/each}}
+          </div>
+        {{/each}}
+      </div>
+
     </div>
 
     {{#if isGM}}
@@ -27,6 +43,9 @@
               <hr>
               <li class="flexrow">
                 <h2 class="item-field-label-long">Level {{add index 1}}</h2>                       
+                <span class="item-field-label-short">
+                  <a class="item-control module-level-delete" data-level-index="{{index}}" title="Delete Level"><i class="fas fa-trash"></i></a>
+                </span>
               </li>
 
               <ul class="ul-level1">

templates/items/item-trait-sheet.hbs

@@ -41,10 +41,13 @@
               </li>
             {{/if}}
 
+          <!--
           <li class="flexrow">
             <label class="item-field-label-long">Selected</label>
             <input type="checkbox" class="item-field-label-short" name="system.selected" {{checked system.selected}} />
           </li>
+          -->
+          
         </ul>
     </div>
   </div>