Various initiative fixes + shield management messages
All checks were successful
Release Creation / build (release) Successful in 46s
All checks were successful
Release Creation / build (release) Successful in 46s
This commit is contained in:
@@ -239,7 +239,7 @@
|
||||
<div class="damage-result auto-applied">
|
||||
<div class="auto-damage-notice">
|
||||
<i class="fa-solid fa-check-circle"></i>
|
||||
<span>Damage automatically applied to defender (with Armor DR)</span>
|
||||
<span>Damage automatically applied to defender (with damage reduction)</span>
|
||||
</div>
|
||||
</div>
|
||||
{{else}}
|
||||
@@ -288,4 +288,4 @@
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
{{!-- GM Controls --}}
|
||||
{{#if user.isGM}}
|
||||
{{#if combat.round}}
|
||||
{{#if (or combat.round (eq combat.turn 0))}}
|
||||
<!-- <button type="button" class="inline-control combat-control icon fa-solid fa-backward-step"
|
||||
data-action="previousRound" data-tooltip aria-label="{{ localize "COMBAT.RoundPrev" }}"></button>
|
||||
<button type="button" class="inline-control combat-control icon fa-solid fa-arrow-left" data-action="previousTurn"
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
{{!-- Combat Status --}}
|
||||
<strong class="encounter-title">
|
||||
{{#if combats.length}}
|
||||
{{#if combat.round}}
|
||||
{{#if (or combat.round (eq combat.turn 0))}}
|
||||
{{ localize "COMBAT.Round" round=combat.round }}
|
||||
{{else}}
|
||||
{{ localize "COMBAT.NotStarted" }}
|
||||
|
||||
Reference in New Issue
Block a user