Merge pull request #70 from WoD5E-Developers/prerelease-4

Prerelease 4
WoD5E-Developers · Oct 7, 2024 · eaa877d · eaa877d
2 parents 48ebfcb + 1c41ecc
commit eaa877d
Show file tree

Hide file tree

Showing 186 changed files with 5,287 additions and 993 deletions.
diff --git a/assets/ui/ui_background_hunter_texture.webp b/assets/ui/ui_background_hunter_texture.webp
diff --git a/display/htr/actors/hunter-sheet.hbs b/display/htr/actors/hunter-sheet.hbs
@@ -13,23 +13,55 @@
     <div class="header-fields">
         <div class="header-fields-right">
             <div class="flexcol">
-                <div class="field-section">
-                    <div class="flexrow nowrap">
+                <div class="field-section flexrow">
+                    <div class="flexrow nowrap shared-row">
                         <div class="flexcol">
                             <label class="resource-label field-header">{{localize 'WOD5E.HTR.Cell'}}</label>
                             <input name="system.headers.cellname" type="text" value="{{cellname}}" placeholder="{{localize 'WOD5E.HTR.Cell'}}"/>
                         </div>
                     </div>
+                    <div class="flexcol despair shared-row">
+                        <label class="resource-label field-header">{{localize 'WOD5E.HTR.Despair'}}</label>
+                        {{> "systems/vtm5e/display/htr/actors/parts/despair.hbs"}}
+                    </div>
                 </div>
-                <div class="field-section">
-                    <div class="flexrow nowrap">
-                        <div class="flexcol">
+                <div class="field-section flexrow">
+                    <div class="flexrow nowrap flexend">
+                        <div class="flexcol shared-row">
                             <label class="resource-label field-header">{{localize 'WOD5E.HTR.Drive'}}</label>
-                            <input name="system.headers.drive" type="text" value="{{drive}}" placeholder="{{localize 'WOD5E.HTR.Drive'}}"/>
+                            <div class="resource resource-content">
+                                {{#if drive}}
+                                    <span class="data-item nowrap">
+                                        {{drive.name}}
+                                    </span>
+                                    <a class="edit-data-item" data-action="itemEdit" data-item-id="{{drive.id}}">
+                                        <i class="fa-solid fa-pen-nib"></i>
+                                    </a>
+                                {{else}}
+                                    <a class="add-data-item" data-action="createItem" data-type="drive">
+                                        <i class="fa-solid fa-plus"></i>
+                                    </a>
+                                {{/if}}
+                            </div>
                         </div>
-                        <div class="flexcol despair">
-                            <label class="resource-label field-header">{{localize 'WOD5E.HTR.Despair'}}</label>
-                            {{> "systems/vtm5e/display/htr/actors/parts/despair.hbs"}}
+                    </div>
+                    <div class="flexrow nowrap flexend">
+                        <div class="flexcol shared-row">
+                            <label class="resource-label field-header">{{localize 'WOD5E.HTR.Creed'}}</label>
+                            <div class="resource resource-content">
+                                {{#if creed}}
+                                    <span class="data-item nowrap">
+                                        {{creed.name}}
+                                    </span>
+                                    <a class="edit-data-item" data-action="itemEdit" data-item-id="{{creed.id}}">
+                                        <i class="fa-solid fa-pen-nib"></i>
+                                    </a>
+                                {{else}}
+                                    <a class="add-data-item" data-action="createItem" data-type="creed">
+                                        <i class="fa-solid fa-plus"></i>
+                                    </a>
+                                {{/if}}
+                            </div>
                         </div>
                     </div>
                 </div>

diff --git a/display/htr/actors/parts/creed-fields.hbs b/display/htr/actors/parts/creed-fields.hbs
@@ -0,0 +1,8 @@
+<div class="flexcol detail-row">
+    <label class="resource-label field-header">{{localize "WOD5E.HTR.CreedFields"}}</label>
+    <div class="resource resource-content">
+        <span class="data-item">
+            {{creed.system.desperationFields}}
+        </span>
+    </div>
+</div>
diff --git a/display/htr/actors/parts/edges.hbs b/display/htr/actors/parts/edges.hbs
@@ -15,7 +15,7 @@
                     {{#if edge.visible}}
                         <span class="parent flexrow">
                             <div class="icon category-select{{#if edge.selected}} selected{{/if}}" data-action="selectEdge" data-edge="{{key}}"></div>
-                            {{edge.displayName}}
+                            <a class="select-label" data-action="selectEdge" data-edge="{{key}}">{{edge.displayName}}</a>
                             <div class="item-controls">
                                 <!-- Icon to show the edge description to the chat-->
                                 <a class="item-control edge-chat" data-action="edgeChat" title="{{localize 'WOD5E.ItemsList.ShowToChat'}}" data-edge="{{key}}">
@@ -34,7 +34,7 @@
                                 <li>
                                     <span>
                                         <div class="icon power-select{{#if perk.system.selected}} selected{{/if}}" data-action="selectEdgePerk" data-perk="{{perk.id}}" style="background-image: url('{{perk.img}}');"></div>
-                                        {{perk.name}}
+                                        <a class="select-label" data-action="selectEdgePerk" data-perk="{{perk.id}}">{{perk.name}}</a>
                                     </span>
                                 </li>
                             {{/each}}

diff --git a/display/htr/actors/parts/features.hbs b/display/htr/actors/parts/features.hbs
@@ -6,34 +6,16 @@
                 {{> "systems/vtm5e/display/shared/actors/parts/core-details.hbs"}}
 
                 <!-- Hunter-specific details -->
-                <div class="flexrow detail-row">
-                    <div class="flexcol">
-                        <label class="resource-label field-header">{{localize 'WOD5E.HTR.Creed'}}</label>
-                        <input name="system.headers.creed" type="text" value="{{creed}}" placeholder="{{localize 'WOD5E.HTR.Creed'}}"/>
-                    </div>
-                    <div class="flexcold">
-                        <label class="resource-label field-header">{{localize "WOD5E.HTR.Redemption"}}</label>
-                        <input type="text" name="system.redemption.value" value="{{redemption}}" placeholder="{{localize 'WOD5E.HTR.Redemption'}}" />
-                    </div>
-                </div>
+                {{> "systems/vtm5e/display/htr/actors/parts/redemption.hbs"}}
+
+                {{> "systems/vtm5e/display/htr/actors/parts/creed-fields.hbs"}}
 
                 <!-- Chronicle Tenets -->
                 {{> "systems/vtm5e/display/shared/actors/parts/chronicle-tenets.hbs"}}
 
                 <!-- Touchstones/Convictions -->
                 {{> "systems/vtm5e/display/shared/actors/parts/touchstones-convictions.hbs"}}
             </div>
-            <div class="flex-group-left">
-                <div class="flex-center">
-                    <label class="resource-label field-header">{{localize "WOD5E.HTR.CreedFields"}}</label>
-                </div>
-                <div class="description-content resource">
-                    <prose-mirror name="system.headers.creedfields" value="{{creedfields}}"
-                        toggled="true" compact="true">
-                        {{{enrichedCreedfields}}}
-                    </prose-mirror>
-                </div>
-            </div>
         </div>
         <div class="features-list item-list">
             <!-- Core features -->

diff --git a/display/htr/actors/parts/redemption.hbs b/display/htr/actors/parts/redemption.hbs
@@ -0,0 +1,8 @@
+<div class="flexcol detail-row">
+    <label class="resource-label field-header">{{localize "WOD5E.HTR.Redemption"}}</label>
+    <div class="resource resource-content">
+        <span class="data-item">
+            {{drive.system.redemption}}
+        </span>
+    </div>
+</div>
diff --git a/display/htr/items/creed-sheet.hbs b/display/htr/items/creed-sheet.hbs
@@ -0,0 +1,6 @@
+<header class="item-header">
+    <img class="profile-img" data-action="editImage" src="{{img}}" data-edit="img" title="{{name}}" alt="Item Image" />
+    <div class="header-fields">
+        <input class="itemname" name="name" type="text" value="{{name}}" placeholder="{{localize 'WOD5E.Name'}}"/>
+    </div>
+</header>
diff --git a/display/htr/items/drive-sheet.hbs b/display/htr/items/drive-sheet.hbs
@@ -0,0 +1,6 @@
+<header class="item-header">
+    <img class="profile-img" data-action="editImage" src="{{img}}" data-edit="img" title="{{name}}" alt="Item Image" />
+    <div class="header-fields">
+        <input class="itemname" name="name" type="text" value="{{name}}" placeholder="{{localize 'WOD5E.Name'}}"/>
+    </div>
+</header>
diff --git a/display/htr/items/edge-pool-sheet.hbs b/display/htr/items/edge-pool-sheet.hbs
@@ -1,5 +1,5 @@
 <header class="item-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" alt="Item Image" />
+    <img class="profile-img" data-action="editImage" src="{{img}}" data-edit="img" title="{{name}}" alt="Item Image" />
     <div class="header-fields">
         <input class="itemname" name="name" type="text" value="{{name}}" placeholder="{{localize 'WOD5E.Name'}}"/>
         <div class="flexrow flex-center header-details">

diff --git a/display/htr/items/parts/creed-details.hbs b/display/htr/items/parts/creed-details.hbs
@@ -0,0 +1,22 @@
+<section class="tab {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+    <div class="flexcol">
+        <div class="flexcol">
+            <div class="field-header">
+                {{localize 'WOD5E.HTR.SuggestedEdges'}}
+            </div>
+            <input type="text" name="system.edges" value="{{edges}}" placeholder="{{localize 'WOD5E.HTR.SuggestedEdges'}}"/>
+        </div>
+        <div class="flexcol">
+            <div class="field-header">
+                {{localize 'WOD5E.HTR.SuggestedDrives'}}
+            </div>
+            <input type="text" name="system.drives" value="{{drives}}" placeholder="{{localize 'WOD5E.HTR.SuggestedDrives'}}"/>
+        </div>
+        <div class="flexcol">
+            <div class="field-header">
+                {{localize 'WOD5E.HTR.DesperationDiceFields'}}
+            </div>
+            <input type="text" name="system.desperationFields" value="{{desperationFields}}" placeholder="{{localize 'WOD5E.HTR.DesperationDiceFields'}}"/>
+        </div>
+    </div>
+</section>
diff --git a/display/htr/items/parts/redemption.hbs b/display/htr/items/parts/redemption.hbs
@@ -0,0 +1,8 @@
+<section class="tab {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+    <div class="flexcol detail-row">
+        <div class="field-header">
+            {{localize 'WOD5E.HTR.Redemption'}}
+        </div>
+        <input type="text" name="system.redemption" value="{{redemption}}" placeholder="{{localize 'WOD5E.HTR.Redemption'}}"/>
+    </div>
+</section>
diff --git a/display/htr/items/perk-sheet.hbs b/display/htr/items/perk-sheet.hbs
@@ -1,5 +1,5 @@
 <header class="item-header">
-    <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" alt="Item Image" />
+    <img class="profile-img" data-action="editImage" src="{{img}}" data-edit="img" title="{{name}}" alt="Item Image" />
     <div class="header-fields">
         <input class="itemname" name="name" type="text" value="{{name}}" placeholder="{{localize 'WOD5E.Name'}}"/>
         <div class="flexrow flex-center header-details">

diff --git a/display/htr/styling/hunter-styling.less b/display/htr/styling/hunter-styling.less
@@ -13,11 +13,6 @@
 .actor.sheet.hunter {
   .actor-header {
     border-bottom: 2px solid var(--hunter-color-1);
-
-    .despair {
-      padding-left: 5px;
-      padding-right: 5px;
-    }
   }
 
   .profile-img,

diff --git a/display/shared/actors/parts/actor-settings.hbs b/display/shared/actors/parts/actor-settings.hbs
@@ -13,4 +13,39 @@
             </select>
         </div>
     </div>
+    {{#ifeq baseActorType 'spc'}}
+        <div class="form-group">
+            <label>Show General Difficulty</label>
+            <div class="form-fields">
+                <input type="checkbox" name="system.settings.generalDifficultyEnabled" {{#if generalDifficultyEnabled}}checked{{/if}}>
+            </div>
+        </div>
+    {{/ifeq}}
+
+    {{#if showOptionalPowers}}
+        {{#ifeq gamesystem 'vampire'}}
+            <div class="form-group">
+                <label>Show Disciplines</label>
+                <div class="form-fields">
+                    <input type="checkbox" name="system.settings.enableDisciplines" {{#if enableDisciplines}}checked{{/if}}>
+                </div>
+            </div>
+        {{/ifeq}}
+        {{#ifeq gamesystem 'hunter'}}
+            <div class="form-group">
+                <label>Show Edges</label>
+                <div class="form-fields">
+                    <input type="checkbox" name="system.settings.enableEdges" {{#if enableEdges}}checked{{/if}}>
+                </div>
+            </div>
+        {{/ifeq}}
+        {{#ifeq gamesystem 'werewolf'}}
+            <div class="form-group">
+                <label>Show Gifts</label>
+                <div class="form-fields">
+                    <input type="checkbox" name="system.settings.enableGifts" {{#if enableEdges}}checked{{/if}}>
+                </div>
+            </div>
+        {{/ifeq}}
+    {{/if}}
 </section>
diff --git a/display/shared/actors/parts/biography.hbs b/display/shared/actors/parts/biography.hbs
@@ -1,7 +1,7 @@
 <section class="tab {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
     <div class="flexrow">
         <div class="detailed-section flexcol">
-            <h2 class="details-header field-header flex-center">{{localize "WOD5E.BiographyList.PersonalInformation"}}</h2>
+            <div class="details-header field-header flex-center big-header">{{localize "WOD5E.BiographyList.PersonalInformation"}}</div>
             <div class="detail flexrow">
                 <label>
                     <b>{{localize "WOD5E.BiographyList.Age"}}:</b>

diff --git a/display/shared/actors/parts/core-details.hbs b/display/shared/actors/parts/core-details.hbs
@@ -6,15 +6,15 @@
     <label class="resource-label field-header">{{localize "WOD5E.BiographyList.Chronicle"}}</label>
     <input type="text" name="system.headers.chronicle" value="{{chronicle}}" placeholder="{{localize 'WOD5E.BiographyList.Chronicle'}}" />
 </div>
-{{#ifnoteq baseActorType 'group'}}
+{{#if showAmbitionDesire}}
     <div class="flexrow detail-row">
-        <div class="flexcol">
+        <div class="flexcol shared-row">
             <label class="resource-label field-header">{{localize "WOD5E.BiographyList.Ambition"}}</label>
             <input type="text" name="system.headers.ambition" value="{{ambition}}" placeholder="{{localize 'WOD5E.BiographyList.Ambition'}}" />
         </div>
-        <div class="flexcol">
+        <div class="flexcol shared-row">
             <label class="resource-label field-header">{{localize "WOD5E.BiographyList.Desire"}}</label>
             <input type="text" name="system.headers.desire" value="{{desire}}" placeholder="{{localize 'WOD5E.BiographyList.Desire'}}" />
         </div>
     </div>
-{{/ifnoteq}}
+{{/if}}
diff --git a/display/shared/actors/parts/equipment.hbs b/display/shared/actors/parts/equipment.hbs
@@ -1,11 +1,64 @@
 <section class="tab {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
-    <div class="flex-group-left">
-        <div class="flex-center">
-            <label class="resource-label">{{localize "WOD5E.Tabs.Equipment"}}</label>
+    <div class="flexrow">
+        <div class="equipment-notes flexcol">
+            <div class="flexcol">
+                <div class="description-field">
+                    <div class="flex-center">
+                        <label class="resource-label field-header">
+                            {{localize "WOD5E.EquipmentList.EquipmentNotes"}}
+                        </label>
+                    </div>
+                    <div class="description-content resource">
+                        <prose-mirror name="system.equipment" value="{{equipment}}"
+                            toggled="true" compact="true">
+                            {{{enrichedEquipment}}}
+                        </prose-mirror>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="equipment-list item-list">
+            {{#each equipmentItems as |equipment key|}}
+                <div class="category">
+                    <div class="equipment">
+                        <div class="flexrow item-header">
+                            <div class="item-name">
+                                {{localize (concat 'TYPES.Item.' key)}}
+                            </div>
+                            <!-- Item controls for gift item sections -->
+                            <div class="item-controls">
+                                <!-- Add new equipment item -->
+                                <a class="item-control item-create" data-action="createItem" title="{{localize 'WOD5E.Add'}}" data-type="{{key}}">
+                                    <i class="fas fa-plus"></i>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                    {{#each equipment as |item key|}}
+                        <div class="collapsible-container">
+                            <div class="flexrow item" data-drag="true" data-item-id="{{item.id}}" data-document-uuid="{{item.uuid}}" data-type="Item">
+                                <div class="item-image">
+                                    <img src="{{item.img}}" class="clickable" data-action="itemChat" data-item-id="{{item._id}}" title="{{localize 'WOD5E.ItemsList.ShowToChat'}}">
+                                </div>
+                                <div class="item-name{{#if item.system.enrichedDescription}} collapsible{{/if}}" {{#if item.system.enrichedDescription}}data-action="toggleCollapse"{{/if}}>{{item.name}}</div>
+                                <div class="item-controls">
+                                    <!-- Icon to edit the item -->
+                                    <a class="item-control item-edit" data-action="itemEdit" data-item-id="{{item._id}}" title="{{localize 'WOD5E.Edit'}}">
+                                        <i class="fas fa-edit"></i>
+                                    </a>
+                                    <!-- Icon to delete the item -->
+                                    <a class="item-control item-delete" data-action="itemDelete" data-item-id="{{item._id}}" title="{{localize 'WOD5E.Delete'}}">
+                                        <i class="fas fa-trash"></i>
+                                    </a>
+                                </div>
+                            </div>
+                            <div class="collapsible-content item-description">
+                                {{{item.system.enrichedDescription}}}
+                            </div>
+                        </div>
+                    {{/each}}
+                </div>
+            {{/each}}
         </div>
-        <prose-mirror name="system.equipment" value="{{actor.system.equipment}}"
-            toggled="true" compact="true">
-            {{{enrichedEquipment}}}
-        </prose-mirror>
     </div>
 </section>
diff --git a/display/shared/actors/parts/experience-display.hbs b/display/shared/actors/parts/experience-display.hbs
@@ -1,7 +1,7 @@
 <div class="experience">
-    <h3>
+    <div class="field-header big-header">
         <input id="xpName" type="text" value="{{name}}" placeholder="{{localize 'WOD5E.Name'}}"/>
-    </h3>
+    </div>
     <div class="grid grid-2col flex-center">
         <div class="flexcol flex-center">
             <b>{{localize "WOD5E.Value"}}</b>