First PC sheet, WIP

css/fvtt-prism-rpg.css

@@ -132,16 +132,51 @@ i.prismrpg {
   font-family: var(--font-primary);
   font-size: calc(var(--font-size-standard) * 1);
   color: var(--color-dark-1);
-  background-image: var(--background-image-base);
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
   background-repeat: no-repeat;
-  background-size: 100% 100%;
   overflow: scroll;
 }
+.prismrpg .character-content nav.tabs {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 2px 0;
+}
 .prismrpg .character-content nav.tabs [data-tab] {
   color: #636060;
+  font-size: calc(var(--font-size-standard) * 1.1);
+  font-family: var(--font-secondary);
+  font-weight: bold;
+  padding: 3px 16px;
+  background-color: rgba(255, 255, 255, 0.3);
+  border-radius: 4px;
+  text-shadow: 1px 1px 2px rgba(255, 255, 255, 0.8);
+  transition: all 0.2s ease;
+  cursor: pointer;
+  border: 2px solid transparent;
+}
+.prismrpg .character-content nav.tabs [data-tab]:hover {
+  background-color: rgba(255, 255, 255, 0.7);
+  color: #1a1a1a;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
+  border-color: rgba(107, 107, 107, 0.3);
 }
 .prismrpg .character-content nav.tabs [data-tab].active {
-  color: #252424;
+  color: #000000;
+  background-color: rgba(255, 255, 255, 0.85);
+  text-shadow: 1px 1px 3px #ffffff;
+  border: 2px solid #6b6b6b;
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
+}
+.prismrpg .character-content nav.tabs [data-tab].active:hover {
+  background-color: rgba(255, 255, 255, 0.95);
+  box-shadow: 0 4px 10px rgba(0, 0, 0, 0.35);
+  transform: translateY(-2px);
+  border-color: #4a4a4a;
 }
 .prismrpg .character-content input:disabled,
 .prismrpg .character-content select:disabled {
@@ -387,6 +422,14 @@ i.prismrpg {
 .prismrpg .character-main .character-characteristic-edit {
   min-width: 160px;
 }
+.prismrpg .tab.character-biography .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
+}
 .prismrpg .tab.character-biography .main-div .biodata {
   display: grid;
   grid-template-columns: repeat(4, 1fr);
@@ -412,6 +455,12 @@ i.prismrpg {
   min-height: 150px;
 }
 .prismrpg .tab.character-skills .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
   display: grid;
   grid-template-columns: 1fr;
 }
@@ -593,6 +642,12 @@ i.prismrpg {
   color: #6b3c3c;
 }
 .prismrpg .tab.character-equipment .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
   display: grid;
   grid-template-columns: 1fr;
 }
@@ -627,6 +682,12 @@ i.prismrpg {
   min-width: 12rem;
 }
 .prismrpg .tab.character-combat .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
   display: grid;
   grid-template-columns: 1fr;
 }
@@ -771,6 +832,12 @@ i.prismrpg {
   min-width: 12rem;
 }
 .prismrpg .tab.character-spells .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
   display: grid;
   grid-template-columns: 1fr;
 }
@@ -826,6 +893,12 @@ i.prismrpg {
   min-height: 150px;
 }
 .prismrpg .tab.character-miracles .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
   display: grid;
   grid-template-columns: 1fr;
 }
@@ -935,22 +1008,22 @@ i.prismrpg {
   letter-spacing: 1px;
 }
 .prismrpg .character-main-v2 .character-sheet-wrapper {
-  background-image: url("../assets/sheet/character-bg.png");
+  background-image: url("../assets/ui/prism_rpg_background.webp");
   background-size: cover;
   background-position: center;
-  padding: 8px 10px;
+  padding: 2px 4px;
   min-height: auto;
 }
 .prismrpg .character-main-v2 .character-header {
   position: relative;
-  margin-bottom: 5px;
+  margin-bottom: 3px;
 }
 .prismrpg .character-main-v2 .character-header .character-name-banner {
   background-image: url("../assets/sheet/banner-bg.png");
   background-size: contain;
   background-repeat: no-repeat;
   background-position: center;
-  height: 60px;
+  height: 42px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -960,15 +1033,16 @@ i.prismrpg {
   border: none;
   text-align: center;
   font-family: "Cinzel", serif;
-  font-size: 24px;
+  font-size: 20px;
   font-weight: bold;
   color: #2c2c2c;
   width: 500px;
   text-shadow: 1px 1px 2px rgba(255, 255, 255, 0.5);
+  padding: 2px 0;
 }
 .prismrpg .character-main-v2 .character-header .character-toggle-controls {
   position: absolute;
-  top: 10px;
+  top: 6px;
   right: 10px;
 }
 .prismrpg .character-main-v2 .character-main-grid {
@@ -1074,12 +1148,14 @@ i.prismrpg {
 }
 .prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-label {
   font-family: "Cinzel", serif;
-  font-size: 14px;
+  font-size: 11px;
   font-weight: bold;
   color: #2c2c2c;
   text-transform: uppercase;
   margin: 0;
   min-width: 40px;
+  display: flex;
+  align-items: center;
 }
 .prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-label a.rollable {
   display: flex;
@@ -1101,6 +1177,10 @@ i.prismrpg {
 .prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-label a.rollable:hover i {
   color: #2c2c2c;
 }
+.prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-value {
+  display: flex;
+  align-items: center;
+}
 .prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-value input {
   width: 45px;
   height: 32px;
@@ -1113,6 +1193,19 @@ i.prismrpg {
 }
 .prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-save {
   margin-left: auto;
+  display: flex;
+  align-items: center;
+}
+.prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-save a.save-rollable {
+  display: contents;
+  cursor: pointer;
+}
+.prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-save a.save-rollable i {
+  margin-right: 6px;
+}
+.prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-save a.save-rollable:hover input {
+  background: rgba(200, 220, 255, 0.8);
+  border-color: #4a4a4a;
 }
 .prismrpg .character-main-v2 .character-left-column .character-attributes .attribute-shield .attribute-save input {
   width: 45px;
@@ -1124,6 +1217,8 @@ i.prismrpg {
   border: 2px solid #6b6b6b;
   border-radius: 4px;
   color: #2c2c2c;
+  cursor: pointer;
+  transition: all 0.2s;
 }
 .prismrpg .character-main-v2 .character-right-column {
   display: flex;
@@ -1144,20 +1239,27 @@ i.prismrpg {
   text-align: center;
 }
 .prismrpg .character-main-v2 .character-right-column .race-section .race-box {
-  padding: 10px;
+  padding: 6px;
   background: rgba(255, 255, 255, 0.5);
-  border: 3px solid #6b6b6b;
+  border: 2px solid #6b6b6b;
-  border-radius: 8px;
+  border-radius: 6px;
-  min-height: 60px;
+  min-height: 50px;
+}
+.prismrpg .character-main-v2 .character-right-column .race-section .race-box .race-label {
+  font-family: "Cinzel", serif;
+  font-size: 10px;
+  color: #6b6b6b;
+  text-align: center;
+  margin-bottom: 3px;
 }
 .prismrpg .character-main-v2 .character-right-column .race-section .race-box .section-title {
   font-family: "Cinzel", serif;
-  font-size: 12px;
+  font-size: 11px;
   font-weight: bold;
   color: #2c2c2c;
   text-transform: uppercase;
-  margin: 0 0 8px 0;
+  margin: 0 0 4px 0;
-  padding: 5px;
+  padding: 3px;
   background: rgba(255, 255, 255, 0.6);
   border: 2px solid #6b6b6b;
   border-radius: 4px;
@@ -1166,11 +1268,11 @@ i.prismrpg {
 .prismrpg .character-main-v2 .character-right-column .race-section .race-box .race-item {
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 6px;
 }
 .prismrpg .character-main-v2 .character-right-column .race-section .race-box .race-item .item-img {
-  width: 36px;
+  width: 30px;
-  height: 36px;
+  height: 30px;
   border: 2px solid #6b6b6b;
   border-radius: 4px;
   object-fit: cover;
@@ -1202,10 +1304,10 @@ i.prismrpg {
 .prismrpg .character-main-v2 .character-right-column .race-section .race-box .no-race {
   text-align: center;
   font-family: "Crimson Text", serif;
-  font-size: 13px;
+  font-size: 11px;
   color: #6b6b6b;
   font-style: italic;
-  padding: 10px;
+  padding: 5px;
 }
 .prismrpg .character-main-v2 .character-right-column .race-section .race-box input {
   width: 100%;
@@ -1218,29 +1320,29 @@ i.prismrpg {
 .prismrpg .character-main-v2 .character-right-column .classes-section {
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 8px;
 }
 .prismrpg .character-main-v2 .character-right-column .classes-section .class-box {
-  padding: 10px;
+  padding: 6px;
   background: rgba(255, 255, 255, 0.5);
-  border: 3px solid #6b6b6b;
+  border: 2px solid #6b6b6b;
-  border-radius: 8px;
+  border-radius: 6px;
 }
 .prismrpg .character-main-v2 .character-right-column .classes-section .class-box .class-label {
   font-family: "Cinzel", serif;
-  font-size: 11px;
+  font-size: 10px;
   color: #6b6b6b;
   text-align: center;
-  margin-bottom: 5px;
+  margin-bottom: 3px;
 }
 .prismrpg .character-main-v2 .character-right-column .classes-section .class-box .class-content .class-item {
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 6px;
 }
 .prismrpg .character-main-v2 .character-right-column .classes-section .class-box .class-content .class-item .item-img {
-  width: 32px;
+  width: 28px;
-  height: 32px;
+  height: 28px;
   border: 2px solid #6b6b6b;
   border-radius: 4px;
   object-fit: cover;
@@ -1307,74 +1409,60 @@ i.prismrpg {
 }
 .prismrpg .character-subattributes.tab .subattributes-content .subattributes-list {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  grid-template-columns: repeat(4, 1fr);
-  gap: 1rem;
+  gap: 0.5rem;
 }
 .prismrpg .character-subattributes.tab .subattributes-content .subattribute-item {
   background: rgba(0, 0, 0, 0.1);
   border: 1px solid var(--color-border-dark-secondary);
   border-radius: 4px;
-  padding: 0.75rem;
+  padding: 0.4rem;
   display: flex;
   flex-direction: column;
-  gap: 0.5rem;
+  align-items: center;
+  gap: 0.15rem;
+  text-align: center;
+  cursor: pointer;
+  text-decoration: none;
 }
 .prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-header {
   display: flex;
-  justify-content: space-between;
   align-items: center;
-  gap: 0.5rem;
+  gap: 0.3rem;
+}
+.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-header i.fa-dice-d20 {
+  font-size: 1em;
+  color: var(--color-text-dark-primary);
+  opacity: 0.7;
+}
+.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item:hover {
+  background: rgba(0, 0, 0, 0.2);
+  border-color: var(--color-text-light-primary);
+  transform: translateY(-1px);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+}
+.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item:hover .subattribute-header i.fa-dice-d20 {
+  opacity: 1;
+  color: var(--color-text-dark-primary);
 }
 .prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-name {
   font-weight: bold;
-  font-size: 1.1em;
+  font-size: 0.75em;
   color: var(--color-text-dark-primary);
+  line-height: 1.2;
 }
-.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-value input {
+.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-value {
-  width: 3em;
+  font-size: 1em;
-  text-align: center;
   font-weight: bold;
-  font-size: 1.2em;
+  color: var(--color-text-dark-primary);
+  min-width: 2em;
+  padding: 0.15rem 0.3rem;
   background: rgba(255, 255, 255, 0.1);
-  border: 1px solid var(--color-border-dark-tertiary);
   border-radius: 3px;
-  padding: 0.25rem;
-  color: var(--color-text-dark-primary);
-}
-.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-value input:disabled {
-  opacity: 0.9;
-  cursor: default;
-}
-.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-details {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-  font-size: 0.9em;
-  color: var(--color-text-dark-secondary);
-}
-.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-parents {
-  font-style: italic;
-}
-.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-parents .parent-char {
-  display: inline-block;
-  margin-right: 0.5rem;
-}
-.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-parents .parent-char .parent-name {
-  font-weight: 600;
-  color: var(--color-text-dark-primary);
-}
-.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-parents .parent-char .parent-value {
-  color: var(--color-text-dark-secondary);
-}
-.prismrpg .character-subattributes.tab .subattributes-content .subattribute-item .subattribute-description {
-  padding-top: 0.25rem;
-  border-top: 1px solid var(--color-border-dark-tertiary);
-  font-size: 0.85em;
-  line-height: 1.3;
 }
 @media (max-width: 768px) {
   .prismrpg .character-subattributes.tab .subattributes-content .subattributes-list {
-    grid-template-columns: 1fr;
+    grid-template-columns: repeat(3, 1fr);
   }
 }
 .prismrpg .monster-content {

lang/en.json

@@ -514,6 +514,7 @@
       "skill": "Skill",
       "skillBonus": "Skill bonus",
       "skills": "Skills",
+      "sub-attribute": "Sub-Attribute",
       "subattributes": "Sub-Attributes",
       "spells": "Spells",
       "str": "STR",
@@ -799,10 +800,13 @@
       "coreSkills": "List of all 18 available Core Skills in Prism RPG",
       "advancedChecks": "Advanced checks are only available for your Core Skill",
       "addEquipment": "New equipment",
-      "addSpell": "New spells",
+      "addSpell": "Add new spell",
+      "addMiracle": "Add new miracle",
       "skill": "Skills list",
+      "skills": "Skills - Your character's skills and abilities",
       "racialAbilities": "Racial Abilities from your character's race and sub-race"
     },
+    "RollSavingThrow": "Roll Saving Throw",
     "Message": {
       "selectCoreSkill": "You must select a Core Skill for your character. Each character chooses one Core Skill at creation.",
       "dropRace": "Drag and drop a Race item here",

module/applications/sheets/character-sheet.mjs

@@ -7,7 +7,7 @@ export default class PrismRPGCharacterSheet extends PrismRPGActorSheet {
   static DEFAULT_OPTIONS = {
     classes: ["character"],
     position: {
-      width: 750,
+      width: 780,
       height: 780,
     },
     window: {
@@ -15,14 +15,9 @@ export default class PrismRPGCharacterSheet extends PrismRPGActorSheet {
     },
     actions: {
       createEquipment: PrismRPGCharacterSheet.#onCreateEquipment,
-      rangedAttackDefense: PrismRPGCharacterSheet.#onRangedAttackDefense,
       rollInitiative: PrismRPGCharacterSheet.#onRollInitiative,
       armorHitPointsPlus: PrismRPGCharacterSheet.#onArmorHitPointsPlus,
       armorHitPointsMinus: PrismRPGCharacterSheet.#onArmorHitPointsMinus,
-      divinityPointsPlus: PrismRPGCharacterSheet.#onDivinityPointsPlus,
-      divinityPointsMinus: PrismRPGCharacterSheet.#onDivinityPointsMinus,
-      aetherPointsPlus: PrismRPGCharacterSheet.#onAetherPointsPlus,
-      aetherPointsMinus: PrismRPGCharacterSheet.#onAetherPointsMinus,
     },
   }
 
@@ -49,11 +44,6 @@ export default class PrismRPGCharacterSheet extends PrismRPGActorSheet {
     spells: {
       template: "systems/fvtt-prism-rpg/templates/character-spells.hbs",
     },
-    /* Miracles disabled - Legacy from Lethal Fantasy
-    miracles: {
-      template: "systems/fvtt-prism-rpg/templates/character-miracles.hbs",
-    },
-    */
     biography: {
       template: "systems/fvtt-prism-rpg/templates/character-biography.hbs",
     },
@@ -79,11 +69,6 @@ export default class PrismRPGCharacterSheet extends PrismRPGActorSheet {
     if (this.actor.system.biodata.magicUser) {
       tabs.spells = { id: "spells", group: "sheet", icon: "fa-sharp-duotone fa-solid fa-wand-magic-sparkles", label: "PRISMRPG.Label.spells" }
     }
-    /* Miracles disabled - Legacy from Lethal Fantasy
-    if (this.actor.system.biodata.clericUser) {
-      tabs.miracles = { id: "miracles", group: "sheet", icon: "fa-sharp-duotone fa-solid fa-hands-praying", label: "PRISMRPG.Label.miracles" }
-    }
-    */
     for (const v of Object.values(tabs)) {
       v.active = this.tabGroups[v.group] === v.id
       v.cssClass = v.active ? "active" : ""
@@ -128,13 +113,6 @@ export default class PrismRPGCharacterSheet extends PrismRPGActorSheet {
         context.spells = doc.itemTypes.spell
         context.hasSpells = context.spells.length > 0
         break
-      /* Miracles disabled - Legacy from Lethal Fantasy
-      case "miracles":
-        context.tab = context.tabs.miracles
-        context.miracles = doc.itemTypes.miracle
-        context.hasMiracles = context.miracles.length > 0
-        break
-      */
       case "combat":
         context.tab = context.tabs.combat
         context.weapons = doc.itemTypes.weapon
@@ -172,19 +150,6 @@ export default class PrismRPGCharacterSheet extends PrismRPGActorSheet {
     }
   }
 
-  static async #onRangedAttackDefense(event, target) {
-    // Future use : const hasTarget = false
-
-    let roll = await PrismRPGRoll.promptRangedDefense({
-      actorId: this.actor.id,
-      actorName: this.actor.name,
-      actorImage: this.actor.img,
-    })
-    if (!roll) return null
-
-    await roll.toMessage({}, { rollMode: roll.options.rollMode })
-  }
-
   static async #onRollInitiative(event, target) {
     await this.document.system.rollInitiative()
   }
@@ -201,34 +166,6 @@ export default class PrismRPGCharacterSheet extends PrismRPGActorSheet {
     this.actor.update({ "system.combat.armorHitPoints": Math.max(armorHP, 0) })
   }
 
-  static #onDivinityPointsPlus(event, target) {
-    let points = this.actor.system.divinityPoints.value
-    points += 1
-    points = Math.min(points, this.actor.system.divinityPoints.max)
-    this.actor.update({ "system.divinityPoints.value": points })
-  }
-
-  static #onDivinityPointsMinus(event, target) {
-    let points = this.actor.system.divinityPoints.value
-    points -= 1
-    points = Math.max(points, 0)
-    this.actor.update({ "system.divinityPoints.value": points })
-  }
-
-  static #onAetherPointsPlus(event, target) {
-    let points = this.actor.system.aetherPoints.value
-    points += 1
-    points = Math.min(points, this.actor.system.aetherPoints.max)
-    this.actor.update({ "system.aetherPoints.value": points })
-  }
-
-  static #onAetherPointsMinus(event, target) {
-    let points = this.actor.system.aetherPoints.value
-    points -= 1
-    points = Math.max(points, 0)
-    this.actor.update({ "system.aetherPoints.value": points })
-  }
-
   static #onCreateEquipment(event, target) {
   }
 
@@ -269,9 +206,11 @@ export default class PrismRPGCharacterSheet extends PrismRPGActorSheet {
 
   async _onRoll(event, target) {
     if (this.isEditMode) return
-    const rollType = event.target.dataset.rollType
+    // Use closest to find the rollable element in case user clicked on a child
-    let rollKey = event.target.dataset.rollKey;
+    const rollableElement = event.target.closest('.rollable') || event.target
-    let rollDice = event.target.dataset?.rollDice;
+    const rollType = rollableElement.dataset.rollType
+    let rollKey = rollableElement.dataset.rollKey;
+    let rollDice = rollableElement.dataset?.rollDice;
 
     this.actor.prepareRoll(rollType, rollKey, rollDice)
 

module/applications/sheets/monster-sheet.mjs

@@ -162,9 +162,11 @@ export default class PrismRPGMonsterSheet extends PrismRPGActorSheet {
 
   async _onRoll(event, target) {
     if (this.isEditMode) return
-    const rollType = event.target.dataset.rollType
+    // Use closest to find the rollable element in case user clicked on a child
-    let rollKey = event.target.dataset.rollKey
+    const rollableElement = event.target.closest('.rollable') || event.target
-    let rollDice = event.target.dataset?.rollDice || "0"
+    const rollType = rollableElement.dataset.rollType
+    let rollKey = rollableElement.dataset.rollKey
+    let rollDice = rollableElement.dataset?.rollDice || "0"
     this.actor.system.prepareMonsterRoll(rollType, rollKey, rollDice)
   }
 }

module/documents/actor.mjs

@@ -94,6 +94,17 @@ export default class PrismRPGActor extends Actor {
           name: game.i18n.localize(`PRISMRPG.Label.${rollKey}`)
         }
         break
+      case "sub-attribute":
+        if (!this.system.subAttributes || !this.system.subAttributes[rollKey]) {
+          ui.notifications.error(`Sub-attribute ${rollKey} not found`)
+          return
+        }
+        rollTarget = {
+          ...foundry.utils.duplicate(this.system.subAttributes[rollKey]),
+          rollKey: rollKey,
+          name: game.i18n.localize(SYSTEM.SUB_ATTRIBUTES[rollKey].label)
+        }
+        break
       case "granted":
         rollTarget = {
           name: rollKey,
@@ -112,6 +123,10 @@ export default class PrismRPGActor extends Actor {
         rollTarget = foundry.utils.duplicate(this.system.saves[rollKey])
         rollTarget.rollKey = rollKey
         rollTarget.rollDice = rollDice
+        // Pass the characteristic value for D&D 5e modifier calculation
+        rollTarget.characteristicValue = this.system.characteristics[rollKey].value
+        // The save bonus is the proficiency modifier (value stored in saves)
+        rollTarget.saveBonus = this.system.saves[rollKey].value
         break
       case "spell":
         rollTarget = this.items.find((i) => i.type === "spell" && i.id === rollKey)
@@ -128,12 +143,16 @@ export default class PrismRPGActor extends Actor {
           ui.notifications.warn(game.i18n.localize("PRISMRPG.Notifications.rollFromWeapon"))
           return
         }
+        // Get the primary attribute for D&D 5e style rolls
+        const attrKey = rollTarget.system.primaryAttribute || "dex"
+        rollTarget.characteristicValue = this.system.characteristics[attrKey].value
+        rollTarget.proficiencyBonus = rollTarget.system.modifier
         break
       case "spell-attack":
       case "spell-power":
       case "miracle-attack":
       case "miracle-power":
-        rollTarget = this.items.find((i) => (i.type === "miracle" || i.type == "spell") && i.id === rollKey)
+        rollTarget = this.items.find((i) => (i.type === "miracle" || i.type === "spell") && i.id === rollKey)
         rollTarget.rollKey = rollKey
         break
       case "shield-roll": {

module/documents/roll.mjs

@@ -7,6 +7,15 @@ import { SYSTEM } from "../config/system.mjs"
 export default class PrismRPGRoll extends Roll {
   static CHAT_TEMPLATE = "systems/fvtt-prism-rpg/templates/chat-message.hbs"
 
+  /**
+   * Calculate D&D 5e style ability modifier from ability score
+   * @param {number} abilityScore The ability score value (3-18+)
+   * @returns {number} The ability modifier
+   */
+  static getAbilityModifier(abilityScore) {
+    return Math.floor((abilityScore - 10) / 2)
+  }
+
   // Getters for roll data
   get type() {
     return this.options.type
@@ -89,17 +98,40 @@ export default class PrismRPGRoll extends Roll {
     switch (options.rollType) {
       case "characteristic":
         options.rollName = options.rollTarget.name
-        // Value already set in actor.mjs
+        // Calculate D&D 5e modifier from characteristic value
+        options.rollTarget.value = this.getAbilityModifier(options.rollTarget.value)
+        break
+
+      case "sub-attribute":
+        options.rollName = options.rollTarget.name
+        // Sub-attribute value is already a modifier (calculated in prepareDerivedData)
         break
 
       case "challenge":
-      case "save":
         options.rollName = game.i18n.localize(`PRISMRPG.Label.${options.rollTarget.rollKey}`)
         break
 
+      case "save":
+        options.rollName = `${game.i18n.localize(`PRISMRPG.Label.${options.rollTarget.rollKey}`)} Save`
+        // Calculate D&D 5e saving throw: ability modifier + proficiency bonus
+        // Get the characteristic value from rollTarget
+        const charValue = options.rollTarget.characteristicValue
+        const abilityMod = this.getAbilityModifier(charValue)
+        const saveBonus = options.rollTarget.saveBonus || 0
+        // Store separate values for display
+        options.rollTarget.abilityModifier = abilityMod
+        options.rollTarget.saveProficiency = saveBonus
+        // Add the save bonus (proficiency) stored in saves
+        options.rollTarget.value = abilityMod + saveBonus
+        break
+
       case "skill":
         options.rollName = options.rollTarget.name
-        options.rollTarget.value = Math.floor(options.rollTarget.system.skillTotal / 10)
+        // D&D 5e style: ability modifier + proficiency bonus
+        const skillCharValue = options.rollTarget.characteristicValue
+        const skillAbilityMod = this.getAbilityModifier(skillCharValue)
+        const proficiency = options.rollTarget.proficiencyBonus || 0
+        options.rollTarget.value = skillAbilityMod + proficiency
         break
 
       case "weapon-attack":

module/models/character.mjs

@@ -144,23 +144,6 @@ export default class PrismRPGCharacter extends foundry.abstract.TypeDataModel {
       }, {}),
     )
 
-    // Core Skill system (Prism RPG)
-    schema.coreSkill = new fields.SchemaField({
-      skill: new fields.StringField({
-        required: false,
-        nullable: true,
-        initial: null,
-        choices: SYSTEM.CORE_SKILLS_CHOICES,
-        label: "Selected Core Skill"
-      }),
-      attributeChoice: new fields.StringField({
-        required: false,
-        nullable: true,
-        initial: null,
-        label: "Attribute Choice for +2 Bonus"
-      })
-    })
-
     return schema
   }
 

module/models/skill.mjs

@@ -36,6 +36,13 @@ export default class PrismRPGSkill extends foundry.abstract.TypeDataModel {
       label: "Is Core Skill"
     })
 
+    // Primary attribute for this skill (str, dex, con, int, wis, cha)
+    schema.primaryAttribute = new fields.StringField({
+      required: true,
+      initial: "dex",
+      label: "Primary Attribute"
+    })
+
     // If Core Skill, which attribute receives the +2 bonus?
     schema.attributeBonus = new fields.StringField({
       required: true,
@@ -107,9 +114,9 @@ export default class PrismRPGSkill extends foundry.abstract.TypeDataModel {
   prepareDerivedData() {
     super.prepareDerivedData()
 
-    // If this is the character's Core Skill, apply bonuses
+    // D&D 5e style: Core Skill gives +2 proficiency bonus
     if (this.isCoreSkill) {
-      this.modifier = CORE_SKILL_BONUS?.basic || 5
+      this.modifier = 2
       this.canAdvancedCheck = true
     } else {
       this.modifier = 0

styles/character-main-v2.less

@@ -5,24 +5,24 @@
   margin: 0;
 
   .character-sheet-wrapper {
-    background-image: url("../assets/sheet/character-bg.png");
+    background-image: url("../assets/ui/prism_rpg_background.webp");
     background-size: cover;
     background-position: center;
-    padding: 8px 10px;
+    padding: 2px 4px;
     min-height: auto;
   }
 
   // Character Header with Banner
   .character-header {
     position: relative;
-    margin-bottom: 5px;
+    margin-bottom: 3px;
 
     .character-name-banner {
       background-image: url("../assets/sheet/banner-bg.png");
       background-size: contain;
       background-repeat: no-repeat;
       background-position: center;
-      height: 60px;
+      height: 42px;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -32,17 +32,18 @@
         border: none;
         text-align: center;
         font-family: "Cinzel", serif;
-        font-size: 24px;
+        font-size: 20px;
         font-weight: bold;
         color: #2c2c2c;
         width: 500px;
         text-shadow: 1px 1px 2px rgba(255, 255, 255, 0.5);
+        padding: 2px 0;
       }
     }
 
     .character-toggle-controls {
       position: absolute;
-      top: 10px;
+      top: 6px;
       right: 10px;
     }
   }
@@ -168,12 +169,14 @@
 
         .attribute-label {
           font-family: "Cinzel", serif;
-          font-size: 14px;
+          font-size: 11px;
           font-weight: bold;
           color: #2c2c2c;
           text-transform: uppercase;
           margin: 0;
           min-width: 40px;
+          display: flex;
+          align-items: center;
 
           a.rollable {
             display: flex;
@@ -201,6 +204,9 @@
         }
 
         .attribute-value {
+          display: flex;
+          align-items: center;
+
           input {
             width: 45px;
             height: 32px;
@@ -215,6 +221,22 @@
 
         .attribute-save {
           margin-left: auto;
+          display: flex;
+          align-items: center;
+
+          a.save-rollable {
+            display: contents;
+            cursor: pointer;
+
+            i {
+              margin-right: 6px;
+            }
+
+            &:hover input {
+              background: rgba(200, 220, 255, 0.8);
+              border-color: #4a4a4a;
+            }
+          }
 
           input {
             width: 45px;
@@ -226,6 +248,8 @@
             border: 2px solid #6b6b6b;
             border-radius: 4px;
             color: #2c2c2c;
+            cursor: pointer;
+            transition: all 0.2s;
           }
         }
       }
@@ -254,20 +278,28 @@
 
     .race-section {
       .race-box {
-        padding: 10px;
+        padding: 6px;
         background: rgba(255, 255, 255, 0.5);
-        border: 3px solid #6b6b6b;
+        border: 2px solid #6b6b6b;
-        border-radius: 8px;
+        border-radius: 6px;
-        min-height: 60px;
+        min-height: 50px;
+
+        .race-label {
+          font-family: "Cinzel", serif;
+          font-size: 10px;
+          color: #6b6b6b;
+          text-align: center;
+          margin-bottom: 3px;
+        }
 
         .section-title {
           font-family: "Cinzel", serif;
-          font-size: 12px;
+          font-size: 11px;
           font-weight: bold;
           color: #2c2c2c;
           text-transform: uppercase;
-          margin: 0 0 8px 0;
+          margin: 0 0 4px 0;
-          padding: 5px;
+          padding: 3px;
           background: rgba(255, 255, 255, 0.6);
           border: 2px solid #6b6b6b;
           border-radius: 4px;
@@ -277,11 +309,11 @@
         .race-item {
           display: flex;
           align-items: center;
-          gap: 8px;
+          gap: 6px;
 
           .item-img {
-            width: 36px;
+            width: 30px;
-            height: 36px;
+            height: 30px;
             border: 2px solid #6b6b6b;
             border-radius: 4px;
             object-fit: cover;
@@ -320,10 +352,10 @@
         .no-race {
           text-align: center;
           font-family: "Crimson Text", serif;
-          font-size: 13px;
+          font-size: 11px;
           color: #6b6b6b;
           font-style: italic;
-          padding: 10px;
+          padding: 5px;
         }
 
         input {
@@ -340,31 +372,31 @@
     .classes-section {
       display: flex;
       flex-direction: column;
-      gap: 12px;
+      gap: 8px;
 
       .class-box {
-        padding: 10px;
+        padding: 6px;
         background: rgba(255, 255, 255, 0.5);
-        border: 3px solid #6b6b6b;
+        border: 2px solid #6b6b6b;
-        border-radius: 8px;
+        border-radius: 6px;
 
         .class-label {
           font-family: "Cinzel", serif;
-          font-size: 11px;
+          font-size: 10px;
           color: #6b6b6b;
           text-align: center;
-          margin-bottom: 5px;
+          margin-bottom: 3px;
         }
 
         .class-content {
           .class-item {
             display: flex;
             align-items: center;
-            gap: 8px;
+            gap: 6px;
 
             .item-img {
-              width: 32px;
+              width: 28px;
-              height: 32px;
+              height: 28px;
               border: 2px solid #6b6b6b;
               border-radius: 4px;
               object-fit: cover;

styles/character-subattributes.less

@@ -6,82 +6,62 @@
 
     .subattributes-list {
       display: grid;
-      grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+      grid-template-columns: repeat(4, 1fr);
-      gap: 1rem;
+      gap: 0.5rem;
     }
 
     .subattribute-item {
       background: rgba(0, 0, 0, 0.1);
       border: 1px solid var(--color-border-dark-secondary);
       border-radius: 4px;
-      padding: 0.75rem;
+      padding: 0.4rem;
       display: flex;
       flex-direction: column;
-      gap: 0.5rem;
+      align-items: center;
+      gap: 0.15rem;
+      text-align: center;
+      cursor: pointer;
+      text-decoration: none;
 
       .subattribute-header {
         display: flex;
-        justify-content: space-between;
         align-items: center;
-        gap: 0.5rem;
+        gap: 0.3rem;
+
+        i.fa-dice-d20 {
+          font-size: 1em;
+          color: var(--color-text-dark-primary);
+          opacity: 0.7;
+        }
+      }
+
+      &:hover {
+        background: rgba(0, 0, 0, 0.2);
+        border-color: var(--color-text-light-primary);
+        transform: translateY(-1px);
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
+
+        .subattribute-header i.fa-dice-d20 {
+          opacity: 1;
+          color: var(--color-text-dark-primary);
+        }
       }
 
       .subattribute-name {
         font-weight: bold;
-        font-size: 1.1em;
+        font-size: 0.75em;
         color: var(--color-text-dark-primary);
+        line-height: 1.2;
       }
 
       .subattribute-value {
-        input {
+        font-size: 1em;
-          width: 3em;
+        font-weight: bold;
-          text-align: center;
+        color: var(--color-text-dark-primary);
-          font-weight: bold;
+        min-width: 2em;
-          font-size: 1.2em;
+        padding: 0.15rem 0.3rem;
-          background: rgba(255, 255, 255, 0.1);
+        background: rgba(255, 255, 255, 0.1);
-          border: 1px solid var(--color-border-dark-tertiary);
+        border-radius: 3px;
-          border-radius: 3px;
-          padding: 0.25rem;
-          color: var(--color-text-dark-primary);
-
-          &:disabled {
-            opacity: 0.9;
-            cursor: default;
-          }
-        }
-      }
-
-      .subattribute-details {
-        display: flex;
-        flex-direction: column;
-        gap: 0.25rem;
-        font-size: 0.9em;
-        color: var(--color-text-dark-secondary);
-      }
-
-      .subattribute-parents {
-        font-style: italic;
-
-        .parent-char {
-          display: inline-block;
-          margin-right: 0.5rem;
-
-          .parent-name {
-            font-weight: 600;
-            color: var(--color-text-dark-primary);
-          }
-
-          .parent-value {
-            color: var(--color-text-dark-secondary);
-          }
-        }
-      }
-
-      .subattribute-description {
-        padding-top: 0.25rem;
-        border-top: 1px solid var(--color-border-dark-tertiary);
-        font-size: 0.85em;
-        line-height: 1.3;
       }
     }
   }
@@ -92,7 +72,7 @@
   .character-subattributes.tab {
     .subattributes-content {
       .subattributes-list {
-        grid-template-columns: 1fr;
+        grid-template-columns: repeat(3, 1fr);
       }
     }
   }

styles/character.less

@@ -1,7 +1,107 @@
 .character-content {
-  .sheet-common();
+  font-family: var(--font-primary);
-  .character-sheet-common();
+  font-size: calc(var(--font-size-standard) * 1);
+  color: var(--color-dark-1);
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
   overflow: scroll;
+
+  nav.tabs {
+    background-image: url("../assets/ui/prism_rpg_background.webp");
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+    padding: 2px 0;
+  }
+
+  nav.tabs [data-tab] {
+    color: #636060;
+    font-size: calc(var(--font-size-standard) * 1.1);
+    font-family: var(--font-secondary);
+    font-weight: bold;
+    padding: 3px 16px;
+    background-color: rgba(255, 255, 255, 0.3);
+    border-radius: 4px;
+    text-shadow: 1px 1px 2px rgba(255, 255, 255, 0.8);
+    transition: all 0.2s ease;
+    cursor: pointer;
+    border: 2px solid transparent;
+
+    &:hover {
+      background-color: rgba(255, 255, 255, 0.7);
+      color: #1a1a1a;
+      transform: translateY(-2px);
+      box-shadow: 0 4px 8px rgba(0, 0, 0, 0.3);
+      border-color: rgba(107, 107, 107, 0.3);
+    }
+  }
+
+  nav.tabs [data-tab].active {
+    color: #000000;
+    background-color: rgba(255, 255, 255, 0.85);
+    text-shadow: 1px 1px 3px rgba(255, 255, 255, 1);
+    border: 2px solid #6b6b6b;
+    box-shadow: 0 3px 6px rgba(0, 0, 0, 0.25);
+
+    &:hover {
+      background-color: rgba(255, 255, 255, 0.95);
+      box-shadow: 0 4px 10px rgba(0, 0, 0, 0.35);
+      transform: translateY(-2px);
+      border-color: #4a4a4a;
+    }
+  }
+
+  input:disabled,
+  select:disabled {
+    background-color: rgba(0, 0, 0, 0.2);
+    border-color: transparent;
+    color: var(--color-dark-3);
+  }
+
+  input,
+  select {
+    height: 1.5rem;
+    background-color: rgba(0, 0, 0, 0.1);
+    border-color: var(--color-dark-6);
+    color: var(--color-dark-2);
+  }
+
+  input[name="name"] {
+    height: 2.5rem;
+    margin-right: 4px;
+    font-family: var(--font-secondary);
+    font-size: calc(var(--font-size-standard) * 1.2);
+    font-weight: bold;
+    border: none;
+  }
+
+  fieldset {
+    margin-bottom: 4px;
+    border-radius: 4px;
+  }
+
+  .form-fields {
+    input,
+    select {
+      text-align: center;
+      font-size: calc(var(--font-size-standard) * 1);
+    }
+    select {
+      font-family: var(--font-secondary);
+      font-size: calc(var(--font-size-standard) * 1);
+    }
+  }
+
+  legend {
+    font-family: var(--font-secondary);
+    font-size: calc(var(--font-size-standard) * 1.2);
+    font-weight: bold;
+    letter-spacing: 1px;
+  }
+
+  .character-sheet-common();
 }
 
 .character-main {
@@ -223,6 +323,13 @@
 }
 
 .tab.character-biography .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
+
   .biodata {
     display: grid;
     grid-template-columns: repeat(4, 1fr);
@@ -253,6 +360,13 @@
 }
 
 .tab.character-skills .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
+
   display: grid;
   grid-template-columns: 1fr;
   legend {
@@ -462,6 +576,13 @@
 }
 
 .tab.character-equipment .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
+
   display: grid;
   grid-template-columns: 1fr;
   legend {
@@ -501,6 +622,13 @@
 }
 
 .tab.character-combat .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
+
   display: grid;
   grid-template-columns: 1fr;
   legend {
@@ -651,6 +779,13 @@
 }
 
 .tab.character-spells .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
+
   display: grid;
   grid-template-columns: 1fr;
   legend {
@@ -712,6 +847,13 @@
 }
 
 .tab.character-miracles .main-div {
+  background-image: url("../assets/ui/prism_rpg_background.webp");
+  background-size: cover;
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 8px 10px;
+  min-height: 100%;
+
   display: grid;
   grid-template-columns: 1fr;
   legend {

templates/character-biography.hbs

@@ -1,97 +1,156 @@
-<section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="{{tab.id}}" data-group="{{tab.group}}">
+<section
+  class="tab character-{{tab.id}} {{tab.cssClass}}"
+  data-tab="{{tab.id}}"
+  data-group="{{tab.group}}"
+>
   <div class="main-div">
 
-  <fieldset>
+    <fieldset>
-    <legend>{{localize "PRISMRPG.Label.biodata"}}</legend>
+      <legend>{{localize "PRISMRPG.Label.biodata"}}</legend>
-    <div class="biodata">
+      <div class="biodata">
-      <div class="biodata-elem">
+        <div class="biodata-elem">
-        <span class="name">Class</span>
+          <span class="name">Class</span>
-        {{formInput systemFields.biodata.fields.class value=system.biodata.class }}
+          {{formInput
-      </div>
+            systemFields.biodata.fields.class
-      <div class="biodata-elem">
+            value=system.biodata.class
-        <span class="name">Level</span>
+          }}
-        {{formInput systemFields.biodata.fields.level value=system.biodata.level }}
+        </div>
-      </div>
+        <div class="biodata-elem">
-      <div class="biodata-elem">
+          <span class="name">Level</span>
-        <span class="name">Mortal</span>
+          {{formInput
-        {{formInput systemFields.biodata.fields.mortal value=system.biodata.mortal }}
+            systemFields.biodata.fields.level
-      </div>
+            value=system.biodata.level
-      <div class="biodata-elem">
+          }}
-        <span class="name">Alignment</span>
+        </div>
-        {{formInput systemFields.biodata.fields.alignment value=system.biodata.alignment }}
+        <div class="biodata-elem">
-      </div>
+          <span class="name">Mortal</span>
-      <div class="biodata-elem">
+          {{formInput
-        <span class="name">Age</span>
+            systemFields.biodata.fields.mortal
-        {{formInput systemFields.biodata.fields.age value=system.biodata.age }}
+            value=system.biodata.mortal
-      </div>
+          }}
-      <div class="biodata-elem">
+        </div>
-        <span class="name">Height</span>
+        <div class="biodata-elem">
-        {{formInput systemFields.biodata.fields.height value=system.biodata.height }}
+          <span class="name">Age</span>
-      </div>
+          {{formInput systemFields.biodata.fields.age value=system.biodata.age}}
-      <div class="biodata-elem">
+        </div>
-        <span class="name">Weight</span>
+        <div class="biodata-elem">
-        {{formInput systemFields.biodata.fields.weight value=system.biodata.weight }}
+          <span class="name">Height</span>
-      </div>
+          {{formInput
-      <div class="biodata-elem">
+            systemFields.biodata.fields.height
-        <span class="name">Eyes</span>
+            value=system.biodata.height
-        {{formInput systemFields.biodata.fields.eyes value=system.biodata.eyes }}
+          }}
-      </div>
+        </div>
-      <div class="biodata-elem">
+        <div class="biodata-elem">
-        <span class="name">Hair</span>
+          <span class="name">Weight</span>
-        {{formInput systemFields.biodata.fields.hair value=system.biodata.hair }}
+          {{formInput
-      </div>
+            systemFields.biodata.fields.weight
-      <div class="biodata-elem">
+            value=system.biodata.weight
-        <span class="name">Dev. Points (Total)</span>
+          }}
-        {{formInput systemFields.developmentPoints.fields.total value=system.developmentPoints.total }}
+        </div>
-      </div>
+        <div class="biodata-elem">
-      <div class="biodata-elem">
+          <span class="name">Eyes</span>
-        <span class="name">Dev. Points (Rem.)</span>
+          {{formInput
-        {{formInput systemFields.developmentPoints.fields.remaining value=system.developmentPoints.remaining }}
+            systemFields.biodata.fields.eyes
-      </div>
+            value=system.biodata.eyes
-      <div class="biodata-elem">
+          }}
-        <span class="name">Magic User</span>
+        </div>
-        {{formInput systemFields.biodata.fields.magicUser value=system.biodata.magicUser }}
+        <div class="biodata-elem">
-      </div>
+          <span class="name">Hair</span>
-      <div class="biodata-elem">
+          {{formInput
-        <span class="name">Cleric User</span>
+            systemFields.biodata.fields.hair
-        {{formInput systemFields.biodata.fields.clericUser value=system.biodata.clericUser }}
+            value=system.biodata.hair
-      </div>
+          }}
-      <div class="biodata-elem">
+        </div>
-        <span class="name">Save bonus (1/5levels)</span>
+        <div class="biodata-elem">
-        {{formInput systemFields.modifiers.fields.saveModifier value=system.modifiers.saveModifier disabled=true}}
+          <span class="name">Dev. Points (Total)</span>
-      </div>
+          {{formInput
+            systemFields.developmentPoints.fields.total
+            value=system.developmentPoints.total
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Dev. Points (Rem.)</span>
+          {{formInput
+            systemFields.developmentPoints.fields.remaining
+            value=system.developmentPoints.remaining
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Magic User</span>
+          {{formInput
+            systemFields.biodata.fields.magicUser
+            value=system.biodata.magicUser
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Cleric User</span>
+          {{formInput
+            systemFields.biodata.fields.clericUser
+            value=system.biodata.clericUser
+          }}
+        </div>
+        <div class="biodata-elem">
+          <span class="name">Save bonus (1/5levels)</span>
+          {{formInput
+            systemFields.modifiers.fields.saveModifier
+            value=system.modifiers.saveModifier
+            disabled=true
+          }}
+        </div>
+
+        {{#if system.biodata.magicUser}}
+          <div class="biodata-elem">
+            <span class="name">Spell bonus (1/5levels)</span>
+            {{formInput
+              systemFields.modifiers.fields.levelSpellModifier
+              value=system.modifiers.levelSpellModifier
+              disabled=true
+            }}
+          </div>
+        {{/if}}
+        {{#if system.biodata.clericUser}}
+          <div class="biodata-elem">
+            <span class="name">Miracle bonus (1/5levels)</span>
+            {{formInput
+              systemFields.modifiers.fields.levelMiracleModifier
+              value=system.modifiers.levelMiracleModifier
+              disabled=true
+            }}
+          </div>
+        {{/if}}
+
+        <div class="biodata-elem">
+          <span class="name">Last HD roll</span>
+          {{formInput
+            systemFields.biodata.fields.hpPerLevel
+            value=system.biodata.hpPerLevel
+            disabled=true
+          }}
+        </div>
 
-      {{#if system.biodata.magicUser}}
-      <div class="biodata-elem">
-        <span class="name">Spell bonus (1/5levels)</span>
-        {{formInput systemFields.modifiers.fields.levelSpellModifier value=system.modifiers.levelSpellModifier disabled=true}}
       </div>
-      {{/if}}
+    </fieldset>
-      {{#if system.biodata.clericUser}}
-      <div class="biodata-elem">
-        <span class="name">Miracle bonus (1/5levels)</span>
-        {{formInput systemFields.modifiers.fields.levelMiracleModifier value=system.modifiers.levelMiracleModifier disabled=true}}
-      </div>
-      {{/if}}
 
-      <div class="biodata-elem">
+    <fieldset>
-        <span class="name">Last HD roll</span>
+      <legend>{{localize "PRISMRPG.Label.description"}}</legend>
-        {{formInput systemFields.biodata.fields.hpPerLevel value=system.biodata.hpPerLevel disabled=true}}
+      {{formInput
-      </div>
+        systemFields.description
+        enriched=enrichedDescription
+        value=system.description
+        name="system.description"
+        toggled=true
+      }}
+    </fieldset>
 
-
+    <fieldset>
-    </div>
+      <legend>{{localize "PRISMRPG.Label.notes"}}</legend>
-  </fieldset>
+      {{formInput
-
+        systemFields.notes
-  <fieldset>
+        enriched=enrichedNotes
-    <legend>{{localize "PRISMRPG.Label.description"}}</legend>
+        value=system.notes
-    {{formInput systemFields.description enriched=enrichedDescription value=system.description name="system.description"
+        name="system.notes"
-    toggled=true}}
+        toggled=true
-  </fieldset>
+      }}
-
+    </fieldset>
-  <fieldset>
-    <legend>{{localize "PRISMRPG.Label.notes"}}</legend>
-    {{formInput systemFields.notes enriched=enrichedNotes value=system.notes name="system.notes" toggled=true}}
-  </fieldset>
   </div>
 </section>

templates/character-combat.hbs

@@ -1,108 +1,102 @@
-<section class="tab character-{{tab.id}} {{tab.cssClass}}" data-tab="combat" data-group="sheet">
+<section
+  class="tab character-{{tab.id}} {{tab.cssClass}}"
+  data-tab="combat"
+  data-group="sheet"
+>
   <div class="main-div">
 
-    <fieldset>
-      <legend>{{localize "PRISMRPG.Label.combatDetails"}}</legend>
-      <div class="combat-details">
-        <div class="combat-detail">
-
-          <button class="action ranged-attack-button" data-action="rangedAttackDefense">
-            {{localize "PRISMRPG.Label.rangedAttackDefense"}}
-          </button>
-
-          <button class="action ranged-attack-button" data-action="rollInitiative">
-            {{localize "PRISMRPG.Label.rollInitiative"}}
-          </button>
-
-          <div class="flexrow armor-hp">
-            <span class="name">{{localize "PRISMRPG.Label.armorHitPoints"}}</span>
-            {{formInput systemFields.combat.fields.armorHitPoints value=system.combat.armorHitPoints localize=true }}
-            <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 class="flexrow granted">
-            <span class="">{{localize
-              "PRISMRPG.Label.grantedAttackDice"}}</a></span>
-            {{formInput systemFields.granted.fields.attackDice value=system.granted.attackDice disabled=isPlayMode }}
-          </div>
-
-          <div class="flexrow granted ">
-            <span class="">{{localize
-              "PRISMRPG.Label.grantedDefenseDice"}}</a></span>
-            {{formInput systemFields.granted.fields.defenseDice value=system.granted.defenseDice disabled=isPlayMode }}
-          </div>
-
-          <div class="flexrow granted">
-            <span class="">{{localize
-              "PRISMRPG.Label.grantedDamageDice"}}</a></span>
-            {{formInput systemFields.granted.fields.damageDice value=system.granted.damageDice disabled=isPlayMode }}
-          </div>
-
-        </div>
-      </div>
-    </fieldset>
-
-    <fieldset>
-      <legend>{{localize "PRISMRPG.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">
-          Duration:<input class="wound-duration wound-data" type="text" data-type="Number" data-index="{{@index}}"
-            value="{{wound.duration}}" data-name="duration">
-          HP:<input class="wound-value wound-data" type="text" data-type="Number" data-index="{{@index}}"
-            value="{{wound.value}}" data-name="value">
-        </div>
-        {{/each}}
-      </div>
-    </fieldset>
-
     <fieldset>
       <legend>{{localize "PRISMRPG.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"
+          <div
-          data-drag-type="damage">
+            class="weapon"
-          {{#if (ne item.img "icons/svg/item-bag.svg")}}
+            data-item-id="{{item.id}}"
-          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+            data-item-uuid="{{item.uuid}}"
-          {{/if}}
+            data-drag="true"
-          <div class="name" data-tooltip="{{item.system.description}}">
+            data-drag-type="damage"
-            {{item.name}}
+          >
+            {{#if (ne item.img "icons/svg/item-bag.svg")}}
+              <img
+                class="item-img"
+                src="{{item.img}}"
+                data-tooltip="{{item.name}}"
+              />
+            {{/if}}
+            <div class="name" data-tooltip="{{item.system.description}}">
+              {{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 'PRISMRPG.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 'PRISMRPG.Delete'}}"
+                data-action="delete"
+                data-item-id="{{item.id}}"
+                data-item-uuid="{{item.uuid}}"
+              ><i class="fas fa-trash"></i></a>
+            </div>
           </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 'PRISMRPG.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 'PRISMRPG.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>
@@ -111,22 +105,47 @@
       <legend>{{localize "PRISMRPG.Label.armors"}}</legend>
       <div class="armors">
         {{#each armors as |item|}}
-        <div class="armor" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+          <div
-          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+            class="armor"
-          <div class="name" data-tooltip="{{item.system.description}}">
+            data-item-id="{{item.id}}"
-            {{item.name}}
+            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="item-detail"
+              data-tooltip="Defense"
+            >{{item.system.defense}}</div>
+            <div
+              class="item-detail"
+              data-tooltip="Maximum movement"
+            >{{item.system.maximumMovement}}</div>
+            <div class="item-detail" data-tooltip="HP">{{item.system.hp}}</div>
+            <div
+              class="item-detail"
+              data-tooltip="Damage Reduction"
+            >{{item.system.damageReduction}}</div>
+            <div class="controls">
+              <a
+                data-tooltip="{{localize 'PRISMRPG.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 'PRISMRPG.Delete'}}"
+                data-action="delete"
+                data-item-id="{{item.id}}"
+                data-item-uuid="{{item.uuid}}"
+              ><i class="fas fa-trash"></i></a>
+            </div>
           </div>
-          <div class="item-detail" data-tooltip="Defense">{{item.system.defense}}</div>
-          <div class="item-detail" data-tooltip="Maximum movement">{{item.system.maximumMovement}}</div>
-          <div class="item-detail" data-tooltip="HP">{{item.system.hp}}</div>
-          <div class="item-detail" data-tooltip="Damage Reduction">{{item.system.damageReduction}}</div>
-          <div class="controls">
-            <a data-tooltip="{{localize 'PRISMRPG.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 'PRISMRPG.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>
@@ -135,25 +154,44 @@
       <legend>{{localize "PRISMRPG.Label.shields"}}</legend>
       <div class="shields">
         {{#each shields as |item|}}
-        <div class="shield" data-item-id="{{item.id}}" data-item-uuid="{{item.uuid}}">
+          <div
-          <img class="item-img" src="{{item.img}}" data-tooltip="{{item.name}}" />
+            class="shield"
-          <div class="name" data-tooltip="{{item.system.description}}">
+            data-item-id="{{item.id}}"
-            {{item.name}}
+            data-item-uuid="{{item.uuid}}"
-          </div>
+          >
-          <div class="item-detail" data-tooltip="Block APC">
+            <img
-            <i class="fa-solid fa-hand"></i> {{item.system.apc}} APC
+              class="item-img"
-          </div>
+              src="{{item.img}}"
-          <div class="item-detail" data-tooltip="Shield Rating">
+              data-tooltip="{{item.name}}"
-            <i class="fa-solid fa-shield"></i> {{item.system.sr}}
+            />
-          </div>
+            <div class="name" data-tooltip="{{item.system.description}}">
+              {{item.name}}
+            </div>
+            <div class="item-detail" data-tooltip="Block APC">
+              <i class="fa-solid fa-hand"></i>
+              {{item.system.apc}}
+              APC
+            </div>
+            <div class="item-detail" data-tooltip="Shield Rating">
+              <i class="fa-solid fa-shield"></i>
+              {{item.system.sr}}
+            </div>
 
-          <div class="controls">
+            <div class="controls">
-            <a data-tooltip="{{localize 'PRISMRPG.Edit'}}" data-action="edit" data-item-id="{{item.id}}"
+              <a
-              data-item-uuid="{{item.uuid}}"><i class="fas fa-edit"></i></a>
+                data-tooltip="{{localize 'PRISMRPG.Edit'}}"
-            <a data-tooltip="{{localize 'PRISMRPG.Delete'}}" data-action="delete" data-item-id="{{item.id}}"
+                data-action="edit"
-              data-item-uuid="{{item.uuid}}"><i class="fas fa-trash"></i></a>
+                data-item-id="{{item.id}}"
+                data-item-uuid="{{item.uuid}}"
+              ><i class="fas fa-edit"></i></a>
+              <a
+                data-tooltip="{{localize 'PRISMRPG.Delete'}}"
+                data-action="delete"
+                data-item-id="{{item.id}}"
+                data-item-uuid="{{item.uuid}}"
+              ><i class="fas fa-trash"></i></a>
+            </div>
           </div>
-        </div>
         {{/each}}
       </div>
     </fieldset>

templates/character-main.hbs

@@ -118,11 +118,14 @@
                 disabled=isPlayMode
               }}
             </div>
-            <div class="attribute-save" data-tooltip="Saving">
+            <div class="attribute-save">
+              <a class="rollable save-rollable" data-roll-type="save" data-roll-key="str" data-tooltip="{{localize 'PRISMRPG.RollSavingThrow'}}">
+                <i class="fa-duotone fa-solid fa-dice-d20"></i>
+              </a>
               {{formInput
                 systemFields.saves.fields.str.fields.value
                 value=system.saves.str.value
-                disabled=true
+                disabled=isPlayMode
               }}
             </div>
           </div>
@@ -140,11 +143,14 @@
                 disabled=isPlayMode
               }}
             </div>
-            <div class="attribute-save" data-tooltip="Saving">
+            <div class="attribute-save">
+              <a class="rollable save-rollable" data-roll-type="save" data-roll-key="dex" data-tooltip="{{localize 'PRISMRPG.RollSavingThrow'}}">
+                <i class="fa-duotone fa-solid fa-dice-d20"></i>
+              </a>
               {{formInput
                 systemFields.saves.fields.dex.fields.value
                 value=system.saves.dex.value
-                disabled=true
+                disabled=isPlayMode
               }}
             </div>
           </div>
@@ -162,11 +168,14 @@
                 disabled=isPlayMode
               }}
             </div>
-            <div class="attribute-save" data-tooltip="Saving">
+            <div class="attribute-save">
+              <a class="rollable save-rollable" data-roll-type="save" data-roll-key="con" data-tooltip="{{localize 'PRISMRPG.RollSavingThrow'}}">
+                <i class="fa-duotone fa-solid fa-dice-d20"></i>
+              </a>
               {{formInput
                 systemFields.saves.fields.con.fields.value
                 value=system.saves.con.value
-                disabled=true
+                disabled=isPlayMode
               }}
             </div>
           </div>
@@ -184,11 +193,14 @@
                 disabled=isPlayMode
               }}
             </div>
-            <div class="attribute-save" data-tooltip="Saving">
+            <div class="attribute-save">
+              <a class="rollable save-rollable" data-roll-type="save" data-roll-key="int" data-tooltip="{{localize 'PRISMRPG.RollSavingThrow'}}">
+                <i class="fa-duotone fa-solid fa-dice-d20"></i>
+              </a>
               {{formInput
                 systemFields.saves.fields.int.fields.value
                 value=system.saves.int.value
-                disabled=true
+                disabled=isPlayMode
               }}
             </div>
           </div>
@@ -206,11 +218,14 @@
                 disabled=isPlayMode
               }}
             </div>
-            <div class="attribute-save" data-tooltip="Saving">
+            <div class="attribute-save">
+              <a class="rollable save-rollable" data-roll-type="save" data-roll-key="wis" data-tooltip="{{localize 'PRISMRPG.RollSavingThrow'}}">
+                <i class="fa-duotone fa-solid fa-dice-d20"></i>
+              </a>
               {{formInput
                 systemFields.saves.fields.wis.fields.value
                 value=system.saves.wis.value
-                disabled=true
+                disabled=isPlayMode
               }}
             </div>
           </div>
@@ -228,11 +243,14 @@
                 disabled=isPlayMode
               }}
             </div>
-            <div class="attribute-save" data-tooltip="Saving">
+            <div class="attribute-save">
+              <a class="rollable save-rollable" data-roll-type="save" data-roll-key="cha" data-tooltip="{{localize 'PRISMRPG.RollSavingThrow'}}">
+                <i class="fa-duotone fa-solid fa-dice-d20"></i>
+              </a>
               {{formInput
                 systemFields.saves.fields.cha.fields.value
                 value=system.saves.cha.value
-                disabled=true
+                disabled=isPlayMode
               }}
             </div>
           </div>
@@ -244,23 +262,25 @@
         {{! Race }}
         <div class="race-section">
           <div class="race-box">
-            <h3 class="section-title">Race</h3>
+            <h4 class="race-label">Race</h4>
-            {{#if race}}
+            <div class="race-content">
-              <div class="race-item" data-item-id="{{race.id}}" data-item-uuid="{{race.uuid}}">
+              {{#if race}}
-                <img class="item-img" src="{{race.img}}" data-tooltip="{{race.name}}" />
+                <div class="race-item" data-item-id="{{race.id}}" data-item-uuid="{{race.uuid}}">
-                <div class="race-name">{{race.name}}</div>
+                  <img class="item-img" src="{{race.img}}" data-tooltip="{{race.name}}" />
-                <div class="controls">
+                  <div class="race-name">{{race.name}}</div>
-                  <a data-tooltip="{{localize 'PRISMRPG.Edit'}}" data-action="edit" data-item-id="{{race.id}}"
+                  <div class="controls">
-                    data-item-uuid="{{race.uuid}}"><i class="fas fa-edit"></i></a>
+                    <a data-tooltip="{{localize 'PRISMRPG.Edit'}}" data-action="edit" data-item-id="{{race.id}}"
-                  <a data-tooltip="{{localize 'PRISMRPG.Delete'}}" data-action="delete" data-item-id="{{race.id}}"
+                      data-item-uuid="{{race.uuid}}"><i class="fas fa-edit"></i></a>
-                    data-item-uuid="{{race.uuid}}"><i class="fas fa-trash"></i></a>
+                    <a data-tooltip="{{localize 'PRISMRPG.Delete'}}" data-action="delete" data-item-id="{{race.id}}"
+                      data-item-uuid="{{race.uuid}}"><i class="fas fa-trash"></i></a>
+                  </div>
                 </div>
-              </div>
+              {{else}}
-            {{else}}
+                <div class="no-race">
-              <div class="no-race">
+                  <p>{{localize "PRISMRPG.Message.dropRace"}}</p>
-                <p>{{localize "PRISMRPG.Message.dropRace"}}</p>
+                </div>
-              </div>
+              {{/if}}
-            {{/if}}
+            </div>
           </div>
         </div>
 
@@ -289,6 +309,20 @@
               </div>
             </div>
           {{/each}}
+
+          {{! Alignment }}
+          <div class="class-box">
+            <h4 class="class-label">Alignment</h4>
+            <div class="class-content">
+              <div class="alignment-value">
+                {{formInput
+                  systemFields.biodata.fields.alignment
+                  value=system.biodata.alignment
+                  disabled=isPlayMode
+                }}
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>

templates/character-skills.hbs

@@ -60,27 +60,5 @@
       {{/each}}
     </div>
   </fieldset>
-
-  <fieldset>
-    <legend data-tooltip="{{localize 'PRISMRPG.Tooltip.vulnerabilities'}}" data-tooltip-direction="UP">
-      {{localize "PRISMRPG.Label.vulnerabilities"}}
-    </legend>
-    <div class="vulnerabilities">
-      {{#each vulnerabilities as |item|}}
-      <div class="vulnerability " 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.description}}}<br><br>{{item.path}}" data-tooltip-direction="UP">
-          {{item.name}}
-        </div>
-        <div class="controls">
-          <a data-tooltip="{{localize 'PRISMRPG.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 'PRISMRPG.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>
 </div>
 </section>

templates/character-subattributes.hbs

@@ -1,46 +1,23 @@
 <section class="character-subattributes tab" data-group="sheet" data-tab="subattributes">
   <div class="subattributes-content">
-    <h2 class="section-header">
-      <i class="fa-solid fa-diagram-project"></i>
-      Sub-Attributes
-    </h2>
-    <p class="section-description">
-      Sub-attributes are derived from the average of two primary characteristics.
-    </p>
-
     <div class="subattributes-list">
       {{#each (entries config.SUB_ATTRIBUTES) as |entry|}}
         {{#with entry.[1] as |subAttr|}}
-          <div class="subattribute-item">
+          <a class="rollable subattribute-item" data-roll-type="sub-attribute" data-roll-key="{{subAttr.id}}" title="{{#each subAttr.parents as |parentKey|}}{{uppercase parentKey}}{{#unless @last}}/{{/unless}}{{/each}}">
             <div class="subattribute-header">
-              <div class="subattribute-name">
+              <i class="fa-duotone fa-solid fa-dice-d20"></i>
-                <i class="fa-solid fa-circle-nodes"></i>
+              <div class="subattribute-name">{{localize subAttr.label}}</div>
-                <span>{{localize subAttr.label}}</span>
-              </div>
-              <div class="subattribute-value">
-                <input
-                  type="text"
-                  value="{{lookup ../system.subAttributes subAttr.id 'value'}}"
-                  disabled
-                  readonly
-                />
-              </div>
             </div>
-            <div class="subattribute-details">
+            <div class="subattribute-value">
-              <div class="subattribute-parents">
+              {{#with (lookup ../../system.subAttributes subAttr.id) as |subAttrData|}}
-                <span class="parent-label">From:</span>
+                {{#if (gt subAttrData.value 0)}}
-                {{#each subAttr.parents as |parentKey|}}
+                  +{{subAttrData.value}}
-                  <span class="parent-char">
+                {{else}}
-                    {{uppercase parentKey}}
+                  {{subAttrData.value}}
-                    ({{lookup ../../system.characteristics parentKey 'value'}})
+                {{/if}}
-                  </span>
+              {{/with}}
-                {{/each}}
-              </div>
-              <div class="subattribute-description">
-                {{localize subAttr.description}}
-              </div>
             </div>
-          </div>
+          </a>
         {{/with}}
       {{/each}}
     </div>

templates/chat-message.hbs

@@ -9,80 +9,102 @@
       <span><STRONG>{{actingCharName}} - {{upperFirst rollName}}</STRONG></span>
 
       {{#if (match rollType "attack")}}
-      <span>Attack roll !</span>
+        <span>Attack roll !</span>
       {{/if}}
       {{#if (match rollType "defense")}}
-      <span>Defense roll !</span>
+        <span>Defense roll !</span>
       {{/if}}
 
       {{#if (eq rollData.favor "favor")}}
-      <span><strong>Favor roll</strong></span>
+        <span><strong>Favor roll</strong></span>
       {{/if}}
       {{#if (eq rollData.favor "disfavor")}}
-      <span><strong>Disfavor roll</strong></span>
+        <span><strong>Disfavor roll</strong></span>
       {{/if}}
       {{#if badResult}}
-      <span><strong>{{localize "PRISMRPG.Label.otherResult"}}</strong> : {{badResult}}</span>
+        <span><strong>{{localize "PRISMRPG.Label.otherResult"}}</strong>
+          :
+          {{badResult}}</span>
       {{/if}}
 
       {{#if rollTarget.weapon}}
-      <span>{{rollTarget.weapon.name}}</span>
+        <span>{{rollTarget.weapon.name}}</span>
       {{/if}}
 
       {{#if rollData.letItFly}}
-      <span>Let It Fly attack ! </span>
+        <span>Let It Fly attack ! </span>
       {{/if}}
       {{#if rollData.pointBlank}}
-      <span>Point Blank Range Attack !</span>
+        <span>Point Blank Range Attack !</span>
       {{/if}}
       {{#if rollData.beyondSkill}}
-      <span>Beyond Skill Range Attack !</span>
+        <span>Beyond Skill Range Attack !</span>
       {{/if}}
 
       <span><strong>Formula</strong> : {{titleFormula}}</span>
 
+      {{#if (eq rollType "save")}}
+        {{#if rollTarget.abilityModifier}}
+          <span style="font-size: 0.9em;">
+            (Ability Mod:
+            {{#if
+              (gt rollTarget.abilityModifier 0)
+            }}+{{/if}}{{rollTarget.abilityModifier}}, Save Bonus:
+            {{#if
+              (gt rollTarget.saveProficiency 0)
+            }}+{{/if}}{{rollTarget.saveProficiency}})
+          </span>
+        {{/if}}
+      {{/if}}
+
       {{#each diceResults as |result|}}
-      <span>{{result.dice}} : {{result.value}}</span>
+        <span>{{result.dice}} : {{result.value}}</span>
       {{/each}}
 
     </div>
   </div>
   {{#if isSave}}
-  <div class="result">
+    <div class="result">
-    {{#if (eq resultType "success")}}
+      {{#if (eq resultType "success")}}
-    {{#if isPrivate}}?{{else}}{{localize "PRISMRPG.Roll.success"}}{{/if}}
+        {{#if isPrivate}}?{{else}}{{localize "PRISMRPG.Roll.success"}}{{/if}}
-    {{else}}
+      {{else}}
-    {{#if isPrivate}}?{{else}}{{localize "PRISMRPG.Roll.failure"}}{{/if}}
+        {{#if isPrivate}}?{{else}}{{localize "PRISMRPG.Roll.failure"}}{{/if}}
-    {{/if}}
+      {{/if}}
-  </div>
+    </div>
   {{/if}}
   {{#if isResource}}
-  <div class="result">
+    <div class="result">
-    {{#if (eq resultType "success")}}
+      {{#if (eq resultType "success")}}
-    {{#if isPrivate}}?{{else}}{{localize "PRISMRPG.Roll.success"}}{{/if}}
+        {{#if isPrivate}}?{{else}}{{localize "PRISMRPG.Roll.success"}}{{/if}}
-    {{else}}
+      {{else}}
-    {{#if isPrivate}}?{{else}}{{localize "PRISMRPG.Roll.failure"}}{{#if isFailure}} ({{localize
+        {{#if isPrivate}}?{{else}}{{localize "PRISMRPG.Roll.failure"}}{{#if
-    "PRISMRPG.Roll.resourceLost"}}){{/if}}{{/if}}
+            isFailure
-    {{/if}}
+          }} ({{localize "PRISMRPG.Roll.resourceLost"}}){{/if}}{{/if}}
-  </div>
+      {{/if}}
+    </div>
   {{/if}}
   {{#if isDamage}}
-  <div>
+    <div>
-    {{#if (and isGM hasTarget)}}
+      {{#if (and isGM hasTarget)}}
-    {{{localize "PRISMRPG.Roll.displayArmor" targetName=targetName targetArmor=targetArmor realDamage=realDamage}}}
+        {{{localize
-    {{/if}}
+          "PRISMRPG.Roll.displayArmor"
-  </div>
+          targetName=targetName
+          targetArmor=targetArmor
+          realDamage=realDamage
+        }}}
+      {{/if}}
+    </div>
   {{/if}}
 
   {{#unless isPrivate}}
-  <div class="dice-result">
+    <div class="dice-result">
-    <h4 class="dice-total">{{total}}</h4>
+      <h4 class="dice-total">{{total}}</h4>
-  </div>
+    </div>
-  {{#if D30result}}
+    {{#if D30result}}
-  <div class="dice-result">
+      <div class="dice-result">
-    <h4 class="dice-total">D30 result: {{D30result}}</h4>
+        <h4 class="dice-total">D30 result: {{D30result}}</h4>
-  </div>
+      </div>
-  {{/if}}
+    {{/if}}
 
   {{/unless}}
 </div>

templates/roll-dialog.hbs

@@ -12,6 +12,18 @@
         +
         {{baseValue}}
       </div>
+      {{#if (eq rollType "save")}}
+        <div class="dialog-save" style="font-size: 0.9em; color: #666;">
+          (Ability Mod:
+          {{#if
+            (gt rollTarget.abilityModifier 0)
+          }}+{{/if}}{{rollTarget.abilityModifier}}
+          + Save Bonus:
+          {{#if
+            (gt rollTarget.saveProficiency 0)
+          }}+{{/if}}{{rollTarget.saveProficiency}})
+        </div>
+      {{/if}}
     {{else}}
       <div class="dialog-save">
         <strong>{{upperFirst rollName}}</strong>

templates/skill.hbs

@@ -11,6 +11,19 @@
     <p class="hint">{{localize "PRISMRPG.Hint.isCoreSkill"}}</p>
   </div>
 
+  {{!-- Primary Attribute for Skill Checks --}}
+  <div class="form-group">
+    <label>{{localize "PRISMRPG.Label.primaryAttribute"}}</label>
+    <select name="system.primaryAttribute">
+      {{#each config.CHARACTERISTICS}}
+        <option value="{{@key}}" {{#if (eq ../system.primaryAttribute @key)}}selected{{/if}}>
+          {{localize this.label}}
+        </option>
+      {{/each}}
+    </select>
+    <p class="hint">Primary attribute used for skill checks (D&D 5e style: ability modifier + proficiency)</p>
+  </div>
+
   {{#if system.isCoreSkill}}
     {{!-- Attribute Bonus Selection --}}
     <div class="form-group">