Merge pull request #77 from WoD5E-Developers/5.0-final-wip

5.0 final wip
WoD5E-Developers · Oct 21, 2024 · 17973c8 · 17973c8
2 parents 48c1c8d + fa4242e
commit 17973c8
Show file tree

Hide file tree

Showing 71 changed files with 804 additions and 664 deletions.
diff --git a/display/shared/actors/parts/stats.hbs b/display/shared/actors/parts/stats.hbs
@@ -18,7 +18,7 @@
                             {{#each type as |attribute key|}}
                                 <div class="attribute">
                                     <label for="actor.system.attributes.{{attribute.id}}.value" class="resource-label rollable" data-action="roll" data-value-paths="attributes.{{attribute.id}}.value" data-select-dialog="true"
-                                        data-label="{{attribute.displayName}}" data-selectors="attributes attributes.{{attribute.id}}" data-attribute="{{attribute.id}}">{{attribute.displayName}}</label>
+                                        data-label="{{attribute.displayName}}" data-selectors="attributes attributes.{{attribute.id}} {{attribute.type}}" data-attribute="{{attribute.id}}">{{attribute.displayName}}</label>
                                     {{#if ../../settings.skillAttributeInputs}}
                                         {{#if ../../locked}}
                                             <b>
@@ -95,14 +95,14 @@
                     <div class="items-list flexcol">
                         {{#each conditions as |condition id|}}
                             <div class="item flexrow" data-drag="true" data-item-id="{{condition.id}}" data-document-uuid="{{condition.uuid}}" data-type="Item">
-                                <div class="item-image" data-action="itemChat" data-item-id="{{condition._id}}">
+                                <div class="item-image clickable" data-action="itemChat" data-item-id="{{condition._id}}">
                                     <img src="{{condition.img}}" title="{{condition.name}}" width="24" height="24" alt="{{condition.name}}" />
                                 </div>
                                 <div class="item-name">{{condition.name}}</div>
                                 <div class="item-controls">
                                     <a class="item-control item-edit" data-action="itemEdit" data-item-id="{{condition._id}}" title="{{localize 'WOD5E.Edit'}}"><i
                                         class="fas fa-edit"></i></a>
-                                    <a class="item-control item-delete" data-action="itemDelete" data-item-id="{{condition._id}}" title="{{localize 'WOD5E.Delete'}}"><i
+                                    <a class="item-control condition-delete" data-action="itemDelete" data-item-id="{{condition._id}}" title="{{localize 'WOD5E.Delete'}}"><i
                                         class="fas fa-trash"></i></a>
                                 </div>
                             </div>

diff --git a/...tions/skill-application/parts/bonuses.hbs → ...ons/skill-application/parts/modifiers.hbs b/...tions/skill-application/parts/bonuses.hbs → ...ons/skill-application/parts/modifiers.hbs
@@ -1,13 +1,13 @@
 <section class="tab {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
-    <div class="bonuses-list">
+    <div class="modifiers-list">
         {{#each bonuses as |bonus key|}}
-            <div class="bonus" style="margin-top: 5px;">
+            <div class="modifier" style="margin-top: 5px;">
                 <div class="field-header">
-                    <a class="edit-bonus" data-action="editBonus" title="Edit bonus" data-uwu="WWWWW" data-bonus="{{key}}" style="margin-right: 5px; margin-top: 5px; font-size: 13pt;">
+                    <a class="edit-bonus" data-action="editModifier" title="Edit bonus" data-uwu="WWWWW" data-bonus="{{key}}" style="margin-right: 5px; margin-top: 5px; font-size: 13pt;">
                         <i class="fas fa-edit"></i>
                     </a>
                     {{bonus.source}}
-                    <a class="delete-bonus" data-action="deleteBonus" title="Delete bonus" data-bonus="{{key}}" style="float: right;">
+                    <a class="delete-bonus" data-action="deleteModifier" title="Delete bonus" data-bonus="{{key}}" style="float: right;">
                         <i class="fas fa-trash"></i>
                     </a>
                 </div>
@@ -17,8 +17,8 @@
                         <input class="input-value" name="value" type="number" value="{{bonus.value}}" disabled="true"/>
                     </div>
                     <div class="flexcol flex-center">
-                        <b>{{localize "WOD5E.Bonus.Selectors"}}</b>
-                        <input name="paths" class="bonus-selectors" type="text" value="{{splitArray bonus.paths}}" placeholder="{{localize 'WOD5E.None'}}" disabled="true"/>
+                        <b>{{localize "WOD5E.Modifier.Selectors"}}</b>
+                        <input name="paths" class="modifier-selectors" type="text" value="{{splitArray bonus.paths}}" placeholder="{{localize 'WOD5E.None'}}" disabled="true"/>
                     </div>
                 </div>
             </div>
@@ -27,7 +27,7 @@
     <hr>
     <div class="flex-center">
         <b>
-            <a class="add-bonus" data-action="addBonus">{{localize 'WOD5E.Bonus.AddNewSpecialty'}}</a>
+            <a class="add-bonus" data-action="addModifier">{{localize 'WOD5E.Modifier.AddNewSpecialty'}}</a>
         </b>
     </div>
 </section>
diff --git a/display/shared/applications/skill-application/parts/specialty-display.hbs b/display/shared/applications/skill-application/parts/specialty-display.hbs
@@ -1,13 +1,13 @@
-<div class="bonus">
-    <div class="field-header big-header"><input id="bonusSource" type="text" value="{{bonus.source}}" placeholder="{{localize 'WOD5E.Bonus.NewSpecialty'}}"/></div>
+<div class="modifier">
+    <div class="field-header big-header"><input id="modifierSource" type="text" value="{{bonus.source}}" placeholder="{{localize 'WOD5E.Modifier.NewSpecialty'}}"/></div>
     <div class="grid grid-2col flex-center">
         <div class="flexcol flex-center">
             <b>{{localize "WOD5E.Value"}}</b>
-            <input class="input-value" id="bonusValue" type="number" value="{{bonus.value}}"/>
+            <input class="input-value" id="modifierValue" type="number" value="{{bonus.value}}"/>
         </div>
         <div class="flexcol flex-center">
-            <b>{{localize "WOD5E.Bonus.Selectors"}}</b>
-            <input type="text" id="bonusPaths" value="{{splitArray bonus.paths}}"/>
+            <b>{{localize "WOD5E.Modifier.Selectors"}}</b>
+            <input type="text" id="modifier" value="{{splitArray bonus.paths}}"/>
         </div>
     </div>
     <hr>

diff --git a/display/shared/items/feature-sheet.hbs b/display/shared/items/feature-sheet.hbs
@@ -16,7 +16,7 @@
                     <b>{{localize "WOD5E.ItemsList.FeatureType"}}</b>
                 </label>
                 <select name="system.featuretype" data-type="String">
-                    {{selectOptions featureTypeOptions selected=selectedFeatureType localize=true}}
+                    {{selectOptions featureTypeOptions selected=featureTypeSelected localize=true}}
                 </select>
             </div>
         </div>

diff --git a/display/shared/items/parts/bonus-display.hbs b/display/shared/items/parts/bonus-display.hbs
diff --git a/display/shared/items/parts/data-item-id.hbs b/display/shared/items/parts/data-item-id.hbs
@@ -0,0 +1,11 @@
+<div class="flex-group-center flexrow">
+    <div class="field-header flexrow">
+        {{localize 'WOD5E.ItemsList.DataItemId'}}
+        <a data-action="formatDataId" title="{{localize 'WOD5E.ItemsList.GenerateDataItemID'}}">
+            <i class="fa-solid fa-arrows-rotate"></i>
+        </a>
+    </div>
+    <div>
+        <input type="text" value="{{dataItemId}}" disabled/>
+    </div>
+</div>
diff --git a/display/shared/items/parts/item-settings.hbs b/display/shared/items/parts/item-settings.hbs
@@ -1,13 +1,3 @@
 <section class="tab {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
-    <div class="flex-group-center flexrow">
-        <div class="field-header flexrow">
-            {{localize 'WOD5E.ItemsList.DataItemId'}}
-            <a data-action="formatDataId" title="{{localize 'WOD5E.ItemsList.GenerateDataItemID'}}">
-                <i class="fa-solid fa-arrows-rotate"></i>
-            </a>
-        </div>
-        <div>
-            <input type="text" value="{{dataItemId}}" disabled/>
-        </div>
-    </div>
+    {{> "systems/vtm5e/display/shared/items/parts/data-item-id.hbs"}}
 </section>
diff --git a/display/shared/items/parts/modifier-display.hbs b/display/shared/items/parts/modifier-display.hbs
@@ -0,0 +1,39 @@
+<div class="modifier">
+    <div class="field-header big-header"><input id="modifierSource" type="text" value="{{bonus.source}}" placeholder="{{localize 'WOD5E.Modifier.NewModifier'}}"/></div>
+    <div class="grid grid-3col flex-center">
+        <div class="flexcol">
+            <b>{{localize "WOD5E.Value"}}</b>
+            <input class="input-value" id="modifierValue" type="number" value="{{bonus.value}}"/>
+        </div>
+        <div>
+            <b>{{localize "WOD5E.Modifier.Unless"}}</b>
+            <input id="unless" type="text" value="{{bonus.unless}}" placeholder="{{localize 'WOD5E.Modifier.Unless'}}"/>
+        </div>
+        <div class="flexrow flex-center">
+            <input id="displayModifierWhenInactive" type="checkbox"{{#if bonus.displayWhenInactive}} checked{{/if}}>{{localize "WOD5E.Modifier.DisplayWhenInactive"}}</input>
+        </div>
+    </div>
+    <div class="grid grid-3col flex-center">
+        <div class="flexcol">
+            <b>{{localize "WOD5E.Modifier.ActiveWhen"}}</b>
+            <select id="activeWhenCheck">
+                <option value="never"{{#ifeq bonus.activeWhen.check "never"}} selected{{/ifeq}}>{{localize "WOD5E.Modifier.Never"}}</option>
+                <option value="always"{{#ifeq bonus.activeWhen.check "always"}} selected{{/ifeq}}>{{localize "WOD5E.Modifier.Always"}}</option>
+                <option value="isEqual"{{#ifeq bonus.activeWhen.check "isEqual"}} selected{{/ifeq}}>{{localize "WOD5E.Modifier.IfEquals"}}</option>
+                <option value="isPath"{{#ifeq bonus.activeWhen.check "isPath"}} selected{{/ifeq}}>{{localize "WOD5E.Modifier.IfPathIs"}}</option>
+            </select>
+        </div>
+        <div style="{{#ifeq bonus.activeWhen.check 'isEqual'}}visibility: visible;{{else}}{{#ifeq bonus.activeWhen.check 'isPath'}}visibility: visible;{{else}}visibility: hidden;{{/ifeq}}{{/ifeq}}">
+            <b>{{localize "WOD5E.Modifier.PathToCheck"}}</b>
+            <input id="activeWhenPath" type="text" value="{{bonus.activeWhen.path}}" placeholder="{{localize 'WOD5E.Modifier.PathToCheck'}}"/>
+        </div>
+        <div style="{{#ifeq bonus.activeWhen.check 'isEqual'}}visibility: visible;{{else}}visibility: hidden;{{/ifeq}}">
+            <b>{{localize "WOD5E.Modifier.ValueToCheck"}}</b>
+            <input id="activeWhenValue" type="text" value="{{bonus.activeWhen.value}}" placeholder="{{localize 'WOD5E.Modifier.ValueToCheck'}}"/>
+        </div>
+    </div>
+    <div class="flexcol">
+        <b>{{localize "WOD5E.Modifier.Selectors"}}</b>
+        <input id="modifier" class="modifier-selectors" type="text" value="{{splitArray bonus.paths}}" placeholder="{{localize 'WOD5E.None'}}"/>
+    </div>
+</div>
diff --git a/display/shared/items/parts/bonuses.hbs → display/shared/items/parts/modifiers.hbs b/display/shared/items/parts/bonuses.hbs → display/shared/items/parts/modifiers.hbs
@@ -1,13 +1,13 @@
 <section class="tab {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
-    <div class="bonuses-list">
+    <div class="modifiers-list">
         {{#each bonuses as |bonus key|}}
-            <div class="bonus" style="margin-top: 5px;">
+            <div class="modifier" style="margin-top: 5px;">
                 <h3>
-                    <a class="edit-bonus" title="Edit bonus" data-action="editBonus" data-bonus-path="skills.{{../id}}.bonuses" data-bonus="{{key}}" style="margin-right: 5px; margin-top: 5px; font-size: 13pt;">
+                    <a class="edit-bonus" title="Edit bonus" data-action="editModifier" data-bonus-path="skills.{{../id}}.bonuses" data-bonus="{{key}}" style="margin-right: 5px; margin-top: 5px; font-size: 13pt;">
                         <i class="fas fa-edit"></i>
                     </a>
                     {{bonus.source}}
-                    <a class="delete-bonus" title="Delete bonus" data-action="deleteBonus" data-bonus-path="skills.{{../id}}.bonuses" data-bonus="{{key}}" style="float: right;">
+                    <a class="delete-bonus" title="Delete bonus" data-action="deleteModifier" data-bonus-path="skills.{{../id}}.bonuses" data-bonus="{{key}}" style="float: right;">
                         <i class="fas fa-trash"></i>
                     </a>
                 </h3>
@@ -17,51 +17,51 @@
                         <input name="value" type="number" value="{{bonus.value}}" disabled="true"/>
                     </div>
                     <div>
-                        <b>{{localize "WOD5E.Bonus.Unless"}}</b>
-                        <input name="path" type="text" value="{{bonus.unless}}" placeholder="{{localize 'WOD5E.Bonus.Unless'}}" disabled="true"/>
+                        <b>{{localize "WOD5E.Modifier.Unless"}}</b>
+                        <input name="path" type="text" value="{{bonus.unless}}" placeholder="{{localize 'WOD5E.Modifier.Unless'}}" disabled="true"/>
                     </div>
                     <div class="flexcol flex-center">
-                        <b>{{localize "WOD5E.Bonus.DisplayWhenInactive"}}</b>
+                        <b>{{localize "WOD5E.Modifier.DisplayWhenInactive"}}</b>
                         <input name="displayWhenInactive" type="checkbox"{{#if bonus.displayWhenInactive}} checked{{/if}} disabled="true"/>
                     </div>
                 </div>
                 <div class="grid grid-3col flex-center">
                     <div class="flexcol">
-                        <b>{{localize "WOD5E.Bonus.ActiveWhen"}}</b>
+                        <b>{{localize "WOD5E.Modifier.ActiveWhen"}}</b>
                         <select name="check" type="number">
-                            <option value="never"{{#ifeq bonus.activeWhen.check "never"}} selected{{/ifeq}} disabled="true">{{localize 'WOD5E.Bonus.Never'}}</option>
-                            <option value="always"{{#ifeq bonus.activeWhen.check "always"}} selected{{/ifeq}} disabled="true">{{localize 'WOD5E.Bonus.Always'}}</option>
-                            <option value="isEqual"{{#ifeq bonus.activeWhen.check "isEqual"}} selected{{/ifeq}} disabled="true">{{localize 'WOD5E.Bonus.IfEquals'}}</option>
-                            <option value="isPath"{{#ifeq bonus.activeWhen.check "isPath"}} selected{{/ifeq}} disabled="true">{{localize 'WOD5E.Bonus.IfPathIs'}}</option>
+                            <option value="never"{{#ifeq bonus.activeWhen.check "never"}} selected{{/ifeq}} disabled="true">{{localize 'WOD5E.Modifier.Never'}}</option>
+                            <option value="always"{{#ifeq bonus.activeWhen.check "always"}} selected{{/ifeq}} disabled="true">{{localize 'WOD5E.Modifier.Always'}}</option>
+                            <option value="isEqual"{{#ifeq bonus.activeWhen.check "isEqual"}} selected{{/ifeq}} disabled="true">{{localize 'WOD5E.Modifier.IfEquals'}}</option>
+                            <option value="isPath"{{#ifeq bonus.activeWhen.check "isPath"}} selected{{/ifeq}} disabled="true">{{localize 'WOD5E.Modifier.IfPathIs'}}</option>
                         </select>
                     </div>
                     {{#ifeq bonus.activeWhen.check 'isEqual'}}
                         <div>
-                            <b>{{localize "WOD5E.Bonus.PathToCheck"}}</b>
-                            <input name="path" type="text" value="{{bonus.activeWhen.path}}" placeholder="{{localize 'WOD5E.Bonus.PathToCheck'}}" disabled="true"/>
+                            <b>{{localize "WOD5E.Modifier.PathToCheck"}}</b>
+                            <input name="path" type="text" value="{{bonus.activeWhen.path}}" placeholder="{{localize 'WOD5E.Modifier.PathToCheck'}}" disabled="true"/>
                         </div>
                         <div>
-                            <b>{{localize "WOD5E.Bonus.ValueToCheck"}}</b>
-                            <input name="value" type="text" value="{{bonus.activeWhen.value}}" placeholder="{{localize 'WOD5E.Bonus.ValueToCheck'}}" disabled="true"/>
+                            <b>{{localize "WOD5E.Modifier.ValueToCheck"}}</b>
+                            <input name="value" type="text" value="{{bonus.activeWhen.value}}" placeholder="{{localize 'WOD5E.Modifier.ValueToCheck'}}" disabled="true"/>
                         </div>
                     {{else if (eq bonus.activeWhen.check "isPath")}}
                         <div>
-                            <b>{{localize "WOD5E.Bonus.PathToCheck"}}</b>
-                            <input name="path" type="text" value="{{bonus.activeWhen.path}}" placeholder="{{localize 'WOD5E.Bonus.PathToCheck'}}" disabled="true"/>
+                            <b>{{localize "WOD5E.Modifier.PathToCheck"}}</b>
+                            <input name="path" type="text" value="{{bonus.activeWhen.path}}" placeholder="{{localize 'WOD5E.Modifier.PathToCheck'}}" disabled="true"/>
                         </div>
                     {{/ifeq}}
                 </div>
                 <div class="flexcol">
-                    <b>{{localize "WOD5E.Bonus.Selectors"}}</b>
-                    <input class="bonus-selectors" name="paths" type="text" value="{{splitArray bonus.paths}}" placeholder="{{localize 'WOD5E.None'}}" disabled="true"/>
+                    <b>{{localize "WOD5E.Modifier.Selectors"}}</b>
+                    <input class="modifier-selectors" name="paths" type="text" value="{{splitArray bonus.paths}}" placeholder="{{localize 'WOD5E.None'}}" disabled="true"/>
                 </div>
             </div>
         {{/each}}
     </div>
     <hr>
     <div class="flex-center">
         <b>
-            <a class="add-bonus" data-action="addBonus" data-skill="{{id}}" data-bonus-path="skills.{{id}}.bonuses">{{localize "WOD5E.Bonus.AddNewBonus"}}</a>
+            <a class="add-bonus" data-action="addModifier" data-skill="{{id}}" data-bonus-path="skills.{{id}}.bonuses">{{localize "WOD5E.Modifier.AddNewModifier"}}</a>
         </b>
     </div>
 </section>