Fix conflict

This commit is contained in:
Dapoolp 2025-06-22 22:23:08 +02:00
commit 22fa89b395
102 changed files with 5478 additions and 2183 deletions

View file

@ -1,19 +0,0 @@
<form class={{cssClass}} autocomplete="off">
<div class="form-group">
<label>{{localize "DAGGERHEART.Settings.Menu.Automation.HopeLabel"}}</label>
<div class="form-fields">
<input type="checkbox" name="{{settings.Hope}}" {{checked this.hope}} />
</div>
</div>
<div class="form-group">
<label>{{localize "DAGGERHEART.Settings.Menu.Automation.ActionPointsLabel"}}</label>
<div class="form-fields">
<input type="checkbox" name="{{settings.ActionPoints}}" {{checked this.actionPoints}} />
</div>
</div>
<footer class="flexrow">
<button type="submit">Save</button>
<button>Cancel</button>
</footer>
</form>

View file

@ -0,0 +1,4 @@
<section class="creation-action-footer">
<button data-action="close">{{localize "Cancel"}}</button>
<button {{#if tabs.setup.finished}}data-action="finish"{{else}}disabled{{/if}}>{{localize "DAGGERHEART.CharacterCreation.FinishCreation"}}</button>
</section>

View file

@ -0,0 +1,13 @@
<section class='tab-navigation'>
<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}}'>
{{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.CharacterCreation.Tabs.Optional"}}</div>{{/if}}
</a>
{{/each}}
</nav>
<line-div></line-div>
</section>

View file

@ -0,0 +1,107 @@
<section
class='tab {{tabs.equipment.cssClass}} {{tabs.equipment.id}}'
data-tab='{{tabs.equipment.id}}'
data-group='{{tabs.equipment.group}}'
>
<div class="main-selections-container">
<div class="main-equipment-selection">
<fieldset class="equipment-selection">
<legend>{{localize "DAGGERHEART.CharacterCreation.SuggestedArmor"}}</legend>
<div class="selections-container armor-card">
{{#> "systems/daggerheart/templates/components/card-preview.hbs" armor }}
{{localize "DAGGERHEART.CharacterCreation.SelectArmor"}}
{{/"systems/daggerheart/templates/components/card-preview.hbs"}}
</div>
{{#if armor.suggestion}}
<fieldset class="suggestion-container">
<legend>{{armor.suggestion.name}}</legend>
<div class="suggestion-inner-container {{#if armor.suggestion.taken}}taken{{/if}}" data-action="viewItem" data-uuid="{{armor.suggestion.uuid}}">
<img src="{{armor.suggestion.img}}" />
</div>
</fieldset>
{{/if}}
</fieldset>
<fieldset class="equipment-selection">
<legend>{{localize "DAGGERHEART.CharacterCreation.SuggestedWeapons"}}</legend>
<div class="equipment-subsection">
<div class="equipment-wrapper">
<div class="selections-container primary-weapon-card">
{{#> "systems/daggerheart/templates/components/card-preview.hbs" primaryWeapon }}
{{localize "DAGGERHEART.CharacterCreation.SelectPrimaryWeapon"}}
{{/"systems/daggerheart/templates/components/card-preview.hbs"}}
</div>
{{#if primaryWeapon.suggestion}}
<fieldset class="suggestion-container">
<legend>{{primaryWeapon.suggestion.name}}</legend>
<div class="suggestion-inner-container {{#if primaryWeapon.suggestion.taken}}taken{{/if}}" data-action="viewItem" data-uuid="{{primaryWeapon.suggestion.uuid}}">
<img src="{{primaryWeapon.suggestion.img}}" />
</div>
</fieldset>
{{/if}}
</div>
<div class="equipment-wrapper">
<div class="selections-container secondary-weapon-card">
{{#> "systems/daggerheart/templates/components/card-preview.hbs" secondaryWeapon }}
{{localize "DAGGERHEART.CharacterCreation.SelectSecondaryWeapon"}}
{{/"systems/daggerheart/templates/components/card-preview.hbs"}}
</div>
{{#if secondaryWeapon.suggestion}}
<fieldset class="suggestion-container">
<legend>{{secondaryWeapon.suggestion.name}}</legend>
<div
class="suggestion-inner-container {{#if secondaryWeapon.suggestion.taken}}taken{{/if}}"
data-action="viewItem" data-uuid="{{secondaryWeapon.suggestion.uuid}}"
>
<img src="{{secondaryWeapon.suggestion.img}}" />
</div>
</fieldset>
{{/if}}
</div>
</div>
</fieldset>
</div>
<div class="main-equipment-selection triple">
<fieldset class="equipment-selection">
<legend>{{localize "DAGGERHEART.CharacterCreation.StartingItems"}}</legend>
<div class="simple-equipment-container">
{{#each inventory.take}}
<div class="simple-equipment">
<label>{{this.name}}</label>
<img src="{{this.img}}" />
</div>
{{/each}}
</div>
</fieldset>
<fieldset class="equipment-selection">
<legend>{{localize "DAGGERHEART.CharacterCreation.Choice"}}</legend>
<div class="simple-equipment-container">
{{#each inventory.choiceA.suggestions}}
<div class="simple-equipment selectable {{#if (not this.selected)}}inactive{{/if}}" data-action="equipmentChoice" data-path="choiceA" data-uuid="{{this.uuid}}">
<label>{{this.name}}</label>
<img src="{{this.img}}" />
</div>
{{/each}}
</div>
</fieldset>
<fieldset class="equipment-selection">
<legend>{{localize "DAGGERHEART.CharacterCreation.Choice"}}</legend>
<div class="simple-equipment-container">
{{#each inventory.choiceB.suggestions}}
<div class="simple-equipment selectable {{#if (not this.selected)}}inactive{{/if}}" data-action="equipmentChoice" data-path="choiceB" data-uuid="{{this.uuid}}" >
<label>{{this.name}}</label>
<img src="{{this.img}}" />
</div>
{{/each}}
</div>
</fieldset>
</div>
</div>
</section>

View file

@ -0,0 +1,101 @@
<section
class='tab {{tabs.setup.cssClass}} {{tabs.setup.id}}'
data-tab='{{tabs.setup.id}}'
data-group='{{tabs.setup.group}}'
>
<div class="main-selections-container">
<fieldset class="section-container">
<legend>{{localize "TYPES.Item.class"}}</legend>
<div class="selections-outer-container">
<div class="selections-container class-card">
{{#> "systems/daggerheart/templates/components/card-preview.hbs" class }}
{{localize "DAGGERHEART.CharacterCreation.SelectClass"}}
{{/"systems/daggerheart/templates/components/card-preview.hbs"}}
</div>
<div class="selections-container subclass-card">
{{#> "systems/daggerheart/templates/components/card-preview.hbs" subclass disabled=(not class.img) }}
{{localize "DAGGERHEART.CharacterCreation.SelectSubclass"}}
{{/"systems/daggerheart/templates/components/card-preview.hbs"}}
</div>
</div>
</fieldset>
{{#if (gte visibility 2)}}
<fieldset class="section-container">
<legend>{{localize "DAGGERHEART.CharacterCreation.Heritage"}}</legend>
<div class="selections-outer-container">
<div class="selections-container ancestry-card">
{{#> "systems/daggerheart/templates/components/card-preview.hbs" ancestry }}
{{localize "DAGGERHEART.CharacterCreation.SelectAncestry"}}
{{/"systems/daggerheart/templates/components/card-preview.hbs"}}
</div>
<div class="selections-container community-card">
{{#> "systems/daggerheart/templates/components/card-preview.hbs" community }}
{{localize "DAGGERHEART.CharacterCreation.SelectCommunity"}}
{{/"systems/daggerheart/templates/components/card-preview.hbs"}}
</div>
</div>
</fieldset>
{{/if}}
{{#if (gte visibility 3)}}
<fieldset class="section-container">
<legend>{{localize "DAGGERHEART.CharacterCreation.TraitIncreases"}} {{traits.nrSelected}}/{{traits.nrTotal}}</legend>
<div class="traits-container">
<fieldset class="section-inner-container">
<legend>{{localize "DAGGERHEART.CharacterCreation.SuggestedTraits"}}</legend>
<div class="suggested-traits-container">
{{#each suggestedTraits}}
<div class="suggested-trait-container">{{this}}</div>
{{/each}}
</div>
<button class="action-button" data-action="useSuggestedTraits">{{localize "Use"}}</button>
</fieldset>
<div class="traits-inner-container">
{{#each traits.values}}
<div class="trait-container">
<div>{{this.name}}</div>
<select name="{{concat "traits." this.key ".value"}}" data-dtype="Number">
{{selectOptions this.options selected=this.value valueAttr="key" labelAttr="value" blank=""}}
</select>
</div>
{{/each}}
</div>
</div>
</fieldset>
{{/if}}
{{#if (gte visibility 4)}}
<fieldset class="section-container">
<legend>{{localize "DAGGERHEART.CharacterCreation.InitialExperiences"}} {{experience.nrSelected}}/{{experience.nrTotal}}</legend>
<div class="experiences-inner-container">
{{#each experience.values as |experience id|}}
<div class="experience-container">
<input class="experience-description" type="text" name="{{concat "experiences." id ".description" }}" value="{{experience.description}}" placeholder="{{localize "DAGGERHEART.CharacterCreation.NewExperience"}}" />
<div class="experience-value">{{signedNumber this.value}}</div>
</div>
{{/each}}
</div>
</fieldset>
{{/if}}
{{#if (gte visibility 5)}}
<fieldset class="section-container">
<legend>{{localize "TYPES.Item.domainCard"}}</legend>
<div class="selections-outer-container">
{{#each domainCards as |domainCard id|}}
<div class="selections-container domain-card" data-card="{{id}}">
{{#> "systems/daggerheart/templates/components/card-preview.hbs" domainCard }}
{{#each @root.class.system.domains }}
<div>{{localize (concat "DAGGERHEART.Domains." this ".label")}}</div>
{{/each}}
{{/"systems/daggerheart/templates/components/card-preview.hbs"}}
</div>
{{/each}}
</div>
</fieldset>
{{/if}}
</div>
</section>

View file

@ -0,0 +1,9 @@
<section
class='tab {{tabs.story.cssClass}} {{tabs.story.id}}'
data-tab='{{tabs.story.id}}'
data-group='{{tabs.story.group}}'
>
<div>
Story
</div>
</section>

View file

@ -0,0 +1,42 @@
<div>
<div class="expanded-view {{#if minimized}}hidden{{/if}}">
<div class="countdowns-menu">
{{#if canCreate}}<button class="flex" data-action="addCountdown">{{localize "DAGGERHEART.Countdown.AddCountdown"}}</button>{{/if}}
{{#if isGM}}<button data-action="openOwnership" data-tooltip="{{localize "DAGGERHEART.Countdown.OpenOwnership"}}"><i class="fa-solid fa-users"></i></button>{{/if}}
</div>
<div class="countdowns-container">
{{#each source.countdowns}}
<fieldset class="countdown-fieldset">
<legend>
{{this.name}}
{{#if this.canEdit}}<a><i class="fa-solid fa-trash icon-button" data-action="removeCountdown" data-countdown="{{@key}}"></i></a>{{/if}}
{{#if @root.isGM}}<a><i class="fa-solid fa-users icon-button" data-action="openCountdownOwnership" data-countdown="{{@key}}" data-tooltip="{{localize "DAGGERHEART.Countdown.OpenOwnership"}}"></i></a>{{/if}}
</legend>
<div class="countdown-container">
<img src="{{this.img}}" {{#if this.canEdit}}data-action='editImage'{{else}}class="disabled"{{/if}} data-countdown="{{@key}}" />
<div class="countdown-inner-container">
{{formGroup @root.countdownFields.name name=(concat @root.base ".countdowns." @key ".name") value=this.name localize=true disabled=(not this.canEdit)}}
<div class="countdown-value-container">
{{formGroup @root.countdownFields.progress.fields.current name=(concat @root.base ".countdowns." @key ".progress.current") value=this.progress.current localize=true disabled=(not this.canEdit)}}
{{formGroup @root.countdownFields.progress.fields.max name=(concat @root.base ".countdowns." @key ".progress.max") value=this.progress.max localize=true disabled=(not this.canEdit)}}
</div>
{{formGroup @root.countdownFields.progress.fields.type.fields.value name=(concat @root.base ".countdowns." @key ".progress.type.value") value=this.progress.type.value localize=true localize=true disabled=(not this.canEdit)}}
</div>
</div>
</fieldset>
{{/each}}
</div>
</div>
<div class="minimized-view {{#if (not minimized)}}hidden{{/if}}">
{{#each source.countdowns}}
<a class="mini-countdown-container {{#if (not this.canEdit)}}disabled{{/if}}" data-countdown="{{@key}}">
<img src="{{this.img}}" />
<div class="mini-countdown-name">{{this.name}}</div>
<div class="mini-countdown-value">{{this.progress.current}}/{{this.progress.max}}</div>
</a>
{{/each}}
</div>
</div>

View file

@ -1,9 +1,14 @@
<div>
<div class="downtime-container">
{{#each this.options as |option key|}}
<h2 class="downtime-header">{{localize "DAGGERHEART.Downtime.DowntimeHeader" current=nrCurrentChoices max=moveData.nrChoices}}</h2>
{{#each moveData.moves as |move key|}}
<div class="activity-container">
<div class="activity-title">
<img class="activity-image {{#if (eq ../selectedActivity.id key)}}selected{{/if}}" src="{{option.img}}" data-action="selectActivity" data-activity="{{key}}" />
<div class="activity-image {{#if this.selected}}selected{{/if}}" data-action="selectMove" data-move="{{key}}">
{{#if this.selected}}<div class="activity-select-label">{{move.selected}}</div>{{/if}}
<img src="{{move.img}}" />
</div>
<span class="activity-title-text">{{localize this.name}}</span>
</div>
<div class="activity-body">
@ -11,18 +16,9 @@
</div>
</div>
{{/each}}
<div class="activity-container">
<div class="activity-title">
<img class="activity-image {{#if (eq selectedActivity this.customActivity)}}selected{{/if}}" src="{{this.customActivity.img}}" data-action="selectActivity" data-activity="{{this.customActivity.id}}" />
<input class="custom-name-input" type="text" name="name" value="{{this.customActivity.name}}" placeholder="{{localize this.customActivity.namePlaceholder}}" />
</div>
<div class="activity-body">
<textarea class="activity-text-area" name="description" placeholder="{{localize this.customActivity.placeholder}}">{{this.customActivity.description}}</textarea>
</div>
</div>
</div>
<footer class="flexrow">
<button data-action="takeDowntime" {{#if this.disabledDowntime}}disabled{{/if}}>{{localize "DAGGERHEART.Application.Downtime.TakeDowntime"}}</button>
<button data-action="close">{{localize "DAGGERHEART.Application.Cancel"}}</button>
<button type="button" data-action="close">{{localize "DAGGERHEART.Application.Cancel"}}</button>
<button type="button" data-action="takeDowntime" {{#if this.disabledDowntime}}disabled{{/if}}>{{localize "DAGGERHEART.Application.Downtime.TakeDowntime"}}</button>
</footer>
</div>

View file

@ -1,13 +0,0 @@
<form class={{cssClass}} autocomplete="off">
<div class="form-group">
<label>{{localize "DAGGERHEART.Settings.Menu.Homebrew.AbilityArrayLabel"}}</label>
<div class="form-fields">
<input type="text" name="{{settings.AbilityArray}}" value="{{this.abilityArray}}" />
</div>
</div>
<footer class="flexrow">
<button type="submit">Save</button>
<button>Cancel</button>
</footer>
</form>

View file

@ -0,0 +1,22 @@
<div class="ownership-outer-container">
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.OwnershipSelection.Default"}}</label>
<select name="ownership.default" data-dtype="Number">
{{selectOptions @root.ownershipOptions selected=ownership.default labelAttr="label" valueAttr="value" }}
</select>
</div>
</div>
{{#each ownership.players as |player id|}}
<div class="ownership-container">
<img src="{{player.img}}" />
<div>{{player.name}}</div>
<select name="{{concat "ownership.players." id ".type"}}" data-dtype="Number">
{{selectOptions @root.ownershipOptions selected=player.ownership labelAttr="label" valueAttr="value" }}
</select>
</div>
{{/each}}
<footer class="flexrow">
<button type="submit">{{localize "Save"}}</button>
</footer>
</div>

View file

@ -1,44 +0,0 @@
<form class={{cssClass}} autocomplete="off">
<div class="form-group">
<label>{{localize "DAGGERHEART.Settings.Menu.Range.EnabledLabel"}}</label>
<div class="form-fields reset-range-container">
<input style="height: 100%;" type="checkbox" name="enabled" {{checked this.range.enabled}} />
<button class="range-reset" style="flex: 0;"><i class="fa-solid fa-clock-rotate-left"></i></button>
</div>
</div>
<div class="form-group">
<label>{{localize "DAGGERHEART.Settings.Menu.Range.MeleeLabel"}}</label>
<div class="form-fields">
<input type="text" name="melee" value="{{this.range.melee}}" data-dtype="Number" {{#if (not this.range.enabled)}}disabled{{/if}} />
</div>
</div>
<div class="form-group">
<label>{{localize "DAGGERHEART.Settings.Menu.Range.VeryCloseLabel"}}</label>
<div class="form-fields">
<input type="text" name="veryClose" value="{{this.range.veryClose}}" data-dtype="Number" {{#if (not this.range.enabled)}}disabled{{/if}} />
</div>
</div>
<div class="form-group">
<label>{{localize "DAGGERHEART.Settings.Menu.Range.CloseLabel"}}</label>
<div class="form-fields">
<input type="text" name="close" value="{{this.range.close}}" data-dtype="Number" {{#if (not this.range.enabled)}}disabled{{/if}} />
</div>
</div>
<div class="form-group">
<label>{{localize "DAGGERHEART.Settings.Menu.Range.FarLabel"}}</label>
<div class="form-fields">
<input type="text" name="far" value="{{this.range.far}}" data-dtype="Number" {{#if (not this.range.enabled)}}disabled{{/if}} />
</div>
</div>
<div class="form-group">
<label>{{localize "DAGGERHEART.Settings.Menu.Range.VeryFarLabel"}}</label>
<div class="form-fields">
<input type="text" name="veryFar" value="{{this.range.veryFar}}" data-dtype="Number" {{#if (not this.range.enabled)}}disabled{{/if}} />
</div>
</div>
<footer class="flexrow">
<button class="save" {{#if this.disabled}}disabled{{/if}}>Save</button>
<button class="close">Cancel</button>
</footer>
</form>