Merge pull request #219 from juanferrer/master

4.6.4
Xacus · Dec 2, 2024 · 21e7c74 · 21e7c74
2 parents 4efffb3 + ae5f74e
commit 21e7c74
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/src/module/active-effects/item-effects.js b/src/module/active-effects/item-effects.js
@@ -252,22 +252,22 @@ export class DLActiveEffects {
           // Selected checkbox (select two, three, fixed)
           addEffect(
             'system.attributes.strength.value',
-            pathLevel.attributes.strength * (pathLevel.attributes.strength.selected || pathLevel.attributeSelectIsFixed),
+            pathLevel.attributes.strength.value * (pathLevel.attributes.strength.selected || pathLevel.attributeSelectIsFixed),
             priority
           ),
           addEffect(
             'system.attributes.agility.value',
-            pathLevel.attributes.agility * (pathLevel.attributes.agility.selected || pathLevel.attributeSelectIsFixed),
+            pathLevel.attributes.agility.value * (pathLevel.attributes.agility.selected || pathLevel.attributeSelectIsFixed),
             priority
           ),
           addEffect(
             'system.attributes.intellect.value',
-            pathLevel.attributes.intellect * (pathLevel.attributes.intellect.selected || pathLevel.attributeSelectIsFixed),
+            pathLevel.attributes.intellect.value * (pathLevel.attributes.intellect.selected || pathLevel.attributeSelectIsFixed),
             priority
           ),
           addEffect(
             'system.attributes.will.value',
-            pathLevel.attributes.will * (pathLevel.attributes.will.selected || pathLevel.attributeSelectIsFixed),
+            pathLevel.attributes.will.value * (pathLevel.attributes.will.selected || pathLevel.attributeSelectIsFixed),
             priority
           ),
         ].filter(falsyChangeFilter),

diff --git a/src/module/actor/actor.js b/src/module/actor/actor.js
@@ -234,6 +234,17 @@ export class DemonlordActor extends Actor {
 
   /* -------------------------------------------- */
 
+  /** @override */
+  async toggleStatusEffect(statusId, options) {
+    // Check we're not immune to this condition
+    if (this.isImmuneToAffliction(statusId)) {
+      ui.notifications.warn(game.i18n.localize('DL.DialogWarningActorImmune'));
+      return false;
+    } else {
+      return await super.toggleStatusEffect(statusId, options)
+    }
+  }
+
   /** @override */
   async _onUpdate(changed, options, user) {
     await super._onUpdate(changed, options, user)

diff --git a/src/templates/item/item-ancestry-edit.hbs b/src/templates/item/item-ancestry-edit.hbs
@@ -118,7 +118,7 @@
           <div class="half-panel">
             <div class="dl-item-section-header">
               <b>{{localize "DL.LanguagesTitle"}} </b>
-              <a class="create-nested-item" data-action="createNestedItem" data-tippy-content="{{localize 'DL.ItemAddLanguage'}}" data-type="language" data-group="languagelist" data-folder-loc="LanguagesTitle">
+              <a class="create-nested-item" data-action="createNestedItem" data-tippy-content="{{localize 'DL.ItemAddLanguage'}}" data-type="language" data-group="languages" data-folder-loc="LanguagesTitle">
                 <i class="fas fa-plus"></i>
               </a>
             </div>

diff --git a/src/templates/item/item-path-view.hbs b/src/templates/item/item-path-view.hbs
@@ -68,10 +68,10 @@
           </div>
 
           {{#if (or level.attributeSelectIsChooseTwo level.attributeSelectIsChooseThree)}}
-            {{> AttributeSelector icon="strength"   value=level.attributes.strength.value  id=(concat "L" level.level ".attributes.strength.selected") name="level.attributes.strength.selected"  selected=level.attributes.strength.selected  loc="DL.AttributeStrength"}}
-            {{> AttributeSelector icon="agility"    value=level.attributes.agility.value   id=(concat "L" level.level ".attributes.agility.selected") name="level.attributes.agility.selected"   selected=level.attributes.agility.selected   loc="DL.AttributeAgility"}}
-            {{> AttributeSelector icon="intellect"  value=level.attributes.intellect.value id=(concat "L" level.level ".attributes.intellect.selected") name="level.attributes.intellect.selected" selected=level.attributes.intellect.selected loc="DL.AttributeIntellect"}}
-            {{> AttributeSelector icon="will"       value=level.attributes.will.value      id=(concat "L" level.level ".attributes.will.selected") name="level.attributes.will.selected"      selected=level.attributes.will.selected      loc="DL.AttributeWill"}}
+            {{> AttributeSelector icon="strength"   value=level.attributes.strength.value  id=(concat "L" level.level ".attributes.strength.selected." ../item.id) name="level.attributes.strength.selected"  selected=level.attributes.strength.selected  loc="DL.AttributeStrength"}}
+            {{> AttributeSelector icon="agility"    value=level.attributes.agility.value   id=(concat "L" level.level ".attributes.agility.selected." ../item.id) name="level.attributes.agility.selected"   selected=level.attributes.agility.selected   loc="DL.AttributeAgility"}}
+            {{> AttributeSelector icon="intellect"  value=level.attributes.intellect.value id=(concat "L" level.level ".attributes.intellect.selected." ../item.id) name="level.attributes.intellect.selected" selected=level.attributes.intellect.selected loc="DL.AttributeIntellect"}}
+            {{> AttributeSelector icon="will"       value=level.attributes.will.value      id=(concat "L" level.level ".attributes.will.selected." ../item.id) name="level.attributes.will.selected"      selected=level.attributes.will.selected      loc="DL.AttributeWill"}}
           {{else if level.attributeSelectIsFixed}}
             {{> AttributeViewer icon="strength"   value=level.attributes.strength.value  name="level.attributes.strength.value"  loc="DL.AttributeStrength"}}
             {{> AttributeViewer icon="agility"    value=level.attributes.agility.value   name="level.attributes.agility.value"   loc="DL.AttributeAgility"}}