diff --git a/modules/applications/sheets/mournblade-cyd2-creature-sheet.mjs b/modules/applications/sheets/mournblade-cyd2-creature-sheet.mjs index b8c4eaa..ea014f9 100644 --- a/modules/applications/sheets/mournblade-cyd2-creature-sheet.mjs +++ b/modules/applications/sheets/mournblade-cyd2-creature-sheet.mjs @@ -30,6 +30,8 @@ export default class MournbladeCYD2CreatureSheet extends MournbladeCYD2ActorShee context.skills = actor.getSkills?.() ?? []; context.combativiteList = MournbladeCYD2Utility.getCombativiteList(actor.system.sante?.nbcombativite || 0); + context.ameList = MournbladeCYD2Utility.getAmeList(actor.system.ame.nbame, actor.getAmeMax?.() ?? 0); + context.ameMaxList = MournbladeCYD2Utility.getAmeMaxList(actor.system.ame.nbame); context.armes = foundry.utils.duplicate(actor.getWeapons?.() ?? []); context.protections = foundry.utils.duplicate(actor.getArmors?.() ?? []); context.runes = foundry.utils.duplicate(actor.getRunes?.() ?? []); @@ -37,9 +39,16 @@ export default class MournbladeCYD2CreatureSheet extends MournbladeCYD2ActorShee context.equipements = foundry.utils.duplicate(actor.getEquipments?.() ?? []); context.monnaies = foundry.utils.duplicate(actor.getMonnaies?.() ?? []); context.talents = foundry.utils.duplicate(actor.getTalents?.() ?? []); + context.traitsChaotiques = foundry.utils.duplicate(actor.getTraitsChaotiques?.() ?? []); + context.traitsEspeces = foundry.utils.duplicate(actor.getTraitsEspeces?.() ?? []); context.protectionTotal = actor.getProtectionTotal?.() ?? 0; context.adversiteTotal = (actor.system.adversite?.bleue || 0) + (actor.system.adversite?.rouge || 0) + (actor.system.adversite?.noire || 0); - context.initiative = context.combat?.initTotal ?? 0; + + // Utiliser les valeurs manuelles si elles existent, sinon les valeurs calculées + context.initiative = actor.system.combat?.inittotal !== undefined ? actor.system.combat.inittotal : (context.combat?.initTotal ?? 0); + context.combat.defenseTotal = actor.system.combat?.defensetotal !== undefined ? actor.system.combat.defensetotal : context.combat.defenseTotal; + context.protectionTotal = actor.system.combat?.protectiontotal !== undefined ? actor.system.combat.protectiontotal : context.protectionTotal; + return context; } } diff --git a/modules/applications/sheets/mournblade-cyd2-don-sheet.mjs b/modules/applications/sheets/mournblade-cyd2-don-sheet.mjs index 1786c80..30c1785 100644 --- a/modules/applications/sheets/mournblade-cyd2-don-sheet.mjs +++ b/modules/applications/sheets/mournblade-cyd2-don-sheet.mjs @@ -22,6 +22,8 @@ export default class MournbladeCYD2DonSheet extends MournbladeCYD2ItemSheetV2 { /** @override */ async _prepareContext() { const context = await super._prepareContext(); + context.owner = this.document.isOwner; + context.editable = this.isEditable; return context; } } diff --git a/modules/models/creature.mjs b/modules/models/creature.mjs index 88f6ebb..008b59a 100644 --- a/modules/models/creature.mjs +++ b/modules/models/creature.mjs @@ -88,12 +88,15 @@ export default class CreatureDataModel extends foundry.abstract.TypeDataModel { }), combat: new fields.SchemaField({ initbonus: new fields.NumberField({ initial: 0, integer: true }), + inittotal: new fields.NumberField({ initial: 0, integer: true }), vitessebonus: new fields.NumberField({ initial: 0, integer: true }), bonusdegats: new fields.NumberField({ initial: 0, integer: true }), attaquebonus: new fields.NumberField({ initial: 0, integer: true }), defensebonus: new fields.NumberField({ initial: 0, integer: true }), + defensetotal: new fields.NumberField({ initial: 0, integer: true }), defensetotale: new fields.BooleanField({ initial: false }), - monte: new fields.BooleanField({ initial: false }) + monte: new fields.BooleanField({ initial: false }), + protectiontotal: new fields.NumberField({ initial: 0, integer: true }) }), balance: new fields.SchemaField({ loi: new fields.NumberField({ initial: 0, integer: true }), diff --git a/modules/models/tendance.mjs b/modules/models/tendance.mjs index 590d59e..2ffbcaf 100644 --- a/modules/models/tendance.mjs +++ b/modules/models/tendance.mjs @@ -6,7 +6,8 @@ export default class TendanceDataModel extends foundry.abstract.TypeDataModel { const fields = foundry.data.fields; return { description: new fields.HTMLField({ initial: "" }), - allegeance: new fields.StringField({ initial: "" }) + allegeance: new fields.StringField({ initial: "" }), + donlie: new fields.StringField({ initial: "" }) }; } } diff --git a/styles/mournblade-cyd2.css b/styles/mournblade-cyd2.css index cc8fb73..7116ba1 100644 --- a/styles/mournblade-cyd2.css +++ b/styles/mournblade-cyd2.css @@ -2718,6 +2718,13 @@ li { background: rgba(10, 20, 55, 0.6); color: #a0c0ff; } +.fvtt-mournblade-cyd-2-0.actor .sheet-header .header-stat-cards .stat-card.card-combat { + border-top-color: #805010; +} +.fvtt-mournblade-cyd-2-0.actor .sheet-header .header-stat-cards .stat-card.card-combat .stat-card-title { + background: rgba(50, 35, 10, 0.6); + color: #ffe8a0; +} .fvtt-mournblade-cyd-2-0.actor .sheet-header .header-stat-cards .stat-card .stat-card-title { font-size: 0.68rem; font-weight: bold; diff --git a/templates/creature-sheet.hbs b/templates/creature-sheet.hbs index 378553d..609e4ba 100644 --- a/templates/creature-sheet.hbs +++ b/templates/creature-sheet.hbs @@ -35,24 +35,45 @@ +