diff --git a/module/applications/sheets/creature-sheet.mjs b/module/applications/sheets/creature-sheet.mjs
index f1c1c4e..d1b9862 100644
--- a/module/applications/sheets/creature-sheet.mjs
+++ b/module/applications/sheets/creature-sheet.mjs
@@ -84,6 +84,9 @@ export default class VermineCreatureSheetV2 extends VermineBaseActorSheet {
         break
       case "combat":
         context.tab = context.tabs.combat
+        context.weapons = doc.itemTypes.weapon
+        context.equippedWeapons = doc.itemTypes.weapon.filter(i => i.system.equipped)
+        context.equippedDefenses = doc.itemTypes.defense.filter(i => i.system.equipped)
         break
       case "effects":
         context.tab = context.tabs.effects
diff --git a/module/system/exchange.mjs b/module/system/exchange.mjs
index 2acccba..17b94c8 100644
--- a/module/system/exchange.mjs
+++ b/module/system/exchange.mjs
@@ -113,7 +113,8 @@ export class VermineExchange {
   /**
    * Dégâts de base de l'arme (hors réussites de l'attaque).
    * Le trait "Vigueur+" ajoute la vigueur de l'attaquant.
-   * PNJ sans arme et créatures utilisent leurs dégâts propres.
+   * PNJ sans arme et créatures utilisent leurs dégâts propres. Une créature
+   * équipée d'une arme (morsure, griffes…) utilise les dégâts de celle-ci.
    * @param {Actor} actor L'attaquant
    * @param {Item|null} weapon
    * @returns {number}
@@ -121,6 +122,11 @@ export class VermineExchange {
   static baseDamage(actor, weapon) {
     const type = actor.type
     if (type === 'creature') {
+      if (weapon?.system?.damage) {
+        let base = weapon.system.damage.value || 0
+        if (weapon.system.damage.addVigor) base += actor.system?.computed?.vigor || 0
+        return base
+      }
       return actor.system?.computed?.damage || 0
     }
     if (weapon?.system?.damage) {
diff --git a/templates/actor/appv2/creature-combat.hbs b/templates/actor/appv2/creature-combat.hbs
index 63aad8f..210906f 100644
--- a/templates/actor/appv2/creature-combat.hbs
+++ b/templates/actor/appv2/creature-combat.hbs
@@ -1,4 +1,6 @@
 <div class="tab combat sheet-part {{#if @root.tabs.combat.active}}active{{/if}}" data-group="sheet" data-tab="combat">
+  {{> "systems/vermine2047/templates/actor/parts/actor-equipped-gear.hbs"}}
+
   <div class="grid grid-2col">
     {{!-- Computed Values --}}
     <div>
@@ -67,6 +69,12 @@
     </div>
   </div>
 
+  {{!-- Armes --}}
+  <div class="grid-span-2 weapons">
+    <h4 class="item-name flexrow">{{ localize 'ITEMS.weapons' }}</h4>
+    {{> "systems/vermine2047/templates/actor/parts/actor-weapons.hbs"}}
+  </div>
+
   {{!-- Equipment --}}
   <div class="grid-span-2">
     <h4>{{ localize 'VERMINE.gear' }}</h4>
diff --git a/templates/actor/parts/actor-equipped-gear.hbs b/templates/actor/parts/actor-equipped-gear.hbs
index 695facf..0450008 100644
--- a/templates/actor/parts/actor-equipped-gear.hbs
+++ b/templates/actor/parts/actor-equipped-gear.hbs
@@ -21,7 +21,7 @@
           <div style="flex:1;"><a data-action="attack" title="{{ localize 'VERMINE.attack' }}"><i class="fas fa-crosshairs"></i></a></div>
           <div style="flex:2;"><a data-action="edit" title="Edit Item">
             {{#if item.system.damage.addVigor}}
-              {{localize 'VERMINE.vigor'}}+
+              {{localize 'ADVERSITY.vigor'}}+
             {{/if}}
             {{item.system.damage.value}}
             ({{item.system.damage.type}})
diff --git a/templates/dialogs/combat-dialog.hbs b/templates/dialogs/combat-dialog.hbs
index 8b341b9..b4ed2d0 100644
--- a/templates/dialogs/combat-dialog.hbs
+++ b/templates/dialogs/combat-dialog.hbs
@@ -12,7 +12,7 @@
     <div class="flexrow flex-wrap weapon-details">
       <span class="weapon-detail">
         <strong>{{localize "VERMINE.damages"}}:</strong>
-        {{#if weapon.system.damage.addVigor}}{{localize "VERMINE.vigor"}}+ {{/if}}
+        {{#if weapon.system.damage.addVigor}}{{localize "ADVERSITY.vigor"}}+ {{/if}}
         {{ weapon.system.damage.value }} ({{ weapon.system.damage.type }})
       </span>
       <span class="weapon-detail">
diff --git a/templates/roll-message.hbs b/templates/roll-message.hbs
index 12997c6..b0d0913 100644
--- a/templates/roll-message.hbs
+++ b/templates/roll-message.hbs
@@ -24,7 +24,7 @@
     <div class="flexrow flex-wrap weapon-details">
       <span class="weapon-detail">
         <strong>{{localize "VERMINE.damages"}}:</strong>
-        {{#if param.weapon.system.damage.addVigor}}{{localize "VERMINE.vigor"}}+ {{/if}}
+        {{#if param.weapon.system.damage.addVigor}}{{localize "ADVERSITY.vigor"}}+ {{/if}}
         {{param.weapon.system.damage.value}} ({{param.weapon.system.damage.type}})
       </span>
       <span class="weapon-detail">