+ ${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !`
+ });
}
-
- count = encaissement.critiques;
- while (count > 0) {
- let critique = blessures.critiques.liste[0];
- if (!critique.active) {
- this._setBlessure(critique, encaissement);
- count--;
- } else {
- // TODO: status effect dead
- this.setEffect(STATUSES.StatusComma, true);
- ChatMessage.create({
- content: `
- ${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !`
- });
- encaissement.critiques -= count;
- encaissement.mort = true;
- break;
- }
- }
-
- encaissement.endurance = Math.max(encaissement.endurance, -endActuelle);
- this.update({ "system.blessures": blessures });
- }
-
- /* -------------------------------------------- */
- _setBlessure(blessure, encaissement) {
- blessure.active = true;
- blessure.psdone = false;
- blessure.scdone = false;
- blessure.loc = encaissement.locName;
+ return blessure;
}
/* -------------------------------------------- */
@@ -3568,42 +3525,28 @@ export class RdDActor extends RdDBaseActor {
/* -------------------------------------------- */
async buildPotionGuerisonList(pointsGuerison) {
- let pointsGuerisonInitial = pointsGuerison;
- let myData = this.system;
- const blessures = duplicate(myData.blessures);
- let guerisonData = { list: [], pointsConsommes: 0 }
-
- console.log(blessures);
- for (let critique of blessures.critiques.liste) {
- if (critique.active && pointsGuerison >= 6) {
- pointsGuerison -= 6;
- critique.active = false;
- guerisonData.list.push("1 Blessure Critique (6 points)");
+ const pointsGuerisonInitial = pointsGuerison;
+ const blessures = this.filterItems(it => it.isLegere() || it.isGrave() || it.isCritique()).sort(Misc.descending(it => it.system.gravite))
+ const ids = []
+ const guerisonData = { list: [], pointsConsommes: 0 }
+ for (let blessure of blessures) {
+ if (pointsGuerison >= blessure.system.gravite) {
+ pointsGuerison -= blessure.system.gravite;
+ guerisonData.list.push(`1 Blessure ${blessure.system.labelGravite} (${blessure.system.gravite} points)`);
+ ids.push(blessure.id)
}
}
- for (let grave of blessures.graves.liste) {
- if (grave.active && pointsGuerison >= 4) {
- pointsGuerison -= 4;
- grave.active = false;
- guerisonData.list.push("1 Blessure Grave (4 points)");
- }
+ if (ids.length > 0) {
+ await this.supprimerBlessures(it => ids.includes(it.id));
}
- for (let legere of blessures.legeres.liste) {
- if (legere.active && pointsGuerison >= 2) {
- pointsGuerison -= 2;
- legere.active = false;
- guerisonData.list.push("1 Blessure Légère (2 points)");
- }
+ if (blessures.length == ids.length) {
+ let pvManquants = this.system.sante.vie.max - this.system.sante.vie.value;
+ let pvSoignees = Math.min(pvManquants, Math.floor(pointsGuerison / 2));
+ pointsGuerison -= pvSoignees * 2;
+ guerisonData.list.push(pvSoignees + " Points de Vie soignés");
+ await this.santeIncDec('vie', +pvSoignees, false);
}
- await this.update({ "system.blessures": blessures });
-
- let pvManquants = myData.sante.vie.max - myData.sante.vie.value;
- let pvSoignees = Math.min(pvManquants, Math.floor(pointsGuerison / 2));
- pointsGuerison -= pvSoignees * 2;
- guerisonData.list.push(pvSoignees + " Points de Vie soignés");
- await this.santeIncDec('vie', +pvSoignees, false);
guerisonData.pointsConsommes = pointsGuerisonInitial - pointsGuerison;
-
return guerisonData;
}
@@ -3622,7 +3565,7 @@ export class RdDActor extends RdDBaseActor {
}
}
if (!potionData.system.magique || potionData.rolled.isSuccess) {
- this.bonusRecuperationPotion = potionData.system.herbeBonus;
+ await this.setBonusPotionSoin(potionData.system.herbeBonus);
}
ChatMessage.create({
whisper: ChatUtility.getWhisperRecipientsAndGMs(this.name),
@@ -3630,6 +3573,10 @@ export class RdDActor extends RdDBaseActor {
});
}
+ async setBonusPotionSoin(bonus) {
+ await this.update({ 'sante.bonusPotion': bonus });
+ }
+
/* -------------------------------------------- */
async consommerPotionRepos(potionData) {
potionData.alias = this.name;
diff --git a/module/actor/base-actor-sheet.js b/module/actor/base-actor-sheet.js
index 9ac21339..11429c01 100644
--- a/module/actor/base-actor-sheet.js
+++ b/module/actor/base-actor-sheet.js
@@ -78,6 +78,7 @@ export class RdDBaseActorSheet extends ActorSheet {
/* -------------------------------------------- */
static filterItemsPerTypeForSheet(formData, itemTypes) {
+ formData.blessures = Misc.arrayOrEmpty(itemTypes['blessure']);
formData.recettescuisine = Misc.arrayOrEmpty(itemTypes['recettecuisine']);
formData.recettesAlchimiques = Misc.arrayOrEmpty(itemTypes['recettealchimique']);
formData.maladies = Misc.arrayOrEmpty(itemTypes['maladie']);
diff --git a/module/actor/base-actor.js b/module/actor/base-actor.js
index 6c838523..769bc76e 100644
--- a/module/actor/base-actor.js
+++ b/module/actor/base-actor.js
@@ -21,7 +21,6 @@ export class RdDBaseActor extends Actor {
Hooks.on("updateActor", (actor, change, options, actorId) => actor.onUpdateActor(change, options, actorId));
}
-
static onSocketMessage(sockmsg) {
switch (sockmsg.msg) {
case "msg_remote_actor_call":
diff --git a/module/item-tache.js b/module/item-tache.js
deleted file mode 100644
index f17bb9af..00000000
--- a/module/item-tache.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const BASE_TACHE_SOIN_BLESSURE = { type: "tache", img: 'systems/foundryvtt-reve-de-dragon/icons/competence_chirurgie.webp', system: { carac: "dexterite", competence: "Chirurgie", periodicite: "1 round", fatigue: 0, } }
-const TACHES_SOIN_BLESSURE = {
- 'critique': { name: 'Blessure critique', system: { difficulte: -6, points_de_tache: 6 } },
- 'grave': { name: 'Blessure grave', system: { difficulte: -4, points_de_tache: 4 } },
- 'legere': { name: 'Blessure légère', system: { difficulte: -2, points_de_tache: 2 } },
-}
-
-export class RdDItemTache extends Item {
-
- static prepareTacheSoin(gravite) {
- const blessure = TACHES_SOIN_BLESSURE[gravite]
- if (blessure) {
- return mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), blessure)
- }
- ui.notifications.warn(`Pas de tâche de soins pour une blessure ${gravite}`)
- return undefined;
- }
-}
\ No newline at end of file
diff --git a/module/item.js b/module/item.js
index 74b59594..bc1248a5 100644
--- a/module/item.js
+++ b/module/item.js
@@ -31,9 +31,9 @@ const typesInventaire = {
const typesObjetsOeuvres = ["oeuvre", "recettecuisine", "musique", "chant", "danse", "jeu"]
const typesObjetsDraconiques = ["queue", "ombre", "souffle", "tete", "signedraconique", "sortreserve", "rencontre"]
const typesObjetsConnaissance = ["meditation", "recettealchimique", "sort"]
-const typesObjetsEffet = ["possession", "poison", "maladie"]
+const typesObjetsEffet = ["possession", "poison", "maladie", "blessure"]
const typesObjetsCompetence = ["competence", "competencecreature"]
-const typesObjetsTemporels = ["poison", "maladie", "queue", "ombre", "souffle", "signedraconique", "rencontre"]
+const typesObjetsTemporels = ["blessure", "poison", "maladie", "queue", "ombre", "souffle", "signedraconique", "rencontre"]
const typesEnvironnement = typesInventaireMateriel;
const encBrin = 0.00005; // un brin = 1 décigramme = 1/10g = 1/10000kg = 1/20000 enc
const encPepin = 0.0007; /* un pépin de gemme = 1/10 cm3 = 1/1000 l = 3.5/1000 kg = 7/2000 kg = 7/1000 enc
@@ -176,6 +176,7 @@ export class RdDItem extends Item {
isBoisson() { return this.isNourritureBoisson() && this.system.boisson; }
isAlcool() { return this.isNourritureBoisson() && this.system.boisson && this.system.alcoolise; }
isHerbeAPotion() { return this.type == 'herbe' && (this.system.categorie == 'Soin' || this.system.categorie == 'Repos'); }
+ isBlessure() { return this.type == 'blessure' }
isPresentDansMilieux(milieux) {
return this.getEnvironnements(milieux).length > 0
diff --git a/module/item/blessure.js b/module/item/blessure.js
new file mode 100644
index 00000000..2c59a9be
--- /dev/null
+++ b/module/item/blessure.js
@@ -0,0 +1,177 @@
+import { RdDItem } from "../item.js";
+import { Misc } from "../misc.js";
+import { RdDTimestamp } from "../rdd-timestamp.js";
+
+const BASE_TACHE_SOIN_BLESSURE = {
+ type: "tache",
+ img: 'systems/foundryvtt-reve-de-dragon/icons/competence_chirurgie.webp',
+ system: { carac: "dexterite", competence: "Chirurgie", periodicite: "1 round", fatigue: 0, }
+}
+const TACHES_SOIN_BLESSURE = {
+ 6: { name: 'Blessure critique', system: { difficulte: -6, points_de_tache: 6 } },
+ 4: { name: 'Blessure grave', system: { difficulte: -4, points_de_tache: 4 } },
+ 2: { name: 'Blessure légère', system: { difficulte: -2, points_de_tache: 2 } },
+}
+
+const definitionsBlessures = [
+ { type: "contusion", gravite: 0, labelGravite: 'Contusion/éraflure', max: 100, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/eraflure.webp" },
+ { type: "legere", gravite: 2, labelGravite: 'Légère', max: 5, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+ { type: "grave", gravite: 4, labelGravite: 'Grave', max: 2, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+ { type: "critique", gravite: 6, labelGravite: 'Critique', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp" },
+ { type: "mort", gravite: 8, labelGravite: 'Mort', max: 1, icon: "systems/foundryvtt-reve-de-dragon/icons/sante/mort.webp" }
+]
+
+export class RdDItemBlessure extends RdDItem {
+
+ static get defaultIcon() {
+ return "systems/foundryvtt-reve-de-dragon/icons/sante/blessure.webp";
+ }
+
+ prepareDerivedData() {
+ super.prepareDerivedData();
+ this.system.labelGravite = this.getLabelGravite()
+ }
+
+ static prepareTacheSoin(gravite) {
+ const tache = TACHES_SOIN_BLESSURE[gravite]
+ if (!tache) {
+ ui.notifications.warn(`Pas de tâche de soins pour une blessure ${gravite}`)
+ return undefined;
+ }
+ return mergeObject(duplicate(BASE_TACHE_SOIN_BLESSURE), tache)
+ }
+ static async createBlessure(actor, gravite, localisation = '') {
+ const definition = RdDItemBlessure.getDefinition(gravite)
+ const blessure = {
+ name: definition.labelGravite,
+ type: 'blessure',
+ img: definition.icon,
+ system: {
+ gravite: gravite,
+ difficulte: - gravite,
+ localisation: localisation
+ }
+ }
+
+ const blessures = await actor.createEmbeddedDocuments('Item', [blessure])
+ return blessures[0]
+ }
+
+ static async createTacheSoinBlessure(actor, gravite) {
+ const tache = RdDItemBlessure.prepareTacheSoin(gravite)
+ if (tache) {
+ const taches = await actor.createEmbeddedDocuments('Item', [tache], { renderSheet: false });
+ return taches[0];
+ }
+ return undefined
+ }
+
+ async updateTacheSoinBlessure(tache) {
+ if (tache) {
+ await tache.update({
+ system: {
+ itemId: this.id,
+ difficulte: Math.min(this.system.difficulte, tache.system.difficulte),
+ points_de_tache_courant: Math.max(0, this.system.premierssoins.tache)
+ }
+ });
+ }
+ }
+
+ async setSoinsBlessure(systemUpdate = {}) {
+ systemUpdate = mergeObject(systemUpdate, this.system, { overwrite: false }),
+ systemUpdate.soinscomplets.done = systemUpdate.premierssoins.done && systemUpdate.soinscomplets.done
+ await this.update({
+ img: this.getImgSoins(systemUpdate.gravite, systemUpdate.soinscomplets.done),
+ system: systemUpdate
+ });
+ }
+
+ async recuperationBlessure({ actor, timestamp, message, isMaladeEmpoisonne, blessures }) {
+ if (this.parent != actor || actor == undefined) {
+ return;
+ }
+ if (new RdDTimestamp(this.system.fin).isAfterIndexDate(timestamp)) {
+ // attente periode
+ return
+ }
+ if (this.system.gravite > 0) {
+ const update = { premierssoins: { bonus: 0 }, soinscomplets: { bonus: 0 } }
+ const gravite = this.system.gravite;
+ const graviteMoindre = gravite - 2;
+ const moindres = blessures.filter(it => it.system.gravite == graviteMoindre, 'blessures').length
+ const labelGravite = RdDItemBlessure.getLabelGravite(gravite);
+
+ let rolled = await actor.jetRecuperationConstitution(Misc.toInt(this.system.soinscomplets.bonus) + actor.system.sante.bonusPotion, message);
+
+ if (rolled.isETotal) {
+ message.content += ` -- une blessure ${labelGravite} s'infecte (temps de guérison augmenté de ${definition.facteur} jours, perte de vie)`;
+ mergeObject(update, { fin: { indexDate: timestamp.addJours(gravite).indexDate } });
+ await actor.santeIncDec("vie", -1);
+ }
+ else {
+ if (!isMaladeEmpoisonne && rolled.isSuccess && this.peutRetrograder(graviteMoindre, moindres)) {
+ message.content += ` -- une blessure ${labelGravite} cicatrise`;
+ mergeObject(update, { gravite: graviteMoindre, fin: { indexDate: timestamp.addJours(graviteMoindre).indexDate } });
+ }
+ else {
+ message.content += ` -- une blessure ${labelGravite} reste stable`;
+ }
+ }
+ await this.update(update);
+ }
+ }
+
+ peutRetrograder(graviteMoindre, moindres) {
+ return moindres < RdDItemBlessure.getDefinition(graviteMoindre).max
+ }
+
+ async calculerFinPeriodeTemporel(debut) {
+ return await debut.nouveauJour().addJours(this.system.gravite);
+ }
+
+ async onFinPeriode(oldTimestamp, newTimestamp) {
+ if (this.system.gravite <= 0) {
+ await super.onFinPeriode(oldTimestamp, newTimestamp)
+ }
+ }
+
+ getImgSoins(gravite, soins) {
+ let img = 'blessure'
+ if (gravite > 6) {
+ img = 'mort'
+ }
+ if (gravite <= 0) {
+ img = 'eraflure'
+ }
+ return `systems/foundryvtt-reve-de-dragon/icons/sante/${soins ? 'blessure-soins' : img}.webp`
+ }
+
+ getLabelGravite() {
+ return RdDItemBlessure.getDefinition(this.system.gravite).labelGravite
+ }
+
+ static getDefinition(gravite) {
+ return definitionsBlessures.sort(Misc.ascending(it => it.gravite))
+ .find(it => it.gravite >= gravite);
+ }
+ static maxBlessures(gravite) {
+ return RdDItemBlessure.getDefinition(gravite).max
+ }
+
+ isContusion() {
+ return this.system.gravite <= 0
+ }
+ isLegere() {
+ return this.system.gravite > 0 && this.system.gravite <= 2
+ }
+ isGrave() {
+ return this.system.gravite > 2 && this.system.gravite <= 4
+ }
+ isCritique() {
+ return this.system.gravite > 4 && this.system.gravite <= 6
+ }
+ isMort() {
+ return this.system.gravite > 6
+ }
+}
diff --git a/module/item/sheet-blessure.js b/module/item/sheet-blessure.js
new file mode 100644
index 00000000..cbab7ad8
--- /dev/null
+++ b/module/item/sheet-blessure.js
@@ -0,0 +1,29 @@
+import { RdDItemSheet } from "../item-sheet.js";
+
+export class RdDBlessureItemSheet extends RdDItemSheet {
+
+ static get ITEM_TYPE() { return "blessure" };
+
+ async getData() {
+ const formData = await super.getData();
+ formData.disabled = formData.options.isGM || formData.options.isOwned ? '' : 'disabled';
+ return formData;
+ }
+
+ activateListeners(html) {
+ super.activateListeners(html);
+
+ if (!this.options.editable) return;
+
+ this.html.find('[name="premierssoins-done"]').change(async event => {
+ await this.item.setSoinsBlessure({ premierssoins: { done: event.currentTarget.checked } });
+ });
+ this.html.find('[name="soinscomplets-done"]').change(async event => {
+ await this.item.setSoinsBlessure({ soinscomplets: { done: event.currentTarget.checked } })
+ });
+ this.html.find('[name="system-gravite"]').change(async event => {
+ const gravite = Number(event.currentTarget.value)
+ await this.item.setSoinsBlessure({ gravite: gravite, difficulte: - gravite })
+ });
+ }
+}
diff --git a/module/migrations.js b/module/migrations.js
index 8b97047c..b1d3513f 100644
--- a/module/migrations.js
+++ b/module/migrations.js
@@ -416,6 +416,49 @@ class _10_5_0_UpdatePeriodicite extends Migration {
}
}
+class _10_7_0_MigrationBlessures extends Migration {
+ get code() { return "migration-blessures"; }
+ get version() { return "10.7.0"; }
+
+ async migrate() {
+ const timestamp = game.system.rdd.calendrier.getTimestamp()
+ await Promise.all(game.actors.filter(it => it.isPersonnage() || it.isCreature())
+ .map(async (actor) => {
+ const legeres = actor.system.blessures?.legeres.liste.filter(it => it.active).map(it => this.creerBlessure(2, 'légère', it, timestamp)) ?? [];
+ const graves = actor.system.blessures?.graves.liste.filter(it => it.active).map(it => this.creerBlessure(4, 'grave', it, timestamp)) ?? [];
+ const critiques = actor.system.blessures?.critiques.liste.filter(it => it.active).map(it => this.creerBlessure(6, 'critique', it, timestamp));
+ const blessures = legeres.concat(graves).concat(critiques);
+ if (blessures.length > 0) {
+ await actor.createEmbeddedDocuments("Item", blessures);
+ }
+ await actor.update({
+ 'system.blessures.legeres.liste': [],
+ 'system.blessures.graves.liste': [],
+ 'system.blessures.critiques.liste': []
+ })
+ }));
+ }
+ creerBlessure(gravite, graviteTexte, blessure, timestamp) {
+ const dateBlessure = timestamp.addJours(-blessure.jours);
+ const datePremiereRecup = dateBlessure.addJours(gravite);
+ return {
+ name: `Blessure ${graviteTexte}`,
+ type: 'blessure',
+ img: `systems/foundryvtt-reve-de-dragon/icons/sante/blessure${blessure.psdone ? '-soins' : ''}.webp`,
+ system: {
+ gravite: gravite,
+ difficulte: -gravite,
+ debut: { indexDate: dateBlessure.indexDate, indexMinute: 0 },
+ fin: { indexDate: datePremiereRecup.indexDate, indexMinute: 0 },
+ premierssoins: { done: blessure.psdone, bonus: blessure.premiers_soins },
+ soinscomplets: { done: blessure.scdone, bonus: blessure.soins_complets },
+ localisation: blessure.localisation,
+ jours: blessure.jours
+ }
+ }
+ }
+}
+
export class Migrations {
static getMigrations() {
return [
@@ -431,6 +474,7 @@ export class Migrations {
new _10_3_17_Monnaies(),
new _10_4_6_ServicesEnCommerces(),
new _10_5_0_UpdatePeriodicite(),
+ new _10_7_0_MigrationBlessures(),
];
}
@@ -447,7 +491,7 @@ export class Migrations {
migrate() {
const currentVersion = game.settings.get(SYSTEM_RDD, "systemMigrationVersion");
if (isNewerVersion(game.system.version, currentVersion)) {
- //if (true) { /* comment previous and uncomment here to test before upgrade */
+ //if (true) { /* comment previous and uncomment here to test before upgrade */
const migrations = Migrations.getMigrations().filter(m => isNewerVersion(m.version, currentVersion));
if (migrations.length > 0) {
migrations.sort((a, b) => this.compareVersions(a, b));
diff --git a/module/rdd-bonus.js b/module/rdd-bonus.js
index 25bbdb3e..2516b0ff 100644
--- a/module/rdd-bonus.js
+++ b/module/rdd-bonus.js
@@ -28,7 +28,7 @@ export class RdDBonus {
}
/* -------------------------------------------- */
- static dmg(rollData, dmgActor, isCauchemar = false) {
+ static dmg(rollData, dmgActor, isEntiteIncarnee = false) {
let dmg = { total: 0 };
if (rollData.arme && rollData.arme.name.toLowerCase() == "esquive") {
// Specific case management
@@ -41,7 +41,7 @@ export class RdDBonus {
dmg.dmgSurprise = RdDBonus.dmgBonus(rollData.ajustements?.attaqueDefenseurSurpris.used);
dmg.dmgActor = rollData.selectedCarac ? RdDBonus._dmgPerso(dmgActor, rollData.selectedCarac.label, dmg.dmgArme) : 0;
dmg.total = dmg.dmgSurprise + dmg.dmgTactique + dmg.dmgArme + dmg.dmgActor + dmg.dmgParticuliere;
- dmg.mortalite = RdDBonus._calculMortalite(rollData, isCauchemar)
+ dmg.mortalite = RdDBonus._calculMortalite(rollData, isEntiteIncarnee)
}
return dmg;
}
@@ -62,11 +62,8 @@ export class RdDBonus {
}
/* -------------------------------------------- */
- static _calculMortalite(rollData, isCauchemar) {
- if (isCauchemar) {
- return "cauchemar";
- }
- return isCauchemar ? "cauchemar"
+ static _calculMortalite(rollData, isEntiteIncarnee) {
+ return isEntiteIncarnee ? "entiteincarnee"
: rollData.dmg?.mortalite
?? rollData.arme?.system.mortalite
?? "mortel";
diff --git a/module/rdd-calendrier.js b/module/rdd-calendrier.js
index 0053d319..03fb26a5 100644
--- a/module/rdd-calendrier.js
+++ b/module/rdd-calendrier.js
@@ -45,6 +45,14 @@ export class RdDCalendrier extends Application {
Hooks.on('updateSetting', async (setting, update, options, id) => this.onUpdateSetting(setting, update, options, id));
}
+ display() {
+ let templatePath = "systems/foundryvtt-reve-de-dragon/templates/calendar-template.html";
+ renderTemplate(templatePath, {}).then(html => {
+ this.render(true);
+ });
+ return this;
+ }
+
async onUpdateSetting(setting, update, options, id) {
if (setting.key == SYSTEM_RDD + '.' + WORLD_TIMESTAMP_SETTING) {
this.timestamp = RdDTimestamp.getWorldTime();
diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index 904384d6..435be56d 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -1295,13 +1295,8 @@ export class RdDCombat {
blessuresStatus: actor.computeResumeBlessure(),
SConst: actor.getSConst(),
actorId: actor.id,
- isGrave: false,
- isCritique: false
- }
- if (actor.countBlessuresNonSoigneeByName("critiques") > 0) { // Pour éviter le cumul grave + critique
- formData.isCritique = true;
- } else if (actor.countBlessuresNonSoigneeByName("graves") > 0) {
- formData.isGrave = true;
+ isGrave: actor.countBlessures(it => it.isGraves()) > 0,
+ isCritique: actor.countBlessures(it => it.isCritique()) > 0
}
ChatUtility.createChatWithRollMode(actor.name, {
diff --git a/module/rdd-commands.js b/module/rdd-commands.js
index ebab970a..74dd1e61 100644
--- a/module/rdd-commands.js
+++ b/module/rdd-commands.js
@@ -332,7 +332,7 @@ export class RdDCommands {
let competence = length > 1 ? actors[0].getCompetence(Misc.join(params.slice(1, length), ' ')) : { name: undefined };
if (competence) {
for (let actor of actors) {
- await actor.rollCaracCompetence(caracName, competence.name, diff);
+ await actor.doRollCaracCompetence(caracName, competence.name, diff);
}
}
return;
diff --git a/module/rdd-main.js b/module/rdd-main.js
index 81f12111..73cf5d55 100644
--- a/module/rdd-main.js
+++ b/module/rdd-main.js
@@ -36,6 +36,7 @@ import { RdDActorVehiculeSheet } from "./actor-vehicule-sheet.js";
import { RdDActorEntiteSheet } from "./actor-entite-sheet.js";
import { RdDItem } from "./item.js";
+import { RdDItemBlessure } from "./item/blessure.js";
import { RdDItemService } from "./item/service.js";
import { RdDItemMaladie } from "./item/maladie.js";
import { RdDItemPoison } from "./item/poison.js";
@@ -46,6 +47,7 @@ import { RdDItemSouffle } from "./item/souffle.js";
import { RdDRencontre } from "./item/rencontre.js";
import { RdDItemSheet } from "./item-sheet.js";
+import { RdDBlessureItemSheet } from "./item/sheet-blessure.js";
import { RdDServiceItemSheet } from "./item/sheet-service.js";
import { RdDRencontreItemSheet } from "./item/sheet-rencontre.js";
import { RdDHerbeItemSheet } from "./item/sheet-herbe.js";
@@ -74,21 +76,22 @@ export class SystemReveDeDragon {
this.RdDUtility = RdDUtility;
this.RdDHotbar = RdDHotbar;
this.itemClasses = {
- service: RdDItemService,
+ blessure: RdDItemBlessure,
maladie: RdDItemMaladie,
+ ombre: RdDItemOmbre,
poison: RdDItemPoison,
queue: RdDItemQueue,
- ombre: RdDItemOmbre,
- souffle: RdDItemSouffle,
+ rencontre: RdDRencontre,
+ service: RdDItemService,
signedraconique: RdDItemSigneDraconique,
- rencontre: RdDRencontre
+ souffle: RdDItemSouffle,
}
this.actorClasses = {
+ commerce: RdDCommerce,
creature: RdDActor,
entite: RdDActor,
personnage: RdDActor,
vehicule: RdDActor,
- commerce: RdDCommerce,
}
}
@@ -157,6 +160,7 @@ export class SystemReveDeDragon {
RdDItemSheet.register(RdDPlanteItemSheet);
RdDItemSheet.register(RdDIngredientItemSheet);
RdDItemSheet.register(RdDServiceItemSheet);
+ RdDItemSheet.register(RdDBlessureItemSheet);
Items.registerSheet(SYSTEM_RDD, RdDItemInventaireSheet, {
types: [
@@ -276,8 +280,8 @@ export class SystemReveDeDragon {
let sidebar = document.getElementById("sidebar");
sidebar.style.width = "min-content";
}
-
if (Misc.isUniqueConnectedGM()) {
+ game.system.rdd.calendrier = new RdDCalendrier();
new Migrations().migrate();
}
@@ -286,13 +290,7 @@ export class SystemReveDeDragon {
RdDDice.onReady();
/* -------------------------------------------- */
/* Affiche/Init le calendrier */
- let calendrier = new RdDCalendrier();
- let templatePath = "systems/foundryvtt-reve-de-dragon/templates/calendar-template.html";
- let templateData = {};
- renderTemplate(templatePath, templateData).then(html => {
- calendrier.render(true);
- });
- game.system.rdd.calendrier = calendrier; // Reference;
+ game.system.rdd.calendrier = new RdDCalendrier().display();
// Avertissement si joueur sans personnage
if (!game.user.isGM && game.user.character == undefined) {
diff --git a/module/rdd-roll-encaisser.js b/module/rdd-roll-encaisser.js
index 4d98e413..a9fc2d84 100644
--- a/module/rdd-roll-encaisser.js
+++ b/module/rdd-roll-encaisser.js
@@ -30,9 +30,9 @@ export class RdDEncaisser extends Dialog {
};
}
else if (actor.isEntite([ENTITE_BLURETTE, ENTITE_INCARNE])) {
- dialogConf.default = "cauchemar"
+ dialogConf.default = "entiteincarnee"
dialogConf.buttons = {
- "cauchemar": { label: "Cauchemar", callback: html => this.performEncaisser("cauchemar") }
+ "entiteincarnee": { label: "Entité incarnée", callback: html => this.performEncaisser("entiteincarnee") }
}
}
@@ -70,7 +70,6 @@ export class RdDEncaisser extends Dialog {
total: Number(this.modifier),
ajustement: Number(this.modifier),
encaisserSpecial: this.encaisserSpecial,
- loc: { result: 0, label: "" },
mortalite: mortalite
}
});
diff --git a/module/rdd-sheet-utility.js b/module/rdd-sheet-utility.js
index da9732cb..28bca225 100644
--- a/module/rdd-sheet-utility.js
+++ b/module/rdd-sheet-utility.js
@@ -9,7 +9,7 @@ export class RdDSheetUtility {
: document.getUserLevel(game.user);
mergeObject(options, {
isGM: game.user.isGM,
- isOwned: document.parent,
+ isOwned: document.parent ? true : false,
editable: editable,
cssClass: editable ? "editable" : "locked",
isLimited: userRightLevel >= CONST.DOCUMENT_OWNERSHIP_LEVELS.LIMITED,
diff --git a/module/rdd-token-hud.js b/module/rdd-token-hud.js
index 6d29ecab..12dcaf4d 100644
--- a/module/rdd-token-hud.js
+++ b/module/rdd-token-hud.js
@@ -2,6 +2,7 @@
import { HtmlUtility } from "./html-utility.js";
import { Misc } from "./misc.js";
import { RdDCombatManager } from "./rdd-combat.js";
+import { Targets } from "./targets.js";
/* -------------------------------------------- */
export class RdDTokenHud {
@@ -18,29 +19,39 @@ export class RdDTokenHud {
}
/* -------------------------------------------- */
- static async addExtensionHud(app, html, tokenId) {
+ static async addExtensionHud(app, html, tokenId, isCombat) {
let token = canvas.tokens.get(tokenId);
let actor = token.actor;
- let combatant = game.combat.combatants.find(c => c.tokenId == tokenId);
- if (! (combatant?.actor) ) {
+ app.hasExtension = true;
+ // soins
+ await RdDTokenHud.addExtensionHudSoins(html, actor);
+
+ if (isCombat) {
+ let combatant = game.combat.combatants.find(c => c.tokenId == tokenId);
+ if (!(combatant?.actor)) {
ui.notifications.warn(`Le combatant ${token.name} n'est pas associé à un acteur, impossible de déterminer ses actions de combat!`)
return;
+ }
+ let actions = RdDCombatManager.listActionsCombat(combatant);
+ // initiative
+ await RdDTokenHud.addExtensionHudInit(html, combatant, actions);
+ // combat
+ await RdDTokenHud.addExtensionHudCombat(html, combatant, actions);
}
- app.hasExtension = true;
- let actionsCombat = RdDCombatManager.listActionsCombat(combatant);
+
+ }
+
+ static async addExtensionHudInit(html, combatant, actions) {
const hudData = {
- combatant: combatant,
- actions: actionsCombat,
+ combatant, actions,
commandes: [
{ name: "Autre action", command: 'autre' },
- { name: 'Initiative +1', command: 'inc', value: 0.01 },
+ { name: 'Initiative +1', command: 'inc', value: 0.01 },
{ name: 'Initiative -1', command: 'dec', value: -0.01 }]
};
-
const controlIconCombat = html.find('.control-icon[data-action=combat]');
- // initiative
await RdDTokenHud._configureSubMenu(controlIconCombat,
'systems/foundryvtt-reve-de-dragon/templates/hud-actor-init.html',
hudData,
@@ -51,48 +62,70 @@ export class RdDTokenHud {
RdDTokenHud._initiativeCommand(initCommand, combatantId);
} else {
let index = event.currentTarget.attributes['data-action-index'].value;
- let action = actionsCombat[index];
+ let action = hudData.actions[index];
RdDCombatManager.rollInitiativeAction(combatantId, action);
- }
+ }
});
+ }
+ static async addExtensionHudCombat(html, combatant, actions) {
+ const hudData = { combatant, actions, commandes: [] };
const controlIconTarget = html.find('.control-icon[data-action=target]');
- // combat
await RdDTokenHud._configureSubMenu(controlIconTarget, 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-attaque.html', hudData,
(event) => {
const actionIndex = event.currentTarget.attributes['data-action-index']?.value;
- const action = actionsCombat[actionIndex];
+ const action = hudData.actions[actionIndex];
if (action.action == 'conjurer') {
- actor.conjurerPossession(actor.getPossession(action.system.possessionid));
+ const possession = combatant.actor.getPossession(action.system.possessionid);
+ combatant.actor.conjurerPossession(possession);
}
else {
- actor.rollArme(action);
+ combatant.actor.rollArme(action);
}
});
}
+ static async addExtensionHudSoins(html, sourceActor) {
+ const target = Targets.getTarget({ warn: false });
+ if (target?.actor) {
+ const hudSoins = { blessures: target.actor.blessuresASoigner() ?? [] };
+ if (hudSoins.blessures.length > 0) {
+ // soins
+ const controlIconTarget = html.find('.control-icon[data-action=combat]');
+ await RdDTokenHud._configureSubMenu(controlIconTarget,
+ 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-soins.hbs',
+ hudSoins,
+ (event) => {
+ const blessureId = event.currentTarget.attributes['data-blessure-id']?.value;
+ sourceActor.rollSoins(target.actor, blessureId)
+ });
+ }
+ }
+ }
+
static _initiativeCommand(initCommand, combatantId) {
switch (initCommand) {
case 'inc': return RdDCombatManager.incDecInit(combatantId, 0.01);
case 'dec': return RdDCombatManager.incDecInit(combatantId, -0.01);
- case 'autre': return RdDCombatManager.rollInitiativeAction(combatantId,
+ case 'autre': return RdDCombatManager.rollInitiativeAction(combatantId,
{ name: "Autre action", action: 'autre', system: { initOnly: true, competence: "Autre action" } });
}
}
/* -------------------------------------------- */
static async addTokenHudExtensions(app, html, tokenId) {
- const controlIconCombat = html.find('.control-icon[data-action=combat]');
- controlIconCombat.click(event => {
- if (event.currentTarget.className.includes('active')) {
- RdDTokenHud.removeExtensionHud(app, html, tokenId);
- } else {
- setTimeout(function () { RdDTokenHud.addExtensionHud(app, html, tokenId) }, 200);
- }
- });
+ const controlIconCombat = html.find('.control-icon[data-action=combat]');
+ if (controlIconCombat.length > 0) {
+ controlIconCombat.click(event => {
+ if (event.currentTarget.className.includes('active')) {
+ RdDTokenHud.removeExtensionHud(app, html, tokenId);
+ } else {
+ setTimeout(() => RdDTokenHud.addExtensionHud(app, html, tokenId), 200);
+ }
+ });
- if (controlIconCombat.length>0 && controlIconCombat[0].className.includes('active')) {
- RdDTokenHud.addExtensionHud(app, html, tokenId);
+ const isCombat = controlIconCombat[0].className.includes('active');
+ RdDTokenHud.addExtensionHud(app, html, tokenId, isCombat);
}
}
@@ -100,9 +133,9 @@ export class RdDTokenHud {
static async _configureSubMenu(insertionPoint, template, hudData, onMenuItem) {
const hud = $(await renderTemplate(template, hudData));
const list = hud.find('div.rdd-hud-list');
-
+
RdDTokenHud._toggleHudListActive(hud, list);
-
+
hud.find('img.rdd-hud-togglebutton').click(event => RdDTokenHud._toggleHudListActive(hud, list));
list.find('.rdd-hud-menu').click(onMenuItem);
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 460b96bb..55e968de 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -19,7 +19,7 @@ import { RdDRaretes } from "./item/raretes.js";
/* -------------------------------------------- */
// This table starts at 0 -> niveau -10
const carac_array = ["taille", "apparence", "constitution", "force", "agilite", "dexterite", "vue", "ouie", "odoratgout", "volonte", "intellect", "empathie", "reve", "chance", "melee", "tir", "lancer", "derobee"];
-const difficultesLibres = Misc.intArray(0, -11);
+const difficultesLibres = Misc.intArray(0, -11);
const ajustementsConditions = Misc.intArray(-10, 11);
const ajustementsEncaissement = Misc.intArray(-10, 26);
@@ -66,38 +66,31 @@ const fatigueMarche = {
"tresdifficile": { "4": 4, "6": 6 }
}
-/* -------------------------------------------- */
-const definitionsBlessures = [
- { type: "legere", facteur: 2 },
- { type: "grave", facteur: 4 },
- { type: "critique", facteur: 6 }
-]
-
/* -------------------------------------------- */
const nomEthylisme = ["Emeché", "Gris", "Pinté", "Pas frais", "Ivre", "Bu", "Complètement fait", "Ivre mort"];
/* -------------------------------------------- */
const definitionsEncaissement = {
"mortel": [
- { minimum: undefined, maximum: 0, endurance: "0", vie: "0", eraflures: 0, legeres: 0, graves: 0, critiques: 0 },
- { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 },
- { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", eraflures: 0, legeres: 1, graves: 0, critiques: 0 },
- { minimum: 16, maximum: 19, endurance: "2d6", vie: "2", eraflures: 0, legeres: 0, graves: 1, critiques: 0 },
- { minimum: 20, maximum: undefined, endurance: "100", vie: "4 + @over20", eraflures: 0, legeres: 0, graves: 0, critiques: 1 },
+ { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1},
+ { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0},
+ { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 2},
+ { minimum: 16, maximum: 19, endurance: "2d6", vie: "2", gravite: 4},
+ { minimum: 20, maximum: undefined, endurance: "100", vie: "4 + @over20", gravite: 6},
],
"non-mortel": [
- { minimum: undefined, maximum: 0, endurance: "0", vie: "0", eraflures: 0, legeres: 0, graves: 0, critiques: 0 },
- { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 },
- { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 },
- { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", eraflures: 0, legeres: 1, graves: 0, critiques: 0 },
- { minimum: 20, maximum: undefined, endurance: "100", vie: "0", eraflures: 0, legeres: 1, graves: 0, critiques: 0 },
+ { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1},
+ { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0 },
+ { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 0 },
+ { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", gravite: 2 },
+ { minimum: 20, maximum: undefined, endurance: "100", vie: "0", gravite: 2 },
],
- "cauchemar": [
- { minimum: undefined, maximum: 0, endurance: "0", vie: "0", eraflures: 0, legeres: 0, graves: 0, critiques: 0 },
- { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 },
- { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 },
- { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 },
- { minimum: 20, maximum: undefined, endurance: "3d6 + @over20", vie: "0", eraflures: 1, legeres: 0, graves: 0, critiques: 0 },
+ "entiteincarnee": [
+ { minimum: undefined, maximum: 0, endurance: "0", vie: "0", gravite: -1},
+ { minimum: 1, maximum: 10, endurance: "1d4", vie: "0", gravite: 0},
+ { minimum: 11, maximum: 15, endurance: "1d6", vie: "0", gravite: 0 },
+ { minimum: 16, maximum: 19, endurance: "2d6", vie: "0", gravite: 0 },
+ { minimum: 20, maximum: undefined, endurance: "3d6 + @over20", vie: "0", gravite: 0 },
]
};
@@ -139,7 +132,7 @@ export class RdDUtility {
'systems/foundryvtt-reve-de-dragon/templates/actor/xp-competences.html',
'systems/foundryvtt-reve-de-dragon/templates/actor/combat.html',
'systems/foundryvtt-reve-de-dragon/templates/actor/blessures.html',
- 'systems/foundryvtt-reve-de-dragon/templates/actor/blessure.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor/blessure.hbs',
'systems/foundryvtt-reve-de-dragon/templates/actor/maladies-poisons.html',
'systems/foundryvtt-reve-de-dragon/templates/actor/possessions.html',
'systems/foundryvtt-reve-de-dragon/templates/actor/taches.html',
@@ -276,7 +269,8 @@ export class RdDUtility {
Handlebars.registerHelper('computeResolutionChances', (row, col) => RdDResolutionTable.computeChances(row, col));
Handlebars.registerHelper('upperFirst', str => Misc.upperFirst(str ?? 'Null'));
Handlebars.registerHelper('lowerFirst', str => Misc.lowerFirst(str ?? 'Null'));
- Handlebars.registerHelper('upper', str => str?.toUpperCase() ?? 'NULL');
+ Handlebars.registerHelper('upper', str => str?.toUpperCase() ?? '');
+ Handlebars.registerHelper('lowercase', str => str?.toLowerCase() ?? '');
Handlebars.registerHelper('le', str => Grammar.articleDetermine(str));
Handlebars.registerHelper('apostrophe', (article, str) => Grammar.apostrophe(article, str));
Handlebars.registerHelper('un', str => Grammar.articleIndetermine(str));
@@ -472,10 +466,6 @@ export class RdDUtility {
return ajustementsEncaissement;
}
- static getDefinitionsBlessures() {
- return definitionsBlessures;
- }
-
/* -------------------------------------------- */
static getSegmentsFatigue(maxEnd) {
maxEnd = Math.max(maxEnd, 1);
@@ -616,17 +606,10 @@ export class RdDUtility {
encaissement.dmg.loc.label = encaissement.dmg.loc.label ?? 'Corps;';
encaissement.roll = roll;
encaissement.armure = armure;
+ encaissement.penetration = rollData.arme?.system.penetration ?? 0;
encaissement.total = jetTotal;
encaissement.vie = await RdDUtility._evaluatePerte(encaissement.vie, over20);
encaissement.endurance = await RdDUtility._evaluatePerte(encaissement.endurance, over20);
- encaissement.penetration = rollData.arme?.system.penetration ?? 0;
- encaissement.blessures = (
- encaissement.critiques > 0 ? "Critique" :
- encaissement.graves > 0 ? "Grave" :
- encaissement.legeres > 0 ? "Légère" :
- encaissement.eraflures > 0 ? "Contusions/Eraflures" :
- 'Aucune'
- );
return encaissement;
}
diff --git a/module/targets.js b/module/targets.js
index f975a60d..7217bea1 100644
--- a/module/targets.js
+++ b/module/targets.js
@@ -39,18 +39,18 @@ export class Targets {
}
}
- static getTarget() {
+ static getTarget(options = { warn: true }) {
const targets = Targets.listTargets();
switch (targets.length) {
case 1:
return targets[0];
case 0:
- ui.notifications.warn("Vous devez choisir une cible à attaquer!");
+ if (options.warn) ui.notifications.warn("Vous devez choisir une cible à attaquer!");
break;
default:
- ui.notifications.warn("Vous devez choisir une cible (et une seule) à attaquer!");
- return;
+ if (options.warn) ui.notifications.warn("Vous devez choisir une cible (et une seule) à attaquer!");
}
+ return undefined;
}
}
\ No newline at end of file
diff --git a/styles/simple.css b/styles/simple.css
index 01c3c55b..f5144534 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -186,7 +186,7 @@ i:is(.fas, .far) {
}
.system-foundryvtt-reve-de-dragon .sheet-header :is(.header-compteurs,.header-etats,.profile-img, .profile-img-token){
- padding: 0 3%;
+ padding: 0 0.4rem;
}
.system-foundryvtt-reve-de-dragon .sheet-header :is(.profile-img, .profile-img-token) {
@@ -213,11 +213,13 @@ i:is(.fas, .far) {
}
.system-foundryvtt-reve-de-dragon .sheet-header .header-compteurs {
+ width: calc(60% - 110px - 1rem);
text-align: right;
max-width: fit-content;
}
.system-foundryvtt-reve-de-dragon .sheet-header div.header-etats {
+ width: calc(40% - 32px - 1rem);
height: 48px;
max-width: fit-content;
flex: initial;
@@ -426,6 +428,7 @@ span.equipement-detail-buttons {
justify-content: center;
text-align: left;
}
+
.blessure-control {
flex-grow: 1;
flex-direction: row;
@@ -457,14 +460,17 @@ input:is(.blessure-premiers_soins, .blessure-soins_complets) {
.blessure-inactive {
color:rgba(150, 150, 150, 0.4);
}
+.blessure-active-2,
.blessure-active-legere {
color:rgba(60, 60, 60, 0.9);
text-shadow: 1px 1px 4px rgba(60, 60, 60, 1);
}
+.blessure-active-4,
.blessure-active-grave {
color: rgba(218, 126, 21, 0.9);
text-shadow: 1px 1px 4px rgba(60, 60, 60, 1);
}
+.blessure-active-6,
.blessure-active-critique {
color: rgba(173, 36, 26, 0.9);
text-shadow: 1px 1px 4px rgba(60, 60, 60, 1);
@@ -1386,27 +1392,36 @@ table.table-nombres-astraux tr:hover {
}
/* ======================================== */
-.tokenhudext {
+.token-hud-ext {
display: flex;
flex: 0 !important;
font-family: CaslonPro;
font-weight: 600;
}
-.tokenhudext.left {
+.token-hud-ext.left {
justify-content: flex-start;
flex-direction: column;
position: absolute;
top: 2.75rem;
right: 4rem;
}
-.tokenhudext.right {
+.token-hud-ext.soins {
+ justify-content: flex-start;
+ flex-direction: column;
+ position: absolute;
+ top: 13.2rem;
+ left: -5rem;
+ max-width: 8.5rem
+}
+
+.token-hud-ext.right {
justify-content: flex-start;
flex-direction: column;
position: absolute;
top: 2.75rem;
left: 4rem;
}
-.control-icon.tokenhudicon {
+.control-icon.token-hud-icon {
width: fit-content;
height: fit-content;
min-width: 6rem;
@@ -1415,7 +1430,7 @@ table.table-nombres-astraux tr:hover {
line-height: 1rem;
margin: 0.2rem;
}
-.control-icon.tokenhudicon.right {
+.control-icon.token-hud-icon.right {
margin-left: 8px;
}
.rdd-hud-menu label {
diff --git a/system.json b/system.json
index 9d83c073..805704df 100644
--- a/system.json
+++ b/system.json
@@ -1,8 +1,8 @@
{
"id": "foundryvtt-reve-de-dragon",
"title": "Rêve de Dragon",
- "version": "10.6.25",
- "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.6.25.zip",
+ "version": "10.7.0",
+ "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.7.0.zip",
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
"compatibility": {
"minimum": "10",
diff --git a/template.json b/template.json
index 52543e5f..a58c064c 100644
--- a/template.json
+++ b/template.json
@@ -179,23 +179,8 @@
"value": 10,
"label": "Endurance",
"derivee": false
- }
- },
- "blessures": {
- "legeres": {
- "liste": [ { "active": false, "psdone": false, "premiers_soins": -1, "scdone": false, "soins_complets": -1, "jours": 0, "localisation": "" },
- { "active": false, "psdone": false, "premiers_soins": -1, "scdone": false, "soins_complets": -1, "jours": 0, "localisation": "" },
- { "active": false, "psdone": false, "premiers_soins": -1, "scdone": false, "soins_complets": -1, "jours": 0, "localisation": "" },
- { "active": false, "psdone": false, "premiers_soins": -1, "scdone": false, "soins_complets": -1, "jours": 0, "localisation": "" },
- { "active": false, "psdone": false, "premiers_soins": -1, "scdone": false, "soins_complets": -1, "jours": 0, "localisation": "" } ]
},
- "graves": {
- "liste": [ { "active": false, "psdone": false, "premiers_soins": -1, "scdone": false, "soins_complets": -1, "jours": 0, "localisation": "" },
- { "active": false, "psdone": false, "premiers_soins": -1, "scdone": false, "soins_complets": -1, "jours": 0, "localisation": "" } ]
- },
- "critiques": {
- "liste": [ { "active": false, "psdone": false, "premiers_soins": -1, "scdone": false, "soins_complets": -1, "jours": 0, "localisation": "" } ]
- }
+ "bonusPotion": 0
},
"attributs": {
"plusdom": {
@@ -380,23 +365,8 @@
"value": 0,
"label": "Fatigue",
"derivee": true
- }
- },
- "blessures": {
- "legeres": {
- "liste": [ { "active": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "localisation": "" },
- { "active": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "localisation": "" },
- { "active": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "localisation": "" },
- { "active": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "localisation": "" },
- { "active": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "localisation": "" } ]
},
- "graves": {
- "liste": [ { "active": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "localisation": "" },
- { "active": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "localisation": "" } ]
- },
- "critiques": {
- "liste": [ { "active": false, "premiers_soins": 0, "soins_complets": 0, "jours": 0, "localisation": "" } ]
- }
+ "bonusPotion": 0
},
"attributs": {
"sconst": {
@@ -567,7 +537,7 @@
"monnaie", "nourritureboisson", "gemme",
"service",
"meditation", "rencontre", "queue", "ombre", "souffle", "tete", "casetmr", "signedraconique", "sort", "sortreserve",
- "nombreastral", "tache", "maladie", "poison", "possession",
+ "nombreastral", "tache", "blessure", "maladie", "poison", "possession",
"tarot", "extraitpoetique"
],
"templates": {
@@ -636,6 +606,22 @@
"compteur": 0,
"date": 0
},
+ "blessure": {
+ "templates": ["temporel"],
+ "gravite": 0,
+ "difficulte": 0,
+ "premierssoins": {
+ "tache": 0,
+ "done": false,
+ "bonus": 0
+ },
+ "soinscomplets": {
+ "done": false,
+ "bonus": 0
+ },
+ "localisation": "",
+ "jours": 0
+ },
"maladie": {
"templates": ["description", "temporel"],
"identifie": false,
@@ -833,7 +819,8 @@
"points_de_tache_courant": 0,
"nb_jet_echec": 0,
"nb_jet_succes": 0,
- "cacher_points_de_tache": false
+ "cacher_points_de_tache": false,
+ "itemId": ""
},
"sort": {
"templates": ["description"],
diff --git a/templates/actor/blessure.hbs b/templates/actor/blessure.hbs
new file mode 100644
index 00000000..16d9bc12
--- /dev/null
+++ b/templates/actor/blessure.hbs
@@ -0,0 +1,38 @@
+
jusqu'à la fin du prochain round{{else}}n'est pas sonné{{/if}}!
{{#if hasPlayerOwner}}Jet d'endurance : Jet d'endurance : {{jetEndurance}} / {{resteEndurance}}{{/if}}
diff --git a/templates/hud-actor-attaque.html b/templates/hud-actor-attaque.html
index 54689bba..4b9ac185 100644
--- a/templates/hud-actor-attaque.html
+++ b/templates/hud-actor-attaque.html
@@ -1,9 +1,9 @@
- 
- 
+