Merge branch 'master' of https://github.com/juanferrer/demonlord

juanferrer · Aug 28, 2024 · 6f866e1 · 6f866e1
2 parents 5849f8e + 5370bd8
commit 6f866e1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/module/combat/combat.js b/src/module/combat/combat.js
@@ -244,8 +244,8 @@ export async function _onUpdateWorldTime(worldTime, _delta, _options, _userId) {
       else
         disabled = calcEffectRemainingSeconds(e, worldTime) <= 0
 
-      // Delete effects that come from spells, characters or afflictions
-      if (autoDelete && disabled && ['spell', 'character', 'affliction'].includes(eType))
+      // Delete effects that come from spells, talents, characters or afflictions
+      if (autoDelete && disabled && ['spell', 'talent', 'character', 'affliction'].includes(eType))
         deleteIds.push(e._id)
       else if (disabled !== e.disabled)
         updateData.push({_id: e._id, disabled: disabled})

diff --git a/src/module/utils/handlebars-helpers.js b/src/module/utils/handlebars-helpers.js
@@ -100,7 +100,7 @@ function _buildRadioBoxes(groupName, checkedKey) {
 // ----------------------------------------------------
 
 function _IsNestedItem(item) {
-  return item?.getFlag('demonlord', 'parentItemId')
+  return item?.getFlag('demonlord', 'parentItemId') && item?.getFlag('demonlord', 'nestedItemId')
 }
 
 function _GetNestedItemSource(item) {

diff --git a/src/templates/chat/partial/chat-effects.hbs b/src/templates/chat/partial/chat-effects.hbs
@@ -4,10 +4,12 @@
       - itemEffects
  --}}
 {{#each data.itemEffects as |effect|}}
-  <div class="combatactions apply-effect" data-effect-uuid="{{effect.uuid}}">
-    <div class="header">
-      <img src="{{effect.img}}" width="15" height="15" />
-      <div>{{effect.name}}</div>
+  {{#unless effect.transfer}}
+    <div class="combatactions apply-effect" data-effect-uuid="{{effect.uuid}}">
+      <div class="header">
+        <img src="{{effect.img}}" width="15" height="15" />
+        <div>{{effect.name}}</div>
+      </div>
     </div>
-  </div>
+  {{/unless}}    
 {{/each}}