Update confrontation
This commit is contained in:
@ -50,7 +50,7 @@
|
||||
<nav class="sheet-tabs tabs" data-group="primary">
|
||||
<a class="item" data-tab="competences">{{localize "ECRY.ui.skills"}}</a>
|
||||
<a class="item" data-tab="traits">{{localize "ECRY.ui.traits"}}</a>
|
||||
<a class="item" data-tab="confrontation">{{localize "ECRY.ui.confrontation"}}</a>
|
||||
<a class="item" data-tab="combat">{{localize "ECRY.ui.healthcombat"}}</a>
|
||||
<a class="item" data-tab="equipements">{{localize "ECRY.ui.equipment"}}</a>
|
||||
<a class="item" data-tab="biodata">{{localize "ECRY.ui.bionotes"}}</a>
|
||||
</nav>
|
||||
@ -69,7 +69,8 @@
|
||||
<ul class="stat-list alternate-list item-list">
|
||||
<li class="item flexrow list-item items-title-bg">
|
||||
<span class="item-name-label-header impact-title">
|
||||
<h3><label class="items-title-text">{{localize category.name}} ({{valueAtIndex @root.impactsMalus categkey}})</label></h3>
|
||||
<h3><label class="items-title-text">{{localize category.name}} ({{valueAtIndex @root.impactsMalus
|
||||
categkey}})</label></h3>
|
||||
</span>
|
||||
</li>
|
||||
{{#each category.skilllist as |skill skillkey|}}
|
||||
@ -150,7 +151,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="tab confrontation" data-group="primary" data-tab="confrontation">
|
||||
<div class="tab combat" data-group="primary" data-tab="combat">
|
||||
|
||||
<div class="flexrow">
|
||||
{{> systems/fvtt-ecryme/templates/actors/partial-impacts.hbs impacts=system.impacts.physical
|
||||
@ -164,18 +165,31 @@
|
||||
<ul class="item-list alternate-list">
|
||||
<li class="item flexrow list-item items-title-bg">
|
||||
<span class="item-name-label-header-long2">
|
||||
<h3><label class="item-name-label-header-long2">{{localize "ECRY.ui.ongoingconfront"}}</label></h3>
|
||||
<h3><label class="item-name-label-header-long2">{{localize "ECRY.ui.weapons"}}</label></h3>
|
||||
</span>
|
||||
<span class="item-field-label-medium">
|
||||
<label class="item-field-label-medium">{{localize "ECRY.ui.type"}}</label>
|
||||
</span>
|
||||
<span class="item-field-label-medium">
|
||||
<label class="item-field-label-medium">{{localize "ECRY.ui.effect"}}</label>
|
||||
</span>
|
||||
</li>
|
||||
{{#each confrontations as |confront key|}}
|
||||
<li class="item flexrow list-item list-item-shadow" data-item-id="{{confront._id}}">
|
||||
{{#each weapons as |weapon key|}}
|
||||
<li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
|
||||
<a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
|
||||
src="{{confront.img}}" /></a>
|
||||
<span class="item-name-label-long2">{{confront.name}}</span>
|
||||
src="{{weapon.img}}" /></a>
|
||||
<span class="item-name-label-long2">
|
||||
<a class="roll-weapon-confront" data-category-key="{{categkey}}" data-skill-key="{{skillkey}}">
|
||||
<i class="fa-regular fa-swords"></i>
|
||||
{{weapon.name}}
|
||||
</a>
|
||||
</span>
|
||||
<span class="item-field-label-medium">{{localize (concat "ECRY.ui." weapon.system.weapontype)}}</span>
|
||||
<span class="item-field-label-medium">{{weapon.system.effect}}</span>
|
||||
|
||||
<div class="item-filler"> </div>
|
||||
<div class="item-controls item-controls-fixed">
|
||||
<a class="item-control item-delete" title="Delete confrontation"><i class="fas fa-trash"></i></a>
|
||||
<a class="item-control item-delete" title="Delete weapon"><i class="fas fa-trash"></i></a>
|
||||
</div>
|
||||
</li>
|
||||
{{/each}}
|
||||
|
||||
54
templates/chat/chat-confrontation-result.hbs
Normal file
54
templates/chat/chat-confrontation-result.hbs
Normal file
@ -0,0 +1,54 @@
|
||||
<div class="chat-message-header">
|
||||
{{#if actorImg}}
|
||||
<img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
|
||||
{{/if}}
|
||||
<h4 class="chat-actor-name">{{alias}}</h4>
|
||||
</div>
|
||||
|
||||
<hr>
|
||||
|
||||
{{#if img}}
|
||||
<div>
|
||||
<img class="chat-icon" src="{{img}}" alt="{{alias}}" />
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<div>
|
||||
<ul>
|
||||
<li>Confrontation : {{rollData1.alias}} vs {{rollData2.alias}}</li>
|
||||
<li>{{localize rollData1.skill.name}} ({{rollData1.skill.value}}) vs {{localize rollData2.skill.name}} ({{rollData2.skill.value}}) </li>
|
||||
<li>{{rollData1.executionTotal}} vs {{rollData2.preservationTotal}} : {{marginExecution}}</li>
|
||||
<li>{{rollData1.preservationTotal}} vs {{rollData2.executionTotal}} : {{marginPreservation}}</li>
|
||||
|
||||
{{#if rollData1.weapon}}
|
||||
<li>{{rollData1.alias}} {{rollData1.weapon.name}} ({{rollData1.weapon.system.effect}})
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{#if rollData2.weapon}}
|
||||
<li>{{rollData2.alias}} {{rollData2.weapon.name}} ({{rollData2.weapon.system.effect}})</li>
|
||||
{{/if}}
|
||||
|
||||
<li>{{localize "ECRY.ui.effect"}} {{localize "ECRY.ui.execution"}} : {{effectExecution}}</li>
|
||||
{{#if impactExecution}}
|
||||
<li>Impact {{rollData2.alias}} : 1 {{localize (concat "ECRY.ui." impactExecution)}}</li>
|
||||
<button class="button-apply-impact" data-actor-id="{{rollData2.actorId}}" data-impact-type={{rollData1.skill.categKey}} data-impact="{{impactExecution}}">{{localize "ECRY.ui.applyimpact"}}</button>
|
||||
{{/if}}
|
||||
{{#if bonus2}}
|
||||
<li>Bonus {{rollData2.alias}} : {{bonus2}}</li>
|
||||
<button class="button-apply-bonus" data-actor-id="{{rollData2.actorId}}" data-bonus="{{bonus2}}">{{localize "ECRY.ui.applybonus"}}</button>
|
||||
{{/if}}
|
||||
|
||||
<li>{{localize "ECRY.ui.effect"}} {{localize "ECRY.ui.preservation"}} : {{effectPreservation}}</li>
|
||||
{{#if impactPreservation}}
|
||||
<li>Impact {{rollData1.alias}} : 1 {{localize (concat "ECRY.ui." impactPreservation)}}</li>
|
||||
<button class="button-apply-impact" data-actor-id="{{rollData1.actorId}}" data-impact-type={{rollData1.skill.categKey}} data-impact="{{impactPreservation}}">{{localize "ECRY.ui.applyimpact"}}</button>
|
||||
{{/if}}
|
||||
{{#if bonus1}}
|
||||
<li>Bonus {{rollData1.alias}} : {{bonus1}}</li>
|
||||
<button class="button-apply-bonus" data-actor-id="{{rollData1.actorId}}" data-bonus="{{bonus1}}">{{localize "ECRY.ui.applybonus"}}</button>
|
||||
{{/if}}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -14,6 +14,8 @@
|
||||
<h3>{{localize "ECRY.ui.execution"}} : <span id="execution-total">{{executionTotal}}</span> </h3>
|
||||
<div id="confront-execution" class="flexrow confront-area confront-execution-area">
|
||||
{{> systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs filter="execution"}}
|
||||
<br>
|
||||
{{> systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs filter="execution"}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -21,16 +23,29 @@
|
||||
<h3>{{localize "ECRY.ui.preservation"}} : <span id="preservation-total">{{preservationTotal}}</span></h3>
|
||||
<div id="confront-preservation" class="flexrow confront-area confront-preservation-area">
|
||||
{{> systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs filter="preservation"}}
|
||||
{{> systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs filter="preservation"}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<h4>{{localize "ECRY.ui.dicepool"}}</h4>
|
||||
<div id="confront-dice-pool" class="flexrow confront-area confrontation-dice-list">
|
||||
<div id="confront-dice-pool" class="flexrow confront-area confrontation-dice-list pool-list">
|
||||
{{> systems/fvtt-ecryme/templates/dialogs/partial-confront-dice-area.hbs filter="mainpool"}}
|
||||
</div>
|
||||
|
||||
<h4>{{localize "ECRY.ui.bonuspool"}} (Total : {{count confrontBonus}})</h4>
|
||||
<div id="confront-bonus-pool" class="flexrow confront-area confrontation-bonus-list pool-list">
|
||||
{{> systems/fvtt-ecryme/templates/dialogs/partial-confront-bonus-area.hbs filter="mainpool"}}
|
||||
</div>
|
||||
|
||||
{{#if weapon}}
|
||||
<div class="flexrow">
|
||||
<span class="roll-dialog-label">{{localize "ECRY.ui.weapon"}} : </span>
|
||||
<span class="roll-dialog-label">{{weapon.name}} ({{localize "ECRY.ui.effect"}} {{weapon.system.effect}})</span>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{#if impactMalus}}
|
||||
<div class="flexrow">
|
||||
<span class="roll-dialog-label">{{localize "ECRY.ui.impactmalus"}} : </span>
|
||||
|
||||
10
templates/dialogs/partial-confront-bonus-area.hbs
Normal file
10
templates/dialogs/partial-confront-bonus-area.hbs
Normal file
@ -0,0 +1,10 @@
|
||||
{{#each confrontBonus as |bonus idx|}}
|
||||
{{#if (eq bonus.location ../filter)}}
|
||||
<div class="confront-dice-container bonus-spec" data-drag-type="bonus" data-bonus-idx={{idx}}>
|
||||
<span draggable="true" data-drag-type="bonus" data-bonus-idx={{idx}}>
|
||||
<img class="confront-dice" data-drag-type="bonus" data-bonus-idx={{idx}} src="icons/svg/circle.svg" >
|
||||
<label class="confront-bonus-centered" data-drag-type="bonus" data-bonus-idx={{idx}}>+1</label>
|
||||
</span>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/each}}
|
||||
@ -1,9 +1,9 @@
|
||||
{{#each availableDices as |dice idx|}}
|
||||
{{#if (eq dice.location ../filter)}}
|
||||
<div class="confront-dice-container" data-dice-idx={{idx}} data-dice-value="{{dice.result}}">
|
||||
<span draggable="true" data-dice-idx={{idx}} data-dice-value="{{dice.result}}">
|
||||
<img class="confront-dice" src="icons/svg/d6-grey.svg" data-dice-idx={{idx}} data-dice-value="{{dice.result}}">
|
||||
<label class="confront-dice-centered" data-dice-idx={{idx}}
|
||||
<div class="confront-dice-container dice-spec" data-drag-type="dice" data-dice-idx={{idx}} data-dice-value="{{dice.result}}">
|
||||
<span draggable="true" data-drag-type="dice" data-dice-idx={{idx}} data-dice-value="{{dice.result}}">
|
||||
<img class="confront-dice" src="icons/svg/d6-grey.svg" data-drag-type="dice" data-dice-idx={{idx}} data-dice-value="{{dice.result}}">
|
||||
<label class="confront-dice-centered" data-drag-type="dice" data-dice-idx={{idx}}
|
||||
data-dice-value="{{dice.result}}">{{dice.result}}</label>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@ -19,6 +19,17 @@
|
||||
<div class="tab" data-group="primary">
|
||||
<ul>
|
||||
|
||||
<li class="flexrow">
|
||||
<label class="item-name-label-long">{{localize "ECRY.ui.weapontype"}}</label>
|
||||
<select class="item-field-label-medium" type="text" name="system.weapontype" value="{{system.weapontype}}" data-dtype="String">
|
||||
{{#select system.weapontype}}
|
||||
{{#each config.weaponTypes as |type key| }}
|
||||
<option value="{{key}}">{{localize type}}</option>
|
||||
{{/each}}
|
||||
{{/select}}
|
||||
</select>
|
||||
</li>
|
||||
|
||||
<li class="flexrow">
|
||||
<label class="item-name-label-long">{{localize "ECRY.ui.effect"}}</label>
|
||||
<input type="text" class="item-field-label-short" name="system.effect" value="{{system.effect}}" data-dtype="Number"/>
|
||||
|
||||
Reference in New Issue
Block a user