Merge pull request 'Encombrement et malus armure' (#661) from VincentVk/foundryvtt-reve-de-dragon:v11 into v11

Reviewed-on: public/foundryvtt-reve-de-dragon#661

changelog.md

@@ -1,5 +1,9 @@
 # v11.0
 
+## v11.0.11 - Les bleus de Khrachtchoum le Problémeux
+- si le gardien configure le sommeil, les joueurs sont notifiés que chateau dormant vient de passer
+- possibilité de créer des armes et des compétences de créatures non-mortelles.
+
 ## v11.0.10 - Les Songes de Khrachtchoum le Problémeux
 - on peut de nouveau se déplacer dans les TMRs d'un clic sur la case à atteindre
 - Lire un livre depuis l'inventaire permet de nouveau de faire un jet de la tâche

module/actor-sheet.js

@@ -57,6 +57,7 @@ export class RdDActorSheet extends RdDBaseActorSheet {
       resumeBlessures: this.actor.computeResumeBlessure(this.actor.system.blessures),
       caracTotal: RdDCarac.computeTotal(this.actor.system.carac, this.actor.system.beaute),
       surEncombrementMessage: this.actor.getMessageSurEncombrement(),
+      malusArmure: this.actor.getMalusArmure()
     })
 
     this.timerRecherche = undefined;

module/actor.js

@@ -95,7 +95,6 @@ export class RdDActor extends RdDBaseActor {
     this.computeIsHautRevant();
     await this.cleanupConteneurs();
     await this.computeEncTotal();
-    await this.computeMalusArmure();
   }
 
   /* -------------------------------------------- */
@@ -218,7 +217,12 @@ export class RdDActor extends RdDBaseActor {
 
   /* -------------------------------------------- */
   getMalusArmure() {
-    return Misc.toInt(this.system.attributs?.malusarmure?.value)
+    if (this.isPersonnage()) {
+      return this.itemTypes[TYPES.armure].filter(it => it.system.equipe)
+        .map(it => it.system.malus)
+        .reduce(Misc.sum(), 0);
+    }
+    return 0;
   }
 
   /* -------------------------------------------- */
@@ -387,6 +391,14 @@ export class RdDActor extends RdDBaseActor {
       await this.distribuerStress('stress', consigne.stress.valeur, consigne.stress.motif);
     }
     await this.update({ 'system.sommeil': consigne.sommeil })
+    const player = this.findPlayer();
+    if (player) {
+      ChatUtility.notifyUser(player.id, 'info', `Vous pouvez gérer la nuit de ${this.name}`);
+    }
+  }
+
+  findPlayer() {
+    return game.users.players.find(player => player.active && player.character?.id == this.id);
   }
 
   async onTimeChanging(oldTimestamp, newTimestamp) {
@@ -1106,7 +1118,7 @@ export class RdDActor extends RdDBaseActor {
       case 'entite': case 'vehicule':
         return 0;
     }
-    return Math.min(0, this.getEncombrementMax() - Math.ceil(Number(this.getEncTotal())));
+    return Math.min(0, Math.floor(this.getEncombrementMax() - this.encTotal));
   }
 
   getMessageSurEncombrement() {
@@ -1134,20 +1146,6 @@ export class RdDActor extends RdDBaseActor {
     }
   }
 
-
-  /* -------------------------------------------- */
-  async computeMalusArmure() {
-    if (this.isPersonnage()) {
-      const malusArmure = this.filterItems(it => it.type == 'armure' && it.system.equipe)
-        .map(it => it.system.malus ?? 0)
-        .reduce(Misc.sum(), 0);
-      // Mise à jour éventuelle du malus armure
-      if (this.system.attributs?.malusarmure?.value != malusArmure) {
-        await this.updateAttributeValue("malusarmure", malusArmure);
-      }
-    }
-  }
-
   /* -------------------------------------------- */
   computeResumeBlessure() {
     const blessures = this.filterItems(it => it.system.gravite > 0, 'blessure')

module/item.js

@@ -675,7 +675,7 @@ export class RdDItem extends Item {
   _armeChatData() {
     return [
       `<b>Compétence</b>: ${this.system.competence}`,
-      `<b>Dommages</b>: ${this.system.dommages}`,
+      `<b>Dommages</b>: ${this.system.dommages} ${this.system.mortalite=='non-mortel'? '(Non mortel)':''}`,
       `<b>Force minimum</b>: ${this.system.force}`,
       `<b>Resistance</b>: ${this.system.resistance}`,
       ...this._inventaireTemplateChatData()

module/rdd-combat.js

@@ -789,7 +789,6 @@ export class RdDCombat {
     let rollData = {
       passeArme: randomID(16),
       mortalite: arme?.system.mortalite,
-      coupsNonMortels: false,
       competence: competence.clone(),
       surprise: this.attacker.getSurprise(true),
       surpriseDefenseur: this.defender.getSurprise(true),

module/rdd-roll-resolution-table.js

@@ -112,7 +112,7 @@ export class RdDRollResolutionTable extends Dialog {
   async updateRollResult() {
     let rollData = this.rollData;
     rollData.caracValue = parseInt(rollData.selectedCarac.value)
-    rollData.finalLevel = this._computeFinalLevel(rollData);
+    rollData.finalLevel = Misc.toInt(rollData.diffConditions) + Misc.toInt(rollData.diffLibre);
 
     const htmlTable = await RdDResolutionTable.buildHTMLTable({
       carac: rollData.caracValue,
@@ -129,12 +129,6 @@ export class RdDRollResolutionTable extends Dialog {
   }
 
   /* -------------------------------------------- */
-  _computeFinalLevel(rollData) {
-    const diffConditions = Misc.toInt(rollData.diffConditions);
-    const diffLibre = Misc.toInt(rollData.diffLibre);
-
-    return diffLibre + diffConditions;
-  }
 
   async close() {
     await super.close();

module/rdd-roll.js

@@ -187,7 +187,7 @@ export class RdDRoll extends Dialog {
       console.log("RdDRollSelectDialog - Cout reve", ptreve);
       this.updateRollResult(html);
     });
-    this.html.find("[name='coupsNonMortels']").change((event) => {
+    this.html.find("[name='mortalite']").change((event) => {
       this.rollData.dmg.mortalite = event.currentTarget.checked ? "non-mortel" : "mortel";
       this.updateRollResult(html);
     });
@@ -295,8 +295,7 @@ export class RdDRoll extends Dialog {
 
     rollData.dmg = rollData.attackerRoll?.dmg ?? RdDBonus.dmg(rollData, this.actor.getBonusDegat())
     rollData.caracValue = parseInt(rollData.selectedCarac.value)
-    rollData.mortalite = rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite ?? 'mortel';
-    rollData.coupsNonMortels = (rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite) == 'non-mortel';
+    rollData.mortalite = rollData.attackerRoll?.dmg.mortalite ?? rollData.dmg.mortalite ?? rollData.mortalite ?? 'mortel';
     rollData.use.appelAuMoral = this.actor.isPersonnage() && RdDCarac.isActionPhysique(rollData.selectedCarac);
     let dmgText = Misc.toSignedString(rollData.dmg.total);
 
@@ -306,7 +305,6 @@ export class RdDRoll extends Dialog {
     }
 
     RollDataAjustements.calcul(rollData, this.actor);
-    rollData.finalLevel = this._computeFinalLevel(rollData);
 
     const resolutionTable = await RdDResolutionTable.buildHTMLTable(RdDResolutionTable.subTable(rollData.caracValue, rollData.finalLevel))
     const adjustements = await this.buildAjustements(rollData);
@@ -319,7 +317,7 @@ export class RdDRoll extends Dialog {
 
     // Mise à jour valeurs
     this.html.find(".dialog-roll-title").text(this._getTitle(rollData));
-    this.html.find("[name='coupsNonMortels']").prop('checked', rollData.mortalite == 'non-mortel');
+    this.html.find("[name='mortalite']").prop('checked', rollData.mortalite == 'non-mortel');
     this.html.find(".dmg-arme-actor").text(dmgText);
     this.html.find("div.placeholder-ajustements").empty().append(adjustements);
     this.html.find("div.placeholder-resolution").empty().append(resolutionTable)
@@ -331,30 +329,6 @@ export class RdDRoll extends Dialog {
     return await renderTemplate(`systems/foundryvtt-reve-de-dragon/templates/partial-roll-ajustements.html`, rollData);
   }
 
-  /* -------------------------------------------- */
-  _computeFinalLevel(rollData) {
-    return RollDataAjustements.sum(rollData.ajustements);
-  }
-  /* -------------------------------------------- */
-  _computeDiffCompetence(rollData) {
-    if (rollData.competence) {
-      return Misc.toInt(rollData.competence.system.niveau);
-    }
-    if (rollData.draconicList) {
-      return Misc.toInt(rollData.competence.system.niveau);
-    }
-    return 0;
-  }
-
-  /* -------------------------------------------- */
-  _computeMalusArmure(rollData) {
-    let malusArmureValue = 0;
-    if (rollData.malusArmureValue && (rollData.selectedCarac.label == "Agilité" || rollData.selectedCarac.label == "Dérobée")) {
-      malusArmureValue = rollData.malusArmureValue;
-    }
-    return malusArmureValue;
-  }
-
   /* -------------------------------------------- */
   _getTitle(rollData) {
     const carac = rollData.selectedCarac.label;

module/rdd-utility.js

@@ -180,24 +180,25 @@ export class RdDUtility {
       'systems/foundryvtt-reve-de-dragon/templates/item-queue-sheet.html',
       'systems/foundryvtt-reve-de-dragon/templates/header-item.html',
       // partial enums
-      'systems/foundryvtt-reve-de-dragon/templates/enum-caracteristiques.html',
-      'systems/foundryvtt-reve-de-dragon/templates/enum-base-competence.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-aspect-tarot.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-base-competence.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-caracteristiques.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-categories.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-ingredient.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-parade.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-potion.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-queue.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-vehicule.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-competence.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-draconic.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-heures.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-initpremierround.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-mortalite.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-niveau-ethylisme.html',
-      'systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html',
-      'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-queue.html',
-      'systems/foundryvtt-reve-de-dragon/templates/enum-draconic.html',
-      'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-periode.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-rarete.html',
       'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-effet.html',
+      'systems/foundryvtt-reve-de-dragon/templates/enum-tmr-type.html',
       // Partials
       'systems/foundryvtt-reve-de-dragon/templates/tirage/liste-resultats-recherche.hbs',
       'systems/foundryvtt-reve-de-dragon/templates/time/horloge.hbs',

module/rolldata-ajustements.js

@@ -164,7 +164,7 @@ export class RollDataAjustements {
         descr: reference.getDescr && reference.getDescr(rollData, actor)
       }
     }
-    rollData.finalLevel = RollDataAjustements.sum(rollData.ajustements);
+    rollData.finalLevel = RollDataAjustements.sum(rollData.ajustements)
   }
 
   /* -------------------------------------------- */

module/settings/system-compendiums.js

@@ -47,6 +47,7 @@ export class SystemCompendiums extends FormApplication {
       label: "Compendiums système",
       hint: "Ouvre la fenêtre de sélection des compendiums système",
       icon: "fas fa-bars",
+      restricted: true,
       type: SystemCompendiums
     })
   }

system.json

@@ -1,8 +1,8 @@
 {
   "id": "foundryvtt-reve-de-dragon",
   "title": "Rêve de Dragon",
-  "version": "11.0.10",
-  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.0.10.zip",
+  "version": "11.0.11",
+  "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-11.0.11.zip",
   "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v11/system.json",
   "changelog": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/branch/v11/changelog.md",
   "compatibility": {

template.json

@@ -393,12 +393,6 @@
             "label": "Encombrement",
             "derivee": true
           },
-          "malusarmure": {
-            "type": "number",
-            "value": 0,
-            "label": "Malus Armure",
-            "derivee": true
-          },
           "protection": {
             "type": "number",
             "value": 0,
@@ -594,7 +588,8 @@
       "iscombat": false,
       "isnaturelle": true,
       "ispossession": false,
-      "dommages": 0
+      "dommages": 0,
+      "mortalite": "mortel"
     },
     "empoignade": {
       "templates": ["description"],
@@ -671,6 +666,7 @@
       "resistance": 0,
       "categorie_parade": "",
       "dommages": "0",
+      "mortalite": "mortel",
       "penetration": 0,
       "force": "0",
       "competence": "",

templates/actor/carac-derivee.html

@@ -72,7 +72,7 @@
   </li>  
   <li class="caracteristique flexrow list-item" >
     <label class="carac-label">Malus armure</label>
-    <input class="derivee-value" type="number" disabled value="{{system.attributs.malusarmure.value}}" data-dtype="number"/>
+    <input class="derivee-value" type="number" disabled value="{{calc.malusArmure}}" data-dtype="number"/>
   </li>  
   <li class="caracteristique flexrow list-item">
     <label class="carac-label" for="system.attributs.protection.value" >Protection naturelle</label>

templates/dialog-roll-competence.html

@@ -54,7 +54,7 @@
           <label>Empoignade</label>
           {{else}}
           <span>
-            <input class="attribute-value" type="checkbox" name="coupsNonMortels" {{#unless (eq mortalite 'mortel')}}checked{{/unless}} />
+            <input class="attribute-value" type="checkbox" name="motalite" {{#unless (eq mortalite 'mortel')}}checked{{/unless}} />
             <label class="dmg-arme-actor"></label>
           </span>
           {{/if}}

templates/enum-mortalite.html

@@ -0,0 +1,3 @@
+<option value="mortel">Mortel</option>
+<option value="non-mortel">Non mortel</option>
+<option value="empoignade">Empoignade</option>

templates/item-arme-sheet.html

@@ -37,6 +37,14 @@
         <label for="system.dommages">Dommages </label>
         <input class="attribute-value" type="text" name="system.dommages" value="{{system.dommages}}" data-dtype="String"/>
       </div>
+      <div class="form-group">
+        <label for="system.mortalite">Mortalité</label>
+        <select name="system.mortalite" data-dtype="String">
+          {{#select system.mortalite}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-mortalite.html"}}
+          {{/select}}
+        </select>
+      </div>
       <div class="form-group">
         <label for="system.resistance">Résistance </label>
         <input class="attribute-value" type="text" name="system.resistance" value="{{system.resistance}}" data-dtype="Number"/>

templates/item-competencecreature-sheet.html

@@ -27,6 +27,14 @@
         <label for="niveau">Dommages (+dom)</label>
         <input class="attribute-value" type="text" name="system.dommages" value="{{system.dommages}}" data-dtype="Number"/>
       </div>
+      <div class="form-group">
+        <label for="system.mortalite">Mortalité</label>
+        <select name="system.mortalite" data-dtype="String">
+          {{#select system.mortalite}}
+          {{>"systems/foundryvtt-reve-de-dragon/templates/enum-mortalite.html"}}
+          {{/select}}
+        </select>
+      </div>
     {{/if}}
     {{#if isparade}}
       <div class="form-group">