${this.name} vient de succomber à une seconde blessure critique ! Que les Dragons gardent son Archétype en paix !`
@@ -3990,109 +3976,64 @@ export class RdDActor extends Actor {
async onUpdateActor(update, options, actorId) {
const updatedEndurance = update?.data?.sante?.endurance;
if (updatedEndurance && options.diff) {
- this.forceStatusEffectId('unconscious', updatedEndurance.value == 0);
- }
- }
- /* -------------------------------------------- */
- async onCreateActiveEffect(effect, options) {
- switch (StatusEffects.statusId(effect)) {
- case 'sonne':
- await this.setStateSonne(true);
- return;
+ await this.setStatusEffect("EFFECT.StatusUnconscious", updatedEndurance.value == 0);
}
}
/* -------------------------------------------- */
async onDeleteActiveEffect(effect, options) {
- switch (StatusEffects.statusId(effect)) {
- case 'sonne':
- await this.setStateSonne(false);
+ switch (effect.label) {
+ case 'EFFECT.StatusStunned':
return;
}
}
/* -------------------------------------------- */
- enleverTousLesEffets() {
- const ids = Array.from(this.effects?.keys() ?? []);
- this.deleteEmbeddedDocuments('ActiveEffect', ids);
+ getActiveEffects(matching = it => true) {
+ return Array.from(this.getEmbeddedCollection("ActiveEffect").values()).filter(it => matching(it));
}
/* -------------------------------------------- */
- listeEffets(matching = it => true) {
- const all = Array.from(this.effects?.values() ?? []);
- const filtered = all.filter(it => matching(it.data));
- return filtered;
+ getEffectByLabel(label) {
+ return this.getActiveEffects().find(it => it.data.label == label);
}
/* -------------------------------------------- */
- async setStatusDemiReve(status) {
- const demiReve = StatusEffects.demiReve();
- if (status) {
- await this.addStatusEffect(demiReve)
- } else {
- await this.deleteStatusEffect(demiReve)
- }
+ getEffectById(id) {
+ return this.getActiveEffects().find(it => it.id == id);
}
/* -------------------------------------------- */
- async setStatusSonne(sonne) {
- if (this.isEntiteCauchemar()) {
+ async setStatusEffect(label, status, updates = {}) {
+ if (this.isEntiteCauchemar() || this.data.type == 'vehicule') {
return;
}
- await this.forceStatusEffectId('sonne', sonne);
- }
-
- /* -------------------------------------------- */
- async forceStatusEffectId(statusId, isSet) {
- if (isSet) {
- await this.addStatusEffectById(statusId);
+ console.log("setStatusEffect", label, status, updates)
+ const existing = this.getEffectByLabel(label);
+ if (existing) {
+ existing.delete();
}
- else {
- await this.deleteStatusEffectById(statusId);
+ if (status) {
+ const statusEffect = mergeObject(duplicate(StatusEffects.status(label)), updates);
+ await this.createEmbeddedDocuments("ActiveEffect", [statusEffect]);
}
}
- /* -------------------------------------------- */
- async deleteStatusEffectById(id) {
-
- const ids = Array.from(this.effects?.values())
- .filter(it => it.data.flags.core?.statusId == id)
- .map(it => it.id);
- console.log("Delete effect IDS1: ", this.effects, ids);
- if (ids.length > 0) {
- await this.deleteEmbeddedDocuments('ActiveEffect', ids);
+ enleverActiveEffectById(id) {
+ if (game.user.isGM){
+ const existing = this.getEffectById(id);
+ if (existing) {
+ existing.delete();
+ }
}
}
-
/* -------------------------------------------- */
- async deleteStatusEffect(effect) {
- const ids = Array.from(this.effects?.values())
- .filter(it => StatusEffects.statusId(it.data) == StatusEffects.statusId(effect))
- .map(it => it.id);
- console.log("Delete effect 1: ", this.effects, ids);
- if (ids.length > 0) {
- await this.deleteEmbeddedDocuments('ActiveEffect', ids);
+ enleverTousLesEffets() {
+ if (game.user.isGM){
+ this.deleteEmbeddedDocuments('ActiveEffect', this.getActiveEffects().map(it => it.id));
}
}
- /* -------------------------------------------- */
- async addStatusEffectById(id) {
- const statusEffect = CONFIG.statusEffects.find(it => it.id == id);
- await this.addStatusEffect(statusEffect);
- }
-
- /* -------------------------------------------- */
- async addStatusEffect(statusEffect) {
- const effet = Misc.data(statusEffect);
- await this.deleteStatusEffectById(effet.id);
- effet.flags = effet.flags ?? { core: {} };
- effet.flags.core.statusId = effet.id;
- let effectArray = await this.createEmbeddedDocuments('ActiveEffect', [effet]);
- //if (effectArray[0]) {
- //await effectArray[0].setFlag('core', 'statusId', effet.id);
- //}
- }
-
/* -------------------------------------------- */
async onPreUpdateItem(item, change, options, id) {
const itemData = Misc.data(item);
diff --git a/module/rdd-combat.js b/module/rdd-combat.js
index 7b5f7ccd..b7904ac6 100644
--- a/module/rdd-combat.js
+++ b/module/rdd-combat.js
@@ -1217,7 +1217,7 @@ export class RdDCombat {
defenderRoll.show.recul = 'encaisse';
} else if (rollRecul.rolled.isETotal || this._isReculCauseChute(impact)) {
defenderRoll.show.recul = 'chute';
- await this.defender.addStatusEffectById('prone');
+ await this.defender.setStatusEffect("EFFECT.StatusProne", true);
}
else {
defenderRoll.show.recul = 'recul';
diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js
index 48770b48..41c3ac73 100644
--- a/module/rdd-tmr-dialog.js
+++ b/module/rdd-tmr-dialog.js
@@ -274,7 +274,7 @@ export class RdDTMRDialog extends Dialog {
if ( this.actor.tmrApp ) {
this.actor.tmrApp = undefined; // Cleanup reference
if ( !this.viewOnly ) {
- this.actor.setStatusDemiReve(false);
+ this.actor.setStatusEffect("EFFECT.StatusDemiReve", false);
this._tellToGM(this.actor.name + " a quitté les terres médianes");
}
this.actor.santeIncDec("fatigue", this.cumulFatigue).then(super.close()); // moving 1 cell costs 1 fatigue
diff --git a/module/rdd-utility.js b/module/rdd-utility.js
index 6de5f96c..40f64b44 100644
--- a/module/rdd-utility.js
+++ b/module/rdd-utility.js
@@ -115,6 +115,7 @@ export class RdDUtility {
'systems/foundryvtt-reve-de-dragon/templates/actor-vehicule-sheet.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html',
+ 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html',
'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html',
diff --git a/module/status-effects.js b/module/status-effects.js
index 5b05324b..59319ab1 100644
--- a/module/status-effects.js
+++ b/module/status-effects.js
@@ -1,23 +1,31 @@
-const demiReveStatusEffect = { id: 'demi-reve', rdd: true, label: 'Demi-rêve', icon: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd12.svg' };
const rddStatusEffects = [
- { id: 'sonne', rdd: true, label: 'Sonné', icon: 'icons/svg/stoned.svg' },
- demiReveStatusEffect
+ { rdd: true, id: 'stun', label: 'EFFECT.StatusStunned', icon: 'icons/svg/stoned.svg' },
+ { rdd: true, id: 'bleeding', label: 'EFFECT.StatusBleeding', icon: 'icons/svg/blood.svg' },
+ { rdd: true, id: 'prone', label: 'EFFECT.StatusProne', icon: 'icons/svg/falling.svg' },
+ { rdd: true, id: 'grappling', tint: '#33cc33', label: 'EFFECT.StatusGrappling', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp' },
+ { rdd: true, id: 'grappled', tint: '#ff9900', label: 'EFFECT.StatusGrappled', icon: 'systems/foundryvtt-reve-de-dragon/icons/competence_corps_a_corps.webp' },
+ { rdd: true, id: 'restrain', label: 'EFFECT.StatusRestrained', icon: 'icons/svg/net.svg' },
+ { rdd: true, id: 'unconscious', label: 'EFFECT.StatusUnconscious', icon: 'icons/svg/unconscious.svg' },
+ { rdd: true, id: 'blind', label: 'EFFECT.StatusBlind', icon: 'icons/svg/blind.svg' },
+ { rdd: true, id: 'comma', label: 'EFFECT.StatusComma', icon: 'icons/svg/skull.svg' },
+ { rdd: true, id: 'dead', label: 'EFFECT.StatusDead', icon: 'icons/svg/skull.svg' },
+ { rdd: true, id: 'demi-reve', label: 'EFFECT.StatusDemiReve', icon: 'systems/foundryvtt-reve-de-dragon/icons/heures/hd12.svg' }
];
-const statusDemiSurprise = new Set(['sonne', 'prone', 'restrain']);
-const statusSurpriseTotale = new Set(['unconscious', 'blind', 'dead']);
+const demiReveStatusEffect = rddStatusEffects.find(it => it.label == 'EFFECT.StatusDemiReve');
+
+const statusDemiSurprise = new Set(['EFFECT.StatusStunned', 'EFFECT.StatusProne', 'EFFECT.StatusRestrain']);
+const statusSurpriseTotale = new Set(['EFFECT.StatusUnconscious', 'EFFECT.StatusBlind', 'EFFECT.StatusComma']);
export class StatusEffects {
static onReady() {
- StatusEffects.setCoreStatusId([demiReveStatusEffect]);
- StatusEffects.setCoreStatusId(rddStatusEffects);
- StatusEffects.setMandatoryRdd();
- const defaultUseStatusEffect = CONFIG.statusEffects.map(it => it.id).join();
+ const rddStatusIds = rddStatusEffects.map(it => it.id);
+ const defaultStatusEffectIds = CONFIG.statusEffects.map(it => it.id);
game.settings.register("foundryvtt-reve-de-dragon", "use-status-effects", {
name: "use-status-effects",
scope: "world",
config: false,
- default: defaultUseStatusEffect,
+ default: defaultStatusEffectIds.join(),
type: String
});
@@ -29,30 +37,21 @@ export class StatusEffects {
type: StatusEffectsSettings,
restricted: true
});
- CONFIG.RDD.allEffects = rddStatusEffects.concat(CONFIG.statusEffects);
-
+
+ CONFIG.RDD.allEffects = rddStatusEffects.concat(CONFIG.statusEffects.filter(it => !rddStatusIds.includes(it.id)));
+
StatusEffects._setUseStatusEffects(StatusEffects._getUseStatusEffects());
console.log('statusEffects', CONFIG.statusEffects);
}
static valeurSurprise(effect, isCombat) {
- const id = StatusEffects.statusId(effect);
- if (statusSurpriseTotale.has(id)) {
+ // const id = StatusEffects.statusId(effect);
+ if (statusSurpriseTotale.has(effect.label)) {
return 2;
}
- return statusDemiSurprise.has(id) || (isCombat && id == demiReveStatusEffect.id) ? 1 : 0;
+ return statusDemiSurprise.has(effect.label) || (isCombat && effect.label == demiReveStatusEffect.label) ? 1 : 0;
}
- static statusId(effectData) {
- return effectData.flags?.core?.statusId ?? effectData["flags.core.statusId"];
- }
-
- static setCoreStatusId(list) {
- list.forEach(it => {
- it.flags = { core: { statusId: it.id } };
- it["flags.core.statusId"] = it.id;
- });
- }
static setMandatoryRdd() {
CONFIG.statusEffects.filter(it => statusDemiSurprise.has(it.id) || statusSurpriseTotale.has(it.id))
.forEach(it => it.rdd = true);
@@ -78,6 +77,9 @@ export class StatusEffects {
return Array.from(useStatusEffects).join();
}
+ static status(label) {
+ return rddStatusEffects.find(it => it.label == label) ?? { label: label };
+ }
static demiReve() {
return demiReveStatusEffect;
}
diff --git a/styles/simple.css b/styles/simple.css
index ff9b32a0..e925f788 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -271,6 +271,11 @@ table {border: 1px solid #7a7971;}
height: 16;
border-width: 0;
}
+.button-effect-img:hover {
+ color: rgba(255, 255, 128, 0.7);
+ border: 1px solid rgba(255, 128, 0, 0.8);
+ cursor: pointer;
+}
.small-button-container {
height: 16px;
diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html
index 70b233a5..c7f2395e 100644
--- a/templates/actor-creature-sheet.html
+++ b/templates/actor-creature-sheet.html
@@ -18,19 +18,7 @@
{{calc.resumeBlessures}}