Merged with v14-Dev

templates/ui/effects-display.hbs

@@ -8,6 +8,9 @@
                 <a {{#if effect.condition}}disabled{{/if}}>
                     <img src="{{effect.img}}" />
                 </a>
+                {{#if (gt effect.system.stacking.value 1)}}
+                    <span class="stacking-value">{{effect.system.stacking.value}}</span>
+                {{/if}}
                 {{#if effect.condition}}<i class="effect-locked fa-solid fa-lock"></i>{{/if}}
             </span>
         {{/each}}

templates/ui/sceneNavigation/scene-navigation.hbs

@@ -1,10 +1,40 @@
+
+
 <nav id="scene-navigation" aria-roledescription="{{localize "SCENE_NAVIGATION.LABEL"}}" data-tooltip-direction="RIGHT">
     {{#if canExpand}}
     <a id="scene-navigation-expand" class="ui-control" data-action="toggleExpand">
         <i class="fa-solid fa-caret-down" inert></i>
     </a>
     {{/if}}
+    {{#with scenes.viewed}}
+        <menu id="scene-navigation-viewed" class="scene-navigation-menu flexcol">
+            {{> ".scene" }}
+        </menu>
+    {{/with}}
+    <menu id="scene-navigation-levels" class="scene-levels scene-navigation-menu flexcol levels-{{ scenes.levels.length }}">
+        {{#each scenes.levels}}
+        <li class="level-row">
+            {{#with button}}
+            <button type="button" class="ui-control icon fa-solid {{ css }}" data-action="cycleLevel"
+                    data-direction="{{ direction }}" aria-label="{{ label }}"></button>
+            {{/with}}
+            <div class="ui-control scene scene-level {{ css }}" data-scene-id="{{ sceneId }}" data-level-id="{{ id }}" data-action="viewLevel">
+                <span class="ellipsis">{{ name }}</span>
+            </div>
+        </li>
+        {{/each}}
+    </menu>
     <menu id="scene-navigation-active" class="scene-navigation-menu flexcol">
+        {{#each scenes.active}}
+        {{> ".scene" }}
+        {{/each}}
+    </menu>
+    <menu id="scene-navigation-inactive" class="scene-navigation-menu flexcol">
+        {{#each scenes.inactive as |scene|}}
+        {{> ".scene" }}
+        {{/each}}
+    </menu>
+    {{!-- <menu id="scene-navigation-active" class="scene-navigation-menu flexcol">
         {{#each scenes.active as |scene|}}
             <li class="scene-wrapper">
                 <ul>
@@ -36,5 +66,25 @@
                 </ul>
             </li>
         {{/each}}
-    </menu>
+    </menu> --}}
 </nav>
+
+{{#*inline ".scene"}}
+<li class="scene-wrapper">
+    <div class="ui-control scene {{ cssClass }}" data-scene-id="{{ id }}" data-action="viewScene" {{#if tooltip}}data-tooltip-text="{{ tooltip }}"{{/if}}>
+        <span class="scene-name ellipsis">{{ name }}</span>
+        {{#if users}}
+        <ul class="scene-players">
+            {{#each users}}
+            <li class="scene-player" style="--color-bg: {{ color }}; --color-border: {{ border }}" data-tooltip
+                aria-label="{{ name }}">{{ letter }}</li>
+            {{/each}}
+        </ul>
+        {{/if}}
+    </div>
+    {{#if hasEnvironments}}
+        <button class="ui-control scene-environment {{#if (gt environments.length 1)}}many-environments{{/if}}" data-action="openSceneEnvironment" data-scene-id="{{id}}"><img src="{{environmentImage}}" /> </button>
+    {{/if}}
+</li>
+{{/inline}}
+

templates/ui/tooltip/armorManagement.hbs

@@ -0,0 +1,19 @@
+<div class="daggerheart armor-management-container">
+    <h3>{{localize "DAGGERHEART.GENERAL.armorSlots"}}</h3>
+    {{#each sources as |source|}}
+        <div class="armor-source-container">
+            <p class="armor-source-label">{{source.name}}</p>
+            <div class="slot-bar">
+                {{#times source.max}}
+                    <a class='armor-slot' data-value="{{add this 1}}" data-uuid="{{source.uuid}}">
+                        {{#if (gte ../current (add this 1))}}
+                            <i class="fa-solid fa-shield" data-index="{{this}}"></i>
+                        {{else}}
+                            <i class="fa-solid fa-shield-halved" data-index="{{this}}"></i>
+                        {{/if}}
+                    </a>
+                {{/times}}
+            </div>
+        </div>
+    {{/each}}
+</div>

templates/ui/tooltip/effect-display.hbs

@@ -16,16 +16,57 @@
         </div>
     {{/if}}
 
-    <div class="close-hints">
-        {{#if (eq effect.type 'beastform')}}
-            <p class="close-hint">
-                <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
-            </p>
-        {{/if}}
-        {{#unless effect.isLockedCondition}}
-            <p class="close-hint">
-                <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.removeThing" thing=(localize "DAGGERHEART.GENERAL.Effect.single")}}
-            </p>
-        {{/unless}}
-    </div>
+    {{#if effect.system.duration.type}}
+        <div class="duration-container">
+            <div class="duration-inner-container">
+                <span>{{localize "EFFECT.DURATION.Label"}}:</span>
+                <span>{{localize (concat "DAGGERHEART.CONFIG.ActiveEffectDuration." effect.system.duration.type )}}</span>
+            </div>
+        </div>
+    {{/if}}
+
+    {{#if effect.system.stacking}}
+        <div class="effect-stacks-outer-container">
+            <div class="effect-stacks-title">{{localize "Stacks"}}</div>
+            <div class="effect-stacks-container">
+                <div class="effect-stacks-inner-container">
+                    <span class="effect-stack-title">{{localize "Current"}}</span>
+                    <span>{{effect.system.stacking.value}}</span>
+                </div>
+                <div class="effect-stacks-inner-container">
+                    <span class="effect-stack-title">{{localize "Max"}}</span>
+                    <span>{{effect.system.stacking.max}}</span>
+                </div>
+            </div>
+        </div>
+    {{/if}}
+
+
+        <div class="close-hints">
+            {{#if (eq effect.type 'beastform')}}
+                <p class="close-hint">
+                    <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.Tooltip.middleClick"}}
+                </p>
+            {{/if}}
+            {{#unless effect.isLockedCondition}}
+                {{#if effect.system.stacking}}
+                    <p class="close-hint">
+                        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.increaseStacks"}}
+                    </p>
+                    {{#if (gt effect.system.stacking.value 1)}}
+                        <p class="close-hint">
+                            <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.decreaseStacks"}}
+                        </p>
+                    {{else}}
+                        <p class="close-hint">
+                            <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.removeThing" thing=(localize "DAGGERHEART.GENERAL.Effect.single")}}
+                        </p>
+                    {{/if}}
+                {{else}}
+                    <p class="close-hint">
+                        <i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.removeThing" thing=(localize "DAGGERHEART.GENERAL.Effect.single")}}
+                    </p>
+                {{/if}}
+            {{/unless}}
+        </div>
 </div>

templates/ui/tooltip/effect.hbs

@@ -4,4 +4,12 @@
     {{#if description}}
         <div class="tooltip-description">{{{description}}}</div>
     {{/if}}
+    {{#if item.system.duration.type}}
+        <div class="tooltip-duration">
+            <div class="duration-inner-container">
+                <span>{{localize "EFFECT.DURATION.Label"}}:</span>
+                <span>{{localize (concat "DAGGERHEART.CONFIG.ActiveEffectDuration." item.system.duration.type )}}</span>
+            </div>
+        </div>
+    {{/if}}
 </div>