Update combat tab

This commit is contained in:
2023-03-24 10:17:20 +01:00
parent 4ca23257cb
commit 0368be050b
11 changed files with 163 additions and 97 deletions

View File

@ -98,7 +98,7 @@
<a class="" data-tab="skills">Skills</a>
<a class="" data-tab="perks">Perks</a>
<a class="" data-tab="talents">Talents</a>
<a class="" data-tab="martial">Martial Arts</a>
<a class="" data-tab="maneuver">Maneuvers</a>
<a class="" data-tab="powers">Powers</a>
<a class="" data-tab="complications">Complications</a>
<a class="" data-tab="equipment">Equipment</a>
@ -117,7 +117,7 @@
<ul class="item-list alternate-list">
<li class="item">
<label class="item-field-label-medium">STR Dice</label>
<a class="roll-direct" data-roll-formula="{{characteristics.str.strdice}}"><i class="fas fa-dice"></i>{{characteristics.str.strdice}}</a>
<a class="roll-direct" data-roll-source="STR Dice" data-roll-formula="{{characteristics.str.strdice.rollFormula}}"><i class="fas fa-dice"></i>{{characteristics.str.strdice.displayFormula}}</a>
<label class="item-field-label-short">&nbsp;</label>
<label class="item-field-label-medium">Lift</label>
<input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.str.lift" value="{{characteristics.str.lift}}" data-dtype="String" />
@ -127,7 +127,7 @@
</li>
<li class="flexrow item">
<label class="item-field-label-long">Presence attack</label>
<a class="roll-direct" data-roll-formula="{{system.biodata.presenceattack}}"><i class="fas fa-dice"></i>{{system.biodata.presenceattack}}</a>
<a class="roll-direct" data-roll-source="Presence attack" data-roll-formula="{{system.biodata.presenceattack.rollFormula}}"><i class="fas fa-dice"></i>{{system.biodata.presenceattack.displayFormula}}</a>
</li>
</ul>
@ -187,10 +187,10 @@
<label class="">Vitals</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Val.</label>
<label class="short-label">Val</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Dam.</label>
<label class="short-label">Dmg</label>
</span>
</li>
{{#each characteristics as |char key|}}
@ -214,10 +214,10 @@
<label class="">Defenses</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Val.</label>
<label class="short-label">Val</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Res.</label>
<label class="short-label">Res</label>
</span>
</li>
{{#each characteristics as |char key|}}
@ -277,16 +277,14 @@
<label class="">Senses</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Val.</label>
</span>
</li>
{{#each senses as |sense key|}}
<li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
<span class="item-field-label-long">{{sense.label}}</span>
<span class="item-field-label-short">{{sense.value}}</span>
<span class="item-field-label-long">Perception Roll</span>
<input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.int.perceptionroll" value="{{characteristics.int.perceptionroll}}" data-dtype="Number" />
</li>
{{/each}}
</ul>
<textarea type="text" class="textarea-full-height padd-right" name="system.biodata.combatnotes1" data-dtype="String">{{system.biodata.combatnotes1}}</textarea>
</div>
<div>
@ -296,10 +294,10 @@
<label class="">Movement</label>
</span>
<span class="item-field-label-short">
<label class="short-label">C.</label>
<label class="short-label">C</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Non-C.</label>
<label class="short-label">NC</label>
</span>
</li>
{{#each characteristics as |char key|}}
@ -457,33 +455,44 @@
</ul>
</div>
{{!-- Martial Tab --}}
<div class="tab martial" data-group="primary" data-tab="martial">
{{!-- Maneuvers Tab --}}
<div class="tab maneuver" data-group="primary" data-tab="maneuver">
<ul class="stat-list alternate-list item-list">
<li class="item flexrow list-item items-title-bg">
<span class="item-field-label-long-img">
<label class="">Martial Arts</label>
<label class="">Maneuvers</label>
</span>
<span class="item-field-label-short">
<label class="short-label">Roll</label>
<label class="short-label">PHA</label>
</span>
<span class="item-field-label-short">
<label class="short-label">OCV</label>
</span>
<span class="item-field-label-short">
<label class="short-label">DCV</label>
</span>
<span class="item-field-label-long">
<label class="short-label">Effects</label>
</span>
</li>
{{#each martialarts as |martial key|}}
<li class="item stat flexrow list-item list-item-shadow" data-item-id="{{martial._id}}">
<a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
src="{{martial.img}}" /></a>
<span class="item-name-label"><a class="roll-item" data-type="talent">{{martial.name}}</a></span>
{{#if martial.system.hasroll}}
<span class="item-field-label-short">{{martial.system.roll}}-</span>
{{else}}
<span class="item-field-label-short">&nbsp;</span>
{{/if}}
<div class="item-filler">&nbsp;</div>
<div class="item-controls item-controls-fixed">
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
</div>
</li>
{{#each nonstockmaneuvers as |maneuver key|}}
<li class="item stat flexrow list-item list-item-shadow" data-item-id="{{maneuver._id}}">
<a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
src="{{maneuver.img}}" /></a>
<span class="item-field-label-long">{{maneuver.name}}</span>
<span class="item-field-label-short">{{maneuver.system.pha}}</span>
<span class="item-field-label-short">{{maneuver.system.ocv}}</span>
<span class="item-field-label-short">{{maneuver.system.dcv}}</span>
<span class="item-field-label-long">{{maneuver.system.effects}}</span>
<div class="item-filler">&nbsp;</div>
<div class="item-controls item-controls-fixed">
<a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
</div>
</li>
{{/each}}
</ul>
</div>

View File

@ -18,8 +18,14 @@
<div>
<ul>
{{#if target}}
<li>Target Roll : {{target}}-
</li>
{{/if}}
{{#if rollSource}}
<li>Roll : {{rollSource}}</li>
{{/if}}
{{#if charac}}
<li>CHAR : {{charac.label}}</li>
@ -29,11 +35,24 @@
<li>{{item.name}} ({{upperFirst item.type}})</li>
{{/if}}
{{#if (exists bonusMalus)}}
<li>Bonus/Penalty : {{bonusMalus}}
</li>
{{/if}}
<li><strong>Result : {{result}}</strong> ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})</li>
<li><strong>Result : {{result}}</strong>
{{#if (exists margin)}}
({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})
{{/if}}
</li>
{{#if (exists bodyValue)}}
<li><strong>BODY : {{bodyValue}}</strong>
{{/if}}
{{#if (exists margin)}}
<li><strong>Margin : {{margin}}</strong>
{{/if}}
</ul>
</div>

View File

@ -29,7 +29,7 @@
</li>
<li class="flexrow"><label class="item-field-label-long">Equipped ?</label>
<label class="item-field-label-medium"><input type="checkbox" name="system.equipped" {{checked system.equipped}}/></label>
<label class="item-field-label-medium"><input type="checkbox" name="system.equipped" {{checked system.equipped}}/></label>
</li>
<li class="flexrow"><label class="item-field-label-long">Weight</label>

View File

@ -27,6 +27,10 @@
</select>
</li>
<li class="flexrow"><label class="item-field-label-medium">Is stock ?</label>
<label class="item-field-label-medium"><input type="checkbox" name="system.isstock" {{checked system.isstock}}/></label>
</li>
<li class="flexrow"><label class="item-field-label-medium">PHA</label>
<input type="text" class="item-field-label-medium" name="system.pha" value="{{system.pha}}" data-dtype="String"/>
</li>

View File

@ -1,23 +0,0 @@
<form class="{{cssClass}}" autocomplete="off">
<header class="sheet-header">
<img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
<div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
</div>
</header>
{{> systems/fvtt-hero-system-6/templates/partials/partial-item-nav.hbs}}
{{!-- Sheet Body --}}
<section class="sheet-body">
<div class="tab details" data-group="primary" data-tab="details">
<ul>
{{> systems/fvtt-hero-system-6/templates/partials/partial-item-description.hbs}}
{{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
</ul>
</div>
</section>
</form>