diff --git a/css/fvtt-lethal-fantasy.css b/css/fvtt-lethal-fantasy.css
index 884634c..150f81c 100644
--- a/css/fvtt-lethal-fantasy.css
+++ b/css/fvtt-lethal-fantasy.css
@@ -482,121 +482,134 @@ i.lethalfantasy {
 .lethalfantasy .tab.character-skills .vulnerabilities .vulnerability .name {
   min-width: 12rem;
 }
-.lethalfantasy .tab.character-weapons {
+.lethalfantasy .tab.character-equipment {
   display: grid;
   grid-template-columns: 1fr;
 }
-.lethalfantasy .tab.character-weapons legend a {
+.lethalfantasy .tab.character-equipment legend a {
   font-size: calc(var(--font-size-standard) * 1.4);
   padding-left: 5px;
 }
-.lethalfantasy .tab.character-weapons .combat-details {
+.lethalfantasy .tab.character-equipment .moneys {
   display: grid;
-  grid-template-columns: repeat(2, 1fr);
+  grid-template-columns: repeat(5, 1fr);
   gap: 10px;
 }
-.lethalfantasy .tab.character-weapons .combat-details .combat-detail {
+.lethalfantasy .tab.character-equipment .equipments {
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 10px;
+}
+.lethalfantasy .tab.character-equipment .equipments .equipment {
   display: flex;
   align-items: center;
   gap: 10px;
 }
-.lethalfantasy .tab.character-weapons .combat-details .combat-detail .armor-hp {
+.lethalfantasy .tab.character-equipment .equipments .equipment .item-img {
+  width: 32px;
+  height: 32px;
+  margin: 5px 0 0 0;
+}
+.lethalfantasy .tab.character-equipment .equipments .equipment .name {
+  min-width: 12rem;
+}
+.lethalfantasy .tab.character-equipment .equipments .name {
+  min-width: 12rem;
+}
+.lethalfantasy .tab.character-combat {
+  display: grid;
+  grid-template-columns: 1fr;
+}
+.lethalfantasy .tab.character-combat legend a {
+  font-size: calc(var(--font-size-standard) * 1.4);
+  padding-left: 5px;
+}
+.lethalfantasy .tab.character-combat .combat-details {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 10px;
+}
+.lethalfantasy .tab.character-combat .combat-details .combat-detail {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.lethalfantasy .tab.character-combat .combat-details .combat-detail .armor-hp {
   min-width: 20rem;
   max-width: 20rem;
 }
-.lethalfantasy .tab.character-weapons .combat-details .combat-detail .armor-hp .input {
+.lethalfantasy .tab.character-combat .combat-details .combat-detail .armor-hp .input {
   min-width: 3rem;
   max-width: 3rem;
 }
-.lethalfantasy .tab.character-weapons .wounds {
+.lethalfantasy .tab.character-combat .wounds {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
   gap: 10px;
 }
-.lethalfantasy .tab.character-weapons .wounds .wound {
+.lethalfantasy .tab.character-combat .wounds .wound {
   display: flex;
   align-items: center;
   gap: 10px;
 }
-.lethalfantasy .tab.character-weapons .wounds .wound .wound-description {
+.lethalfantasy .tab.character-combat .wounds .wound .wound-description {
   min-width: 16rem;
   max-width: 16rem;
 }
-.lethalfantasy .tab.character-weapons .wounds .wound .wound-duration {
+.lethalfantasy .tab.character-combat .wounds .wound .wound-duration {
   min-width: 3rem;
   max-width: 3rem;
 }
-.lethalfantasy .tab.character-weapons .wounds .wound .wound-value {
+.lethalfantasy .tab.character-combat .wounds .wound .wound-value {
   min-width: 3rem;
   max-width: 3rem;
 }
-.lethalfantasy .tab.character-weapons .wounds .wound .item-img {
+.lethalfantasy .tab.character-combat .wounds .wound .item-img {
   width: 32px;
   height: 32px;
   margin: 5px 0 0 0;
 }
-.lethalfantasy .tab.character-weapons .wounds .wound .name {
+.lethalfantasy .tab.character-combat .wounds .wound .name {
   min-width: 12rem;
 }
-.lethalfantasy .tab.character-weapons .weapons {
+.lethalfantasy .tab.character-combat .weapons {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
   gap: 10px;
 }
-.lethalfantasy .tab.character-weapons .weapons .weapon {
+.lethalfantasy .tab.character-combat .weapons .weapon {
   display: flex;
   align-items: center;
   gap: 10px;
 }
-.lethalfantasy .tab.character-weapons .weapons .weapon .item-img {
+.lethalfantasy .tab.character-combat .weapons .weapon .item-img {
   width: 32px;
   height: 32px;
   margin: 5px 0 0 0;
 }
-.lethalfantasy .tab.character-weapons .weapons .weapon .name {
+.lethalfantasy .tab.character-combat .weapons .weapon .name {
   min-width: 12rem;
 }
-.lethalfantasy .tab.character-weapons .weapons .weapon .attack-icons a {
+.lethalfantasy .tab.character-combat .weapons .weapon .attack-icons a {
   margin-left: 8px;
   margin-right: 8px;
 }
-.lethalfantasy .tab.character-weapons .armors {
+.lethalfantasy .tab.character-combat .armors {
   display: grid;
   grid-template-columns: repeat(3, 1fr);
   gap: 10px;
 }
-.lethalfantasy .tab.character-weapons .armors .armor {
+.lethalfantasy .tab.character-combat .armors .armor {
   display: flex;
   align-items: center;
   gap: 10px;
 }
-.lethalfantasy .tab.character-weapons .armors .armor .item-img {
+.lethalfantasy .tab.character-combat .armors .armor .item-img {
   width: 32px;
   height: 32px;
   margin: 5px 0 0 0;
 }
-.lethalfantasy .tab.character-weapons .armors .name {
-  min-width: 12rem;
-}
-.lethalfantasy .tab.character-weapons .equipments {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 10px;
-}
-.lethalfantasy .tab.character-weapons .equipments .equipment {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-}
-.lethalfantasy .tab.character-weapons .equipments .equipment .item-img {
-  width: 32px;
-  height: 32px;
-  margin: 5px 0 0 0;
-}
-.lethalfantasy .tab.character-weapons .equipments .equipment .name {
-  min-width: 12rem;
-}
-.lethalfantasy .tab.character-weapons .equipments .name {
+.lethalfantasy .tab.character-combat .armors .name {
   min-width: 12rem;
 }
 .lethalfantasy .tab.character-spells {
diff --git a/lang/en.json b/lang/en.json
index ea59b69..0260a18 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -41,6 +41,38 @@
     },
     "Character": {
       "FIELDS": {
+        "moneys": {
+          "tinbit": {
+            "label": "Tin Bits",
+            "value": {
+              "label": "Tin Bits"
+            }
+          },
+          "silver": {
+            "label": "Silver",
+            "value": {
+              "label": "Silver"
+            }
+          },
+          "copper": {
+            "label": "Copper",
+            "value": {
+              "label": "Copper"
+            }
+          },
+          "gold": {
+            "label": "Gold",
+            "value": {
+              "label": "Gold"
+            }
+          },
+          "platinum": {
+            "label": "Platinum",
+            "value": {
+              "label": "Platinum"
+            }
+          }
+        },
         "app": {
           "label": "Appearance"
         },
@@ -146,6 +178,8 @@
       }
     },
     "Label": {
+      "combat": "Combat",
+      "money": "Money",
       "favorResult": "Favor result",
       "disfavorResult": "Disfavor result",
       "otherResult": "Other result",
diff --git a/lethal-fantasy.mjs b/lethal-fantasy.mjs
index 05b5881..025f692 100644
--- a/lethal-fantasy.mjs
+++ b/lethal-fantasy.mjs
@@ -173,11 +173,6 @@ Hooks.on("renderChatMessage", (message, html, data) => {
 Hooks.on("updateSetting", async (setting, update, options, id) => {
 })
 
-// Dice-so-nice Ready
-Hooks.once("diceSoNiceReady", (dice3d) => {
-  configureDiceSoNice(dice3d)
-})
-
 /**
  * Create a macro when dropping an entity on the hotbar
  * Item      - open roll dialog
diff --git a/module/applications/sheets/character-sheet.mjs b/module/applications/sheets/character-sheet.mjs
index 2e40da3..c830c08 100644
--- a/module/applications/sheets/character-sheet.mjs
+++ b/module/applications/sheets/character-sheet.mjs
@@ -31,8 +31,11 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
     skills: {
       template: "systems/fvtt-lethal-fantasy/templates/character-skills.hbs",
     },
-    weapons: {
-      template: "systems/fvtt-lethal-fantasy/templates/character-weapons.hbs",
+    combat: {
+      template: "systems/fvtt-lethal-fantasy/templates/character-combat.hbs",
+    },
+    equipment: {
+      template: "systems/fvtt-lethal-fantasy/templates/character-equipment.hbs",
     },
     spells: {
       template: "systems/fvtt-lethal-fantasy/templates/character-spells.hbs",
@@ -57,7 +60,8 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
   #getTabs() {
     let tabs = {
       skills: { id: "skills", group: "sheet", icon: "fa-solid fa-shapes", label: "LETHALFANTASY.Label.skills" },
-      weapons: { id: "weapons", group: "sheet", icon: "fa-solid fa-swords", label: "LETHALFANTASY.Label.weapons" },
+      combat: { id: "combat", group: "sheet", icon: "fa-solid fa-swords", label: "LETHALFANTASY.Label.combat" },
+      equipment: { id: "equipment", group: "sheet", icon: "fa-solid fa-backpack", label: "LETHALFANTASY.Label.equipment" },
       biography: { id: "biography", group: "sheet", icon: "fa-solid fa-book", label: "LETHALFANTASY.Label.biography" },
     }
     if (this.actor.system.biodata.magicUser) {
@@ -106,13 +110,16 @@ export default class LethalFantasyCharacterSheet extends LethalFantasyActorSheet
         context.miracles = doc.itemTypes.miracle
         context.hasMiracles = context.miracles.length > 0
         break
-      case "weapons":
-        context.tab = context.tabs.weapons
+      case "combat":
+        context.tab = context.tabs.combat
         context.weapons = doc.itemTypes.weapon
         context.armors = doc.itemTypes.armor
+        break
+      case "equipment":
+        context.tab = context.tabs.equipment
         context.equipments = doc.itemTypes.equipment
         break
-      case "biography":
+        case "biography":
         context.tab = context.tabs.biography
         context.enrichedDescription = await TextEditor.enrichHTML(doc.system.description, { async: true })
         context.enrichedNotes = await TextEditor.enrichHTML(doc.system.notes, { async: true })
diff --git a/packs-system/lf-equipment/000008.log b/packs-system/lf-equipment/000008.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs-system/lf-equipment/CURRENT b/packs-system/lf-equipment/CURRENT
index f7753e2..3051f81 100644
--- a/packs-system/lf-equipment/CURRENT
+++ b/packs-system/lf-equipment/CURRENT
@@ -1 +1 @@
-MANIFEST-000006
+MANIFEST-000010
diff --git a/packs-system/lf-equipment/LOG b/packs-system/lf-equipment/LOG
index dd695b3..165bb23 100644
--- a/packs-system/lf-equipment/LOG
+++ b/packs-system/lf-equipment/LOG
@@ -1,7 +1,7 @@
-2025/01/09-22:06:01.230631 7f0abbfff6c0 Recovering log #4
-2025/01/09-22:06:01.239976 7f0abbfff6c0 Delete type=3 #2
-2025/01/09-22:06:01.240081 7f0abbfff6c0 Delete type=0 #4
-2025/01/09-22:26:22.511134 7f0ab9bff6c0 Level-0 table #9: started
-2025/01/09-22:26:22.511166 7f0ab9bff6c0 Level-0 table #9: 0 bytes OK
-2025/01/09-22:26:22.540103 7f0ab9bff6c0 Delete type=0 #7
-2025/01/09-22:26:22.609664 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2025/01/09-22:31:28.606227 7f0abbfff6c0 Recovering log #8
+2025/01/09-22:31:28.615890 7f0abbfff6c0 Delete type=3 #6
+2025/01/09-22:31:28.615953 7f0abbfff6c0 Delete type=0 #8
+2025/01/09-22:43:31.203725 7f0ab9bff6c0 Level-0 table #13: started
+2025/01/09-22:43:31.203752 7f0ab9bff6c0 Level-0 table #13: 0 bytes OK
+2025/01/09-22:43:31.296594 7f0ab9bff6c0 Delete type=0 #11
+2025/01/09-22:43:31.296887 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-equipment/LOG.old b/packs-system/lf-equipment/LOG.old
index 7c8ea83..dd695b3 100644
--- a/packs-system/lf-equipment/LOG.old
+++ b/packs-system/lf-equipment/LOG.old
@@ -1,5 +1,7 @@
-2025/01/09-20:31:12.531379 7f0abaffd6c0 Delete type=3 #1
-2025/01/09-22:05:02.668496 7f0ab9bff6c0 Level-0 table #5: started
-2025/01/09-22:05:02.668533 7f0ab9bff6c0 Level-0 table #5: 0 bytes OK
-2025/01/09-22:05:02.675350 7f0ab9bff6c0 Delete type=0 #3
-2025/01/09-22:05:02.689275 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2025/01/09-22:06:01.230631 7f0abbfff6c0 Recovering log #4
+2025/01/09-22:06:01.239976 7f0abbfff6c0 Delete type=3 #2
+2025/01/09-22:06:01.240081 7f0abbfff6c0 Delete type=0 #4
+2025/01/09-22:26:22.511134 7f0ab9bff6c0 Level-0 table #9: started
+2025/01/09-22:26:22.511166 7f0ab9bff6c0 Level-0 table #9: 0 bytes OK
+2025/01/09-22:26:22.540103 7f0ab9bff6c0 Delete type=0 #7
+2025/01/09-22:26:22.609664 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-equipment/MANIFEST-000006 b/packs-system/lf-equipment/MANIFEST-000006
deleted file mode 100644
index 97450be..0000000
Binary files a/packs-system/lf-equipment/MANIFEST-000006 and /dev/null differ
diff --git a/packs-system/lf-gifts/000008.log b/packs-system/lf-gifts/000008.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs-system/lf-gifts/CURRENT b/packs-system/lf-gifts/CURRENT
index f7753e2..3051f81 100644
--- a/packs-system/lf-gifts/CURRENT
+++ b/packs-system/lf-gifts/CURRENT
@@ -1 +1 @@
-MANIFEST-000006
+MANIFEST-000010
diff --git a/packs-system/lf-gifts/LOG b/packs-system/lf-gifts/LOG
index a73af80..3b1f5c0 100644
--- a/packs-system/lf-gifts/LOG
+++ b/packs-system/lf-gifts/LOG
@@ -1,7 +1,7 @@
-2025/01/09-22:06:01.242474 7f0abb7fe6c0 Recovering log #4
-2025/01/09-22:06:01.252331 7f0abb7fe6c0 Delete type=3 #2
-2025/01/09-22:06:01.252401 7f0abb7fe6c0 Delete type=0 #4
-2025/01/09-22:26:22.580727 7f0ab9bff6c0 Level-0 table #9: started
-2025/01/09-22:26:22.580760 7f0ab9bff6c0 Level-0 table #9: 0 bytes OK
-2025/01/09-22:26:22.609536 7f0ab9bff6c0 Delete type=0 #7
-2025/01/09-22:26:22.609684 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2025/01/09-22:31:28.618153 7f0abb7fe6c0 Recovering log #8
+2025/01/09-22:31:28.629092 7f0abb7fe6c0 Delete type=3 #6
+2025/01/09-22:31:28.629179 7f0abb7fe6c0 Delete type=0 #8
+2025/01/09-22:43:31.034575 7f0ab9bff6c0 Level-0 table #13: started
+2025/01/09-22:43:31.034610 7f0ab9bff6c0 Level-0 table #13: 0 bytes OK
+2025/01/09-22:43:31.125906 7f0ab9bff6c0 Delete type=0 #11
+2025/01/09-22:43:31.296849 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-gifts/LOG.old b/packs-system/lf-gifts/LOG.old
index a46e09d..a73af80 100644
--- a/packs-system/lf-gifts/LOG.old
+++ b/packs-system/lf-gifts/LOG.old
@@ -1,5 +1,7 @@
-2025/01/09-20:31:12.546769 7f0aba7fc6c0 Delete type=3 #1
-2025/01/09-22:05:02.682626 7f0ab9bff6c0 Level-0 table #5: started
-2025/01/09-22:05:02.682649 7f0ab9bff6c0 Level-0 table #5: 0 bytes OK
-2025/01/09-22:05:02.688999 7f0ab9bff6c0 Delete type=0 #3
-2025/01/09-22:05:02.689300 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2025/01/09-22:06:01.242474 7f0abb7fe6c0 Recovering log #4
+2025/01/09-22:06:01.252331 7f0abb7fe6c0 Delete type=3 #2
+2025/01/09-22:06:01.252401 7f0abb7fe6c0 Delete type=0 #4
+2025/01/09-22:26:22.580727 7f0ab9bff6c0 Level-0 table #9: started
+2025/01/09-22:26:22.580760 7f0ab9bff6c0 Level-0 table #9: 0 bytes OK
+2025/01/09-22:26:22.609536 7f0ab9bff6c0 Delete type=0 #7
+2025/01/09-22:26:22.609684 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-gifts/MANIFEST-000006 b/packs-system/lf-gifts/MANIFEST-000006
deleted file mode 100644
index 97450be..0000000
Binary files a/packs-system/lf-gifts/MANIFEST-000006 and /dev/null differ
diff --git a/packs-system/lf-skills/000008.log b/packs-system/lf-skills/000008.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs-system/lf-skills/CURRENT b/packs-system/lf-skills/CURRENT
index f7753e2..3051f81 100644
--- a/packs-system/lf-skills/CURRENT
+++ b/packs-system/lf-skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000006
+MANIFEST-000010
diff --git a/packs-system/lf-skills/LOG b/packs-system/lf-skills/LOG
index f98007a..10eea8c 100644
--- a/packs-system/lf-skills/LOG
+++ b/packs-system/lf-skills/LOG
@@ -1,7 +1,7 @@
-2025/01/09-22:06:01.218155 7f0abaffd6c0 Recovering log #4
-2025/01/09-22:06:01.228492 7f0abaffd6c0 Delete type=3 #2
-2025/01/09-22:06:01.228577 7f0abaffd6c0 Delete type=0 #4
-2025/01/09-22:26:22.540188 7f0ab9bff6c0 Level-0 table #9: started
-2025/01/09-22:26:22.540210 7f0ab9bff6c0 Level-0 table #9: 0 bytes OK
-2025/01/09-22:26:22.580587 7f0ab9bff6c0 Delete type=0 #7
-2025/01/09-22:26:22.609674 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2025/01/09-22:31:28.593009 7f0aba7fc6c0 Recovering log #8
+2025/01/09-22:31:28.603392 7f0aba7fc6c0 Delete type=3 #6
+2025/01/09-22:31:28.603450 7f0aba7fc6c0 Delete type=0 #8
+2025/01/09-22:43:30.943627 7f0ab9bff6c0 Level-0 table #13: started
+2025/01/09-22:43:30.943704 7f0ab9bff6c0 Level-0 table #13: 0 bytes OK
+2025/01/09-22:43:31.034381 7f0ab9bff6c0 Delete type=0 #11
+2025/01/09-22:43:31.296823 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-skills/LOG.old b/packs-system/lf-skills/LOG.old
index a817439..f98007a 100644
--- a/packs-system/lf-skills/LOG.old
+++ b/packs-system/lf-skills/LOG.old
@@ -1,5 +1,7 @@
-2025/01/09-20:31:12.516007 7f0aba7fc6c0 Delete type=3 #1
-2025/01/09-22:05:02.675509 7f0ab9bff6c0 Level-0 table #5: started
-2025/01/09-22:05:02.675540 7f0ab9bff6c0 Level-0 table #5: 0 bytes OK
-2025/01/09-22:05:02.682505 7f0ab9bff6c0 Delete type=0 #3
-2025/01/09-22:05:02.689288 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2025/01/09-22:06:01.218155 7f0abaffd6c0 Recovering log #4
+2025/01/09-22:06:01.228492 7f0abaffd6c0 Delete type=3 #2
+2025/01/09-22:06:01.228577 7f0abaffd6c0 Delete type=0 #4
+2025/01/09-22:26:22.540188 7f0ab9bff6c0 Level-0 table #9: started
+2025/01/09-22:26:22.540210 7f0ab9bff6c0 Level-0 table #9: 0 bytes OK
+2025/01/09-22:26:22.580587 7f0ab9bff6c0 Delete type=0 #7
+2025/01/09-22:26:22.609674 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-skills/MANIFEST-000006 b/packs-system/lf-skills/MANIFEST-000006
deleted file mode 100644
index 97450be..0000000
Binary files a/packs-system/lf-skills/MANIFEST-000006 and /dev/null differ
diff --git a/packs-system/lf-vulnerabilities/000008.log b/packs-system/lf-vulnerabilities/000008.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs-system/lf-vulnerabilities/CURRENT b/packs-system/lf-vulnerabilities/CURRENT
index f7753e2..3051f81 100644
--- a/packs-system/lf-vulnerabilities/CURRENT
+++ b/packs-system/lf-vulnerabilities/CURRENT
@@ -1 +1 @@
-MANIFEST-000006
+MANIFEST-000010
diff --git a/packs-system/lf-vulnerabilities/LOG b/packs-system/lf-vulnerabilities/LOG
index 4f9a734..0d8ef43 100644
--- a/packs-system/lf-vulnerabilities/LOG
+++ b/packs-system/lf-vulnerabilities/LOG
@@ -1,7 +1,7 @@
-2025/01/09-22:06:01.254140 7f0aba7fc6c0 Recovering log #4
-2025/01/09-22:06:01.264214 7f0aba7fc6c0 Delete type=3 #2
-2025/01/09-22:06:01.264273 7f0aba7fc6c0 Delete type=0 #4
-2025/01/09-22:26:22.480492 7f0ab9bff6c0 Level-0 table #9: started
-2025/01/09-22:26:22.480548 7f0ab9bff6c0 Level-0 table #9: 0 bytes OK
-2025/01/09-22:26:22.511014 7f0ab9bff6c0 Delete type=0 #7
-2025/01/09-22:26:22.609652 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2025/01/09-22:31:28.631702 7f0abaffd6c0 Recovering log #8
+2025/01/09-22:31:28.641622 7f0abaffd6c0 Delete type=3 #6
+2025/01/09-22:31:28.641694 7f0abaffd6c0 Delete type=0 #8
+2025/01/09-22:43:31.126046 7f0ab9bff6c0 Level-0 table #13: started
+2025/01/09-22:43:31.126074 7f0ab9bff6c0 Level-0 table #13: 0 bytes OK
+2025/01/09-22:43:31.203593 7f0ab9bff6c0 Delete type=0 #11
+2025/01/09-22:43:31.296871 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-vulnerabilities/LOG.old b/packs-system/lf-vulnerabilities/LOG.old
index db97fad..4f9a734 100644
--- a/packs-system/lf-vulnerabilities/LOG.old
+++ b/packs-system/lf-vulnerabilities/LOG.old
@@ -1,5 +1,7 @@
-2025/01/09-20:31:12.562459 7f0abaffd6c0 Delete type=3 #1
-2025/01/09-22:05:02.655239 7f0ab9bff6c0 Level-0 table #5: started
-2025/01/09-22:05:02.655331 7f0ab9bff6c0 Level-0 table #5: 0 bytes OK
-2025/01/09-22:05:02.668318 7f0ab9bff6c0 Delete type=0 #3
-2025/01/09-22:05:02.689254 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2025/01/09-22:06:01.254140 7f0aba7fc6c0 Recovering log #4
+2025/01/09-22:06:01.264214 7f0aba7fc6c0 Delete type=3 #2
+2025/01/09-22:06:01.264273 7f0aba7fc6c0 Delete type=0 #4
+2025/01/09-22:26:22.480492 7f0ab9bff6c0 Level-0 table #9: started
+2025/01/09-22:26:22.480548 7f0ab9bff6c0 Level-0 table #9: 0 bytes OK
+2025/01/09-22:26:22.511014 7f0ab9bff6c0 Delete type=0 #7
+2025/01/09-22:26:22.609652 7f0ab9bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs-system/lf-vulnerabilities/MANIFEST-000006 b/packs-system/lf-vulnerabilities/MANIFEST-000006
deleted file mode 100644
index 97450be..0000000
Binary files a/packs-system/lf-vulnerabilities/MANIFEST-000006 and /dev/null differ
diff --git a/styles/character.less b/styles/character.less
index 5122be6..1cb21d0 100644
--- a/styles/character.less
+++ b/styles/character.less
@@ -387,7 +387,47 @@
     }
   }
 }
-.tab.character-weapons {
+
+.tab.character-equipment {
+  display: grid;
+  grid-template-columns: 1fr;
+  legend {
+    a {
+      font-size: calc(var(--font-size-standard) * 1.4);
+      padding-left: 5px;
+    }
+  }
+
+  .moneys {
+    display: grid;
+    grid-template-columns: repeat(5, 1fr);
+    gap: 10px;
+  }
+
+  .equipments {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 10px;
+    .equipment{
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      .item-img {
+        width: 32px;
+        height: 32px;
+        margin: 5px 0 0 0;
+      }
+      .name {
+        min-width: 12rem;
+      }
+    }
+    .name {
+      min-width: 12rem;
+    }
+  }
+}
+
+.tab.character-combat {
     display: grid;
     grid-template-columns: 1fr;
     legend {
@@ -487,27 +527,6 @@
       min-width: 12rem;
     }
   }
-  .equipments {
-    display: grid;
-    grid-template-columns: repeat(3, 1fr);
-    gap: 10px;
-    .equipment{
-      display: flex;
-      align-items: center;
-      gap: 10px;
-      .item-img {
-        width: 32px;
-        height: 32px;
-        margin: 5px 0 0 0;
-      }
-      .name {
-        min-width: 12rem;
-      }
-    }
-    .name {
-      min-width: 12rem;
-    }
-  }
 }
 
 .tab.character-spells {
diff --git a/templates/character-weapons.hbs b/templates/character-weapons.hbs
deleted file mode 100644
index c037867..0000000
--- a/templates/character-weapons.hbs
+++ /dev/null
@@ -1,118 +0,0 @@
-<section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
-
-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.combatDetails"}}</legend>
-    <div class="combat-details">
-      <div class="combat-detail">
-        <button class="action" data-action="rangedAttackDefense">{{localize
-        "LETHALFANTASY.Label.rangedAttackDefense"}}</button>
-
-        {{formField systemFields.combat.fields.armorHitPoints value=system.combat.armorHitPoints localize=true classes="armor-hp"}}
-        <a data-action="armorHitPointsPlus"><i class="fa-solid fa-hexagon-plus"></i></a>
-        <a data-action="armorHitPointsMinus"><i class="fa-solid fa-hexagon-minus"></i></a>
-      </div>
-    </div>
-  </fieldset>
-
-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.wounds"}}</legend>
-    <div class="wounds">
-        {{#each system.hp.wounds as |wound idx|}}
-        <div class="wound">
-          Name:<input class="wound-description wound-data" type="text" data-type="String" data-index="{{@index}}" value="{{wound.description}}" data-name="description" >
-          HP:<input class="wound-value wound-data" type="text" data-type="Number" data-index="{{@index}}" value="{{wound.value}}" data-name="value" >
-          Duration:<input class="wound-duration wound-data" type="text" data-type="Number" data-index="{{@index}}" value="{{wound.duration}}" data-name="duration" >
-        </div>
-        {{/each}}
-    </div>
-  </fieldset>
-
-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.weapons"}}</legend>
-    <div class="weapons">
-      {{#each weapons as |item|}}
-      <div class="weapon" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}" data-drag="true"
-        data-drag-type="damage">
-        {{#if (ne item.img "icons/svg/item-bag.svg")}}
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        {{/if}}
-        <div class="name">
-          {{item.name}}
-        </div>
-        <div class="attack-icons">
-
-          <a class="rollable" data-roll-type="weapon-attack" data-roll-key="{{item.id}}" data-tooltip="Roll Attack">
-            <i class="lf-roll-small fa-solid fa-swords" data-roll-type="weapon-attack" data-roll-key="{{item.id}}"></i>
-          </a>
-
-          <a class="rollable" data-roll-type="weapon-defense" data-roll-key="{{item.id}}" data-tooltip="Roll Defense">
-            <i class="fa-solid fa-shield-halved" data-roll-type="weapon-defense" data-roll-key="{{item.id}}"></i>
-          </a>
-
-          <a class="rollable" data-roll-type="weapon-damage-small" data-roll-key="{{item.id}}"
-            data-tooltip="Roll Damage (Small)">
-            <i class="fa-regular fa-face-head-bandage" data-roll-type="weapon-damage-small"
-              data-roll-key="{{item.id}}"></i>S
-          </a>
-
-          <a class="rollable" data-roll-type="weapon-damage-medium" data-roll-key="{{item.id}}"
-            data-tooltip="Roll Damage (Medium)">
-            <i class="fa-regular fa-face-head-bandage" data-roll-type="weapon-damage-medium"
-              data-roll-key="{{item.id}}"></i>M
-          </a>
-
-        </div>
-
-        <div class="controls">
-          <a data-tooltip="{{localize 'LETHALFANTASY.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
-          <a data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
-        </div>
-      </div>
-      {{/each}}
-    </div>
-  </fieldset>
-
-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.armors"}}</legend>
-    <div class="armors">
-      {{#each armors as |item|}}
-      <div class="armor" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        <div class="name" data-tooltip="{{{item.system.description}}}">
-          {{item.name}}
-        </div>
-        <div class="controls">
-          <a data-tooltip="{{localize 'LETHALFANTASY.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
-          <a data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
-        </div>
-      </div>
-      {{/each}}
-    </div>
-  </fieldset>
-
-  <fieldset>
-    <legend>{{localize "LETHALFANTASY.Label.equipment"}}</legend>
-    <div class="equipments">
-      {{#each equipments as |item|}}
-      <div class="equipment" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
-        <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
-        <div class="name" data-tooltip="{{{item.system.description}}}">
-          {{item.name}}
-        </div>
-        <div class="controls">
-          <a data-tooltip="{{localize 'LETHALFANTASY.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
-          <a data-tooltip="{{localize 'LETHALFANTASY.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
-            data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
-        </div>
-      </div>
-      {{/each}}
-    </div>
-  </fieldset>
-
-
-</section>
\ No newline at end of file