Merge pull request #60 from WoD5E-Developers/prerelease-2

More prerelease 2 fetures (wip)
WoD5E-Developers · Aug 31, 2024 · 5ee2dd8 · 5ee2dd8
2 parents c561c1c + 49862b3
commit 5ee2dd8
Show file tree

Hide file tree

Showing 67 changed files with 563 additions and 576 deletions.
diff --git a/display/htr/actors/cell-sheet.hbs b/display/htr/actors/cell-sheet.hbs
@@ -1,6 +1,6 @@
 <form class="{{cssClass}} flexcol {{#if locked}}locked{{/if}}" autocomplete="off">
     {{!-- Cell Sheet Header --}}
-    <header class="actor-header" {{#if actor.system.settings.headerbg}}style="background: url({{actor.system.settings.headerbg}}) center;"{{/if}}>
+    <header class="actor-header"{{#if headerbg}} style="background: url({{headerbg}}) center;"{{/if}}>
         {{> "systems/vtm5e/display/shared/actors/parts/group/header-profile.hbs"}}
         <div>
             <div class="flexrow">

diff --git a/display/htr/actors/hunter-sheet.hbs b/display/htr/actors/hunter-sheet.hbs
@@ -1,6 +1,6 @@
 <form class="{{cssClass}} flexcol {{#if locked}}locked{{/if}}" autocomplete="off">
     {{!-- Hunter Sheet Header --}}
-    <header class="actor-header" {{#if actor.system.settings.headerbg}}style="background: url({{actor.system.settings.headerbg}}) center;"{{/if}}>
+    <header class="actor-header" {{#if headerbg}} style="background: url({{headerbg}}) center;"{{/if}}>
         <div class="header-fields">
             <div class="header-fields-left">
                 {{!-- Health Tracker --}}

diff --git a/display/shared/actors/mortal-sheet.hbs b/display/shared/actors/mortal-sheet.hbs
@@ -1,6 +1,6 @@
 <form class="{{cssClass}} flexcol {{#if locked}}locked{{/if}}" autocomplete="off">
     {{!-- Mortal Sheet Header --}}
-    <header class="actor-header" {{#if actor.system.settings.headerbg}}style="background: url({{actor.system.settings.headerbg}}) center;"{{/if}}>
+    <header class="actor-header" {{#if headerbg}} style="background: url({{headerbg}}) center;"{{/if}}>
         <div class="header-fields">
             <div class="header-fields-left">
                 {{!-- Health Tracker --}}

diff --git a/display/shared/actors/parts/actor-settings.hbs b/display/shared/actors/parts/actor-settings.hbs
@@ -1,8 +1,16 @@
 <div class="tab" data-group="primary" data-tab="settings">
-  <div class="form-group">
-    <label>Actor Header Background</label>
-    <div class="form-fields">
-      <file-picker name="system.settings.headerbg" type="imagevideo" value="{{actor.system.settings.headerbg}}" noupload></file-picker>
+    <div class="form-group">
+        <label>Actor Header Background</label>
+        <div class="form-fields">
+            <file-picker name="system.settings.headerbg" type="imagevideo" value="{{actor.system.settings.headerbg}}" noupload></file-picker>
+        </div>
     </div>
-  </div>
-</div>
+    <div class="form-group">
+        <label>Actor Type</label>
+        <div class="form-fields">
+            <select class="actor-type-selector" name="{{actorTypePath}}" data-type="String"{{#if actor.limited}} disabled{{/if}}>
+                {{selectOptions actorOptions selected=currentActorType localize=true}}
+            </select>
+        </div>
+    </div>
+</div>
diff --git a/display/shared/actors/parts/group/header-profile.hbs b/display/shared/actors/parts/group/header-profile.hbs
@@ -14,17 +14,3 @@
         </div>
     </div>
 </div>
-<div>
-    <div class="flexcol flex-group-center">
-        <div class="field-header">Group Type</div>
-        <div class="group-type-container resource flex-group-center">
-            {{#if locked}}
-                <div class="group-type-label">
-                    {{generateLocalizedLabel actor.system.groupType 'grouptype'}}
-                </div>
-            {{else}}
-                {{> "systems/vtm5e/display/shared/actors/parts/group/type-selector.hbs"}}
-            {{/if}}
-        </div>
-    </div>
-</div>
diff --git a/display/shared/actors/parts/group/type-selector.hbs b/display/shared/actors/parts/group/type-selector.hbs
diff --git a/display/shared/actors/parts/spc/type-selector.hbs b/display/shared/actors/parts/spc/type-selector.hbs
diff --git a/display/shared/actors/spc-sheet.hbs b/display/shared/actors/spc-sheet.hbs
@@ -1,6 +1,6 @@
 <form class="{{cssClass}} flexcol {{#if locked}}locked{{/if}}" autocomplete="off">
     {{!-- SPC Sheet Header --}}
-    <header class="actor-header" {{#if actor.system.settings.headerbg}}style="background: url({{actor.system.settings.headerbg}}) center;"{{/if}}>
+    <header class="actor-header" {{#if headerbg}} style="background: url({{headerbg}}) center;"{{/if}}>
         <div class="header-fields">
             <div class="header-fields-left">
                 {{!-- Health Tracker --}}
@@ -68,10 +68,7 @@
     {{!-- Actor Type Banner --}}
     {{#if displayBanner}}
         <div class="sheet-banner flexrow">
-            <div class="sheet-label">
-                {{localize "WOD5E.SPC.Label"}}
-            </div>
-            {{> "systems/vtm5e/display/shared/actors/parts/spc/type-selector.hbs"}}
+            {{localize "WOD5E.SPC.Label"}}
         </div>
     {{/if}}
 </form>
diff --git a/display/vtm/actors/coterie-sheet.hbs b/display/vtm/actors/coterie-sheet.hbs
@@ -1,6 +1,6 @@
 <form class="{{cssClass}} flexcol{{#if locked}} locked{{/if}}" autocomplete="off">
   {{!-- Coterie Sheet Header --}}
-    <header class="actor-header" {{#if actor.system.settings.headerbg}}style="background: url({{actor.system.settings.headerbg}}) center;"{{/if}}>
+    <header class="actor-header" {{#if headerbg}} style="background: url({{headerbg}}) center;"{{/if}}>
         {{> "systems/vtm5e/display/shared/actors/parts/group/header-profile.hbs"}}
         <div>
             <div class="flexrow coterie-features grid-2col">

diff --git a/display/vtm/actors/ghoul-sheet.hbs b/display/vtm/actors/ghoul-sheet.hbs
@@ -1,6 +1,6 @@
 <form class="{{cssClass}} flexcol {{#if locked}}locked{{/if}}" autocomplete="off">
     {{!-- Ghoul Sheet Header --}}
-    <header class="actor-header" {{#if actor.system.settings.headerbg}}style="background: url({{actor.system.settings.headerbg}}) center;"{{/if}}>
+    <header class="actor-header" {{#if headerbg}} style="background: url({{headerbg}}) center;"{{/if}}>
         <div class="header-fields">
             <div class="header-fields-left">
                 {{!-- Health Tracker --}}

diff --git a/display/vtm/actors/vampire-sheet.hbs b/display/vtm/actors/vampire-sheet.hbs
@@ -1,6 +1,6 @@
 <form class="{{cssClass}} flexcol {{#if locked}}locked{{/if}}" autocomplete="off">
     {{!-- Vampire Sheet Header --}}
-    <header class="actor-header" {{#if actor.system.settings.headerbg}}style="background: url({{actor.system.settings.headerbg}}) center;"{{/if}}>
+    <header class="actor-header" {{#if headerbg}} style="background: url({{headerbg}}) center;"{{/if}}>
         <div class="header-fields">
             <div class="header-fields-left">
                 {{!-- Health Tracker --}}

diff --git a/display/wta/actors/pack-sheet.hbs b/display/wta/actors/pack-sheet.hbs
@@ -1,6 +1,6 @@
 <form class="{{cssClass}} flexcol{{#if locked}} locked{{/if}}" autocomplete="off">
     {{!-- Pack Sheet Header --}}
-    <header class="actor-header" {{#if actor.system.settings.headerbg}}style="background: url({{actor.system.settings.headerbg}}) center;"{{/if}}>
+    <header class="actor-header" {{#if headerbg}} style="background: url({{headerbg}}) center;"{{/if}}>
         {{> "systems/vtm5e/display/shared/actors/parts/group/header-profile.hbs"}}
     </header>
 

diff --git a/display/wta/actors/parts/forms.hbs b/display/wta/actors/parts/forms.hbs
@@ -2,7 +2,7 @@
 <div class="flexrow grid grid-5col forms">
     {{#each actor.system.forms as |form id|}}
         <div>
-            <label class="resource-label were-form-name"><h3>{{localize form.name}}</h3></label>
+            <label class="resource-label were-form-name"><h3>{{localize form.displayName}}</h3></label>
             <div class="were-form-title flexcol flex-center">
                 <label class="were-form-nickname">{{localize form.nickname}}</label>
             </div>

diff --git a/display/wta/actors/werewolf-sheet.hbs b/display/wta/actors/werewolf-sheet.hbs
@@ -1,6 +1,6 @@
 <form class="{{cssClass}} flexcol {{#if locked}}locked{{/if}}" autocomplete="off">
     {{!-- Werewolf Sheet Header --}}
-    <header class="actor-header" {{#if actor.system.settings.headerbg}}style="background: url({{actor.system.settings.headerbg}}) center;"{{/if}}>
+    <header class="actor-header" {{#if headerbg}} style="background: url({{headerbg}}) center;"{{/if}}>
         <div class="header-fields">
             <div class="header-fields-left">
                 {{!-- Health Tracker --}}

diff --git a/lang/de/core-de.json b/lang/de/core-de.json
@@ -184,6 +184,8 @@
     "Settings": {
       "ActorBanner": "Charakter-Typ-Banner anzeigen",
       "ActorBannerHint": "Zeigt einen farbigen Banner oben am Charakterbogen, der den Typ von Wesen anzeigt.",
+      "_actorHeaderOverride": "",
+      "_actorHeaderOverrideHint": "",
       "AddAttributeModification": "Attributs-Modifikation hinzufügen",
       "AddCustomAttribute": "Eigenes Attribut hinzufügen",
       "_AddCustomDiscipline": "",

diff --git a/lang/de/werewolf-de.json b/lang/de/werewolf-de.json
@@ -10,8 +10,17 @@
       "Ban": "Bann",
       "BlackFury": "Schwarze Furie",
       "BoneGnawer": "Knochenbeißer",
+      "_CausesDelirium": "",
       "ChildrenOfGaia": "Kind von Gaia",
+      "_CrinosBite": "",
+      "_CrinosClaws": "",
+      "_CrinosFrenzy": "",
+      "_CrinosHealth": "",
+      "_CrinosMentalTests": "",
       "CrinosName": "Crinos",
+      "_CrinosPhysicalTests": "",
+      "_CrinosRegenerate": "",
+      "_CrinosSocialTests": "",
       "CrinosTitle": "Die Kriegsform, Das Monster",
       "EndFrenzy": "Raserei beenden",
       "EnterFrenzy": "In Raserei fallen",
@@ -29,6 +38,9 @@
       "GiftsandRites": "Gaben und Riten",
       "GiftType": "Gaben-Typ",
       "GlabroName": "Glabro",
+      "_GlabroPhysicalTests": "",
+      "_GlabroRegenerate": "",
+      "_GlabroSocialTests": "",
       "GlabroTitle": "Der Fast-Mensch",
       "GlassWalker": "Glaswandler",
       "Glory": "Ruhm",
@@ -38,7 +50,12 @@
       "HasCost": "Hat Kosten",
       "Hauglosk": "Hauglosk",
       "HaugloskTest": "Hauglosk-Probe",
+      "_HispoBite": "",
       "HispoName": "Hispo",
+      "_HispoPhysicalTests": "",
+      "_HispoRegenerate": "",
+      "_HispoSocialTests": "",
+      "_HispoStealthTests": "",
       "HispoTitle": "Der Schreckenswolf",
       "HomidName": "Homid",
       "HomidTitle": "Der Mensch",
@@ -50,6 +67,7 @@
       "LostWolfShiftDown": "Dieser Akteur hat den Wolf in sich verloren und kann nicht in übernatürlicher Form bleiben. Wähle eine Form zum Zurückverwandeln.",
       "LostWolfWarning": "Dieser Akteur hat 0 Zorn und den Wolf in sich verloren.",
       "LupusName": "Lupus",
+      "_LupusSocialTests": "",
       "LupusTitle": "Der Wolf",
       "Native": "Native",
       "NewGift": "Neue Gabe",
@@ -73,6 +91,7 @@
       "ShadowLord": "Schattenlord",
       "SilentStrider": "Stiller Wanderer",
       "SilverFang": "Silberfang",
+      "_SilverImmunity": "",
       "_StringGifts": "",
       "Theurge": "Theurg",
       "TheWolf": "Der Wolf",

diff --git a/lang/en/core-en.json b/lang/en/core-en.json
@@ -184,6 +184,8 @@
     "Settings": {
       "ActorBanner": "Enable Character Type Banner",
       "ActorBannerHint": "Display a banner at the top of actor sheets to represent the character type.",
+      "actorHeaderOverride": "Default Actor Header",
+      "actorHeaderOverrideHint": "Determine the default image used for actor headers.",
       "AddAttributeModification": "Add Attribute Modification",
       "AddCustomAttribute": "Add Custom Attribute",
       "AddCustomDiscipline": "Add Custom Discipline",

diff --git a/lang/en/werewolf-en.json b/lang/en/werewolf-en.json
@@ -10,8 +10,17 @@
       "Ban": "Ban",
       "BlackFury": "Black Fury",
       "BoneGnawer": "Bone Gnawer",
+      "CausesDelirium": "Causes Delirium",
       "ChildrenOfGaia": "Children of Gaia",
+      "CrinosBite": "Bite: +1 Aggravated",
+      "CrinosClaws": "Claws: +3",
+      "CrinosFrenzy": "Frenzy Risk, 1 Willpower/turn",
+      "CrinosHealth": "Health: +4",
+      "CrinosMentalTests": "Mental Tests: Auto-failure",
       "CrinosName": "Crinos",
+      "CrinosPhysicalTests": "Physical Tests: +4",
+      "CrinosRegenerate": "Regenerate: 2/Rage Check",
+      "CrinosSocialTests": "Social Tests: Auto-failure",
       "CrinosTitle": "The War-Form, The Monster",
       "EndFrenzy": "End Frenzy",
       "EnterFrenzy": "Enter Frenzy",
@@ -29,6 +38,9 @@
       "GiftsandRites": "Gifts & Rites",
       "GiftType": "Gift Type",
       "GlabroName": "Glabro",
+      "GlabroPhysicalTests": "Physical Tests: +2",
+      "GlabroRegenerate": "Regenerate: 1/Rage Check",
+      "GlabroSocialTests": "Social Tests: -2",
       "GlabroTitle": "The Near-Human",
       "GlassWalker": "Glass Walker",
       "Glory": "Glory",
@@ -38,7 +50,12 @@
       "HasCost": "Has Cost",
       "Hauglosk": "Hauglosk",
       "HaugloskTest": "Hauglosk Test",
+      "HispoBite": "Bite: +1 Aggravated",
       "HispoName": "Hispo",
+      "HispoPhysicalTests": "(Non-Stealth) Physical Tests: +2",
+      "HispoRegenerate": "Regenerate: 1/Rage Check",
+      "HispoSocialTests": "Social Tests: Limited to wolves and Garou",
+      "HispoStealthTests": "Stealth Tests: -2",
       "HispoTitle": "The Dire Wolf",
       "HomidName": "Homid",
       "HomidTitle": "The Human",
@@ -50,6 +67,7 @@
       "LostWolfShiftDown": "This actor has Lost the Wolf and cannot remain in supernatural forms. Choose a form to shift down into.",
       "LostWolfWarning": "This actor has 0 rage and has lost the wolf.",
       "LupusName": "Lupus",
+      "LupusSocialTests": "Social Tests: Limited to wolves and Garou",
       "LupusTitle": "The Wolf",
       "Native": "Native",
       "NewGift": "New Gift",
@@ -73,6 +91,7 @@
       "ShadowLord": "Shadow Lord",
       "SilentStrider": "Silent Strider",
       "SilverFang": "Silver fang",
+      "SilverImmunity": "Silver Immunity",
       "StringGifts": "{string} Gifts",
       "Theurge": "Theurge",
       "TheWolf": "The Wolf",

diff --git a/lang/es/core-es.json b/lang/es/core-es.json
@@ -184,6 +184,8 @@
     "Settings": {
       "_ActorBanner": "",
       "_ActorBannerHint": "",
+      "_actorHeaderOverride": "",
+      "_actorHeaderOverrideHint": "",
       "_AddAttributeModification": "",
       "_AddCustomAttribute": "",
       "_AddCustomDiscipline": "",

diff --git a/lang/es/werewolf-es.json b/lang/es/werewolf-es.json
@@ -10,8 +10,17 @@
       "_Ban": "",
       "_BlackFury": "",
       "_BoneGnawer": "",
+      "_CausesDelirium": "",
       "_ChildrenOfGaia": "",
+      "_CrinosBite": "",
+      "_CrinosClaws": "",
+      "_CrinosFrenzy": "",
+      "_CrinosHealth": "",
+      "_CrinosMentalTests": "",
       "CrinosName": "Crinos",
+      "_CrinosPhysicalTests": "",
+      "_CrinosRegenerate": "",
+      "_CrinosSocialTests": "",
       "_CrinosTitle": "",
       "_EndFrenzy": "",
       "_EnterFrenzy": "",
@@ -29,6 +38,9 @@
       "_GiftsandRites": "",
       "_GiftType": "",
       "GlabroName": "Glabro",
+      "_GlabroPhysicalTests": "",
+      "_GlabroRegenerate": "",
+      "_GlabroSocialTests": "",
       "_GlabroTitle": "",
       "_GlassWalker": "",
       "Glory": "Gloria",
@@ -38,7 +50,12 @@
       "HasCost": "Tiene coste",
       "Hauglosk": "Hauglosk",
       "_HaugloskTest": "",
+      "_HispoBite": "",
       "HispoName": "Hispo",
+      "_HispoPhysicalTests": "",
+      "_HispoRegenerate": "",
+      "_HispoSocialTests": "",
+      "_HispoStealthTests": "",
       "_HispoTitle": "",
       "HomidName": "Homid",
       "HomidTitle": "El humano",
@@ -50,6 +67,7 @@
       "_LostWolfShiftDown": "",
       "_LostWolfWarning": "",
       "LupusName": "Lupus",
+      "_LupusSocialTests": "",
       "_LupusTitle": "",
       "_Native": "",
       "_NewGift": "",
@@ -73,6 +91,7 @@
       "_ShadowLord": "",
       "_SilentStrider": "",
       "_SilverFang": "",
+      "_SilverImmunity": "",
       "_StringGifts": "",
       "_Theurge": "",
       "TheWolf": "El lobo",

diff --git a/lang/fr/core-fr.json b/lang/fr/core-fr.json
@@ -184,6 +184,8 @@
     "Settings": {
       "_ActorBanner": "",
       "_ActorBannerHint": "",
+      "_actorHeaderOverride": "",
+      "_actorHeaderOverrideHint": "",
       "_AddAttributeModification": "",
       "_AddCustomAttribute": "",
       "_AddCustomDiscipline": "",