New combat management and various improvments

templates/chat-message.hbs

@@ -1,193 +1,291 @@
 {{!log 'chat-message' this}}
 {{!log 'weaponDamageOptions' weaponDamageOptions}}
 <div class="{{cssClass}}">
-  <div class="intro-chat">
-    <div class="intro-img">
-      <img src="{{actingCharImg}}" data-tooltip="{{actingCharName}}" />
-    </div>
-
-    <div class="intro-right">
-      <span><STRONG>{{actingCharName}} - {{upperFirst rollName}}</STRONG></span>
-
-      {{#if (match rollType "attack")}}
-        <span>Attack roll !</span>
-      {{/if}}
-      {{#if (match rollType "defense")}}
-        <span>Defense roll !</span>
-      {{/if}}
-
-      {{#if (eq rollData.favor "favor")}}
-        <span><strong>Favor roll</strong></span>
-      {{/if}}
-      {{#if (eq rollData.favor "disfavor")}}
-        <span><strong>Disfavor roll</strong></span>
-      {{/if}}
-      {{#if badResult}}
-        <span><strong>{{localize "LETHALFANTASY.Label.otherResult"}}</strong>
-          :
-          {{badResult}}</span>
-      {{/if}}
-
-      {{#if rollTarget.weapon}}
-        <span>{{rollTarget.weapon.name}}</span>
-      {{/if}}
-
-      {{#if rollData.isDamage}}
-        <span><strong>Damage Roll</strong></span>
-      {{/if}}
-      {{#if rollData.damageSmall}}
-        <span><strong>{{localize
-              "LETHALFANTASY.Label.weapon-damage-small"
-            }}</strong></span>
-      {{/if}}
-      {{#if rollData.damageMedium}}
-        <span><strong>{{localize
-              "LETHALFANTASY.Label.weapon-damage-medium"
-            }}</strong></span>
-      {{/if}}
-
-      {{#if rollData.letItFly}}
-        <span>Let It Fly attack ! </span>
-      {{/if}}
-      {{#if rollData.pointBlank}}
-        <span>Point Blank Range Attack !</span>
-      {{/if}}
-      {{#if rollData.beyondSkill}}
-        <span>Beyond Skill Range Attack !</span>
-      {{/if}}
-
-      <span><strong>Formula</strong> : {{titleFormula}}</span>
-
-      {{#each diceResults as |result|}}
-        <span>{{result.dice}} : {{result.value}}</span>
-      {{/each}}
-
+  <!-- Header with character info -->
+  <div class="chat-header">
+    <div class="character-info">
+      <div class="character-avatar">
+        <img src="{{actingCharImg}}" data-tooltip="{{actingCharName}}" />
+      </div>
+      <div class="character-details">
+        <div class="character-name">{{actingCharName}}</div>
+        <div class="roll-type-badge">
+          {{#if (match rollType "attack")}}
+            <i class="fa-solid fa-swords"></i>
+          {{/if}}
+          {{#if (match rollType "defense")}}
+            <i class="fa-solid fa-shield"></i>
+          {{/if}}
+          {{#if rollData.isDamage}}
+            <i class="fa-solid fa-burst"></i>
+          {{/if}}
+          {{#if (eq rollType "skill")}}
+            <i class="fa-solid fa-hand-sparkles"></i>
+          {{/if}}
+          {{upperFirst rollName}}
+        </div>
+      </div>
     </div>
   </div>
-  {{#if isSave}}
-    <div class="result">
-      {{#if (eq resultType "success")}}
-        {{#if isPrivate}}?{{else}}{{localize
-            "LETHALFANTASY.Roll.success"
-          }}{{/if}}
-      {{else}}
-        {{#if isPrivate}}?{{else}}{{localize
-            "LETHALFANTASY.Roll.failure"
-          }}{{/if}}
-      {{/if}}
-    </div>
-  {{/if}}
-  {{#if isResource}}
-    <div class="result">
-      {{#if (eq resultType "success")}}
-        {{#if isPrivate}}?{{else}}{{localize
-            "LETHALFANTASY.Roll.success"
-          }}{{/if}}
-      {{else}}
-        {{#if isPrivate}}?{{else}}{{localize "LETHALFANTASY.Roll.failure"}}{{#if
-            isFailure
-          }} ({{localize "LETHALFANTASY.Roll.resourceLost"}}){{/if}}{{/if}}
-      {{/if}}
-    </div>
-  {{/if}}
-  {{#if isDamage}}
-    <div>
-      {{#if (and isGM hasTarget)}}
-        {{{localize
-          "LETHALFANTASY.Roll.displayArmor"
-          targetName=targetName
-          targetArmor=targetArmor
-          realDamage=realDamage
-        }}}
-      {{/if}}
-    </div>
-  {{/if}}
 
-  {{#unless isPrivate}}
-    <div class="dice-result">
-      <h4 class="dice-total">{{total}}</h4>
-    </div>
-    {{#if D30result}}
-      <div class="dice-result">
-        <h4 class="dice-total">D30 result: {{D30result}}</h4>
+  <!-- Roll details and modifiers -->
+  <div class="roll-details">
+    {{#if rollTarget.weapon}}
+      <div class="detail-item weapon-name">
+        <i class="fa-solid fa-sword"></i>
+        <span>{{rollTarget.weapon.name}}</span>
       </div>
     {{/if}}
 
-  {{/unless}}
+    {{#if (eq rollData.favor "favor")}}
+      <div class="detail-badge favor-badge">
+        <i class="fa-solid fa-sparkles"></i>
+        <span>Favor</span>
+      </div>
+    {{/if}}
+    {{#if (eq rollData.favor "disfavor")}}
+      <div class="detail-badge disfavor-badge">
+        <i class="fa-solid fa-skull"></i>
+        <span>Disfavor</span>
+      </div>
+    {{/if}}
 
-  {{#if weaponDamageOptions}}
-    <div class="damage-buttons">
-      <div class="damage-buttons-title">{{localize
-          "LETHALFANTASY.Label.rollDamage"
-        }}</div>
-      <div class="damage-buttons-grid {{#if weaponDamageOptions.isMonster}}monster-damage{{/if}}">
-        {{#if weaponDamageOptions.isMonster}}
-          <button
-            class="damage-roll-btn"
-            data-weapon-id="{{weaponDamageOptions.weaponId}}"
-            data-damage-type="monster"
-            data-damage-formula="{{weaponDamageOptions.damageFormula}}"
-            data-damage-modifier="{{weaponDamageOptions.damageModifier}}"
-            data-is-monster="true"
-            title="{{weaponDamageOptions.weaponName}}"
-          >
-            <i class="fa-solid fa-dice"></i>
-            Damage:
-            {{weaponDamageOptions.damageFormula}}{{#if
-              weaponDamageOptions.damageModifier
-            }}+{{weaponDamageOptions.damageModifier}}{{/if}}
-          </button>
-        {{else}}
-          {{#if weaponDamageOptions.damageS}}
-            <button
-              class="damage-roll-btn"
-              data-weapon-id="{{weaponDamageOptions.weaponId}}"
-              data-damage-type="small"
-              data-damage-formula="{{weaponDamageOptions.damageS}}"
-              data-is-monster="false"
-              title="{{localize 'LETHALFANTASY.Label.weapon-damage-small'}}"
-            >
-              <i class="fa-solid fa-dice-d6"></i>
-              {{localize "LETHALFANTASY.Label.weapon-damage-small"}}
-            </button>
+    {{#if rollData.letItFly}}
+      <div class="detail-badge special-badge">
+        <i class="fa-solid fa-bow-arrow"></i>
+        <span>Let It Fly!</span>
+      </div>
+    {{/if}}
+    {{#if rollData.pointBlank}}
+      <div class="detail-badge special-badge">
+        <i class="fa-solid fa-bullseye-arrow"></i>
+        <span>Point Blank</span>
+      </div>
+    {{/if}}
+    {{#if rollData.beyondSkill}}
+      <div class="detail-badge special-badge">
+        <i class="fa-solid fa-target-lock"></i>
+        <span>Beyond Skill</span>
+      </div>
+    {{/if}}
+
+    {{#if rollData.damageSmall}}
+      <div class="detail-badge damage-badge">
+        <i class="fa-solid fa-dice-d6"></i>
+        <span>{{localize "LETHALFANTASY.Label.weapon-damage-small"}}</span>
+      </div>
+    {{/if}}
+    {{#if rollData.damageMedium}}
+      <div class="detail-badge damage-badge">
+        <i class="fa-solid fa-dice-d20"></i>
+        <span>{{localize "LETHALFANTASY.Label.weapon-damage-medium"}}</span>
+      </div>
+    {{/if}}
+
+    {{#if badResult}}
+      <div class="detail-item other-result">
+        <strong>{{localize "LETHALFANTASY.Label.otherResult"}}</strong>: {{badResult}}
+      </div>
+    {{/if}}
+  </div>
+
+  <!-- Formula and dice results -->
+  <div class="formula-section">
+    <div class="formula-display">
+      <i class="fa-solid fa-dice-d20"></i>
+      <span class="formula-text">{{titleFormula}}</span>
+    </div>
+    {{#if diceResults}}
+      <div class="dice-breakdown">
+        {{#each diceResults as |result|}}
+          <div class="dice-item">
+            <span class="dice-type">{{result.dice}}</span>
+            <span class="dice-separator">→</span>
+            <span class="dice-value">{{result.value}}</span>
+          </div>
+        {{/each}}
+      </div>
+    {{/if}}
+  </div>
+  <!-- Result section -->
+  {{#unless isPrivate}}
+    <div class="result-section">
+      <div class="main-result">
+        <div class="result-label">Total</div>
+        <div class="result-value {{#if (eq resultType 'success')}}success{{else}}failure{{/if}}">
+          {{total}}
+        </div>
+      </div>
+
+      {{#if D30result}}
+        <div class="d30-result">
+          <div class="d30-header">
+            <i class="fa-solid fa-dice-d20"></i>
+            <span class="d30-label">D30 Special</span>
+            <span class="d30-value">{{D30result}}</span>
+          </div>
+          {{#if D30message}}
+            <div class="d30-message">
+              <i class="fa-solid fa-wand-magic-sparkles"></i>
+              <span>{{D30message}}</span>
+            </div>
           {{/if}}
-          {{#if weaponDamageOptions.damageM}}
-            <button
-              class="damage-roll-btn"
-              data-weapon-id="{{weaponDamageOptions.weaponId}}"
-              data-damage-type="medium"
-              data-damage-formula="{{weaponDamageOptions.damageM}}"
-              data-is-monster="false"
-              title="{{localize 'LETHALFANTASY.Label.weapon-damage-medium'}}"
-            >
-              <i class="fa-solid fa-dice-d20"></i>
-              {{localize "LETHALFANTASY.Label.weapon-damage-medium"}}
-            </button>
+        </div>
+      {{/if}}
+    </div>
+
+    {{#if isSave}}
+      <div class="outcome-badge {{#if (eq resultType 'success')}}success-outcome{{else}}failure-outcome{{/if}}">
+        {{#if (eq resultType "success")}}
+          <i class="fa-solid fa-circle-check"></i>
+          {{localize "LETHALFANTASY.Roll.success"}}
+        {{else}}
+          <i class="fa-solid fa-circle-xmark"></i>
+          {{localize "LETHALFANTASY.Roll.failure"}}
+        {{/if}}
+      </div>
+    {{/if}}
+
+    {{#if isResource}}
+      <div class="outcome-badge {{#if (eq resultType 'success')}}success-outcome{{else}}failure-outcome{{/if}}">
+        {{#if (eq resultType "success")}}
+          <i class="fa-solid fa-circle-check"></i>
+          {{localize "LETHALFANTASY.Roll.success"}}
+        {{else}}
+          <i class="fa-solid fa-circle-xmark"></i>
+          {{localize "LETHALFANTASY.Roll.failure"}}
+          {{#if isFailure}}
+            <span class="resource-lost">({{localize "LETHALFANTASY.Roll.resourceLost"}})</span>
           {{/if}}
         {{/if}}
       </div>
+    {{/if}}
+
+    {{#if isDamage}}
+      {{#if (and isGM hasTarget)}}
+        <div class="target-info">
+          <i class="fa-solid fa-crosshairs"></i>
+          {{{localize
+            "LETHALFANTASY.Roll.displayArmor"
+            targetName=targetName
+            targetArmor=targetArmor
+            realDamage=realDamage
+          }}}
+        </div>
+      {{/if}}
+    {{/if}}
+  {{else}}
+    <div class="private-result">
+      <i class="fa-solid fa-eye-slash"></i>
+      <span>Private Roll</span>
     </div>
+  {{/unless}}
+
+  {{#if weaponDamageOptions}}
+    {{#if canSelectTarget}}
+      <div class="damage-buttons">
+        <div class="damage-buttons-grid {{#if weaponDamageOptions.isMonster}}monster-damage{{/if}}">
+          {{#if weaponDamageOptions.isMonster}}
+            <button
+              class="damage-roll-btn"
+              data-weapon-id="{{weaponDamageOptions.weaponId}}"
+              data-damage-type="monster"
+              data-damage-formula="{{weaponDamageOptions.damageFormula}}"
+              data-damage-modifier="{{weaponDamageOptions.damageModifier}}"
+              data-is-monster="true"
+              title="{{localize 'LETHALFANTASY.Label.rollDamage'}} - {{weaponDamageOptions.weaponName}}"
+            >
+              <i class="fa-solid fa-dice"></i>
+              Damage:
+              {{weaponDamageOptions.damageFormula}}{{#if
+                weaponDamageOptions.damageModifier
+              }}+{{weaponDamageOptions.damageModifier}}{{/if}}
+            </button>
+          {{else}}
+            {{#if weaponDamageOptions.damageS}}
+              <button
+                class="damage-roll-btn"
+                data-weapon-id="{{weaponDamageOptions.weaponId}}"
+                data-damage-type="small"
+                data-damage-formula="{{weaponDamageOptions.damageS}}"
+                data-is-monster="false"
+                title="{{localize 'LETHALFANTASY.Label.rollDamage'}}"
+              >
+                <i class="fa-solid fa-dice-d6"></i>
+                Damage Small
+              </button>
+            {{/if}}
+            {{#if weaponDamageOptions.damageM}}
+              <button
+                class="damage-roll-btn"
+                data-weapon-id="{{weaponDamageOptions.weaponId}}"
+                data-damage-type="medium"
+                data-damage-formula="{{weaponDamageOptions.damageM}}"
+                data-is-monster="false"
+                title="{{localize 'LETHALFANTASY.Label.rollDamage'}}"
+              >
+                <i class="fa-solid fa-dice-d20"></i>
+                Damage Medium
+              </button>
+            {{/if}}
+          {{/if}}
+        </div>
+      </div>
+    {{/if}}
   {{/if}}
 
   {{#if rollData.isDamage}}
-    <div class="damage-result">
-      <ul>
-        <li class="li-apply-wounds">
-          <div>{{localize "LETHALFANTASY.Label.applyDamage"}}</div>
-          <div class="combatants-grid">
-            {{#each combatants}}
-              <button
-                class="apply-wounds-btn"
-                data-combatant-id="{{this.id}}"
-                title="{{this.name}}"
-              >
-                {{this.name}}
-              </button>
-            {{/each}}
-          </div>
-        </li>
-      </ul>
-    </div>
+    {{#if defenderId}}
+      <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>
+        </div>
+      </div>
+    {{else}}
+      <div class="damage-result">
+        <ul>
+          <li class="li-apply-wounds">
+            <div>{{localize "LETHALFANTASY.Label.applyDamage"}}</div>
+            <div class="combatants-grid">
+              {{#each combatants}}
+                <button
+                  class="apply-wounds-btn"
+                  data-combatant-id="{{this.id}}"
+                  title="{{this.name}}"
+                >
+                  {{this.name}}
+                </button>
+              {{/each}}
+            </div>
+          </li>
+        </ul>
+      </div>
+    {{/if}}
+  {{/if}}
+
+  {{#if isAttack}}
+    {{#if canSelectTarget}}
+      <div class="attack-targets">
+        <ul>
+          <li class="li-select-target">
+            <div>{{localize "LETHALFANTASY.Label.selectTarget"}}</div>
+            <div class="combatants-grid">
+              {{#each combatants}}
+                <button
+                  class="request-defense-btn"
+                  data-combatant-id="{{this.id}}"
+                  data-token-id="{{this.tokenId}}"
+                  title="{{this.name}}"
+                >
+                  {{this.name}}
+                </button>
+              {{/each}}
+            </div>
+          </li>
+        </ul>
+      </div>
+    {{/if}}
   {{/if}}
 
 </div>

templates/damage-applied-message.hbs

@@ -0,0 +1,36 @@
+<div class="fvtt-lethal-fantasy damage-applied-message">
+  <div class="damage-header">
+    <div class="damage-icon">
+      <i class="fa-solid fa-heart-crack"></i>
+    </div>
+    <div class="damage-info">
+      <div class="target-name">{{targetName}}</div>
+      <div class="damage-subtitle">{{localize "LETHALFANTASY.DamageApplied.subtitle"}}</div>
+    </div>
+  </div>
+
+  <div class="damage-details">
+    <div class="damage-amount">
+      <span class="damage-label">{{localize "LETHALFANTASY.DamageApplied.damageDealt"}}</span>
+      <span class="damage-value">{{damage}}</span>
+      {{#if rawDamage}}
+        <span class="damage-raw">({{rawDamage}} raw)</span>
+      {{/if}}
+    </div>
+
+    {{#if drText}}
+      <div class="damage-reduction">
+        <i class="fa-solid fa-shield"></i>
+        <span>{{drText}}</span>
+      </div>
+    {{/if}}
+
+    <div class="damage-source">
+      <i class="fa-solid fa-crosshairs"></i>
+      <span>{{localize "LETHALFANTASY.DamageApplied.from"}}
+        {{#if attackerName}}<strong>{{attackerName}}</strong> with {{/if}}
+        <strong>{{weaponName}}</strong>
+      </span>
+    </div>
+  </div>
+</div>

templates/monster-combat.hbs

@@ -22,7 +22,7 @@
       {{#each system.attacks as |item key|}}
       <div class="attack" data-attack-key="{{key}}" >
         <div class="">
-          <input type="checkbox" name="system.attacks.{{item.key}}.enabled" value="{{item.enabled}}" data-tooltip="Attack enabled/disabled" />
+          <input type="checkbox" name="system.attacks.{{item.key}}.enabled" {{checked item.enabled}} data-tooltip="Attack enabled/disabled" />
         </div>
         <div class="name">
           <input type="text" name="system.attacks.{{item.key}}.name" value="{{item.name}}" data-tooltip="Attack name" />
@@ -65,4 +65,54 @@
       {{/each}}
     </div>
   </fieldset>
+
+  <fieldset>
+    <legend>Hand To Hand Attacks</legend>
+    <div class="attacks">
+      {{#each system.combatHTH as |item key|}}
+      <div class="attack" data-attack-key="{{key}}" >
+        <div class="">
+          <input type="checkbox" name="system.combatHTH.{{item.key}}.enabled" {{checked item.enabled}} data-tooltip="HTH Attack enabled/disabled" />
+        </div>
+        <div class="name">
+          <input type="text" name="system.combatHTH.{{item.key}}.name" value="{{item.name}}" data-tooltip="HTH Attack name" />
+        </div>
+        <div class="numeric">
+          <input type="number" name="system.combatHTH.{{item.key}}.attackScore" value="{{item.attackScore}}" data-tooltip="Progression number" />
+        </div>
+        <div class="numeric">
+          <input type="number" name="system.combatHTH.{{item.key}}.attackModifier" value="{{item.attackModifier}}" data-tooltip="Attack modifier" />
+        </div>
+        <div class="numeric">
+          <input type="number" name="system.combatHTH.{{item.key}}.defenseModifier" value="{{item.defenseModifier}}" data-tooltip="Defense modifier"/>
+        </div>
+        <div class="damage-dice">
+          <input type="text" name="system.combatHTH.{{item.key}}.damageDice" value="{{item.damageDice}}" data-tooltip="Damage dice"/>
+        </div>
+        <div class="numeric">
+          <input type="number" name="system.combatHTH.{{item.key}}.damageModifier" value="{{item.damageModifier}}" data-tooltip="Damage modifier"/>
+        </div>
+
+        <div class="attack-icons">
+
+          <a class="rollable" data-roll-type="monster-attack-hth" data-roll-key="{{item.key}}" data-tooltip="Roll HTH Attack">
+            <i class="lf-roll-small fa-solid fa-hand-fist" data-roll-type="monster-attack-hth" data-roll-key="{{item.key}}"></i>
+          </a>
+
+          <a class="rollable" data-roll-type="monster-defense-hth" data-roll-key="{{item.key}}" data-tooltip="Roll HTH Defense">
+            <i class="fa-solid fa-shield-halved" data-roll-type="monster-defense-hth" data-roll-key="{{item.key}}"></i>
+          </a>
+
+          <a class="rollable" data-roll-type="monster-damage-hth" data-roll-key="{{item.key}}"
+            data-tooltip="Roll HTH Damage">
+            <i class="fa-regular fa-face-head-bandage" data-roll-type="monster-damage-hth"
+              data-roll-key="{{item.key}}"></i>
+          </a>
+
+        </div>
+
+      </div>
+      {{/each}}
+    </div>
+  </fieldset>
 </section>

templates/monster-main.hbs

@@ -291,13 +291,6 @@
         disabled=isPlayMode
         data-char-id="int"
       }}
-
-      {{formField
-        systemFields.characteristics.fields.int.fields.percent
-        value=system.characteristics.int.percent
-        disabled=isPlayMode
-        type="number"
-      }}
     </div>
     <div class="monster-characteristic">
       <span>{{localize "LETHALFANTASY.Label.dex"}}</span>
@@ -307,13 +300,6 @@
         disabled=isPlayMode
         data-char-id="wis"
       }}
-
-      {{formField
-        systemFields.characteristics.fields.dex.fields.percent
-        value=system.characteristics.dex.percent
-        disabled=isPlayMode
-        type="number"
-      }}
     </div>
 
     <legend>{{localize "LETHALFANTASY.Label.Movement"}}</legend>

templates/progression-message.hbs

@@ -0,0 +1,44 @@
+<div class="fvtt-lethal-fantasy progression-message {{#if success}}progression-success{{else}}progression-failure{{/if}}">
+  <div class="progression-header">
+    <div class="progression-icon">
+      {{#if success}}
+        <i class="fa-solid fa-check-circle"></i>
+      {{else}}
+        <i class="fa-solid fa-hourglass-half"></i>
+      {{/if}}
+    </div>
+    <div class="progression-info">
+      <div class="actor-name">{{actorName}}</div>
+      <div class="progression-subtitle">
+        {{#if success}}
+          {{localize "LETHALFANTASY.ProgressionMessage.canAct"}}
+        {{else}}
+          {{localize "LETHALFANTASY.ProgressionMessage.cannotAct"}}
+        {{/if}}
+      </div>
+    </div>
+  </div>
+
+  <div class="progression-details">
+    {{#if weaponName}}
+      <div class="progression-weapon">
+        <i class="fa-solid fa-sword"></i>
+        <span><strong>{{weaponName}}</strong></span>
+      </div>
+    {{/if}}
+
+    {{#if rollResult}}
+      <div class="progression-roll">
+        <span class="roll-label">{{localize "LETHALFANTASY.ProgressionMessage.diceResult"}}</span>
+        <span class="roll-value">{{rollResult}}</span>
+      </div>
+    {{/if}}
+
+    {{#if progressionCount}}
+      <div class="progression-count">
+        <i class="fa-solid fa-dice-d20"></i>
+        <span>{{localize "LETHALFANTASY.ProgressionMessage.progressionCount"}} <strong>{{progressionCount}}</strong></span>
+      </div>
+    {{/if}}
+  </div>
+</div>