Synchronized tracks in Assets and assets summary in Moves

Ironsworn/Ironsworn.css

@@ -2494,6 +2494,7 @@
 }
 .charsheet .assets.assets-summary .repitem {
   width: 100%;
+  margin-bottom: -5px;
 }
 .charsheet fieldset.assets-summary~.repcontrol {
   display: none;

Ironsworn/src/app/components/assets/asset-builder.pug

@@ -64,7 +64,7 @@ mixin description(asset, type, key)
         - var translationDesc = `asset-description-${key}`
         .asset-description-text(data-i18n=translationDesc)!=locals.translations[translationDesc]
 
-mixin track(number, name)
+mixin track(number, name, isSummary)
   .asset-track-wrapper
     - 
       var currentTrack = 0
@@ -75,7 +75,7 @@ mixin track(number, name)
           .asset-track-box-display=0
         else
           .asset-track-box-display=`+ ${currentTrack}`
-        input(type='radio' name=`attr_assettrack_${transformedName}` value=`${currentTrack}`)
+        input(type='radio' name=`attr_assettrack_${transformedName + (isSummary ? '_summary' : '')}` value=`${currentTrack}`)
         - currentTrack++
 
 mixin combatTalentBuilder
@@ -142,7 +142,7 @@ mixin ritualBuilder
           each ability in [ 1, 2, 3 ]
             +ability(asset, ability, key)
         if asset.track
-          +track(asset.track, key)
+          +track(asset.track, key, false)
 
 mixin pathBuilder
   - var assetType = 'path'
@@ -158,4 +158,4 @@ mixin pathBuilder
           each ability in [ 1, 2, 3 ]
             +ability(asset, ability, key)
         if asset.track
-          +track(asset.track, key)
+          +track(asset.track, key, false)

Ironsworn/src/app/components/assets/asset-custom.pug

@@ -5,13 +5,13 @@ mixin builderTitles(parent, child)
     value=''
   )
 
-mixin assetTrackBox(parent, value)
+mixin assetTrackBox(parent, value, isSummary)
   .asset-track-box
     if value == 0
       .asset-track-box-display 0
     else
       .asset-track-box-display='+ ' + value
-    input(type='radio' name=`attr_custom-asset-track-${parent}` value=`${value}`)
+    input(type='radio' name=`attr_custom-asset-track-${parent + (isSummary ? '_summary' : '')}` value=`${value}`)
 
 mixin abilityView(value)
   input(
@@ -138,7 +138,7 @@ mixin customAssets
                 .asset-track-wrapper.custom-track
                   - var currentBox = 0
                   while currentBox <= dropdownNumber
-                    +assetTrackBox(dropdownNumber, currentBox++)
+                    +assetTrackBox(dropdownNumber, currentBox++, false)
 
 mixin customSummaryBuilder
   input.asset-summary-custom.hide-element(type='checkbox' name='attr_assetcustom')
@@ -168,7 +168,7 @@ mixin customSummaryBuilder
               .asset-track-wrapper.custom-track
                 - var currentBox = 0
                 while currentBox <= dropdownNumber
-                  +assetTrackBox(dropdownNumber, currentBox++)
+                  +assetTrackBox(dropdownNumber, currentBox++, true)
 
 mixin summaryAbilityView(value)
   //- text only

Ironsworn/src/app/components/assets/asset-summary-builder.pug

@@ -36,7 +36,7 @@ mixin companionSummaryBuilder()
                 .asset-track-box-display=value
               else
                 .asset-track-box-display=`+ ${value}`
-              input(type='radio' name=`attr_assettrack_${key}` value=`${value}`)
+              input(type='radio' name=`attr_assettrack_${key}_summary` value=`${value}`)
 
 mixin ritualSummaryBuilder()
   - var assetType = 'ritual'
@@ -50,7 +50,7 @@ mixin ritualSummaryBuilder()
           each ability in [ 1, 2, 3 ]
             +summaryAbility(asset, ability, key)
         if asset.track
-          +track(asset.track, key)
+          +track(asset.track, key, true)
 
 mixin pathSummaryBuilder()
   - var assetType = 'path'
@@ -64,7 +64,7 @@ mixin pathSummaryBuilder()
           each ability in [ 1, 2, 3 ]
             +summaryAbility(asset, ability, key)
         if asset.track
-          +track(asset.track, key)
+          +track(asset.track, key, true)
 
 mixin summaryAbility(asset, number, key)
   if asset.firstAbilityChecked && number == 1

Ironsworn/src/app/components/assets/assets.styl

@@ -211,6 +211,7 @@ div.assets
     padding: 0px 4px 0px 0px
   & .repitem
     width 100%
+    margin-bottom -5px // for some reason there is a 5px bottom margin when in roll20
 
 fieldset.assets-summary~.repcontrol
   display none

Ironsworn/src/app/workers/scripts/assets.js

@@ -68,3 +68,17 @@ on('change:repeating_assets:track-dropdown', function (values) {
   });
 });
 
+on('change:repeating_assets', function (eventInfo) {
+  // sync assets and summary tracks
+  const attrName = eventInfo.sourceAttribute
+  if (attrName.includes('_assettrack_') || attrName.includes('_custom-asset-track-')) {
+    const summarySuffix = '_summary';
+    const syncedAttribute = attrName.endsWith(summarySuffix)
+      ? attrName.substring(0, attrName.length - summarySuffix.length)
+      : attrName + summarySuffix;
+    setAttrs({
+      [syncedAttribute]: eventInfo.newValue
+    });
+  }
+});
+

Ironsworn/src/test/test.js

@@ -45,7 +45,7 @@ let currentRepeatingContext = undefined; // stores the repeating section info wh
 window.getAttrs = (attributeNames, fn) => {
   const values = {};
   for (attributeName of attributeNames) {
-    const attribute = createAttribute(attributeName);
+    const attribute = buildAttribute(attributeName);
     values[attributeName] = attributeStore.getValue(attribute.fullName);
   }
 
@@ -57,7 +57,7 @@ window.setAttrs = (attributeValues, isInit) => {
 
   for (const attributeName in attributeValues) {
     // build attribute
-    const attribute = createAttribute(attributeName);
+    const attribute = buildAttribute(attributeName);
     attribute.currentValue = attributeStore.getValue(attribute.fullName);
     attribute.newValue = attributeValues[attributeName];
 
@@ -98,6 +98,12 @@ window.setAttrs = (attributeValues, isInit) => {
 
         let input = inputParent.find(`input[name='${inputName}'], input[data-attrname='${shortName}'], select[name='${inputName}'], textarea[name='${inputName}'],
           input[name='${inputName.toLowerCase()}'], input[data-attrname='${shortName.toLowerCase()}'], select[name='${inputName.toLowerCase()}'], textarea[name='${inputName.toLowerCase()}']`);
+
+        if (currentRepeatingContext?.skippedInputUpdate === attribute.fullName) { // roll20 does not sync radio inputs in sections with same name
+          console.log(`Skipped radio input update for ${inputName}`);
+          return;
+        }
+
         if (!input.prop('disabled')) { // it seems roll20 explicitly does not update values of disabled inputs (perhaps linked to autocalc inputs needing to be disabled)
           input.val([attribute.newValue]);
         }
@@ -151,7 +157,7 @@ window.setAttrs = (attributeValues, isInit) => {
   }
 };
 
-function createAttribute(attributeName) {
+function buildAttribute(attributeName) {
   // supported names are:
   // <attribute_name>
   // <sectionName>_<attributeShortname> with sectionName = repeating_<any>
@@ -300,7 +306,7 @@ function instrumentInputs(root) {
     }
 
     // init the attributes values in the store
-    let attributeName = input.attr('data-attrname') ?? getInputAttributeName(input);
+    let attributeName = getInputAttributeName(input);
 
     const repItem = input.parents('.repitem');
     if (repItem.length > 0) {
@@ -330,7 +336,7 @@ function instrumentInputs(root) {
       }
 
       // store the value
-      let attributeName = input.attr('data-attrname') ?? getInputAttributeName(input);
+      let attributeName = getInputAttributeName(input);
 
       const repItem = input.parents('.repitem');
       if (repItem.length > 0) {
@@ -341,6 +347,9 @@ function instrumentInputs(root) {
 
         attributeName = `${currentRepeatingContext.sectionName}_${currentRepeatingContext.rowId}_${attributeName}`;
 
+        if (input.attr('type') == 'radio') {  // roll20 does not sync radio inputs in sections with same name
+          currentRepeatingContext.skippedInputUpdate = attributeName;
+        }
       } else {
         currentRepeatingContext = undefined;
       }
@@ -422,5 +431,5 @@ function instrumentInputs(root) {
 }
 
 function getInputAttributeName(input) {
-  return input.attr('name').substring(ATTR_PREFIX.length);
+  return input.attr('data-attrname') ?? input.attr('name').substring(ATTR_PREFIX.length);
 }