[Fix] 691 - CharacterCreation Improvement (#863)

* Removed main creation tab. Added equipment to remaining tab

* Fixed MixedAncestry name setting

* Fixed tab after first creation

templates/characterCreation/footer.hbs

@@ -1,7 +1,7 @@
 <section class="creation-action-footer">
     <button data-action="close">{{localize "Cancel"}}</button>
     {{#if isLastTab}}
-        <button data-action="finish" {{disabled (not tabs.setup.finished)}}>{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.finishCreation"}}</button>
+        <button data-action="finish">{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.finishCreation"}}</button>
     {{else}}
         <button data-action="setupGoNext" {{disabled nextDisabled}}>{{localize "Next"}}</button>
     {{/if}}

templates/characterCreation/setup.hbs

@@ -0,0 +1,7 @@
+<nav class='feature-tab sheet-tabs tabs setup-tabs' data-group='setup'>
+    {{#each tabs as |tab|}}
+        <button class='{{tab.id}} {{tab.cssClass}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}' {{disabled tab.disabled}}>
+            {{localize tab.label}}
+        </button>
+    {{/each}}
+</nav>

templates/characterCreation/tabs.hbs

@@ -2,7 +2,7 @@
     <line-div></line-div>
     <nav class='feature-tab sheet-tabs tabs' data-group='primary'>
         {{#each tabs as |tab|}}
-            <a class='{{tab.id}} {{tab.cssClass}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}'>
+            <a class='{{tab.id}} {{tab.cssClass}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}' {{disabled tab.disabled}}>
                 {{localize tab.label}}
                 <div class="finish-marker {{#if (eq tab.cssClass 'active')}}active{{/if}}">{{#if tab.finished}}<i class="fa-solid fa-check"></i>{{/if}}</div>
                 {{#if tab.optional}}<div class="descriptor">{{localize "DAGGERHEART.GENERAL.Tabs.optional"}}</div>{{/if}}

templates/characterCreation/tabs/ancestry.hbs

@@ -1,14 +1,14 @@
 <section
-    class='tab {{setupTabs.ancestry.cssClass}} {{setupTabs.ancestry.id}}'
-    data-tab='{{setupTabs.ancestry.id}}'
-    data-group='{{setupTabs.ancestry.group}}'
+    class='tab {{tabs.ancestry.cssClass}} {{tabs.ancestry.id}}'
+    data-tab='{{tabs.ancestry.id}}'
+    data-group='{{tabs.ancestry.group}}'
 >
     <div class="main-selections-container">
         <fieldset class="section-container">
             <legend>{{localize "TYPES.Item.ancestry"}}</legend>
 
             <div class="ancestry-name">
-                <input type="text" name="ancestryName" value="{{ancestryName}}" placeholder="{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.ancestryNamePlaceholder"}}" {{disabled (not primaryAncestry.uuid)}} />
+                <input type="text" name="ancestryName.overwrite" value="{{ancestryName}}" placeholder="{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.ancestryNamePlaceholder"}}" {{disabled (not primaryAncestry.uuid)}} />
             </div>
 
             <div class="ancestry-mixed-controller {{#if mixedAncestry}}active{{/if}}">

templates/characterCreation/tabs/class.hbs

@@ -1,7 +1,7 @@
 <section
-    class='tab {{setupTabs.class.cssClass}} {{setupTabs.class.id}}'
-    data-tab='{{setupTabs.class.id}}'
-    data-group='{{setupTabs.class.group}}'
+    class='tab {{tabs.class.cssClass}} {{tabs.class.id}}'
+    data-tab='{{tabs.class.id}}'
+    data-group='{{tabs.class.group}}'
 >
     <div class="main-selections-container">
         <fieldset class="section-container">

templates/characterCreation/tabs/community.hbs

@@ -1,7 +1,7 @@
 <section
-    class='tab {{setupTabs.community.cssClass}} {{setupTabs.community.id}}'
-    data-tab='{{setupTabs.community.id}}'
-    data-group='{{setupTabs.community.group}}'
+    class='tab {{tabs.community.cssClass}} {{tabs.community.id}}'
+    data-tab='{{tabs.community.id}}'
+    data-group='{{tabs.community.group}}'
 >
     <div class="main-selections-container">
         <fieldset class="section-container">

templates/characterCreation/tabs/domainCards.hbs

@@ -1,7 +1,7 @@
 <section
-    class='tab {{setupTabs.domainCards.cssClass}} {{setupTabs.domainCards.id}}'
-    data-tab='{{setupTabs.domainCards.id}}'
-    data-group='{{setupTabs.domainCards.group}}'
+    class='tab {{tabs.domainCards.cssClass}} {{tabs.domainCards.id}}'
+    data-tab='{{tabs.domainCards.id}}'
+    data-group='{{tabs.domainCards.group}}'
 >
     <div class="main-selections-container">
         <fieldset class="section-container">

templates/characterCreation/tabs/experience.hbs

@@ -1,7 +1,7 @@
 <section
-    class='tab {{setupTabs.experience.cssClass}} {{setupTabs.experience.id}}'
-    data-tab='{{setupTabs.experience.id}}'
-    data-group='{{setupTabs.experience.group}}'
+    class='tab {{tabs.experience.cssClass}} {{tabs.experience.id}}'
+    data-tab='{{tabs.experience.id}}'
+    data-group='{{tabs.experience.group}}'
 >
     <div class="main-selections-container">
         <fieldset class="section-container">

templates/characterCreation/tabs/setup.hbs

@@ -1,13 +0,0 @@
-<section
-    class='tab {{tabs.setup.cssClass}} {{tabs.setup.id}}'
-    data-tab='{{tabs.setup.id}}'
-    data-group='{{tabs.setup.group}}'
->
-    <nav class='feature-tab sheet-tabs tabs setup-tabs' data-group='setup'>
-        {{#each setupTabs as |tab|}}
-            <button class='{{tab.id}} {{tab.cssClass}}' data-action='tab' data-group='{{tab.group}}' data-tab='{{tab.id}}' {{disabled tab.disabled}}>
-                {{localize tab.label}}
-            </button>
-        {{/each}}
-    </nav>
-</section>

templates/characterCreation/tabs/traits.hbs

@@ -1,7 +1,7 @@
 <section
-    class='tab {{setupTabs.traits.cssClass}} {{setupTabs.traits.id}}'
-    data-tab='{{setupTabs.traits.id}}'
-    data-group='{{setupTabs.traits.group}}'
+    class='tab {{tabs.traits.cssClass}} {{tabs.traits.id}}'
+    data-tab='{{tabs.traits.id}}'
+    data-group='{{tabs.traits.group}}'
 >
    <div class="main-selections-container">
         <fieldset class="section-container">