Compare commits

...

3 Commits

Author SHA1 Message Date
uberwald 4743cc7b4a fix: utiliser skill.value dans les formules de jets (pas skill.max)
Release Creation / build (release) Successful in 40s
- computeRollFormula, computeResults, confrontations utilisent la valeur actuelle
- skill.max sert uniquement de plafond et d'affichage
2026-07-24 09:27:11 +02:00
uberwald adbbb8ffa8 Fix release number 2026-07-24 09:18:26 +02:00
uberwald 31e2561797 feat: separate skill value/max (transcendence pool vs level)
Release Creation / build (release) Successful in 58s
- skill.value = spendable transcendence pool (editable select)
- skill.max = max level (locked by default, unlock btn)
- computeRollFormula/computeResults/confront use skill.max
- clamp transcendence spend to skill.value
- resetTranscendence button in Bio&Notes
- v14 compat: duplicate→deepClone, mergeObject→spread, socket fixes
- Dialog v1 removed, DragDrop dedup, await fixes
2026-07-24 09:00:26 +02:00
64 changed files with 372 additions and 327 deletions
+1 -1
View File
@@ -67,5 +67,5 @@ jobs:
version: ${{steps.get_version.outputs.version-without-v}} version: ${{steps.get_version.outputs.version-without-v}}
manifest: "https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/latest/system.json" manifest: "https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/latest/system.json"
notes: "https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/fvtt-ecryme-${{github.event.release.tag_name}}.zip" notes: "https://www.uberwald.me/gitea/${{gitea.repository}}/releases/download/${{github.event.release.tag_name}}/fvtt-ecryme-${{github.event.release.tag_name}}.zip"
compatibility-minimum: "13" compatibility-minimum: "14"
compatibility-verified: "14" compatibility-verified: "14"
+4
View File
@@ -73,6 +73,10 @@
"notes": "Notes", "notes": "Notes",
"bio": "Bio", "bio": "Bio",
"bionotes": "Bio&Notes", "bionotes": "Bio&Notes",
"resetTranscendence": "Reset transcendence",
"transcendenceCurrent": "Current value",
"transcendenceMax": "Max value",
"toggleEditMax": "Edit max level",
"skills": "Skills", "skills": "Skills",
"traits": "Traits", "traits": "Traits",
"equipment": "Equipment", "equipment": "Equipment",
+4
View File
@@ -74,6 +74,10 @@
"notes": "Notes", "notes": "Notes",
"bio": "Bio", "bio": "Bio",
"bionotes": "Bio&Notes", "bionotes": "Bio&Notes",
"resetTranscendence": "Réinitialiser la transcendance",
"transcendenceCurrent": "Valeur actuelle",
"transcendenceMax": "Valeur max",
"toggleEditMax": "Modifier le niveau max",
"skills": "Compétences", "skills": "Compétences",
"traits": "Traits", "traits": "Traits",
"equipment": "Equipement", "equipment": "Equipement",
+13 -8
View File
@@ -11,15 +11,16 @@ export class EcrymeActorSheet extends foundry.appv1.sheets.ActorSheet {
/** @override */ /** @override */
static get defaultOptions() { static get defaultOptions() {
return foundry.utils.mergeObject(super.defaultOptions, { return {
...super.defaultOptions,
classes: ["fvtt-ecryme", "sheet", "actor"], classes: ["fvtt-ecryme", "sheet", "actor"],
template: "systems/fvtt-ecryme/templates/actors/actor-sheet.hbs", template: "systems/fvtt-ecryme/templates/actors/actor-sheet.hbs",
width: 860, width: 860,
height:680, height:680,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills" }], tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "skills" }],
dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }], dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
editScore: true editScore: false
}); };
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@@ -33,7 +34,7 @@ export class EcrymeActorSheet extends foundry.appv1.sheets.ActorSheet {
name: this.actor.name, name: this.actor.name,
editable: this.isEditable, editable: this.isEditable,
cssClass: this.isEditable ? "editable" : "locked", cssClass: this.isEditable ? "editable" : "locked",
system: foundry.utils.duplicate(this.object.system), system: foundry.utils.deepClone(this.object.system),
limited: this.object.limited, limited: this.object.limited,
skills: this.actor.prepareSkills(), skills: this.actor.prepareSkills(),
traits: this.actor.getRollTraits(), traits: this.actor.getRollTraits(),
@@ -41,17 +42,17 @@ export class EcrymeActorSheet extends foundry.appv1.sheets.ActorSheet {
ideal: this.actor.getIdeal(), ideal: this.actor.getIdeal(),
spleen: this.actor.getSpleen(), spleen: this.actor.getSpleen(),
impacts: this.object.getImpacts(), impacts: this.object.getImpacts(),
config: foundry.utils.duplicate(game.system.ecryme.config), config: foundry.utils.deepClone(game.ecryme.config),
weapons: this.actor.getWeapons(), weapons: this.actor.getWeapons(),
maneuvers: this.actor.getManeuvers(), maneuvers: this.actor.getManeuvers(),
impactsMalus: this.actor.getImpactsMalus(), impactsMalus: this.actor.getImpactsMalus(),
archetype: foundry.utils.duplicate(this.actor.getArchetype()), archetype: foundry.utils.deepClone(this.actor.getArchetype()),
equipments: this.actor.getEquipments(), equipments: this.actor.getEquipments(),
hasCephaly: EcrymeUtility.hasCephaly(), hasCephaly: EcrymeUtility.hasCephaly(),
hasBoheme: EcrymeUtility.hasBoheme(), hasBoheme: EcrymeUtility.hasBoheme(),
hasAmertume: EcrymeUtility.hasAmertume(), hasAmertume: EcrymeUtility.hasAmertume(),
cephalySkills: this.actor.getCephalySkills(), cephalySkills: this.actor.getCephalySkills(),
subActors: foundry.utils.duplicate(this.actor.getSubActors()), subActors: foundry.utils.deepClone(this.actor.getSubActors()),
annency: this.actor.getAnnency(), annency: this.actor.getAnnency(),
description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.description, { async: true }), description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.description, { async: true }),
notes: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.notes, { async: true }), notes: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.object.system.biodata.notes, { async: true }),
@@ -162,7 +163,7 @@ export class EcrymeActorSheet extends foundry.appv1.sheets.ActorSheet {
html.find('.roll-weapon').click((event) => { html.find('.roll-weapon').click((event) => {
const armeId = $(event.currentTarget).data("arme-id") const armeId = $(event.currentTarget).data("arme-id")
this.actor.rollArme(armeId) this.actor.rollWeapon(armeId)
}); });
html.find('.lock-unlock-sheet').click((event) => { html.find('.lock-unlock-sheet').click((event) => {
@@ -179,6 +180,10 @@ export class EcrymeActorSheet extends foundry.appv1.sheets.ActorSheet {
let value = Number(ev.currentTarget.value); let value = Number(ev.currentTarget.value);
this.actor.update( { [`${fieldName}`]: value } ); this.actor.update( { [`${fieldName}`]: value } );
}); });
html.find('.reset-transcendence').click(async (ev) => {
await this.actor.resetSkillPool();
this.render(true);
});
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
+62 -36
View File
@@ -29,9 +29,9 @@ export class EcrymeActor extends Actor {
if (data instanceof Array) { if (data instanceof Array) {
return super.create(data, options); return super.create(data, options);
} }
// If the created actor has items (only applicable to foundry.utils.duplicated actors) bypass the new actor creation logic // If the created actor has items bypass the new actor creation logic
if (data.items) { if (data.items) {
let actor = super.create(data, options); let actor = await super.create(data, options);
return actor; return actor;
} }
@@ -49,9 +49,9 @@ export class EcrymeActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
_preUpdate(changed, options, user) { async _preUpdate(changed, options, user) {
super._preUpdate(changed, options, user); await super._preUpdate(changed, options, user);
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@@ -73,7 +73,7 @@ export class EcrymeActor extends Actor {
return comp; return comp;
} }
getArchetype() { getArchetype() {
let comp = foundry.utils.duplicate(this.items.find(item => item.type == 'archetype') || { name: "Pas d'archetype" }) let comp = foundry.utils.deepClone(this.items.find(item => item.type == 'archetype') || { name: "Pas d'archetype" })
if (comp?.system) { if (comp?.system) {
comp.tarot = EcrymeUtility.getTarot(comp.system.lametutelaire) comp.tarot = EcrymeUtility.getTarot(comp.system.lametutelaire)
} }
@@ -92,7 +92,7 @@ export class EcrymeActor extends Actor {
} }
/* ----------------------- --------------------- */ /* ----------------------- --------------------- */
addAnnencyActor(actorId) { addAnnencyActor(actorId) {
let members = foundry.utils.duplicate(this.system.base.characters) let members = foundry.utils.deepClone(this.system.base.characters)
members.push(actorId) members.push(actorId)
this.update({ 'system.base.characters': members }) this.update({ 'system.base.characters': members })
} }
@@ -123,7 +123,7 @@ export class EcrymeActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
getTrait(id) { getTrait(id) {
//console.log("TRAITS", this.items, this.items.filter(it => it.type == "trait") ) //console.log("TRAITS", this.items, this.items.filter(it => it.type == "trait") )
return this.items.find(it => it.type == "trait" && it._id == id) return this.items.find(it => it.type == "trait" && it.id === id)
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getSpecialization(id) { getSpecialization(id) {
@@ -136,7 +136,7 @@ export class EcrymeActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
prepareSkills() { prepareSkills() {
let skills = foundry.utils.duplicate(this.system.skills) let skills = foundry.utils.deepClone(this.system.skills)
for (let categKey in skills) { for (let categKey in skills) {
let category = skills[categKey] let category = skills[categKey]
for (let skillKey in category.skilllist) { for (let skillKey in category.skilllist) {
@@ -148,22 +148,22 @@ export class EcrymeActor extends Actor {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getCephalySkills() { getCephalySkills() {
let skills = foundry.utils.duplicate(this.system.cephaly.skilllist) let skills = foundry.utils.deepClone(this.system.cephaly.skilllist)
return skills return skills
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getImpacts() { getImpacts() {
let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'impact') || []) let comp = foundry.utils.deepClone(this.items.filter(item => item.type == 'impact') || [])
return comp; return comp;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getWeapons() { getWeapons() {
let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'weapon') || []) let comp = foundry.utils.deepClone(this.items.filter(item => item.type == 'weapon') || [])
EcrymeUtility.sortArrayObjectsByName(comp) EcrymeUtility.sortArrayObjectsByName(comp)
return comp; return comp;
} }
getManeuvers() { getManeuvers() {
let comp = foundry.utils.duplicate(this.items.filter(item => item.type == 'maneuver') || []) let comp = foundry.utils.deepClone(this.items.filter(item => item.type == 'maneuver') || [])
EcrymeUtility.sortArrayObjectsByName(comp) EcrymeUtility.sortArrayObjectsByName(comp)
return comp; return comp;
} }
@@ -171,7 +171,7 @@ export class EcrymeActor extends Actor {
getItemById(id) { getItemById(id) {
let item = this.items.find(item => item.id == id); let item = this.items.find(item => item.id == id);
if (item) { if (item) {
item = foundry.utils.duplicate(item) item = foundry.utils.deepClone(item)
} }
return item; return item;
} }
@@ -206,13 +206,13 @@ export class EcrymeActor extends Actor {
/* ------------------------------------------- */ /* ------------------------------------------- */
async buildContainerTree() { async buildContainerTree() {
let equipments = foundry.utils.duplicate(this.items.filter(item => item.type == "equipment") || []) let equipments = foundry.utils.deepClone(this.items.filter(item => item.type == "equipment") || [])
for (let equip1 of equipments) { for (let equip1 of equipments) {
if (equip1.system.iscontainer) { if (equip1.system.iscontainer) {
equip1.system.contents = [] equip1.system.contents = []
equip1.system.contentsEnc = 0 equip1.system.contentsEnc = 0
for (let equip2 of equipments) { for (let equip2 of equipments) {
if (equip1._id != equip2.id && equip2.system.containerid == equip1.id) { if (equip1.id !== equip2.id && equip2.system.containerid == equip1.id) {
equip1.system.contents.push(equip2) equip1.system.contents.push(equip2)
let q = equip2.system.quantity ?? 1 let q = equip2.system.quantity ?? 1
equip1.system.contentsEnc += q * equip2.system.weight equip1.system.contentsEnc += q * equip2.system.weight
@@ -288,7 +288,7 @@ export class EcrymeActor extends Actor {
/* -------------------------------------------- */ /* -------------------------------------------- */
clearInitiative() { clearInitiative() {
this.getFlag("world", "initiative", -1) this.setFlag("world", "initiative", -1)
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
getInitiativeScore(combatId, combatantId) { getInitiativeScore(combatId, combatantId) {
@@ -301,13 +301,13 @@ export class EcrymeActor extends Actor {
getSubActors() { getSubActors() {
let subActors = []; let subActors = [];
for (let id of this.system.subactors) { for (let id of this.system.subactors) {
subActors.push(foundry.utils.duplicate(game.actors.get(id))) subActors.push(foundry.utils.deepClone(game.actors.get(id)))
} }
return subActors; return subActors;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
async addSubActor(subActorId) { async addSubActor(subActorId) {
let subActors = foundry.utils.duplicate(this.system.subactors); let subActors = foundry.utils.deepClone(this.system.subactors);
subActors.push(subActorId); subActors.push(subActorId);
await this.update({ 'system.subactors': subActors }); await this.update({ 'system.subactors': subActors });
} }
@@ -378,10 +378,10 @@ export class EcrymeActor extends Actor {
rollData.actorId = this.id rollData.actorId = this.id
rollData.img = this.img rollData.img = this.img
rollData.isReroll = false rollData.isReroll = false
rollData.config = game.system.ecryme.config rollData.config = game.ecryme.config
rollData.traits = this.getRollTraits().map(t => ({ _id: t.id, name: t.name, img: t.img, system: { level: t.system.level, traitype: t.system.traitype } })) rollData.traits = this.getRollTraits().map(t => ({ id: t.id, name: t.name, img: t.img, system: { level: t.system.level, traitype: t.system.traitype } }))
rollData.spleen = this.getSpleen() ? foundry.utils.duplicate(this.getSpleen()) : null rollData.spleen = this.getSpleen() ? foundry.utils.deepClone(this.getSpleen()) : null
rollData.ideal = this.getIdeal() ? foundry.utils.duplicate(this.getIdeal()) : null rollData.ideal = this.getIdeal() ? foundry.utils.deepClone(this.getIdeal()) : null
rollData.confrontBonus = this.getBonusList() rollData.confrontBonus = this.getBonusList()
return rollData return rollData
@@ -402,7 +402,7 @@ export class EcrymeActor extends Actor {
} }
} else { } else {
skill = this.system.skills[categKey].skilllist[skillKey] skill = this.system.skills[categKey].skilllist[skillKey]
skill = foundry.utils.duplicate(skill) skill = foundry.utils.deepClone(skill)
skill.spec = this.getSpecializations(skillKey) skill.spec = this.getSpecializations(skillKey)
} }
@@ -434,7 +434,7 @@ export class EcrymeActor extends Actor {
let spec = this.items.find(it => it.type == "specialization" && it.id == specId) let spec = this.items.find(it => it.type == "specialization" && it.id == specId)
rollData.mode = "skill" rollData.mode = "skill"
rollData.selectedSpecs = [spec.id] rollData.selectedSpecs = [spec.id]
rollData.forcedSpec = foundry.utils.duplicate(spec) rollData.forcedSpec = foundry.utils.deepClone(spec)
rollData.title = game.i18n.localize(rollData.skill.name) rollData.title = game.i18n.localize(rollData.skill.name)
this.startRoll(rollData).catch("Error on startRoll") this.startRoll(rollData).catch("Error on startRoll")
} }
@@ -447,8 +447,8 @@ export class EcrymeActor extends Actor {
rollData.executionTotal = rollData.skill.value rollData.executionTotal = rollData.skill.value
rollData.preservationTotal = rollData.skill.value rollData.preservationTotal = rollData.skill.value
rollData.applyTranscendence = "execution" rollData.applyTranscendence = "execution"
rollData.traitsBonus = foundry.utils.duplicate(rollData.traits) rollData.traitsBonus = foundry.utils.deepClone(rollData.traits)
rollData.traitsMalus = foundry.utils.duplicate(rollData.traits) rollData.traitsMalus = foundry.utils.deepClone(rollData.traits)
console.log("ROLLDATA", rollData) console.log("ROLLDATA", rollData)
let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData) let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
confrontStartDialog.render(true) confrontStartDialog.render(true)
@@ -457,16 +457,16 @@ export class EcrymeActor extends Actor {
async rollCephalySkillConfront(skillKey) { async rollCephalySkillConfront(skillKey) {
let rollData = this.getCommonRollData() let rollData = this.getCommonRollData()
rollData.mode = "cephaly" rollData.mode = "cephaly"
rollData.skill = foundry.utils.duplicate(this.system.cephaly.skilllist[skillKey]) rollData.skill = foundry.utils.deepClone(this.system.cephaly.skilllist[skillKey])
rollData.annency = foundry.utils.duplicate(this.getAnnency()) rollData.annency = foundry.utils.deepClone(this.getAnnency())
rollData.img = rollData.skill.img rollData.img = rollData.skill.img
rollData.skill.categKey = "cephaly" rollData.skill.categKey = "cephaly"
rollData.skill.skillKey = skillKey rollData.skill.skillKey = skillKey
rollData.title = game.i18n.localize("ECRY.ui.cephaly") + " : " + game.i18n.localize(rollData.skill.name) rollData.title = game.i18n.localize("ECRY.ui.cephaly") + " : " + game.i18n.localize(rollData.skill.name)
rollData.executionTotal = rollData.skill.value rollData.executionTotal = rollData.skill.value
rollData.preservationTotal = rollData.skill.value rollData.preservationTotal = rollData.skill.value
rollData.traitsBonus = foundry.utils.duplicate(rollData.traits) rollData.traitsBonus = foundry.utils.deepClone(rollData.traits)
rollData.traitsMalus = foundry.utils.duplicate(rollData.traits) rollData.traitsMalus = foundry.utils.deepClone(rollData.traits)
rollData.applyTranscendence = "execution" rollData.applyTranscendence = "execution"
let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData) let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
confrontStartDialog.render(true) confrontStartDialog.render(true)
@@ -482,27 +482,27 @@ export class EcrymeActor extends Actor {
rollData = this.getCommonSkill("physical", "shooting") rollData = this.getCommonSkill("physical", "shooting")
} }
rollData.mode = "weapon" rollData.mode = "weapon"
rollData.weapon = foundry.utils.duplicate(weapon) rollData.weapon = foundry.utils.deepClone(weapon)
rollData.title = game.i18n.localize("ECRY.ui.confrontation") + " : " + game.i18n.localize(rollData.skill.name) rollData.title = game.i18n.localize("ECRY.ui.confrontation") + " : " + game.i18n.localize(rollData.skill.name)
rollData.executionTotal = rollData.skill.value rollData.executionTotal = rollData.skill.value
rollData.preservationTotal = rollData.skill.value rollData.preservationTotal = rollData.skill.value
rollData.traitsBonus = foundry.utils.duplicate(rollData.traits) rollData.traitsBonus = foundry.utils.deepClone(rollData.traits)
rollData.traitsMalus = foundry.utils.duplicate(rollData.traits) rollData.traitsMalus = foundry.utils.deepClone(rollData.traits)
rollData.applyTranscendence = "execution" rollData.applyTranscendence = "execution"
let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData) let confrontStartDialog = await EcrymeConfrontStartDialog.create(this, rollData)
confrontStartDialog.render(true) confrontStartDialog.render(true)
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
rollWeapon(weaponId) { rollWeapon(weaponId) {
let weapon = this.items.get(weaponId) let weapon = this.items.get(weaponId)
if (weapon) { if (weapon) {
weapon = foundry.utils.duplicate(weapon) weapon = foundry.utils.deepClone(weapon)
let rollData = this.getCommonRollData() let rollData = this.getCommonRollData()
if (weapon.system.armetype == "mainsnues" || weapon.system.armetype == "epee") { if (weapon.system.armetype == "mainsnues" || weapon.system.armetype == "epee") {
rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor((this.getPhysiqueMalus() + this.system.attributs.physique.value + this.system.attributs.habilite.value) / 2) } rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor((this.getPhysiqueMalus() + this.system.attributs.physique.value + this.system.attributs.habilite.value) / 2) }
} else { } else {
rollData.attr = foundry.utils.duplicate(this.system.attributs.habilite) rollData.attr = foundry.utils.deepClone(this.system.attributs.habilite)
} }
rollData.mode = "weapon" rollData.mode = "weapon"
rollData.weapon = weapon rollData.weapon = weapon
@@ -514,6 +514,32 @@ export class EcrymeActor extends Actor {
} }
} }
/* -------------------------------------------- */
resetSkillPool() {
const updateData = {}
const skills = this.system.skills
for (const categKey of Object.keys(skills)) {
const skilllist = skills[categKey]?.skilllist
if (!skilllist) continue
for (const skillKey of Object.keys(skilllist)) {
const skill = skilllist[skillKey]
if (skill.max !== undefined) {
updateData[`system.skills.${categKey}.skilllist.${skillKey}.value`] = skill.max
}
}
}
const cephaly = this.system.cephaly?.skilllist
if (cephaly) {
for (const skillKey of Object.keys(cephaly)) {
const skill = cephaly[skillKey]
if (skill.max !== undefined) {
updateData[`system.cephaly.skilllist.${skillKey}.value`] = skill.max
}
}
}
return this.update(updateData)
}
/* -------------------------------------------- */ /* -------------------------------------------- */
async startRoll(rollData) { async startRoll(rollData) {
let rollDialog = await EcrymeRollDialog.create(this, rollData) let rollDialog = await EcrymeRollDialog.create(this, rollData)
+6 -5
View File
@@ -11,7 +11,8 @@ export class EcrymeAnnencySheet extends foundry.appv1.sheets.ActorSheet {
/** @override */ /** @override */
static get defaultOptions() { static get defaultOptions() {
return foundry.utils.mergeObject(super.defaultOptions, { return {
...super.defaultOptions,
classes: ["fvtt-ecryme", "sheet", "actor"], classes: ["fvtt-ecryme", "sheet", "actor"],
template: "systems/fvtt-ecryme/templates/actors/annency-sheet.hbs", template: "systems/fvtt-ecryme/templates/actors/annency-sheet.hbs",
width: 640, width: 640,
@@ -19,7 +20,7 @@ export class EcrymeAnnencySheet extends foundry.appv1.sheets.ActorSheet {
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "annency" }], tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "annency" }],
dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }], dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
editScore: true editScore: true
}); };
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@@ -33,9 +34,9 @@ export class EcrymeAnnencySheet extends foundry.appv1.sheets.ActorSheet {
name: this.actor.name, name: this.actor.name,
editable: this.isEditable, editable: this.isEditable,
cssClass: this.isEditable ? "editable" : "locked", cssClass: this.isEditable ? "editable" : "locked",
system: foundry.utils.duplicate(this.object.system), system: foundry.utils.deepClone(this.object.system),
limited: this.object.limited, limited: this.object.limited,
config: foundry.utils.duplicate(game.system.ecryme.config), config: foundry.utils.deepClone(game.ecryme.config),
hasCephaly: EcrymeUtility.hasCephaly(), hasCephaly: EcrymeUtility.hasCephaly(),
hasBoheme: EcrymeUtility.hasBoheme(), hasBoheme: EcrymeUtility.hasBoheme(),
hasAmertume: EcrymeUtility.hasAmertume(), hasAmertume: EcrymeUtility.hasAmertume(),
@@ -121,7 +122,7 @@ export class EcrymeAnnencySheet extends foundry.appv1.sheets.ActorSheet {
} else { } else {
ui.notifications.warn("Actor not found") ui.notifications.warn("Actor not found")
} }
super._onDropActor(event) super._onDropActor(event, dragData)
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
+4 -4
View File
@@ -63,7 +63,7 @@ export default class EcrymeAnnencySheet extends EcrymeBaseActorSheet {
img: actor.img, img: actor.img,
name: actor.name, name: actor.name,
isEditable: this.isEditable, isEditable: this.isEditable,
config: game.system.ecryme.config, config: game.ecryme.config,
hasCephaly: EcrymeUtility.hasCephaly(), hasCephaly: EcrymeUtility.hasCephaly(),
hasBoheme: EcrymeUtility.hasBoheme(), hasBoheme: EcrymeUtility.hasBoheme(),
characters: actor.buildAnnencyActorList(), characters: actor.buildAnnencyActorList(),
@@ -85,7 +85,7 @@ export default class EcrymeAnnencySheet extends EcrymeBaseActorSheet {
/** @override */ /** @override */
async _onDrop(event) { async _onDrop(event) {
const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event) const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event)
if (data.type === "Actor") { if (data?.type === "Actor") {
const actor = await fromUuid(data.uuid) const actor = await fromUuid(data.uuid)
if (actor) { if (actor) {
this.actor.addAnnencyActor(actor.id) this.actor.addAnnencyActor(actor.id)
@@ -118,9 +118,9 @@ export default class EcrymeAnnencySheet extends EcrymeBaseActorSheet {
EcrymeUtility.confirmDelete(this, $(li)).catch(() => {}) EcrymeUtility.confirmDelete(this, $(li)).catch(() => {})
} }
static #onItemCreate(event, target) { static async #onItemCreate(event, target) {
const dataType = target.dataset.type const dataType = target.dataset.type
this.document.createEmbeddedDocuments("Item", [{ name: "NewItem", type: dataType }], { renderSheet: true }) await this.document.createEmbeddedDocuments("Item", [{ name: "NewItem", type: dataType }], { renderSheet: true })
} }
// #endregion // #endregion
-28
View File
@@ -6,13 +6,6 @@ const { HandlebarsApplicationMixin } = foundry.applications.api
*/ */
export default class EcrymeBaseActorSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ActorSheetV2) { export default class EcrymeBaseActorSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ActorSheetV2) {
constructor(options = {}) {
super(options)
this.#dragDrop = this.#createDragDropHandlers()
}
#dragDrop
/** @override */ /** @override */
static DEFAULT_OPTIONS = { static DEFAULT_OPTIONS = {
classes: ["fvtt-ecryme", "sheet", "actor"], classes: ["fvtt-ecryme", "sheet", "actor"],
@@ -32,27 +25,6 @@ export default class EcrymeBaseActorSheet extends HandlebarsApplicationMixin(fou
}, },
} }
/** @override */
_onRender(context, options) {
this.#dragDrop.forEach((d) => d.bind(this.element))
}
// #region Drag-and-Drop
#createDragDropHandlers() {
return this.options.dragDrop.map((d) => {
d.permissions = {
dragstart: this._canDragStart.bind(this),
drop: this._canDragDrop.bind(this),
}
d.callbacks = {
dragstart: this._onDragStart.bind(this),
dragover: this._onDragOver.bind(this),
drop: this._onDrop.bind(this),
}
return new foundry.applications.ux.DragDrop.implementation(d)
})
}
_canDragStart(selector) { return this.isEditable } _canDragStart(selector) { return this.isEditable }
_canDragDrop(selector) { return this.isEditable && this.document.isOwner } _canDragDrop(selector) { return this.isEditable && this.document.isOwner }
_onDragStart(event) {} _onDragStart(event) {}
+14 -6
View File
@@ -6,6 +6,8 @@ import { EcrymeUtility } from "../../common/ecryme-utility.js"
*/ */
export default class EcrymeActorSheet extends EcrymeBaseActorSheet { export default class EcrymeActorSheet extends EcrymeBaseActorSheet {
#editScore = false
/** @override */ /** @override */
static DEFAULT_OPTIONS = { static DEFAULT_OPTIONS = {
classes: ["pc-npc"], classes: ["pc-npc"],
@@ -28,6 +30,7 @@ export default class EcrymeActorSheet extends EcrymeBaseActorSheet {
equipItem: EcrymeActorSheet.#onEquipItem, equipItem: EcrymeActorSheet.#onEquipItem,
quantityMinus: EcrymeActorSheet.#onQuantityMinus, quantityMinus: EcrymeActorSheet.#onQuantityMinus,
quantityPlus: EcrymeActorSheet.#onQuantityPlus, quantityPlus: EcrymeActorSheet.#onQuantityPlus,
resetTranscendence:EcrymeActorSheet.#onResetTranscendence,
}, },
} }
@@ -89,7 +92,7 @@ export default class EcrymeActorSheet extends EcrymeBaseActorSheet {
img: actor.img, img: actor.img,
name: actor.name, name: actor.name,
isEditable: this.isEditable, isEditable: this.isEditable,
config: game.system.ecryme.config, config: game.ecryme.config,
hasCephaly: EcrymeUtility.hasCephaly(), hasCephaly: EcrymeUtility.hasCephaly(),
hasBoheme: EcrymeUtility.hasBoheme(), hasBoheme: EcrymeUtility.hasBoheme(),
hasAmertume: EcrymeUtility.hasAmertume(), hasAmertume: EcrymeUtility.hasAmertume(),
@@ -107,7 +110,7 @@ export default class EcrymeActorSheet extends EcrymeBaseActorSheet {
annency: actor.getAnnency(), annency: actor.getAnnency(),
owner: this.document.isOwner, owner: this.document.isOwner,
isGM: game.user.isGM, isGM: game.user.isGM,
editScore: this.options.editScore ?? true, editScore: this.#editScore,
tabs: this._getTabs(), tabs: this._getTabs(),
} }
} }
@@ -182,9 +185,9 @@ export default class EcrymeActorSheet extends EcrymeBaseActorSheet {
EcrymeUtility.confirmDelete(this, $(li)).catch(() => {}) EcrymeUtility.confirmDelete(this, $(li)).catch(() => {})
} }
static #onItemCreate(event, target) { static async #onItemCreate(event, target) {
const dataType = target.dataset.type const dataType = target.dataset.type
this.document.createEmbeddedDocuments("Item", [{ name: "NewItem", type: dataType }], { renderSheet: true }) await this.document.createEmbeddedDocuments("Item", [{ name: "NewItem", type: dataType }], { renderSheet: true })
} }
static #onSubactorEdit(event, target) { static #onSubactorEdit(event, target) {
@@ -227,11 +230,11 @@ export default class EcrymeActorSheet extends EcrymeBaseActorSheet {
} }
static #onRollWeapon(event, target) { static #onRollWeapon(event, target) {
this.actor.rollArme(target.dataset.armeId) this.actor.rollWeapon(target.dataset.armeId)
} }
static #onLockUnlock(event, target) { static #onLockUnlock(event, target) {
this.options.editScore = !this.options.editScore this.#editScore = !this.#editScore
this.render(true) this.render(true)
} }
@@ -251,5 +254,10 @@ export default class EcrymeActorSheet extends EcrymeBaseActorSheet {
this.actor.incDecQuantity(li?.dataset.itemId, +1) this.actor.incDecQuantity(li?.dataset.itemId, +1)
} }
static async #onResetTranscendence(event, target) {
await this.actor.resetSkillPool()
this.render(true)
}
// #endregion // #endregion
} }
+4 -7
View File
@@ -8,7 +8,7 @@ export class EcrymeCombat extends Combat {
ids = typeof ids === "string" ? [ids] : ids; ids = typeof ids === "string" ? [ids] : ids;
for (let cId = 0; cId < ids.length; cId++) { for (let cId = 0; cId < ids.length; cId++) {
const c = this.combatants.get(ids[cId]); const c = this.combatants.get(ids[cId]);
let id = c._id || c.id; let id = c.id;
let initBonus = c.actor ? c.actor.getInitiativeScore( this.id, id ) : -1; let initBonus = c.actor ? c.actor.getInitiativeScore( this.id, id ) : -1;
await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initBonus } ]); await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initBonus } ]);
} }
@@ -17,9 +17,6 @@ export class EcrymeCombat extends Combat {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
_onUpdate(changed, options, userId) {
}
/* -------------------------------------------- */ /* -------------------------------------------- */
static async checkTurnPosition() { static async checkTurnPosition() {
while (game.combat.turn > 0) { while (game.combat.turn > 0) {
@@ -28,13 +25,13 @@ export class EcrymeCombat extends Combat {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
_onDelete() { async _onDelete() {
let combatants = this.combatants.contents let combatants = this.combatants.contents
for (let c of combatants) { for (let c of combatants) {
let actor = game.actors.get(c.actorId) let actor = game.actors.get(c.actorId)
actor.clearInitiative() await actor.clearInitiative()
} }
super._onDelete() await super._onDelete()
} }
} }
+3 -3
View File
@@ -7,10 +7,10 @@ import { EcrymeCharacterSummary } from "../app/ecryme-summary-app.js"
export class EcrymeCommands { export class EcrymeCommands {
static init() { static init() {
if (!game.system.ecryme.commands) { if (!game.ecryme.commands) {
const commands = new EcrymeCommands(); const commands = new EcrymeCommands();
commands.registerCommand({ path: ["/resume"], func: (content, msg, params) => EcrymeCharacterSummary.displayPCSummary(), descr: "Affiche la liste des PJs!" }); commands.registerCommand({ path: ["/resume"], func: (content, msg, params) => EcrymeCharacterSummary.displayPCSummary(), descr: "Affiche la liste des PJs!" });
game.system.ecryme.commands = commands; game.ecryme.commands = commands;
} }
} }
constructor() { constructor() {
@@ -88,7 +88,7 @@ export class EcrymeCommands {
if (command && command.func) { if (command && command.func) {
const result = command.func(content, msg, params); const result = command.func(content, msg, params);
if (result == false) { if (result == false) {
CrucibleCommands._chatAnswer(msg, command.descr); EcrymeCommands._chatAnswer(msg, command.descr);
} }
return true; return true;
} }
+4 -4
View File
@@ -14,7 +14,7 @@ export class EcrymeHotbar {
if (documentData.type == "Item") { if (documentData.type == "Item") {
console.log("Drop done !!!", bar, documentData, slot) console.log("Drop done !!!", bar, documentData, slot)
let item = documentData.data let item = documentData.data
let command = `game.system.ecryme.EcrymeHotbar.rollMacro("${item.name}", "${item.type}");` let command = `game.ecryme.EcrymeHotbar.rollMacro("${item.name}", "${item.type}");`
let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command)) let macro = game.macros.contents.find(m => (m.name === item.name) && (m.command === command))
if (!macro) { if (!macro) {
macro = await Macro.create({ macro = await Macro.create({
@@ -33,9 +33,9 @@ export class EcrymeHotbar {
let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command)); let macro = game.macros.contents.find(m => (m.name === actor.name) && (m.command === command));
if (!macro) { if (!macro) {
macro = await Macro.create({ macro = await Macro.create({
name: actor.data.name, name: actor.name,
type: "script", type: "script",
img: actor.data.img, img: actor.img,
command: command command: command
}, { displaySheet: false }) }, { displaySheet: false })
game.user.assignHotbarMacro(macro, slot); game.user.assignHotbarMacro(macro, slot);
@@ -48,7 +48,7 @@ export class EcrymeHotbar {
let macro = game.macros.contents.find(m => (m.name === journal.name) && (m.command === command)); let macro = game.macros.contents.find(m => (m.name === journal.name) && (m.command === command));
if (!macro) { if (!macro) {
macro = await Macro.create({ macro = await Macro.create({
name: journal.data.name, name: journal.name,
type: "script", type: "script",
img: "", img: "",
command: command command: command
+3 -3
View File
@@ -31,7 +31,7 @@ export class EcrymeCharacterSummary extends HandlebarsApplicationMixin(foundry.a
/* -------------------------------------------- */ /* -------------------------------------------- */
static displayPCSummary() { static displayPCSummary() {
if (game.user.isGM) { if (game.user.isGM) {
game.system.ecryme.charSummary.render(true) game.ecryme.charSummary.render(true)
} else { } else {
ui.notifications.info("Commande /summary réservée au MJ !") ui.notifications.info("Commande /summary réservée au MJ !")
} }
@@ -50,7 +50,7 @@ export class EcrymeCharacterSummary extends HandlebarsApplicationMixin(foundry.a
return return
} }
let charSummary = new EcrymeCharacterSummary() let charSummary = new EcrymeCharacterSummary()
game.system.ecryme.charSummary = charSummary game.ecryme.charSummary = charSummary
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@@ -75,7 +75,7 @@ export class EcrymeCharacterSummary extends HandlebarsApplicationMixin(foundry.a
return { return {
pcs, pcs,
npcs, npcs,
config: game.system.ecryme.config, config: game.ecryme.config,
} }
} }
+18 -37
View File
@@ -131,7 +131,7 @@ export class EcrymeUtility {
/*-------------------------------------------- */ /*-------------------------------------------- */
static buildSkillConfig() { static buildSkillConfig() {
// Build skill configuration from DataModel structure // Build skill configuration from DataModel structure
game.system.ecryme.config.skills = {} game.ecryme.config.skills = {}
const skillCategories = { const skillCategories = {
physical: { physical: {
@@ -169,9 +169,9 @@ export class EcrymeUtility {
for (let categKey in skillCategories) { for (let categKey in skillCategories) {
let category = skillCategories[categKey] let category = skillCategories[categKey]
for (let skillKey in category.skilllist) { for (let skillKey in category.skilllist) {
let skill = foundry.utils.duplicate(category.skilllist[skillKey]) let skill = foundry.utils.deepClone(category.skilllist[skillKey])
skill.categKey = categKey skill.categKey = categKey
game.system.ecryme.config.skills[skillKey] = skill game.ecryme.config.skills[skillKey] = skill
} }
} }
} }
@@ -264,7 +264,7 @@ export class EcrymeUtility {
} }
let msg = await this.createChatWithRollMode(this.confrontData1.alias, { let msg = await this.createChatWithRollMode(this.confrontData1.alias, {
content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-confrontation-result.hbs`, confront) content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-confrontation-result.hbs`, confront)
}) })
await msg.setFlag("world", "ecryme-rolldata", confront) await msg.setFlag("world", "ecryme-rolldata", confront)
console.log("Confront result", confront) console.log("Confront result", confront)
@@ -287,7 +287,7 @@ export class EcrymeUtility {
rollData.marginPreservation = -1 rollData.marginPreservation = -1
} }
let msg = await this.createChatWithRollMode(rollData.alias, { let msg = await this.createChatWithRollMode(rollData.alias, {
content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-cephaly-result.hbs`, rollData) content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-cephaly-result.hbs`, rollData)
}) })
msg.setFlag("world", "ecryme-rolldata", rollData) msg.setFlag("world", "ecryme-rolldata", rollData)
console.log("Cephaly result", rollData) console.log("Cephaly result", rollData)
@@ -457,7 +457,7 @@ export class EcrymeUtility {
let id = rollData.rollId let id = rollData.rollId
let oldRollData = this.rollDataStore[id] || {} let oldRollData = this.rollDataStore[id] || {}
let newRollData = foundry.utils.mergeObject(oldRollData, rollData) let newRollData = { ...oldRollData, ...rollData }
this.rollDataStore[id] = newRollData this.rollDataStore[id] = newRollData
} }
@@ -468,7 +468,7 @@ export class EcrymeUtility {
let rollData = msg.data.rollData let rollData = msg.data.rollData
if (game.user.isGM) { if (game.user.isGM) {
let chatMsg = await this.createChatMessage(rollData.alias, "blindroll", { let chatMsg = await this.createChatMessage(rollData.alias, "blindroll", {
content: await renderTemplate(msg.data.template, rollData), content: await foundry.applications.handlebars.renderTemplate(msg.data.template, rollData),
whisper: game.user.id whisper: game.user.id
}) })
chatMsg.setFlag("world", "ecryme-rolldata", rollData) chatMsg.setFlag("world", "ecryme-rolldata", rollData)
@@ -480,7 +480,7 @@ export class EcrymeUtility {
static async searchItem(dataItem) { static async searchItem(dataItem) {
let item let item
if (dataItem.pack) { if (dataItem.pack) {
let id = dataItem.id || dataItem._id let id = dataItem.id
let items = await this.loadCompendium(dataItem.pack, item => item.id == id) let items = await this.loadCompendium(dataItem.pack, item => item.id == id)
item = items[0] || undefined item = items[0] || undefined
} else { } else {
@@ -499,7 +499,7 @@ export class EcrymeUtility {
if (["gmroll", "blindroll"].includes(chatData.rollMode)) chatData["whisper"] = ChatMessage.getWhisperRecipients("GM").map(u => u.id); if (["gmroll", "blindroll"].includes(chatData.rollMode)) chatData["whisper"] = ChatMessage.getWhisperRecipients("GM").map(u => u.id);
if (chatData.rollMode === "blindroll") chatData["blind"] = true; if (chatData.rollMode === "blindroll") chatData["blind"] = true;
else if (chatData.rollMode === "selfroll") chatData["whisper"] = [game.user]; else if (chatData.rollMode === "selfroll") chatData["whisper"] = [game.user.id];
if (forceWhisper) { // Final force ! if (forceWhisper) { // Final force !
chatData["speaker"] = ChatMessage.getSpeaker(); chatData["speaker"] = ChatMessage.getSpeaker();
@@ -570,8 +570,9 @@ export class EcrymeUtility {
diceFormula += "+" + rollData.skill.value diceFormula += "+" + rollData.skill.value
} }
if (rollData.skillTranscendence) { if (rollData.skillTranscendence) {
diceFormula += "+" + rollData.skillTranscendence let toSpend = Math.min(rollData.skillTranscendence, rollData.skill.value)
actor.spentSkillTranscendence(rollData.skill, rollData.skillTranscendence) diceFormula += "+" + toSpend
actor.spentSkillTranscendence(rollData.skill, toSpend)
} }
if (rollData.selectedSpecs && rollData.selectedSpecs.length > 0) { if (rollData.selectedSpecs && rollData.selectedSpecs.length > 0) {
rollData.spec = actor.getSpecialization(rollData.selectedSpecs[0]) rollData.spec = actor.getSpecialization(rollData.selectedSpecs[0])
@@ -620,7 +621,7 @@ export class EcrymeUtility {
// Performs roll // Performs roll
let myRoll = await new Roll(diceFormula).roll() let myRoll = await new Roll(diceFormula).roll()
await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
rollData.roll = foundry.utils.duplicate(myRoll) rollData.roll = foundry.utils.deepClone(myRoll)
rollData.total = myRoll.total rollData.total = myRoll.total
rollData.diceSum = myRoll.terms[0].total rollData.diceSum = myRoll.terms[0].total
@@ -644,7 +645,7 @@ export class EcrymeUtility {
actor.spentSkillTranscendence(rollData.skill, value) actor.spentSkillTranscendence(rollData.skill, value)
let msg = await this.createChatWithRollMode(rollData.alias, { let msg = await this.createChatWithRollMode(rollData.alias, {
content: await renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData) content: await foundry.applications.handlebars.renderTemplate(`systems/fvtt-ecryme/templates/chat/chat-generic-result.hbs`, rollData)
}) })
await msg.setFlag("world", "ecryme-rolldata", rollData) await msg.setFlag("world", "ecryme-rolldata", rollData)
} }
@@ -748,7 +749,7 @@ export class EcrymeUtility {
useSpleen: false, useSpleen: false,
useIdeal: false, useIdeal: false,
impactMalus: 0, impactMalus: 0,
config: foundry.utils.duplicate(game.system.ecryme.config) config: foundry.utils.deepClone(game.ecryme.config)
} }
EcrymeUtility.updateWithTarget(rollData) EcrymeUtility.updateWithTarget(rollData)
return rollData return rollData
@@ -770,29 +771,9 @@ export class EcrymeUtility {
/* -------------------------------------------- */ /* -------------------------------------------- */
static async confirmDelete(actorSheet, li) { static async confirmDelete(actorSheet, li) {
let itemId = li.data("item-id"); let itemId = li.data("item-id");
let msgTxt = "<p>Etes vous certain de souhaiter envoyer cet item dans les limbes ?"; if (!confirm("Etes vous certain de souhaiter envoyer cet item dans les limbes ?")) return;
let buttons = { actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]);
delete: { li.slideUp(200, () => actorSheet.render(false));
icon: '<i class="fas fa-check"></i>',
label: "Oui, retirez-le",
callback: () => {
actorSheet.actor.deleteEmbeddedDocuments("Item", [itemId]);
li.slideUp(200, () => actorSheet.render(false));
}
},
cancel: {
icon: '<i class="fas fa-times"></i>',
label: "Annuler"
}
}
msgTxt += "</p>";
let d = new Dialog({
title: "Confirm removal",
content: msgTxt,
buttons: buttons,
default: "cancel"
});
d.render(true);
} }
} }
+4 -4
View File
@@ -48,7 +48,7 @@ export class EcrymeConfrontDialog extends HandlebarsApplicationMixin(foundry.app
async _prepareContext() { async _prepareContext() {
return { return {
...this.rollData, ...this.rollData,
config: game.system.ecryme.config, config: game.ecryme.config,
buttonDisabled: this.buttonDisabled, buttonDisabled: this.buttonDisabled,
} }
} }
@@ -216,7 +216,7 @@ export class EcrymeConfrontDialog extends HandlebarsApplicationMixin(foundry.app
// Specialization // Specialization
if (rollData.selectedSpecs?.length > 0) { if (rollData.selectedSpecs?.length > 0) {
rollData.spec = foundry.utils.duplicate(actor.getSpecialization(rollData.selectedSpecs[0])) rollData.spec = foundry.utils.deepClone(actor.getSpecialization(rollData.selectedSpecs[0]))
rollData.specApplied = true rollData.specApplied = true
rollData.executionTotal += 2 rollData.executionTotal += 2
rollData.preservationTotal += 2 rollData.preservationTotal += 2
@@ -232,11 +232,11 @@ export class EcrymeConfrontDialog extends HandlebarsApplicationMixin(foundry.app
for (const t of rollData.traitsMalus) t.activated = false for (const t of rollData.traitsMalus) t.activated = false
for (const id of (rollData.traitsBonusSelected ?? [])) { for (const id of (rollData.traitsBonusSelected ?? [])) {
const trait = rollData.traitsBonus.find(t => t._id === id) const trait = rollData.traitsBonus.find(t => t.id === id)
if (trait) { trait.activated = true; rollData.bonusMalusTraits += Number(trait.system.level) } if (trait) { trait.activated = true; rollData.bonusMalusTraits += Number(trait.system.level) }
} }
for (const id of (rollData.traitsMalusSelected ?? [])) { for (const id of (rollData.traitsMalusSelected ?? [])) {
const trait = rollData.traitsMalus.find(t => t._id === id) const trait = rollData.traitsMalus.find(t => t.id === id)
if (trait) { trait.activated = true; rollData.bonusMalusTraits -= Number(trait.system.level) } if (trait) { trait.activated = true; rollData.bonusMalusTraits -= Number(trait.system.level) }
} }
@@ -47,7 +47,7 @@ export class EcrymeConfrontStartDialog extends HandlebarsApplicationMixin(foundr
async _prepareContext() { async _prepareContext() {
return { return {
...this.rollData, ...this.rollData,
config: game.system.ecryme.config, config: game.ecryme.config,
} }
} }
@@ -57,11 +57,11 @@ export class EcrymeConfrontStartDialog extends HandlebarsApplicationMixin(foundr
await EcrymeUtility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode")) await EcrymeUtility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
const rollData = this.rollData const rollData = this.rollData
rollData.roll = foundry.utils.duplicate(myRoll) rollData.roll = foundry.utils.deepClone(myRoll)
rollData.availableDices = [] rollData.availableDices = []
for (const result of myRoll.terms[0].results) { for (const result of myRoll.terms[0].results) {
if (!result.discarded) { if (!result.discarded) {
const dup = foundry.utils.duplicate(result) const dup = foundry.utils.deepClone(result)
dup.location = "mainpool" dup.location = "mainpool"
rollData.availableDices.push(dup) rollData.availableDices.push(dup)
} }
+1 -1
View File
@@ -40,7 +40,7 @@ export class EcrymeRollDialog extends HandlebarsApplicationMixin(foundry.applica
async _prepareContext() { async _prepareContext() {
return { return {
...this.rollData, ...this.rollData,
config: game.system.ecryme.config, config: game.ecryme.config,
} }
} }
+4 -6
View File
@@ -10,7 +10,7 @@ const ECRYME_WELCOME_MESSAGE_URL = "https://www.uberwald.me/gitea/public/fvtt-ec
/* -------------------------------------------- */ /* -------------------------------------------- */
// Import Modules // Import Modules
import { EcrymeActor } from "./actors/ecryme-actor.js"; import { EcrymeActor } from "./actors/ecryme-actor.js";
import { EcrymeItemSheet } from "./items/ecryme-item-sheet.js"; // import { EcrymeItemSheet } from "./items/ecryme-item-sheet.js";
import { import {
EcrymeEquipmentSheet, EcrymeEquipmentSheet,
EcrymeWeaponSheet, EcrymeWeaponSheet,
@@ -74,7 +74,7 @@ Hooks.once("init", async function () {
maneuver: models.EcrymeManeuverDataModel maneuver: models.EcrymeManeuverDataModel
} }
game.system.ecryme = { game.ecryme = {
config: ECRYME_CONFIG, config: ECRYME_CONFIG,
models, models,
EcrymeHotbar EcrymeHotbar
@@ -82,12 +82,10 @@ Hooks.once("init", async function () {
/* -------------------------------------------- */ /* -------------------------------------------- */
// Register sheet application classes // Register sheet application classes
foundry.documents.collections.Actors.unregisterSheet("core", foundry.appv1.sheets.ActorSheet);
foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["pc"], makeDefault: true }); foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["pc"], makeDefault: true });
foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["npc"], makeDefault: true }); foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeActorSheet, { types: ["npc"], makeDefault: true });
foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeAnnencySheet, { types: ["annency"], makeDefault: true }); foundry.documents.collections.Actors.registerSheet("fvtt-ecryme", EcrymeAnnencySheet, { types: ["annency"], makeDefault: true });
foundry.documents.collections.Items.unregisterSheet("core", foundry.appv1.sheets.ItemSheet);
foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeEquipmentSheet, { types: ["equipment"], makeDefault: true }); foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeEquipmentSheet, { types: ["equipment"], makeDefault: true });
foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeWeaponSheet, { types: ["weapon"], makeDefault: true }); foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeWeaponSheet, { types: ["weapon"], makeDefault: true });
foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeTraitSheet, { types: ["trait"], makeDefault: true }); foundry.documents.collections.Items.registerSheet("fvtt-ecryme", EcrymeTraitSheet, { types: ["trait"], makeDefault: true });
@@ -145,7 +143,7 @@ Hooks.once("ready", function () {
ui.notifications.info("Attention ! Aucun personnage relié au joueur !"); ui.notifications.info("Attention ! Aucun personnage relié au joueur !");
ChatMessage.create({ ChatMessage.create({
content: "<b>WARNING</b> Le joueur " + game.user.name + " n'est pas relié à un personnage !", content: "<b>WARNING</b> Le joueur " + game.user.name + " n'est pas relié à un personnage !",
user: game.user._id user: game.user.id
}); });
} }
@@ -176,7 +174,7 @@ Hooks.on("chatMessage", (html, content, msg) => {
if (content[0] == '/') { if (content[0] == '/') {
let regExp = /(\S+)/g; let regExp = /(\S+)/g;
let commands = content.match(regExp); let commands = content.match(regExp);
if (game.system.ecryme.commands.processChatCommand(commands, content, msg)) { if (game.ecryme.commands.processChatCommand(commands, content, msg)) {
return false; return false;
} }
} }
+8 -21
View File
@@ -8,28 +8,15 @@ export class EcrymeItemSheet extends foundry.appv1.sheets.ItemSheet {
/** @override */ /** @override */
static get defaultOptions() { static get defaultOptions() {
return foundry.utils.mergeObject(super.defaultOptions, { return {
...super.defaultOptions,
classes: ["fvtt-ecryme", "sheet", "item"], classes: ["fvtt-ecryme", "sheet", "item"],
template: "systems/fvtt-ecryme/templates/item-sheet.hbs", template: "systems/fvtt-ecryme/templates/item-sheet.hbs",
dragDrop: [{ dragSelector: null, dropSelector: null }], dragDrop: [{ dragSelector: null, dropSelector: null }],
width: 620, width: 620,
height: 580, height: 580,
tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }] tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }]
}); };
}
/* -------------------------------------------- */
_getHeaderButtons() {
let buttons = super._getHeaderButtons();
// Add "Post to chat" button
// We previously restricted this to GM and editable items only. If you ever find this comment because it broke something: eh, sorry!
buttons.unshift(
{
class: "post",
icon: "fas fa-comment",
onclick: ev => { }
})
return buttons
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@@ -56,8 +43,8 @@ export class EcrymeItemSheet extends foundry.appv1.sheets.ItemSheet {
name: this.object.name, name: this.object.name,
editable: this.isEditable, editable: this.isEditable,
cssClass: this.isEditable ? "editable" : "locked", cssClass: this.isEditable ? "editable" : "locked",
system: foundry.utils.duplicate(this.object.system), system: foundry.utils.deepClone(this.object.system),
config: foundry.utils.duplicate(game.system.ecryme.config), config: foundry.utils.deepClone(game.ecryme.config),
limited: this.object.limited, limited: this.object.limited,
options: this.options, options: this.options,
owner: this.document.isOwner, owner: this.document.isOwner,
@@ -89,7 +76,7 @@ export class EcrymeItemSheet extends foundry.appv1.sheets.ItemSheet {
/* -------------------------------------------- */ /* -------------------------------------------- */
postItem() { postItem() {
let chatData = foundry.utils.duplicate(this.item) let chatData = foundry.utils.deepClone(this.item)
if (this.actor) { if (this.actor) {
chatData.actor = { id: this.actor.id }; chatData.actor = { id: this.actor.id };
} }
@@ -104,7 +91,7 @@ export class EcrymeItemSheet extends foundry.appv1.sheets.ItemSheet {
payload: chatData, payload: chatData,
}); });
renderTemplate('systems/Ecryme/templates/post-item.html', chatData).then(html => { foundry.applications.handlebars.renderTemplate('systems/fvtt-ecryme/templates/post-item.html', chatData).then(html => {
let chatOptions = EcrymeUtility.chatDataSetup(html); let chatOptions = EcrymeUtility.chatDataSetup(html);
ChatMessage.create(chatOptions) ChatMessage.create(chatOptions)
}); });
@@ -154,7 +141,7 @@ export class EcrymeItemSheet extends foundry.appv1.sheets.ItemSheet {
// Update Inventory Item // Update Inventory Item
html.find('.item-edit').click(ev => { html.find('.item-edit').click(ev => {
const li = $(ev.currentTarget).parents(".item"); const li = $(ev.currentTarget).parents(".item");
const item = this.object.options.actor.getOwnedItem(li.data("item-id")); const item = this.actor?.items.get(li.data("item-id"));
item.sheet.render(true); item.sheet.render(true);
}); });
+1 -29
View File
@@ -6,13 +6,6 @@ const { HandlebarsApplicationMixin } = foundry.applications.api
*/ */
export default class EcrymeBaseItemSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) { export default class EcrymeBaseItemSheet extends HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) {
constructor(options = {}) {
super(options)
this.#dragDrop = this.#createDragDropHandlers()
}
#dragDrop
/** @override */ /** @override */
static DEFAULT_OPTIONS = { static DEFAULT_OPTIONS = {
classes: ["fvtt-ecryme", "item"], classes: ["fvtt-ecryme", "item"],
@@ -63,7 +56,7 @@ export default class EcrymeBaseItemSheet extends HandlebarsApplicationMixin(foun
item: this.document, item: this.document,
system: this.document.system, system: this.document.system,
source: this.document.toObject(), source: this.document.toObject(),
config: game.system.ecryme.config, config: game.ecryme.config,
isEditable: this.isEditable, isEditable: this.isEditable,
tabs: this._getTabs(), tabs: this._getTabs(),
} }
@@ -82,27 +75,6 @@ export default class EcrymeBaseItemSheet extends HandlebarsApplicationMixin(foun
return context return context
} }
/** @override */
_onRender(context, options) {
this.#dragDrop.forEach((d) => d.bind(this.element))
}
// #region Drag-and-Drop
#createDragDropHandlers() {
return this.options.dragDrop.map((d) => {
d.permissions = {
dragstart: this._canDragStart.bind(this),
drop: this._canDragDrop.bind(this),
}
d.callbacks = {
dragstart: this._onDragStart.bind(this),
dragover: this._onDragOver.bind(this),
drop: this._onDrop.bind(this),
}
return new foundry.applications.ux.DragDrop.implementation(d)
})
}
_canDragStart(selector) { return this.isEditable } _canDragStart(selector) { return this.isEditable }
_canDragDrop(selector) { return this.isEditable && this.document.isOwner } _canDragDrop(selector) { return this.isEditable && this.document.isOwner }
_onDragStart(event) {} _onDragStart(event) {}
+11 -11
View File
@@ -41,26 +41,26 @@ export default class EcrymePCDataModel extends foundry.abstract.TypeDataModel {
}; };
const mentalSkills = { const mentalSkills = {
anthropomecanology: new fields.SchemaField(createSkillSchema("anthropomecanology", "ECRY.ui.anthropomecanology", 10)), anthropomecanology: new fields.SchemaField(createSkillSchema("anthropomecanology", "ECRY.ui.anthropomecanology")),
ecrymology: new fields.SchemaField(createSkillSchema("ecrymology", "ECRY.ui.ecrymology", 10)), ecrymology: new fields.SchemaField(createSkillSchema("ecrymology", "ECRY.ui.ecrymology")),
traumatology: new fields.SchemaField(createSkillSchema("traumatology", "ECRY.ui.traumatology", 10)), traumatology: new fields.SchemaField(createSkillSchema("traumatology", "ECRY.ui.traumatology")),
traversology: new fields.SchemaField(createSkillSchema("traversology", "ECRY.ui.traversology", 10)), traversology: new fields.SchemaField(createSkillSchema("traversology", "ECRY.ui.traversology")),
urbatechnology: new fields.SchemaField(createSkillSchema("urbatechnology", "ECRY.ui.urbatechnology", 10)) urbatechnology: new fields.SchemaField(createSkillSchema("urbatechnology", "ECRY.ui.urbatechnology"))
}; };
const socialSkills = { const socialSkills = {
quibbling: new fields.SchemaField(createSkillSchema("quibbling", "ECRY.ui.quibbling", 10)), quibbling: new fields.SchemaField(createSkillSchema("quibbling", "ECRY.ui.quibbling")),
creativity: new fields.SchemaField(createSkillSchema("creativity", "ECRY.ui.creativity", 10)), creativity: new fields.SchemaField(createSkillSchema("creativity", "ECRY.ui.creativity")),
loquacity: new fields.SchemaField(createSkillSchema("loquacity", "ECRY.ui.loquacity", 10)), loquacity: new fields.SchemaField(createSkillSchema("loquacity", "ECRY.ui.loquacity")),
guile: new fields.SchemaField(createSkillSchema("guile", "ECRY.ui.guile", 10)), guile: new fields.SchemaField(createSkillSchema("guile", "ECRY.ui.guile")),
performance: new fields.SchemaField(createSkillSchema("performance", "ECRY.ui.performance", 10)) performance: new fields.SchemaField(createSkillSchema("performance", "ECRY.ui.performance"))
}; };
// Helper function to create a cephaly skill schema // Helper function to create a cephaly skill schema
const createCephalySkillSchema = (nameValue) => ({ const createCephalySkillSchema = (nameValue) => ({
name: new fields.StringField({ initial: nameValue }), name: new fields.StringField({ initial: nameValue }),
value: new fields.NumberField({ initial: 0, integer: true, min: 0 }), value: new fields.NumberField({ initial: 0, integer: true, min: 0 }),
max: new fields.NumberField({ initial: 10, integer: true }) max: new fields.NumberField({ initial: 0, integer: true })
}); });
// Cephaly skills // Cephaly skills
+1 -1
View File
@@ -1 +1 @@
MANIFEST-000395 MANIFEST-000403
+7 -7
View File
@@ -1,7 +1,7 @@
2026/07/21-23:37:06.398350 7f8f09fec6c0 Recovering log #393 2026/07/24-08:30:57.764367 7fb397fff6c0 Recovering log #401
2026/07/21-23:37:06.408503 7f8f09fec6c0 Delete type=3 #391 2026/07/24-08:30:57.820757 7fb397fff6c0 Delete type=3 #399
2026/07/21-23:37:06.408560 7f8f09fec6c0 Delete type=0 #393 2026/07/24-08:30:57.820848 7fb397fff6c0 Delete type=0 #401
2026/07/21-23:58:26.140301 7f8f097eb6c0 Level-0 table #398: started 2026/07/24-08:59:46.956225 7fb394b4f6c0 Level-0 table #406: started
2026/07/21-23:58:26.140328 7f8f097eb6c0 Level-0 table #398: 0 bytes OK 2026/07/24-08:59:46.956258 7fb394b4f6c0 Level-0 table #406: 0 bytes OK
2026/07/21-23:58:26.146757 7f8f097eb6c0 Delete type=0 #396 2026/07/24-08:59:46.963004 7fb394b4f6c0 Delete type=0 #404
2026/07/21-23:58:26.160256 7f8f097eb6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) 2026/07/24-08:59:46.977171 7fb394b4f6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)
+7 -7
View File
@@ -1,7 +1,7 @@
2026/07/21-21:44:20.517858 7f8f0afee6c0 Recovering log #389 2026/07/23-23:29:38.540622 7fb3977fe6c0 Recovering log #397
2026/07/21-21:44:20.527213 7f8f0afee6c0 Delete type=3 #387 2026/07/23-23:29:38.552087 7fb3977fe6c0 Delete type=3 #395
2026/07/21-21:44:20.527291 7f8f0afee6c0 Delete type=0 #389 2026/07/23-23:29:38.552145 7fb3977fe6c0 Delete type=0 #397
2026/07/21-22:22:52.642955 7f8f097eb6c0 Level-0 table #394: started 2026/07/24-08:14:15.212953 7fb394b4f6c0 Level-0 table #402: started
2026/07/21-22:22:52.642974 7f8f097eb6c0 Level-0 table #394: 0 bytes OK 2026/07/24-08:14:15.212989 7fb394b4f6c0 Level-0 table #402: 0 bytes OK
2026/07/21-22:22:52.649267 7f8f097eb6c0 Delete type=0 #392 2026/07/24-08:14:15.263841 7fb394b4f6c0 Delete type=0 #400
2026/07/21-22:22:52.662877 7f8f097eb6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end) 2026/07/24-08:14:15.341416 7fb394b4f6c0 Manual compaction at level-0 from '!folders!1GrTlI1xWvaxdKRI' @ 72057594037927935 : 1 .. '!items!zs7krgXhDRndtqbl' @ 0 : 0; will stop at (end)
+1 -1
View File
@@ -1 +1 @@
MANIFEST-000328 MANIFEST-000336
+8 -8
View File
@@ -1,8 +1,8 @@
2026/07/21-23:37:06.449926 7f8f0afee6c0 Recovering log #326 2026/07/24-08:30:58.009658 7fb396ffd6c0 Recovering log #334
2026/07/21-23:37:06.459731 7f8f0afee6c0 Delete type=3 #324 2026/07/24-08:30:58.067952 7fb396ffd6c0 Delete type=3 #332
2026/07/21-23:37:06.459790 7f8f0afee6c0 Delete type=0 #326 2026/07/24-08:30:58.068041 7fb396ffd6c0 Delete type=0 #334
2026/07/21-23:58:26.167099 7f8f097eb6c0 Level-0 table #331: started 2026/07/24-08:59:46.969755 7fb394b4f6c0 Level-0 table #339: started
2026/07/21-23:58:26.167127 7f8f097eb6c0 Level-0 table #331: 0 bytes OK 2026/07/24-08:59:46.969790 7fb394b4f6c0 Level-0 table #339: 0 bytes OK
2026/07/21-23:58:26.173119 7f8f097eb6c0 Delete type=0 #329 2026/07/24-08:59:46.976981 7fb394b4f6c0 Delete type=0 #337
2026/07/21-23:58:26.183592 7f8f097eb6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) 2026/07/24-08:59:46.977429 7fb394b4f6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
2026/07/21-23:58:26.190269 7f8f097eb6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) 2026/07/24-08:59:46.990444 7fb394b4f6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
+8 -8
View File
@@ -1,8 +1,8 @@
2026/07/21-21:44:20.567283 7f8f09fec6c0 Recovering log #322 2026/07/23-23:29:38.605125 7fb397fff6c0 Recovering log #330
2026/07/21-21:44:20.578221 7f8f09fec6c0 Delete type=3 #320 2026/07/23-23:29:38.614967 7fb397fff6c0 Delete type=3 #328
2026/07/21-21:44:20.578306 7f8f09fec6c0 Delete type=0 #322 2026/07/23-23:29:38.615053 7fb397fff6c0 Delete type=0 #330
2026/07/21-22:22:52.669940 7f8f097eb6c0 Level-0 table #327: started 2026/07/24-08:14:15.385470 7fb394b4f6c0 Level-0 table #335: started
2026/07/21-22:22:52.669970 7f8f097eb6c0 Level-0 table #327: 0 bytes OK 2026/07/24-08:14:15.385508 7fb394b4f6c0 Level-0 table #335: 0 bytes OK
2026/07/21-22:22:52.676090 7f8f097eb6c0 Delete type=0 #325 2026/07/24-08:14:15.417431 7fb394b4f6c0 Delete type=0 #333
2026/07/21-22:22:52.696989 7f8f097eb6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) 2026/07/24-08:14:15.479154 7fb394b4f6c0 Manual compaction at level-0 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
2026/07/21-22:22:52.707515 7f8f097eb6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end) 2026/07/24-08:14:15.542162 7fb394b4f6c0 Manual compaction at level-1 from '!journal!wooTFYjEwh83FwgT' @ 72057594037927935 : 1 .. '!journal.pages!wooTFYjEwh83FwgT.xhc7hqoL8kdW6lrD' @ 0 : 0; will stop at (end)
+1 -1
View File
@@ -1 +1 @@
MANIFEST-000393 MANIFEST-000401
+7 -7
View File
@@ -1,7 +1,7 @@
2026/07/21-23:37:06.438745 7f8f0a7ed6c0 Recovering log #391 2026/07/24-08:30:57.946392 7fb3977fe6c0 Recovering log #399
2026/07/21-23:37:06.448044 7f8f0a7ed6c0 Delete type=3 #389 2026/07/24-08:30:58.006024 7fb3977fe6c0 Delete type=3 #397
2026/07/21-23:37:06.448110 7f8f0a7ed6c0 Delete type=0 #391 2026/07/24-08:30:58.006152 7fb3977fe6c0 Delete type=0 #399
2026/07/21-23:58:26.160548 7f8f097eb6c0 Level-0 table #396: started 2026/07/24-08:59:46.984189 7fb394b4f6c0 Level-0 table #404: started
2026/07/21-23:58:26.160599 7f8f097eb6c0 Level-0 table #396: 0 bytes OK 2026/07/24-08:59:46.984218 7fb394b4f6c0 Level-0 table #404: 0 bytes OK
2026/07/21-23:58:26.166936 7f8f097eb6c0 Delete type=0 #394 2026/07/24-08:59:46.990285 7fb394b4f6c0 Delete type=0 #402
2026/07/21-23:58:26.183563 7f8f097eb6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) 2026/07/24-08:59:47.001933 7fb394b4f6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)
+7 -7
View File
@@ -1,7 +1,7 @@
2026/07/21-21:44:20.555084 7f8f0b7ef6c0 Recovering log #387 2026/07/23-23:29:38.590323 7fb3977fe6c0 Recovering log #395
2026/07/21-21:44:20.564635 7f8f0b7ef6c0 Delete type=3 #385 2026/07/23-23:29:38.602055 7fb3977fe6c0 Delete type=3 #393
2026/07/21-21:44:20.564707 7f8f0b7ef6c0 Delete type=0 #387 2026/07/23-23:29:38.602139 7fb3977fe6c0 Delete type=0 #395
2026/07/21-22:22:52.662972 7f8f097eb6c0 Level-0 table #392: started 2026/07/24-08:14:15.341819 7fb394b4f6c0 Level-0 table #400: started
2026/07/21-22:22:52.663005 7f8f097eb6c0 Level-0 table #392: 0 bytes OK 2026/07/24-08:14:15.341876 7fb394b4f6c0 Level-0 table #400: 0 bytes OK
2026/07/21-22:22:52.669773 7f8f097eb6c0 Delete type=0 #390 2026/07/24-08:14:15.385247 7fb394b4f6c0 Delete type=0 #398
2026/07/21-22:22:52.687465 7f8f097eb6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end) 2026/07/24-08:14:15.479122 7fb394b4f6c0 Manual compaction at level-0 from '!items!13IYF6BPUTivFZzB' @ 72057594037927935 : 1 .. '!items!oSutlbe9wyBZccmf' @ 0 : 0; will stop at (end)
+1 -1
View File
@@ -1 +1 @@
MANIFEST-000281 MANIFEST-000289
+8 -8
View File
@@ -1,8 +1,8 @@
2026/07/21-23:37:06.424077 7f8f0b7ef6c0 Recovering log #278 2026/07/24-08:30:57.885965 7fb397fff6c0 Recovering log #287
2026/07/21-23:37:06.434900 7f8f0b7ef6c0 Delete type=3 #276 2026/07/24-08:30:57.939362 7fb397fff6c0 Delete type=3 #285
2026/07/21-23:37:06.434963 7f8f0b7ef6c0 Delete type=0 #278 2026/07/24-08:30:57.939470 7fb397fff6c0 Delete type=0 #287
2026/07/21-23:58:26.153514 7f8f097eb6c0 Level-0 table #284: started 2026/07/24-08:59:46.948977 7fb394b4f6c0 Level-0 table #292: started
2026/07/21-23:58:26.153548 7f8f097eb6c0 Level-0 table #284: 0 bytes OK 2026/07/24-08:59:46.949053 7fb394b4f6c0 Level-0 table #292: 0 bytes OK
2026/07/21-23:58:26.160040 7f8f097eb6c0 Delete type=0 #282 2026/07/24-08:59:46.956075 7fb394b4f6c0 Delete type=0 #290
2026/07/21-23:58:26.167084 7f8f097eb6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end) 2026/07/24-08:59:46.977151 7fb394b4f6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end)
2026/07/21-23:58:26.183582 7f8f097eb6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end) 2026/07/24-08:59:46.977404 7fb394b4f6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end)
+8 -15
View File
@@ -1,15 +1,8 @@
2026/07/21-21:44:20.541841 7f8f0afee6c0 Recovering log #274 2026/07/23-23:29:38.570468 7fb396ffd6c0 Recovering log #283
2026/07/21-21:44:20.552114 7f8f0afee6c0 Delete type=3 #272 2026/07/23-23:29:38.581351 7fb396ffd6c0 Delete type=3 #281
2026/07/21-21:44:20.552164 7f8f0afee6c0 Delete type=0 #274 2026/07/23-23:29:38.581438 7fb396ffd6c0 Delete type=0 #283
2026/07/21-22:22:52.649444 7f8f097eb6c0 Level-0 table #279: started 2026/07/24-08:14:15.298614 7fb394b4f6c0 Level-0 table #288: started
2026/07/21-22:22:52.653578 7f8f097eb6c0 Level-0 table #279: 1805 bytes OK 2026/07/24-08:14:15.298651 7fb394b4f6c0 Level-0 table #288: 0 bytes OK
2026/07/21-22:22:52.662677 7f8f097eb6c0 Delete type=0 #277 2026/07/24-08:14:15.341159 7fb394b4f6c0 Delete type=0 #286
2026/07/21-22:22:52.669921 7f8f097eb6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end) 2026/07/24-08:14:15.341595 7fb394b4f6c0 Manual compaction at level-0 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end)
2026/07/21-22:22:52.687503 7f8f097eb6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 40 : 1 2026/07/24-08:14:15.417678 7fb394b4f6c0 Manual compaction at level-1 from '!scenes!DDibQQLAvyIq9y09' @ 72057594037927935 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end)
2026/07/21-22:22:52.687516 7f8f097eb6c0 Compacting 1@1 + 1@2 files
2026/07/21-22:22:52.690551 7f8f097eb6c0 Generated table #280@1: 4 keys, 1805 bytes
2026/07/21-22:22:52.690566 7f8f097eb6c0 Compacted 1@1 + 1@2 files => 1805 bytes
2026/07/21-22:22:52.696271 7f8f097eb6c0 compacted to: files[ 0 0 1 0 0 0 0 ]
2026/07/21-22:22:52.696454 7f8f097eb6c0 Delete type=2 #247
2026/07/21-22:22:52.696927 7f8f097eb6c0 Delete type=2 #279
2026/07/21-22:22:52.707490 7f8f097eb6c0 Manual compaction at level-1 from '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 40 : 1 .. '!scenes.levels!zvY1RwBhTfwdZIBa.defaultLevel0000' @ 0 : 0; will stop at (end)
+1 -1
View File
@@ -1 +1 @@
MANIFEST-000397 MANIFEST-000403
+7 -3
View File
@@ -1,3 +1,7 @@
2026/07/21-23:39:43.018556 7f86d23fe6c0 Recovering log #396 2026/07/24-08:30:57.704269 7fb3e4fff6c0 Recovering log #401
2026/07/21-23:39:43.069296 7f86d23fe6c0 Delete type=0 #396 2026/07/24-08:30:57.760459 7fb3e4fff6c0 Delete type=3 #399
2026/07/21-23:39:43.069385 7f86d23fe6c0 Delete type=3 #395 2026/07/24-08:30:57.760535 7fb3e4fff6c0 Delete type=0 #401
2026/07/24-08:59:46.963178 7fb394b4f6c0 Level-0 table #406: started
2026/07/24-08:59:46.963211 7fb394b4f6c0 Level-0 table #406: 0 bytes OK
2026/07/24-08:59:46.969620 7fb394b4f6c0 Delete type=0 #404
2026/07/24-08:59:46.977188 7fb394b4f6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)
+8 -3
View File
@@ -1,3 +1,8 @@
2026/07/21-23:39:38.357102 7ff068bfd6c0 Recovering log #394 2026/07/23-23:29:38.526675 7fb397fff6c0 Recovering log #398
2026/07/21-23:39:38.412635 7ff068bfd6c0 Delete type=0 #394 2026/07/23-23:29:38.536758 7fb397fff6c0 Delete type=0 #398
2026/07/21-23:39:38.412727 7ff068bfd6c0 Delete type=3 #393 2026/07/23-23:29:38.536840 7fb397fff6c0 Delete type=3 #397
2026/07/23-23:29:38.536904 7fb397fff6c0 Delete type=0 #393
2026/07/24-08:14:15.178686 7fb394b4f6c0 Level-0 table #402: started
2026/07/24-08:14:15.178752 7fb394b4f6c0 Level-0 table #402: 0 bytes OK
2026/07/24-08:14:15.212738 7fb394b4f6c0 Delete type=0 #400
2026/07/24-08:14:15.341395 7fb394b4f6c0 Manual compaction at level-0 from '!folders!00Hn2nNarlL7b0DR' @ 72057594037927935 : 1 .. '!items!yozTUjNuc2rEGjFK' @ 0 : 0; will stop at (end)
View File
+1 -1
View File
@@ -1 +1 @@
MANIFEST-000395 MANIFEST-000403
+7 -7
View File
@@ -1,7 +1,7 @@
2026/07/21-23:37:06.411000 7f8f0a7ed6c0 Recovering log #393 2026/07/24-08:30:57.824354 7fb3e4fff6c0 Recovering log #401
2026/07/21-23:37:06.421521 7f8f0a7ed6c0 Delete type=3 #391 2026/07/24-08:30:57.882379 7fb3e4fff6c0 Delete type=3 #399
2026/07/21-23:37:06.421589 7f8f0a7ed6c0 Delete type=0 #393 2026/07/24-08:30:57.882459 7fb3e4fff6c0 Delete type=0 #401
2026/07/21-23:58:26.146891 7f8f097eb6c0 Level-0 table #398: started 2026/07/24-08:59:46.977440 7fb394b4f6c0 Level-0 table #406: started
2026/07/21-23:58:26.146920 7f8f097eb6c0 Level-0 table #398: 0 bytes OK 2026/07/24-08:59:46.977475 7fb394b4f6c0 Level-0 table #406: 0 bytes OK
2026/07/21-23:58:26.153371 7f8f097eb6c0 Delete type=0 #396 2026/07/24-08:59:46.984032 7fb394b4f6c0 Delete type=0 #404
2026/07/21-23:58:26.160268 7f8f097eb6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) 2026/07/24-08:59:47.001914 7fb394b4f6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)
+7 -7
View File
@@ -1,7 +1,7 @@
2026/07/21-21:44:20.529547 7f8f09fec6c0 Recovering log #389 2026/07/23-23:29:38.555786 7fb3e4fff6c0 Recovering log #397
2026/07/21-21:44:20.539682 7f8f09fec6c0 Delete type=3 #387 2026/07/23-23:29:38.566404 7fb3e4fff6c0 Delete type=3 #395
2026/07/21-21:44:20.539761 7f8f09fec6c0 Delete type=0 #389 2026/07/23-23:29:38.566494 7fb3e4fff6c0 Delete type=0 #397
2026/07/21-22:22:52.637033 7f8f097eb6c0 Level-0 table #394: started 2026/07/24-08:14:15.264074 7fb394b4f6c0 Level-0 table #402: started
2026/07/21-22:22:52.637050 7f8f097eb6c0 Level-0 table #394: 0 bytes OK 2026/07/24-08:14:15.264110 7fb394b4f6c0 Level-0 table #402: 0 bytes OK
2026/07/21-22:22:52.642866 7f8f097eb6c0 Delete type=0 #392 2026/07/24-08:14:15.298436 7fb394b4f6c0 Delete type=0 #400
2026/07/21-22:22:52.662863 7f8f097eb6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end) 2026/07/24-08:14:15.341433 7fb394b4f6c0 Manual compaction at level-0 from '!folders!DiwHbtGAkTYxtshX' @ 72057594037927935 : 1 .. '!items!zgNI2haxhBxBDBdl' @ 0 : 0; will stop at (end)
+7
View File
@@ -228,10 +228,17 @@
.item-name-label-long2, .item-name-label-long2,
.item-name-label-free, .item-name-label-free,
.item-field-label-short, .item-field-label-short,
.item-field-skill-level,
.item-field-label-medium { .item-field-label-medium {
color: @steam-rust; color: @steam-rust;
} }
.item-field-skill-level:disabled {
background: @steam-parchment-dk;
color: fade(@steam-rust, 40%);
opacity: 0.85;
}
// ---- Roll action links (dice icons) ---- // ---- Roll action links (dice icons) ----
a[data-action^="roll"], a[data-action^="roll"],
a.roll-skill, a.roll-skill,
+5
View File
@@ -251,6 +251,11 @@ ul, li {
.item-field-label-short { margin-top: 4px; flex-grow: 1; max-width: 4rem; min-width: 4rem; } .item-field-label-short { margin-top: 4px; flex-grow: 1; max-width: 4rem; min-width: 4rem; }
.item-field-label-short-header { margin-top: 4px; flex-grow: 1; max-width: 2.2rem; min-width: 2.2rem; } .item-field-label-short-header { margin-top: 4px; flex-grow: 1; max-width: 2.2rem; min-width: 2.2rem; }
.fvtt-ecryme .window-content .sheet-body .item-field-skill-level { margin-top: 4px; margin-left: 0; width: 2.5rem; min-width: 2.5rem; max-width: 2.5rem; flex-shrink: 0; flex-grow: 0; padding: 0 1px; }
.skill-separator { margin: 0; flex: 0 0 auto; }
.item-field-skill-level:disabled { background: rgba(0,0,0,0.06); color: #666; cursor: not-allowed; opacity: 0.85; }
.skill-transcendence { margin-left: 2px; white-space: nowrap; }
.skill-toolbar { text-align: right; padding: 4px 8px; }
.item-field-label-medium { flex-grow: 1; max-width: 6rem; min-width: 6rem; } .item-field-label-medium { flex-grow: 1; max-width: 6rem; min-width: 6rem; }
.item-field-skill { flex-grow: 1; max-width: 6.8rem; min-width: 6.8rem; } .item-field-skill { flex-grow: 1; max-width: 6.8rem; min-width: 6.8rem; }
.item-field-label-long { flex-grow: 1; max-width: 10rem; min-width: 10rem; } .item-field-label-long { flex-grow: 1; max-width: 10rem; min-width: 10rem; }
+10 -3
View File
@@ -101,7 +101,8 @@
"manifest": "https://www.uberwald.me/gitea/public/fvtt-ecryme/raw/branch/master/system.json", "manifest": "https://www.uberwald.me/gitea/public/fvtt-ecryme/raw/branch/master/system.json",
"compatibility": { "compatibility": {
"minimum": "14", "minimum": "14",
"verified": "14" "verified": "14",
"maximum": "14"
}, },
"documentTypes": { "documentTypes": {
"Actor": { "Actor": {
@@ -129,12 +130,18 @@
{ {
"id": "babele", "id": "babele",
"type": "module", "type": "module",
"compatibility": {} "compatibility": {
"minimum": "3.0",
"verified": "3.0"
}
}, },
{ {
"id": "lib-wrapper", "id": "lib-wrapper",
"type": "module", "type": "module",
"compatibility": {} "compatibility": {
"minimum": "1.0",
"verified": "1.0"
}
} }
] ]
+5
View File
@@ -53,5 +53,10 @@
value=system.biodata.gmnotes name="system.biodata.gmnotes" toggled=true}} value=system.biodata.gmnotes name="system.biodata.gmnotes" toggled=true}}
</div> </div>
<hr> <hr>
<div class="form-group">
<button type="button" data-action="resetTranscendence" title="{{localize "ECRY.ui.resetTranscendence"}}">
<i class="fas fa-undo-alt"></i> {{localize "ECRY.ui.resetTranscendence"}}
</button>
</div>
</section> </section>
+17 -2
View File
@@ -13,10 +13,18 @@
{{localize skill.name}} {{localize skill.name}}
</a> </a>
</span> </span>
<select class="item-field-label-short" <select class="item-field-skill-level"
name="system.cephaly.skilllist.{{skillkey}}.value"> name="system.cephaly.skilllist.{{skillkey}}.value"
title="{{localize "ECRY.ui.transcendenceCurrent"}}">
{{selectOptions @root.config.skillLevel selected=skill.value}} {{selectOptions @root.config.skillLevel selected=skill.value}}
</select> </select>
<span class="skill-separator">/</span>
<select class="item-field-skill-level"
name="system.cephaly.skilllist.{{skillkey}}.max"
title="{{localize "ECRY.ui.transcendenceMax"}}"
{{#unless @root.editScore}}disabled{{/unless}}>
{{selectOptions @root.config.skillLevel selected=skill.max}}
</select>
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
@@ -39,4 +47,11 @@
</div> </div>
<div class="skill-toolbar">
<a data-action="lockUnlock" title="{{localize "ECRY.ui.toggleEditMax"}}">
<i class="fas {{#if @root.editScore}}fa-lock-open{{else}}fa-lock{{/if}}"></i>
{{localize "ECRY.ui.toggleEditMax"}}
</a>
</div>
</section> </section>
+39 -5
View File
@@ -116,11 +116,18 @@
<i class="fa-solid fa-dice-d6"></i> <i class="fa-solid fa-dice-d6"></i>
{{localize skill.name}} {{localize skill.name}}
</a></span> </a></span>
<select class="item-field-label-short" type="text" <select class="item-field-skill-level"
name="system.skills.{{categkey}}.skilllist.{{skillkey}}.value" value="{{skill.value}}" name="system.skills.{{categkey}}.skilllist.{{skillkey}}.value"
data-dtype="Number"> title="{{localize "ECRY.ui.transcendenceCurrent"}}">
{{selectOptions @root.config.skillLevel selected=skill.value}} {{selectOptions @root.config.skillLevel selected=skill.value}}
</select> </select>
<span class="skill-separator">/</span>
<select class="item-field-skill-level"
name="system.skills.{{categkey}}.skilllist.{{skillkey}}.max"
title="{{localize "ECRY.ui.transcendenceMax"}}"
{{#unless editScore}}disabled{{/unless}}>
{{selectOptions @root.config.skillLevel selected=skill.max}}
</select>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<ul class="ul-level1"> <ul class="ul-level1">
@@ -147,6 +154,13 @@
{{/each}} {{/each}}
</div> </div>
<div class="skill-toolbar">
<a class="lock-unlock-sheet" title="{{localize "ECRY.ui.toggleEditMax"}}">
<i class="fas {{#if editScore}}fa-lock-open{{else}}fa-lock{{/if}}"></i>
{{localize "ECRY.ui.toggleEditMax"}}
</a>
</div>
</div> </div>
{{#if hasCephaly}} {{#if hasCephaly}}
@@ -166,10 +180,18 @@
<i class="fa-solid fa-dice-d6"></i> <i class="fa-solid fa-dice-d6"></i>
{{localize skill.name}} {{localize skill.name}}
</a></span> </a></span>
<select class="item-field-label-short" type="text" name="system.cephaly.skilllist.{{skillkey}}.value" <select class="item-field-skill-level"
value="{{skill.value}}" data-dtype="Number"> name="system.cephaly.skilllist.{{skillkey}}.value"
title="{{localize "ECRY.ui.transcendenceCurrent"}}">
{{selectOptions @root.config.skillLevel selected=skill.value}} {{selectOptions @root.config.skillLevel selected=skill.value}}
</select> </select>
<span class="skill-separator">/</span>
<select class="item-field-skill-level"
name="system.cephaly.skilllist.{{skillkey}}.max"
title="{{localize "ECRY.ui.transcendenceMax"}}"
{{#unless editScore}}disabled{{/unless}}>
{{selectOptions @root.config.skillLevel selected=skill.max}}
</select>
</li> </li>
{{/each}} {{/each}}
</ul> </ul>
@@ -193,6 +215,13 @@
</div> </div>
<div class="skill-toolbar">
<a class="lock-unlock-sheet" title="{{localize "ECRY.ui.toggleEditMax"}}">
<i class="fas {{#if editScore}}fa-lock-open{{else}}fa-lock{{/if}}"></i>
{{localize "ECRY.ui.toggleEditMax"}}
</a>
</div>
</div> </div>
{{/if}} {{/if}}
@@ -399,6 +428,11 @@
{{editor notes target="system.biodata.notes" button=true owner=owner editable=editable}} {{editor notes target="system.biodata.notes" button=true owner=owner editable=editable}}
</div> </div>
<hr> <hr>
<div class="form-group">
<button type="button" class="reset-transcendence" title="{{localize "ECRY.ui.resetTranscendence"}}">
<i class="fas fa-undo-alt"></i> {{localize "ECRY.ui.resetTranscendence"}}
</button>
</div>
</div> </div>
+17 -2
View File
@@ -38,10 +38,18 @@
{{localize skill.name}} {{localize skill.name}}
</a> </a>
</span> </span>
<select class="item-field-label-short" <select class="item-field-skill-level"
name="system.skills.{{categkey}}.skilllist.{{skillkey}}.value"> name="system.skills.{{categkey}}.skilllist.{{skillkey}}.value"
title="{{localize "ECRY.ui.transcendenceCurrent"}}">
{{selectOptions @root.config.skillLevel selected=skill.value}} {{selectOptions @root.config.skillLevel selected=skill.value}}
</select> </select>
<span class="skill-separator">/</span>
<select class="item-field-skill-level"
name="system.skills.{{categkey}}.skilllist.{{skillkey}}.max"
title="{{localize "ECRY.ui.transcendenceMax"}}"
{{#unless @root.editScore}}disabled{{/unless}}>
{{selectOptions @root.config.skillLevel selected=skill.max}}
</select>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<ul class="ul-level1"> <ul class="ul-level1">
@@ -67,4 +75,11 @@
</div> </div>
<div class="skill-toolbar">
<a data-action="lockUnlock" title="{{localize "ECRY.ui.toggleEditMax"}}">
<i class="fas {{#if @root.editScore}}fa-lock-open{{else}}fa-lock{{/if}}"></i>
{{localize "ECRY.ui.toggleEditMax"}}
</a>
</div>
</section> </section>
@@ -20,7 +20,7 @@
<li>Confrontation : <strong>{{alias}}</strong></li> <li>Confrontation : <strong>{{alias}}</strong></li>
{{/if}} {{/if}}
<li>{{localize skill.name}}: <strong>{{skill.value}}</strong></li> <li>{{localize skill.name}}: <strong>{{skill.max}} ({{skill.value}})</strong></li>
{{#if spec}} {{#if spec}}
<li>{{localize "ECRY.chat.specialization"}} {{spec.name}} (+{{spec.system.bonus}})</li> <li>{{localize "ECRY.chat.specialization"}} {{spec.name}} (+{{spec.system.bonus}})</li>
{{/if}} {{/if}}
+1 -1
View File
@@ -12,7 +12,7 @@
<ul> <ul>
<li><strong>Confrontation</strong> : {{rollData1.alias}} vs {{rollData2.alias}}</li> <li><strong>Confrontation</strong> : {{rollData1.alias}} vs {{rollData2.alias}}</li>
<li>{{localize rollData1.skill.name}} ({{rollData1.skill.value}}) vs {{localize rollData2.skill.name}} ({{rollData2.skill.value}})</li> <li>{{localize rollData1.skill.name}} ({{rollData1.skill.max}}/{{rollData1.skill.value}}) vs {{localize rollData2.skill.name}} ({{rollData2.skill.max}}/{{rollData2.skill.value}})</li>
<li>{{localize "ECRY.ui.execution"}} : {{rollData1.executionTotal}} vs {{rollData2.preservationTotal}} → <strong>{{marginExecution}}</strong></li> <li>{{localize "ECRY.ui.execution"}} : {{rollData1.executionTotal}} vs {{rollData2.preservationTotal}} → <strong>{{marginExecution}}</strong></li>
<li>{{localize "ECRY.ui.preservation"}} : {{rollData1.preservationTotal}} vs {{rollData2.executionTotal}} → <strong>{{marginPreservation}}</strong></li> <li>{{localize "ECRY.ui.preservation"}} : {{rollData1.preservationTotal}} vs {{rollData2.executionTotal}} → <strong>{{marginPreservation}}</strong></li>
+1 -1
View File
@@ -15,7 +15,7 @@
<ul> <ul>
{{#if skill}} {{#if skill}}
<li>{{localize skill.name}}: <strong>{{skill.value}}</strong></li> <li>{{localize skill.name}}: <strong>{{skill.max}} ({{skill.value}})</strong></li>
{{#if spec}} {{#if spec}}
<li>{{localize "ECRY.chat.specialization"}} {{spec.name}} (+{{spec.system.bonus}})</li> <li>{{localize "ECRY.chat.specialization"}} {{spec.name}} (+{{spec.system.bonus}})</li>
{{/if}} {{/if}}
+1 -1
View File
@@ -3,7 +3,7 @@
{{#if img}} {{#if img}}
<img class="actor-icon" src="{{img}}" title="{{name}}" /> <img class="actor-icon" src="{{img}}" title="{{name}}" />
{{/if}} {{/if}}
<h1 class="dialog-roll-title roll-dialog-header">{{title}} ({{skill.value}})</h1> <h1 class="dialog-roll-title roll-dialog-header">{{title}} ({{skill.max}})</h1>
</header> </header>
<div class="flexcol"> <div class="flexcol">
@@ -1,7 +1,7 @@
{{#if skill}} {{#if skill}}
<div class="flexrow"> <div class="flexrow">
<span class="roll-dialog-label">{{localize skill.name}} : </span> <span class="roll-dialog-label">{{localize skill.name}} : </span>
<span class="roll-dialog-label">{{skill.value}}</span> <span class="roll-dialog-label">{{skill.max}} ({{skill.value}})</span>
</div> </div>
{{#if impactMalus}} {{#if impactMalus}}