— flatten it
+ div.form-group { display: contents; }
input {
- min-width: 3rem;
- max-width: 3rem;
+ width: 2.8rem;
text-align: center;
}
+ span { opacity: 0.6; }
}
// Defense display
diff --git a/less/base.less b/less/base.less
index f17193d..f44360e 100644
--- a/less/base.less
+++ b/less/base.less
@@ -122,7 +122,7 @@
.skills-header,
.skill-row {
display: grid;
- grid-template-columns: 1fr 3rem 3rem;
+ grid-template-columns: 1fr 2.5rem 2.5rem 2.5rem 5.5rem;
align-items: center;
gap: 4px;
}
@@ -135,6 +135,9 @@
border-bottom: 1px solid @color-olive;
margin-bottom: 2px;
padding-bottom: 2px;
+
+ span { text-align: center; }
+ .skill-name-col { text-align: left; }
}
.skill-row {
@@ -144,8 +147,46 @@
font-size: @font-size-sm;
}
- .skill-rank-col input {
+ .skill-rank-col select,
+ .skill-modifier-col input {
+ width: 100%;
text-align: center;
+ font-size: @font-size-sm;
+ padding: 1px 2px;
+ }
+
+ .skill-color-col {
+ display: flex;
+ align-items: center;
+ gap: 2px;
+
+ .color-dice-dot {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ border-radius: 50%;
+ flex-shrink: 0;
+ border: 1px solid rgba(0,0,0,0.3);
+
+ &.color-dice-white { background: #f0f0f0; }
+ &.color-dice-red { background: #d9534f; }
+ &.color-dice-black { background: #222; }
+ }
+
+ .color-dice-select {
+ flex: 1;
+ font-size: @font-size-sm;
+ padding: 1px 1px;
+ min-width: 0;
+ }
+
+ input[type="number"] {
+ width: 2.2rem;
+ text-align: center;
+ font-size: @font-size-sm;
+ padding: 1px 2px;
+ flex-shrink: 0;
+ }
}
.skill-total {
diff --git a/less/item-list.less b/less/item-list.less
index 648b680..ccd37b5 100644
--- a/less/item-list.less
+++ b/less/item-list.less
@@ -10,45 +10,153 @@
padding: 0;
}
- .item-entry {
- display: flex;
+ // Header row shared by all lists
+ .item-list-header {
+ display: grid;
align-items: center;
- gap: 6px;
- padding: 3px 4px;
- border-bottom: 1px solid @color-olive-faint;
+ gap: 4px;
+ padding: 2px 4px 3px;
+ border-bottom: 1px solid @color-olive;
+ margin-bottom: 2px;
+ font-family: @font-secondary;
+ font-size: @font-size-xs;
+ color: @color-blue;
+ span { text-align: center; }
+ .col-name { text-align: left; }
+ }
+ // Data row
+ .item-entry {
+ display: grid;
+ align-items: center;
+ gap: 4px;
+ padding: 2px 4px;
+ border-bottom: 1px solid @color-olive-faint;
&:hover { background-color: @color-blue-hover; }
.item-img {
- height: @item-img-size;
width: @item-img-size;
+ height: @item-img-size;
border: 1px solid @color-olive;
border-radius: 2px;
object-fit: cover;
+ align-self: center;
+ justify-self: center;
+ flex-shrink: 0;
}
.item-name {
- flex: 1;
font-family: @font-body;
font-size: @font-size-base;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ min-width: 0;
}
.item-detail {
font-size: @font-size-xs;
color: @color-olive;
- min-width: 4rem;
text-align: center;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.item-type {
- font-size: @font-size-sm;
+ font-size: @font-size-xs;
color: @color-blue;
- min-width: 6rem;
+ text-align: center;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
- a {
- .transition-opacity();
- &:hover { color: @color-blue; }
+ .item-equipped {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ input[type="checkbox"] {
+ width: 0.95rem;
+ height: 0.95rem;
+ cursor: pointer;
+ margin: 0;
+ }
+ }
+
+ .item-actions {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ gap: 4px;
+ a {
+ .transition-opacity();
+ font-size: @font-size-sm;
+ &:hover { color: @color-blue; }
+ }
+ }
+ }
+
+ // ── Per-list grid templates ──────────────────────────────
+ // Format: [img] [name] [detail cols...] [equipped?] [actions]
+
+ .item-list--weapon {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 5.5rem 3rem 1.8rem 3.5rem;
+ }
+ }
+
+ .item-list--armor {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 3.5rem 5rem 1.8rem 3.5rem;
+ }
+ }
+
+ .item-list--ammo {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 4rem 3.5rem;
+ }
+ }
+
+ .item-list--spell {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 3rem 6rem 3rem 3.5rem;
+ }
+ }
+
+ .item-list--miracle {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 4.5rem 3.5rem;
+ }
+ }
+
+ .item-list--equipment {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 5rem 3rem 3.5rem;
+ }
+ }
+
+ .item-list--magic-item {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 5rem 3.5rem;
+ }
+ }
+
+ .item-list--condition {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 5.5rem 3.5rem;
+ }
+ }
+
+ .item-list--ability {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 6rem 3.5rem;
+ }
+ }
+
+ .item-list--oath {
+ .item-list-header, .item-entry {
+ grid-template-columns: @item-img-size 1fr 5.5rem 3.5rem;
}
}
diff --git a/module/applications/sheets/character-sheet.mjs b/module/applications/sheets/character-sheet.mjs
index 1ca3c47..351b2ad 100644
--- a/module/applications/sheets/character-sheet.mjs
+++ b/module/applications/sheets/character-sheet.mjs
@@ -57,6 +57,10 @@ export default class OathHammerCharacterSheet extends OathHammerActorSheet {
async _prepareContext() {
const context = await super._prepareContext()
context.tabs = this.#getTabs()
+ // lineage/class/experience available to all parts (header + identity tab)
+ const doc = this.document
+ context.lineage = doc.itemTypes.lineage?.[0] ?? null
+ context.characterClass = doc.itemTypes["class"]?.[0] ?? null
return context
}
@@ -68,8 +72,6 @@ export default class OathHammerCharacterSheet extends OathHammerActorSheet {
break
case "identity":
context.tab = context.tabs.identity
- context.lineage = doc.itemTypes.lineage?.[0] ?? null
- context.characterClass = doc.itemTypes["class"]?.[0] ?? null
context.abilities = doc.itemTypes.ability
context.oaths = doc.itemTypes.oath
break
@@ -89,14 +91,26 @@ export default class OathHammerCharacterSheet extends OathHammerActorSheet {
attribute: attr,
label: `OATHHAMMER.Attribute.${attr.charAt(0).toUpperCase()}${attr.slice(1)}`,
attrRank: attrRanks[attr],
- skillData: skillKeys.map(skillKey => ({
- key: skillKey,
- label: SYSTEM.SKILLS[skillKey].label,
- rank: sys.skills[skillKey].rank,
- name: `system.skills.${skillKey}.rank`,
- total: attrRanks[attr] + sys.skills[skillKey].rank,
- field: skillSchemaFields[skillKey].fields.rank,
- }))
+ skillData: skillKeys.map(skillKey => {
+ const sk = sys.skills[skillKey]
+ return {
+ key: skillKey,
+ label: SYSTEM.SKILLS[skillKey].label,
+ rank: sk.rank,
+ modifier: sk.modifier,
+ colorDice: sk.colorDice,
+ colorDiceType: sk.colorDiceType,
+ rankName: `system.skills.${skillKey}.rank`,
+ modifierName: `system.skills.${skillKey}.modifier`,
+ colorDiceName: `system.skills.${skillKey}.colorDice`,
+ colorDiceTypeName: `system.skills.${skillKey}.colorDiceType`,
+ rankOptions: [0,1,2,3,4].map(v => ({ value: v, label: String(v), selected: v === sk.rank })),
+ total: attrRanks[attr] + sk.rank,
+ // legacy - kept for formInput compatibility
+ name: `system.skills.${skillKey}.rank`,
+ field: skillSchemaFields[skillKey].fields.rank,
+ }
+ })
}))
break
}
@@ -125,6 +139,36 @@ export default class OathHammerCharacterSheet extends OathHammerActorSheet {
return context
}
+ /** Auto-fill colorDice count when color type changes */
+ static #COLOR_THRESHOLDS = { white: 4, red: 3, black: 2 }
+
+ _onRender(context, options) {
+ super._onRender?.(context, options)
+
+ // Color dice auto-fill
+ this.element.querySelectorAll('select.color-dice-select').forEach(select => {
+ select.addEventListener('change', event => {
+ const threshold = OathHammerCharacterSheet.#COLOR_THRESHOLDS[event.target.value] ?? 4
+ const countInput = event.target.closest('.skill-color-col')?.querySelector('input[type="number"]')
+ if (countInput) {
+ countInput.value = threshold
+ countInput.dispatchEvent(new Event('change', { bubbles: true }))
+ }
+ const dot = event.target.closest('.skill-color-col')?.querySelector('.color-dice-dot')
+ if (dot) dot.className = `color-dice-dot color-dice-${event.target.value}`
+ })
+ })
+
+ // Equipped checkbox — directly updates the item
+ this.element.querySelectorAll('input.item-equipped-cb').forEach(cb => {
+ cb.addEventListener('change', event => {
+ const itemId = event.target.dataset.itemId
+ const item = this.document.items.get(itemId)
+ if (item) item.update({ 'system.equipped': event.target.checked })
+ })
+ })
+ }
+
async _onDrop(event) {
if (!this.isEditable) return
const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event)
diff --git a/module/models/character.mjs b/module/models/character.mjs
index aa79368..0e02a42 100644
--- a/module/models/character.mjs
+++ b/module/models/character.mjs
@@ -20,9 +20,15 @@ export default class OathHammerCharacter extends foundry.abstract.TypeDataModel
fate: attributeField()
})
- // Skills: 26 skills each with a rank (0–4). Grit.max = resilience.rank + toughness.rank.
+ // Skills: 26 skills each with a rank (0–4), a bonus/penalty modifier, and color dice.
+ // Total dice = attr rank + skill rank. Modifier = bonus (+) or penalty (-) dice.
+ // Color dice: type (white 4+, red 3+, black 2+) + count of colored dice in the pool.
const skillField = () => new fields.SchemaField({
- rank: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0, max: 4 })
+ rank: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0, max: 4 }),
+ modifier: new fields.NumberField({ required: true, nullable: false, integer: true, initial: 0 }),
+ colorDiceType: new fields.StringField({ required: true, nullable: false, initial: "white",
+ choices: { white: "OATHHAMMER.ColorDice.White", red: "OATHHAMMER.ColorDice.Red", black: "OATHHAMMER.ColorDice.Black" } }),
+ colorDice: new fields.NumberField({ ...requiredInteger, initial: 4, min: 0 }),
})
schema.skills = new fields.SchemaField({
academics: skillField(),
diff --git a/templates/actor/character-combat.hbs b/templates/actor/character-combat.hbs
index 8cd8ed6..077756b 100644
--- a/templates/actor/character-combat.hbs
+++ b/templates/actor/character-combat.hbs
@@ -21,18 +21,30 @@
{{#unless isPlayMode}}
{{/unless}}
{{#if weapons.length}}
-
+
+
{{#each weapons as |weapon|}}
- -
+
-
{{weapon.name}}
{{weapon.system.damageLabel}}
- AP: {{weapon.system.ap}}
- {{formField weapon.system.schema.fields.equipped value=weapon.system.equipped name="system.equipped"}}
- {{#unless ../isPlayMode}}
-
-
- {{/unless}}
+ {{weapon.system.ap}}
+
+
+
+
+ {{#unless ../isPlayMode}}
+
+
+ {{/unless}}
+
{{/each}}
@@ -44,18 +56,30 @@
{{#if armors.length}}
-
+
+
{{#each armors as |armor|}}
- -
+
-
{{armor.name}}
- AV: {{armor.system.armorValue}}
- {{#if armor.system.penalty}}{{armor.system.penalty}}{{/if}}
- {{formField armor.system.schema.fields.equipped value=armor.system.equipped name="system.equipped"}}
- {{#unless ../isPlayMode}}
-
-
- {{/unless}}
+ {{armor.system.armorValue}}
+ {{#if armor.system.penalty}}{{armor.system.penalty}}{{else}}—{{/if}}
+
+
+
+
+ {{#unless ../isPlayMode}}
+
+
+ {{/unless}}
+
{{/each}}
@@ -67,16 +91,24 @@
{{#if ammunition.length}}