fix: make ActiveEffects work properly

templates/sheets/active-effect/active-effect-config.hbs

@@ -9,7 +9,9 @@ SPDX-License-Identifier: MIT
     <!-- Effect Header -->
     <header class="sheet-header">
         <img class="effect-icon" src="{{ data.icon }}" data-edit="icon">
-        <h1 class="effect-title">{{ data.label }}</h1>
+        <h1 class="effect-title">
+            <input name="name" type="text" value="{{data.name}}" placeholder="{{ localize 'Name' }}" />
+        </h1>
     </header>
 
     <!-- Effect Configuration Tabs -->
@@ -21,30 +23,19 @@ SPDX-License-Identifier: MIT
 
     <!-- Details Tab -->
     <section class="tab" data-tab="details">
-
-        <div class="form-group">
-            <label>{{ localize "EFFECT.Label" }}</label>
-            <div class="form-fields">
-                <input type="text" name="label" value="{{ data.label }}" />
-            </div>
-        </div>
-
-        <div class="form-group">
-            <label>{{ localize "EFFECT.Icon" }}</label>
-            <div class="form-fields">
-                {{filePicker target="icon" type="image"}}
-                <input class="image" type="text" name="icon" placeholder="path/image.png" value="{{data.icon}}" />
-            </div>
-        </div>
-
         <div class="form-group">
             <label>{{ localize "EFFECT.IconTint" }}</label>
             <div class="form-fields">
-                <input class="color" type="text" name="tint" value="{{data.tint}}" />
-                <input type="color" value="{{data.tint}}" data-edit="tint" />
+                {{colorPicker name="tint" value=data.tint}}
             </div>
         </div>
 
+        <div class="form-group stacked">
+            <label>{{ localize "EFFECT.Description" }}</label>
+            {{editor descriptionHTML target="description" button=false editable=editable engine="prosemirror"
+            collaborate=false}}
+        </div>
+
         <div class="form-group">
             <label>{{ localize "EFFECT.Disabled" }}</label>
             <div class="form-fields">
@@ -63,10 +54,11 @@ SPDX-License-Identifier: MIT
 
         {{#if isItemEffect}}
         <div class="form-group">
-            <label>{{ localize "EFFECT.Transfer" }}</label>
+            <label>{{ labels.transfer.name }}</label>
             <div class="form-fields">
                 <input type="checkbox" name="transfer" {{checked data.transfer}} />
             </div>
+            <p class="hint">{{ labels.transfer.hint }}</p>
         </div>
         {{/if}}
 

templates/sheets/actor/components/effect-list-entry.hbs

@@ -15,15 +15,15 @@ SPDX-License-Identifier: MIT
         type="checkbox" {{checked (ne effectData.disabled true)}} data-dtype="Boolean" data-property="disabled"
         data-inverted="true" title="{{localize 'DS4.EffectEnabled'}}">
 
-    {{!-- effectively enabled --}}
-    {{#if effectData.isEffectivelyEnabled}}<i class="fas fa-check"></i>{{else}}<i class="fas fa-ban"></i>{{/if}}
+    {{!-- active --}}
+    {{#if effectData.active}}<i class="fas fa-check"></i>{{else}}<i class="fas fa-ban"></i>{{/if}}
 
     {{!-- icon --}}
     {{> systems/ds4/templates/sheets/shared/components/rollable-image.hbs rollable=false src=effectData.icon
     alt=(localize "DS4.DocumentImageAltText" name=effectData.label) title=effectData.label}}
 
-    {{!-- label --}}
-    <div title="{{effectData.label}}">{{effectData.label}}</div>
+    {{!-- name --}}
+    <div title="{{effectData.name}}">{{effectData.name}}</div>
 
     {{!-- source name --}}
     <div title="{{effectData.sourceName}}">{{effectData.sourceName}}</div>

templates/sheets/actor/components/effect-list-header.hbs

@@ -12,14 +12,14 @@ SPDX-License-Identifier: MIT
     {{!-- enabled --}}
     <div title="{{localize 'DS4.EffectEnabled'}}">{{localize 'DS4.EffectEnabledAbbr'}}</div>
 
-    {{!-- effectively enabled --}}
-    <div title="{{localize 'DS4.EffectEffectivelyEnabled'}}">{{localize 'DS4.EffectEffectivelyEnabledAbbr'}}</div>
+    {{!-- active --}}
+    <div title="{{localize 'DS4.EffectActive'}}">{{localize 'DS4.EffectActiveAbbr'}}</div>
 
     {{!-- icon --}}
     <div></div>
 
-    {{!-- label --}}
-    <div>{{localize 'DS4.EffectLabel'}}</div>
+    {{!-- name --}}
+    <div>{{localize 'DS4.EffectName'}}</div>
 
     {{!-- source name --}}
     <div>{{localize 'DS4.EffectSourceName'}}</div>

templates/sheets/item/components/effect-list-entry.hbs

@@ -13,8 +13,8 @@ SPDX-License-Identifier: MIT
     {{> systems/ds4/templates/sheets/shared/components/rollable-image.hbs rollable=false src=effectData.icon
     alt=(localize "DS4.DocumentImageAltText" name=effectData.label) title=effectData.label}}
 
-    {{!-- label --}}
-    <div title="{{effectData.label}}">{{effectData.label}}</div>
+    {{!-- name --}}
+    <div title="{{effectData.name}}">{{effectData.name}}</div>
 
     {{!-- control button group --}}
     {{> systems/ds4/templates/sheets/shared/components/control-button-group.hbs documentType="effect"

templates/sheets/item/components/effect-list-header.hbs

@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT
     <div></div>
 
     {{!-- label --}}
-    <div>{{localize 'DS4.EffectLabel'}}</div>
+    <div>{{localize 'DS4.EffectName'}}</div>
 
     {{!-- control buttons placeholder --}}
     <div></div>