Fix CSS pour confrontation et CSS pour DiceTray

README.md

@@ -1,5 +1,7 @@
 # Système Foundry pour Maléfices (French RPG, Arkhane Asylum Publishing)
 
+[Vue du système](https://www.lahiette.com/leratierbretonnien/wp-content/uploads/2023/02/malefices_snapshot.webp)
+
 ## EN
 
 Unofficial system for Maléfices v4 (French version from Arkhane Asylum Publishing).

images/icons/.directory

@@ -0,0 +1,6 @@
+[Dolphin]
+SortRole=modificationtime
+Timestamp=2023,2,26,15,32,34.892
+Version=4
+ViewMode=1
+VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

modules/malefices-actor-sheet.js

@@ -12,7 +12,7 @@ export class MaleficesActorSheet extends ActorSheet {
   static get defaultOptions() {
 
     return mergeObject(super.defaultOptions, {
-      classes: ["fvtt-malefices", "sheet", "actor"],
+      classes: ["fvtt-malefices", "sheet", "actor", "malefices-actor-sheet"],
       template: "systems/fvtt-malefices/templates/actors/actor-sheet.hbs",
       width: 640,
       height:680,
@@ -44,6 +44,9 @@ export class MaleficesActorSheet extends ActorSheet {
       phyMalus: this.actor.getPhysiqueMalus(),
       elementsbio: this.actor.getElementsBio(),
       sorts: this.actor.getSorts(),
+      description: await TextEditor.enrichHTML(this.object.system.biodata.description, { async: true }),
+      notes: await TextEditor.enrichHTML(this.object.system.biodata.notes, { async: true }),
+      equipementlibre: await TextEditor.enrichHTML(this.object.system.equipementlibre, { async: true }),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -51,7 +54,7 @@ export class MaleficesActorSheet extends ActorSheet {
     }
     this.formData = formData;
 
-    console.log("PC : ", formData, this.object);
+    console.log("PC : ", formData, this.object );
     return formData;
   }
 

modules/malefices-actor.js

@@ -229,9 +229,9 @@ export class MaleficesActor extends Actor {
   }
   /* -------------------------------------------- */
   getInitiativeScore(combatId, combatantId) {
-    let init = Math.floor(this.system.attributs.physique.value+this.system.attributs.habilete.value)
+    let init = Math.floor( (this.system.attributs.physique.value+this.system.attributs.habilite.value) / 2)
     let subvalue = new Roll("1d20").roll({async: false})
-    return init + (subvalue / 100)
+    return init + (subvalue.total / 100)
   }
 
   /* -------------------------------------------- */
@@ -372,7 +372,7 @@ export class MaleficesActor extends Actor {
       arme = duplicate(arme)
       let rollData = this.getCommonRollData()
       if (arme.system.armetype == "mainsnues" || arme.system.armetype == "epee") {
-        rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique+this.system.attributs.habilite) / 2) }
+        rollData.attr = { label: "(Physique+Habilité)/2", value: Math.floor( (this.getPhysiqueMalus()+this.system.attributs.physique.value+this.system.attributs.habilite.value) / 2) }
       } else {
         rollData.attr = duplicate(this.system.attributs.habilite)
       }

modules/malefices-commands.js

@@ -12,6 +12,7 @@ export class MaleficesCommands {
     if (!game.system.malefices.commands) {
       const commands = new MaleficesCommands();
       commands.registerCommand({ path: ["/tirage"], func: (content, msg, params) => MaleficesCommands.createTirage(msg), descr: "Tirage des tarots" });
+      commands.registerCommand({ path: ["/carte"], func: (content, msg, params) => MaleficesCommands.tirerCarte(msg), descr: "Tirer une carte" });
       commands.registerCommand({ path: ["/resume"], func: (content, msg, params) => MaleficesCharacterSummary.displayPCSummary(), descr: "Affiche la liste des PJs!" });
       game.system.malefices.commands = commands;
     }
@@ -105,7 +106,7 @@ export class MaleficesCommands {
     ChatMessage.create(msg);
   }
 
-  /* -------------------------------------------- */
+  /* --------------------------------------------- */
   static async createTirage(msg) {
     if (game.user.isGM) {
       let tirageData = {
@@ -127,5 +128,20 @@ export class MaleficesCommands {
       tirageDialog.render(true)
     }
   }
+  /* --------------------------------------------- */
+  static async tirerCarte(msg) {
+    let deck =  MaleficesUtility.getTarots()
+    let index = Math.round(Math.random() * (deck.length-1))
+    let selectedCard = deck[index]
+    selectedCard.system.ispositif = true
+    if ( selectedCard.system.isdualside) { // Cas des cartes pouvant avoir 2 sens
+      selectedCard.system.ispositif = (Math.random() > 0.5)
+    }
+    selectedCard.system.isgm = false
+    selectedCard.value = (selectedCard.system.ispositif)? selectedCard.system.numericvalueup : selectedCard.system.numericvaluedown
+    MaleficesUtility.createChatMessage(game.user.name, "", {
+      content: await renderTemplate(`systems/fvtt-malefices/templates/chat/display-tarot-card.hbs`, selectedCard) 
+    })
+  }
 
 }

modules/malefices-item-sheet.js

@@ -19,20 +19,6 @@ export class MaleficesItemSheet extends ItemSheet {
     });
   }
 
-  /* -------------------------------------------- */
-  _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
-  }
-
   /* -------------------------------------------- */
   /** @override */
   setPosition(options = {}) {

modules/malefices-main.js

@@ -27,7 +27,7 @@ import { MALEFICES_CONFIG } from "./malefices-config.js"
 Hooks.once("init", async function () {
 
   console.log(`Initializing Malefices RPG`);
-  
+
   game.system.malefices = {
     config: MALEFICES_CONFIG,
     MaleficesHotbar
@@ -65,25 +65,27 @@ Hooks.once("init", async function () {
   Items.registerSheet("fvtt-malefices", MaleficesItemSheet, { makeDefault: true });
 
   MaleficesUtility.init()
+
 });
 
 /* -------------------------------------------- */
 function welcomeMessage() {
-  ChatMessage.create({
+  if (game.user.isGM) {
-    user: game.user.id,
+    ChatMessage.create({
-    whisper: [game.user.id],
+      user: game.user.id,
-    content: `<div id="welcome-message-malefices"><span class="rdd-roll-part">
+      whisper: [game.user.id],
-    <strong>Bienvenu dans Malefices, le JDR qui sent le souffre !</strong>
+      content: `<div id="welcome-message-malefices"><span class="rdd-roll-part">
-    <p>Le Livre de Base de Maléfices v4 est nécessaire pour jouer : https://arkhane-asylum.fr/en/malefices/</p>
+      <strong>Bienvenu dans Malefices, le JDR qui sent le souffre !</strong>
-    <p>Maléfices et un jeu de rôle publié par Arkhane Asylum Publishing, tout les droits leur appartiennent.</p>
+      <p>Le Livre de Base de Maléfices v4 est nécessaire pour jouer : https://arkhane-asylum.fr/en/malefices/</p>
-    <p>Système développé par LeRatierBretonnien avec l'aide de la Dame du Lac et Malik, support sur le <a href="https://discord.gg/pPSDNJk">Discord FR de Foundry</a>.</p>
+      <p>Maléfices et un jeu de rôle publié par Arkhane Asylum Publishing, tout les droits leur appartiennent.</p>
-    ` });
+      <p>Système développé par LeRatierBretonnien avec l'aide de la Dame du Lac et Malik, support sur le <a href="https://discord.gg/pPSDNJk">Discord FR de Foundry</a>.</p>
+      <p>Commandes : /tirage pour le tirage des tarots, /carte pour tirer une simple carte et /resume pour le résumé des PJs (MJ seulement)` });
+  }
 }
-
 /* -------------------------------------------- */
 // Register world usage statistics
-function registerUsageCount( registerKey ) {
+function registerUsageCount(registerKey) {
-  if ( game.user.isGM ) {
+  if (game.user.isGM) {
     game.settings.register(registerKey, "world-key", {
       name: "Unique world key",
       scope: "world",
@@ -93,14 +95,14 @@ function registerUsageCount( registerKey ) {
     });
 
     let worldKey = game.settings.get(registerKey, "world-key")
-    if ( worldKey == undefined || worldKey == "" ) {
+    if (worldKey == undefined || worldKey == "") {
       worldKey = randomID(32)
-      game.settings.set(registerKey, "world-key", worldKey )
+      game.settings.set(registerKey, "world-key", worldKey)
     }
     // Simple API counter
     let regURL = `https://www.uberwald.me/fvtt_appcount/count.php?name="${registerKey}"&worldKey="${worldKey}"&version="${game.release.generation}.${game.release.build}"&system="${game.system.id}"&systemversion="${game.system.version}"`
     //$.ajaxSetup({
-      //headers: { 'Access-Control-Allow-Origin': '*' }
+    //headers: { 'Access-Control-Allow-Origin': '*' }
     //})
     $.ajax(regURL)
   }
@@ -119,18 +121,11 @@ Hooks.once("ready", function () {
       user: game.user._id
     });
   }
-  
-  // CSS patch for v9
-  if (game.version) {
-    let sidebar = document.getElementById("sidebar");
-    sidebar.style.width = "min-content";
-  }
 
   registerUsageCount('fvtt-malefices')
   welcomeMessage();
   MaleficesUtility.ready()
-  MaleficesUtility.init()
+  MaleficesCharacterSummary.ready()
-  MaleficesCharacterSummary.ready()  
 
 })
 

modules/malefices-summary-app.js

@@ -5,24 +5,29 @@ import { MaleficesUtility } from "./malefices-utility.js";
 export class MaleficesCharacterSummary extends Application {
 
   /* -------------------------------------------- */
-  static displayPCSummary(){
+  static displayPCSummary() {
-    game.system.malefices.charSummary.render(true)
+    if (game.user.isGM) {
+      game.system.malefices.charSummary.render(true)
+    } else {
+      ui.notifications.info("Commande /tirage réservée au MJ !")
+    }
   }
+
   /* -------------------------------------------- */
-  updatePCSummary(){
+  updatePCSummary() {
-    if ( this.rendered) {
+    if (this.rendered) {
       this.render(true)
     }
   }
-   
+
   /* -------------------------------------------- */
   static createSummaryPos() {
     return { top: 200, left: 200 };
   }
-  
+
   /* -------------------------------------------- */
   static ready() {
-    if ( !game.user.isGM ) { // Uniquement si GM
+    if (!game.user.isGM) { // Uniquement si GM
       return
     }
     let charSummary = new MaleficesCharacterSummary()
@@ -51,14 +56,14 @@ export class MaleficesCharacterSummary extends Application {
   getData() {
     let formData = super.getData();
 
-    formData.pcs = game.actors.filter( ac => ac.type == "personnage" && ac.hasPlayerOwner )
+    formData.pcs = game.actors.filter(ac => ac.type == "personnage" && ac.hasPlayerOwner)
     formData.npcs = []
     let newList = []
-    let toUpdate = false    
+    let toUpdate = false
-    for( let actorId of this.settings.npcList ) {
+    for (let actorId of this.settings.npcList) {
       let actor = game.actors.get(actorId)
       if (actor) {
-        formData.npcs.push( actor )
+        formData.npcs.push(actor)
         newList.push(actorId)
       } else {
         toUpdate = true
@@ -66,7 +71,7 @@ export class MaleficesCharacterSummary extends Application {
     }
     formData.config = game.system.malefices.config
 
-    if ( toUpdate ) {
+    if (toUpdate) {
       this.settings.npcList = newList
       //console.log("Going to update ...", this.settings)
       game.settings.set("world", "character-summary-data", this.settings)
@@ -79,21 +84,21 @@ export class MaleficesCharacterSummary extends Application {
   updateNPC() {
     game.settings.set("world", "character-summary-data", game.system.malefices.charSummary.settings)
     game.system.malefices.charSummary.close()
-    setTimeout( function() { game.system.malefices.charSummary.render(true)}, 500)
+    setTimeout(function () { game.system.malefices.charSummary.render(true) }, 500)
   }
 
   /* -------------------------------------------- */
   async _onDrop(event) {
     //console.log("Dragged data are : ", dragData)
     let data = event.dataTransfer.getData('text/plain')
-    let dataItem = JSON.parse( data)
+    let dataItem = JSON.parse(data)
     let actor = fromUuidSync(dataItem.uuid)
     if (actor) {
-      game.system.malefices.charSummary.settings.npcList.push( actor.id )
+      game.system.malefices.charSummary.settings.npcList.push(actor.id)
       game.system.malefices.charSummary.updateNPC()
-      
+
     } else {
-      ui.notifications.warn( "Pas d'acteur trouvé" )
+      ui.notifications.warn("Pas d'acteur trouvé")
     }
   }
 
@@ -124,6 +129,6 @@ export class MaleficesCharacterSummary extends Application {
       game.system.malefices.charSummary.updateNPC()
     })
 
- }
+  }
 
 }

modules/malefices-utility.js

@@ -5,18 +5,18 @@ import { MaleficesCommands } from "./malefices-commands.js";
 /* -------------------------------------------- */
 export class MaleficesUtility {
 
-
   /* -------------------------------------------- */
   static async init() {
     Hooks.on('renderChatLog', (log, html, data) => MaleficesUtility.chatListeners(html));
-    /*Hooks.on("dropCanvasData", (canvas, data) => {
-      MaleficesUtility.dropItemOnToken(canvas, data)
-    });*/
 
     this.rollDataStore = {}
     this.defenderStore = {}
 
     MaleficesCommands.init();
+  }
+
+  /* -------------------------------------------- */
+  static async ready() {
 
     Handlebars.registerHelper('count', function (list) {
       return list.length;
@@ -51,6 +51,10 @@ export class MaleficesUtility {
       default: { npcList: [], x: 200, y: 200 },
       type: Object
     })
+
+    const tarots = await MaleficesUtility.loadCompendium("fvtt-malefices.malefices-tarots")
+    this.tarots = tarots.map(i => i.toObject())
+
   }
 
   /*-------------------------------------------- */
@@ -67,13 +71,6 @@ export class MaleficesUtility {
     return  this.tarots.find(t => t._id == tId)
   }
 
-  /* -------------------------------------------- */
-  static async ready() {
-    const tarots = await MaleficesUtility.loadCompendium("fvtt-malefices.malefices-tarots")
-    this.tarots = tarots.map(i => i.toObject())
-
-  }
-
   /* -------------------------------------------- */
   static async loadCompendiumData(compendium) {
     const pack = game.packs.get(compendium)
@@ -407,7 +404,7 @@ export class MaleficesUtility {
     console.log("Roll formula", diceFormula)
     let myRoll = new Roll(diceFormula).roll({ async: false })
     await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-    rollData.roll = myRoll
+    rollData.roll = duplicate(myRoll)
     rollData.total = myRoll.total
 
     this.computeResults(rollData)

packs/malefices-archetypes/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000014

packs/malefices-archetypes/LOG

@@ -0,0 +1,8 @@
+2023/10/26-09:14:30.238994 7f5603fff6c0 Recovering log #12
+2023/10/26-09:14:30.250498 7f5603fff6c0 Delete type=3 #10
+2023/10/26-09:14:30.250614 7f5603fff6c0 Delete type=0 #12
+2023/10/26-09:23:17.065670 7f56037fe6c0 Level-0 table #17: started
+2023/10/26-09:23:17.065742 7f56037fe6c0 Level-0 table #17: 0 bytes OK
+2023/10/26-09:23:17.072462 7f56037fe6c0 Delete type=0 #15
+2023/10/26-09:23:17.079476 7f56037fe6c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)
+2023/10/26-09:23:17.079561 7f56037fe6c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)

packs/malefices-archetypes/LOG.old

@@ -0,0 +1,8 @@
+2023/10/26-09:13:41.637133 7f5603fff6c0 Recovering log #8
+2023/10/26-09:13:41.648494 7f5603fff6c0 Delete type=3 #6
+2023/10/26-09:13:41.648626 7f5603fff6c0 Delete type=0 #8
+2023/10/26-09:13:55.694567 7f56037fe6c0 Level-0 table #13: started
+2023/10/26-09:13:55.694619 7f56037fe6c0 Level-0 table #13: 0 bytes OK
+2023/10/26-09:13:55.701338 7f56037fe6c0 Delete type=0 #11
+2023/10/26-09:13:55.715996 7f56037fe6c0 Manual compaction at level-0 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)
+2023/10/26-09:13:55.716063 7f56037fe6c0 Manual compaction at level-1 from '!items!2HWSdXDSFei9KC6y' @ 72057594037927935 : 1 .. '!items!xtYE2kVIfNtrXSoU' @ 0 : 0; will stop at (end)

packs/malefices-armes/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000014

packs/malefices-armes/LOG

@@ -0,0 +1,8 @@
+2023/10/26-09:14:30.225660 7f56117fa6c0 Recovering log #12
+2023/10/26-09:14:30.236009 7f56117fa6c0 Delete type=3 #10
+2023/10/26-09:14:30.236095 7f56117fa6c0 Delete type=0 #12
+2023/10/26-09:23:17.051895 7f56037fe6c0 Level-0 table #17: started
+2023/10/26-09:23:17.051934 7f56037fe6c0 Level-0 table #17: 0 bytes OK
+2023/10/26-09:23:17.058810 7f56037fe6c0 Delete type=0 #15
+2023/10/26-09:23:17.072664 7f56037fe6c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)
+2023/10/26-09:23:17.079499 7f56037fe6c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)

packs/malefices-armes/LOG.old

@@ -0,0 +1,8 @@
+2023/10/26-09:13:41.623945 7f5610ff96c0 Recovering log #8
+2023/10/26-09:13:41.634738 7f5610ff96c0 Delete type=3 #6
+2023/10/26-09:13:41.634829 7f5610ff96c0 Delete type=0 #8
+2023/10/26-09:13:55.687144 7f56037fe6c0 Level-0 table #13: started
+2023/10/26-09:13:55.687180 7f56037fe6c0 Level-0 table #13: 0 bytes OK
+2023/10/26-09:13:55.694295 7f56037fe6c0 Delete type=0 #11
+2023/10/26-09:13:55.701584 7f56037fe6c0 Manual compaction at level-0 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)
+2023/10/26-09:13:55.716019 7f56037fe6c0 Manual compaction at level-1 from '!items!5J6qIaWdnhEGMAXJ' @ 72057594037927935 : 1 .. '!items!nkRQU81L1gWOfaeo' @ 0 : 0; will stop at (end)

packs/malefices-macros.db

@@ -0,0 +1,3 @@
+{"name":"Résumé des PJs pour le MJ","type":"chat","scope":"global","author":"R9gIh86vXDB4IFn1","img":"systems/fvtt-malefices/images/icons/resume.webp","command":"/resume","flags":{"core":{"sourceId":"Macro.ulj2PgchTQVE1VV4"}},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.1.1","coreVersion":"10.291","createdTime":1677422022018,"modifiedTime":1677422143283,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"folder":null,"sort":0,"_id":"ESV4er8Hy6liMOC3"}
+{"name":"Tirage des tarots","type":"chat","scope":"global","author":"R9gIh86vXDB4IFn1","img":"systems/fvtt-malefices/images/icons/tirage.webp","command":"/tirage","flags":{"core":{"sourceId":"Macro.ulj2PgchTQVE1VV4"}},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.1.1","coreVersion":"10.291","createdTime":1677422022018,"modifiedTime":1677422144635,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"folder":null,"sort":0,"_id":"sVKXJsiG9KAaBglV"}
+{"name":"Tirer une carte","type":"chat","command":"/carte","author":"R9gIh86vXDB4IFn1","img":"systems/fvtt-malefices/images/icons/tirer.webp","scope":"global","flags":{"core":{"sourceId":"Macro.P2dPA3CA5ZjOwDeE"}},"_stats":{"systemId":"fvtt-malefices","systemVersion":"10.1.1","coreVersion":"10.291","createdTime":1677421496447,"modifiedTime":1677422146138,"lastModifiedBy":"R9gIh86vXDB4IFn1"},"ownership":{"default":0,"R9gIh86vXDB4IFn1":3},"folder":null,"sort":0,"_id":"zDPgmHiwNxBWhoYz"}

packs/malefices-macros/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000014

packs/malefices-macros/LOG

@@ -0,0 +1,8 @@
+2023/10/26-09:14:30.253493 7f5610ff96c0 Recovering log #12
+2023/10/26-09:14:30.264581 7f5610ff96c0 Delete type=3 #10
+2023/10/26-09:14:30.264682 7f5610ff96c0 Delete type=0 #12
+2023/10/26-09:23:17.058988 7f56037fe6c0 Level-0 table #17: started
+2023/10/26-09:23:17.059024 7f56037fe6c0 Level-0 table #17: 0 bytes OK
+2023/10/26-09:23:17.065403 7f56037fe6c0 Delete type=0 #15
+2023/10/26-09:23:17.079441 7f56037fe6c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)
+2023/10/26-09:23:17.079539 7f56037fe6c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)

packs/malefices-macros/LOG.old

@@ -0,0 +1,8 @@
+2023/10/26-09:13:41.652680 7f5611ffb6c0 Recovering log #8
+2023/10/26-09:13:41.662766 7f5611ffb6c0 Delete type=3 #6
+2023/10/26-09:13:41.662869 7f5611ffb6c0 Delete type=0 #8
+2023/10/26-09:13:55.701609 7f56037fe6c0 Level-0 table #13: started
+2023/10/26-09:13:55.701657 7f56037fe6c0 Level-0 table #13: 0 bytes OK
+2023/10/26-09:13:55.708471 7f56037fe6c0 Delete type=0 #11
+2023/10/26-09:13:55.716035 7f56037fe6c0 Manual compaction at level-0 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)
+2023/10/26-09:13:55.716078 7f56037fe6c0 Manual compaction at level-1 from '!macros!ESV4er8Hy6liMOC3' @ 72057594037927935 : 1 .. '!macros!zDPgmHiwNxBWhoYz' @ 0 : 0; will stop at (end)

packs/malefices-tarots/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000014

packs/malefices-tarots/LOG

@@ -0,0 +1,8 @@
+2023/10/26-09:14:30.211232 7f5611ffb6c0 Recovering log #12
+2023/10/26-09:14:30.222971 7f5611ffb6c0 Delete type=3 #10
+2023/10/26-09:14:30.223076 7f5611ffb6c0 Delete type=0 #12
+2023/10/26-09:23:17.024333 7f56037fe6c0 Level-0 table #17: started
+2023/10/26-09:23:17.024403 7f56037fe6c0 Level-0 table #17: 0 bytes OK
+2023/10/26-09:23:17.030633 7f56037fe6c0 Delete type=0 #15
+2023/10/26-09:23:17.041759 7f56037fe6c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)
+2023/10/26-09:23:17.051874 7f56037fe6c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)

packs/malefices-tarots/LOG.old

@@ -0,0 +1,8 @@
+2023/10/26-09:13:41.610590 7f56117fa6c0 Recovering log #8
+2023/10/26-09:13:41.620893 7f56117fa6c0 Delete type=3 #6
+2023/10/26-09:13:41.620978 7f56117fa6c0 Delete type=0 #8
+2023/10/26-09:13:55.669182 7f56037fe6c0 Level-0 table #13: started
+2023/10/26-09:13:55.669226 7f56037fe6c0 Level-0 table #13: 0 bytes OK
+2023/10/26-09:13:55.676595 7f56037fe6c0 Delete type=0 #11
+2023/10/26-09:13:55.687107 7f56037fe6c0 Manual compaction at level-0 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)
+2023/10/26-09:13:55.694543 7f56037fe6c0 Manual compaction at level-1 from '!items!1DRKmbzGzbCRCswc' @ 72057594037927935 : 1 .. '!items!zbGGMEQFdwVdlKAf' @ 0 : 0; will stop at (end)

styles/simple.css

@@ -1,64 +1,64 @@
-  /* ==================== (A) Fonts ==================== */
+/* ==================== (A) Fonts ==================== */
-  @font-face {
+@font-face {
-    font-family: "Rivanna";
+  font-family: "Rivanna";
-    src: url('../fonts/rivanna.ttf') format("truetype");
+  src: url('../fonts/rivanna.ttf') format("truetype");
-  }
+}
-  
-  :root {
-  /* =================== 1. ACTOR SHEET FONT STYLES =========== */
-    --window-header-title-font-size: 1.3rem;
-    --window-header-title-font-weight: normal;
-    --window-header-title-color: #f5f5f5;
 
-    --major-button-font-size: 1.05rem;
+:root {
-    --major-button-font-weight: normal;
+/* =================== 1. ACTOR SHEET FONT STYLES =========== */
-    --major-button-color: #dadada;
+  --window-header-title-font-size: 1.3rem;
+  --window-header-title-font-weight: normal;
+  --window-header-title-color: #f5f5f5;
 
-    --tab-header-font-size: 1.0rem;
+  --major-button-font-size: 1.05rem;
-    --tab-header-font-weight: 700;
+  --major-button-font-weight: normal;
-    --tab-header-color: #403f3e;
+  --major-button-color: #dadada;
-    --tab-header-color-active: #4a0404;
 
-    --actor-input-font-size: 0.8rem;
+  --tab-header-font-size: 1.0rem;
-    --actor-input-font-weight: 500;
+  --tab-header-font-weight: 700;
-    --actor-input-color: black;
+  --tab-header-color: #403f3e;
+  --tab-header-color-active: #4a0404;
 
-    --actor-label-font-size: 0.8rem;
+  --actor-input-font-size: 0.8rem;
-    --actor-label-font-weight: 700;
+  --actor-input-font-weight: 500;
-    --actor-label-color: #464331c4;
+  --actor-input-color: black;
 
-  /* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ 
+  --actor-label-font-size: 0.8rem;
-    --debug-background-color-red: #ff000054;
+  --actor-label-font-weight: 700;
-    --debug-background-color-blue: #1d00ff54;
+  --actor-label-color: #464331c4;
-    --debug-background-color-green: #54ff0054;
 
-    --debug-box-shadow-red: inset 0 0 2px red;
+/* =================== 2. DEBUGGING HIGHLIGHTERS ============ */ 
-    --debug-box-shadow-blue: inset 0 0 2px blue;
+  --debug-background-color-red: #ff000054;
-    --debug-box-shadow-green: inset 0 0 2px green;
+  --debug-background-color-blue: #1d00ff54;
-  }
+  --debug-background-color-green: #54ff0054;
+
+  --debug-box-shadow-red: inset 0 0 2px red;
+  --debug-box-shadow-blue: inset 0 0 2px blue;
+  --debug-box-shadow-green: inset 0 0 2px green;
+}
 
 /*@import url("https://fonts.googleapis.com/css2?family=Martel:wght@400;800&family=Roboto:wght@300;400;500&display=swap");*/
 /* Global styles & Font */
-.window-app {
+.fvtt-malefices .window-app {
-  text-align: justify;
+text-align: justify;
-  font-size: 16px;
+font-size: 16px;
-  letter-spacing: 1px;
+letter-spacing: 1px;
 }
 
 /* Fonts */
 .sheet header.sheet-header h1 input, .window-app .window-header, #actors .directory-list, #navigation #scene-list .scene.nav-item {
-  font-size: 1.0rem;
+font-size: 1.0rem;
 } /* For title, sidebar character and scene */
-.sheet nav.sheet-tabs {
+.fvtt-malefices .sheet nav.sheet-tabs {
-  font-size: 0.8rem;
+font-size: 0.8rem;
 } /* For nav and title */
 .window-app input, .fvtt-malefices .item-form, .sheet header.sheet-header .flex-group-center.flex-compteurs, .sheet header.sheet-header .flex-group-center.flex-fatigue, select, button, .item-checkbox, #sidebar, #players, #navigation #nav-toggle {
-  font-size: 0.8rem;
+font-size: 0.8rem;
 }
 
 .window-header{
-  background: rgba(0,0,0,0.75);
+background: rgba(0,0,0,0.75);
-}
+}  
 
 .window-app.sheet .window-content {
   margin: 0;
@@ -235,6 +235,11 @@ table {border: 1px solid #7a7971;}
   object-position: 50% 0;
   border-width: 0px;
 }
+.profile-img-container {
+  margin-right: 0.2rem;
+  max-width: 140px;
+  width: 140px;
+}
 
 .button-img {
   vertical-align: baseline;
@@ -396,7 +401,7 @@ li.folder > .folder-header h3 {
 
 /* ======================================== */
 /* Sheet  */
-.window-app.sheet .window-content .sheet-header{
+.fvtt-malefices .window-app.sheet .window-content .sheet-header{
   color: rgba(19, 18, 18, 0.95);
   background: url("../images/ui/background_01_clear.webp");
   /*background: #494e6b;*/
@@ -442,7 +447,7 @@ select {
   margin-left: 2px;
 }
 
-.window-app .window-content, .window-app.sheet .window-content .sheet-body{
+.fvtt-malefices .window-app .window-content, .fvtt-malefices .window-app.sheet .window-content .sheet-body{
   font-size: 0.8rem;
   /*background: url("../images/ui/pc_sheet_bg.webp") repeat left top;*/
   background: url("../images/ui/background_01_clear.webp");
@@ -460,7 +465,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
   padding: 0;
 }
 
-.sheet nav.sheet-tabs {
+.malefices-actor-sheet nav.sheet-tabs {
   font-size: 1.2rem;
   font-weight: bold;
   height: 3rem;
@@ -476,7 +481,16 @@ section.sheet-body{padding: 0.25rem 0.5rem;}
   color:beige;
 }
 
-/*  background: rgb(245,245,240) url("../images/ui/fond4.webp") repeat left top;*/
+/* Dice tray specific overrides */
+.dice-tray button svg * {
+  fill: #6d5923 !important;
+}
+.dice-tray input[type="text"] {
+  color: #6d5923 !important;
+}
+.dice-tray button {
+  color: #6d5923 !important;
+}
 
 nav.sheet-tabs .item {
   position: relative;
@@ -490,7 +504,7 @@ nav.sheet-tabs .item:after {
   right: 0;
   height: 2rem;
   width: 1px;
-  border-right: 1px dashed rgba(52, 52, 52, 0.25);
+  /*border-right: 1px dashed rgba(52, 52, 52, 0.25);*/
 }
 
 .sheet .tab[data-tab] {
@@ -754,6 +768,10 @@ ul, li {
 #token-hud .status-effects.active{
   z-index: 2;
 }
+.token-sheet .window-content .flexcol .sheet-tabs {
+  font-size: 0.8rem;
+}
+
 /* ======================================== */
 .item-checkbox {
   height: 25px;
@@ -794,6 +812,9 @@ ul, li {
   color: rgba(19, 18, 18, 0.95);
 }
 
+#sidebar .scene {
+  color: rgba(237, 240, 199, 0.95);
+}
 /*  background: rgb(105,85,65) url("../images/ui/texture_feuille_perso_onglets.webp") no-repeat right bottom;*/
 
 #sidebar.collapsed {
@@ -950,8 +971,6 @@ ul, li {
 }
 
 #sidebar #sidebar-tabs i{
-  width: 25px;
-  height: 25px;
   display: inline-block;
   background-position:center;
   background-size:cover;

system.json

@@ -46,14 +46,23 @@
       "system": "fvtt-malefices",
       "private": false,
       "flags": {}
+    },
+    {
+      "type": "Macro",
+      "label": "Macros",
+      "name": "malefices-macros",
+      "path": "packs/malefices-macros.db",
+      "system": "fvtt-malefices",
+      "private": false,
+      "flags": {}
     }
   ],
   "license": "LICENSE.txt",
   "manifest": "https://www.uberwald.me/gitea/public/fvtt-malefices/raw/branch/master/system.json",
   "compatibility": {
     "minimum": "10",
-    "verified": "10",
+    "verified": "11",
-    "maximum": "10"
+    "maximum": "11"
   },
   "id": "fvtt-malefices",
   "primaryTokenAttribute": "secondary.health",
@@ -64,7 +73,7 @@
   ],
   "title": "Maléfices, le Jeu de Rôle",
   "url": "https://www.uberwald.me/gitea/public/fvtt-malefices",
-  "version": "10.0.23",
+  "version": "11.0.2",
-  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v10.0.23.zip",
+  "download": "https://www.uberwald.me/gitea/public/fvtt-malefices/archive/fvtt-malefices-v11.0.2.zip",
   "background": "systems/fvtt-malefices/images/ui/malefice_welcome_page.webp"
 }

template.json

@@ -25,6 +25,7 @@
           "religion": "",
           "fantastique": "",
           "description": "",
+          "notes": "",
           "gmnotes": ""
         }
       },
@@ -83,7 +84,8 @@
             "value": 0,
             "max": 0
           }
-        }
+        },
+        "equipementlibre": ""
       },
       "npccore": {
         "npctype": "",
@@ -131,7 +133,7 @@
       "description": ""
     },
     "arme": {
-      "armetype": 0,
+      "armetype": "",
       "porteecourte": "",
       "porteemoyenne": "",
       "dommagenormale": 0,

templates/actors/actor-sheet.hbs

@@ -4,7 +4,11 @@
   <header class="sheet-header">
     <div class="header-fields">
       <div class="flexrow">
-        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+
+        <div class="profile-img-container">
+          <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
+        </div>
+        
         <div class="flexcol">
           <h1 class="charname margin-right"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
 
@@ -145,6 +149,13 @@
     {{!-- Equipement Tab --}}
     <div class="tab equipements" data-group="primary" data-tab="equipements">
 
+      <span class="item-name-label-header items-title-bg">
+          <h3><label class="items-title-text">Equipements (saisie libre)</label></h3>
+      </span>
+      <div class="form-group small-editor">
+        {{editor equipementlibre target="system.equipementlibre" button=true owner=owner editable=editable}}
+      </div>
+
       <ul class="item-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
           <span class="item-name-label-header">
@@ -183,7 +194,7 @@
       <ul class="item-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
           <span class="item-name-label-header">
-            <h3><label class="items-title-text">Equipements</label></h3>
+            <h3><label class="items-title-text">Equipements (Items)</label></h3>
           </span>
           <span class="item-field-label-long">
             <label class="short-label">Q.</label>
@@ -328,7 +339,7 @@
             <label class="item-field-label-medium">Sens</label>
           </span>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="tarot" title="Create Item"><i class="fas fa-plus"></i></a>
           </div>
         </li>
         {{#each tarots as |tarot key|}}
@@ -347,6 +358,7 @@
         {{/each}}
       </ul>
 
+      {{#if isGM}}
       <ul class="item-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
           <span class="item-name-label-header">
@@ -356,7 +368,7 @@
             <label class="item-field-label-medium">Sens</label>
           </span>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+            <a class="item-control item-add" data-type="tarot" title="Create Item"><i class="fas fa-plus"></i></a>
           </div>
         </li>
         {{#each tarotsCache as |tarot key|}}
@@ -374,6 +386,7 @@
         </li>
         {{/each}}
       </ul>
+      {{/if}}
 
   </div>
 
@@ -383,8 +396,7 @@
           <h3><label class="items-title-text">Background</label></h3>
       </span>
       <div class="form-group editor">
-        {{editor description target="system.biodata.description" button=true owner=owner
+        {{editor description target="system.biodata.description" button=true owner=owner editable=editable}}
-        editable=editable}}
       </div>
       <hr>
       <span class="item-name-label-header items-title-bg">

templates/chat/chat-confrontation-result.hbs

@@ -28,7 +28,7 @@
         {{#if isSuccess}}
           <li><label class="chat-result-text chat-result-success ">Réussite !</label> Votre {{attr.label}} augmente de {{gainAttr}} points.</li>
         {{else}}
-          <li><label class="chat-result-text chat-result-success ">Echec !</label> Votre {{attr.label}} diminue de {{gainAttr}} points.</li>
+          <li><label class="chat-result-text chat-result-failure ">Echec !</label> Votre {{attr.label}} diminue de {{gainAttr}} points.</li>
         {{/if}}
 
       </ul>  

templates/chat/chat-generic-result.hbs

@@ -33,25 +33,25 @@
             <li><label class="chat-result-text chat-result-success ">Réussite Critique !</label></li>
             {{#if arme}}
               {{#if arme.system.dommagecritiquemort}}
-                <li><label class="chat-result-text chat-result-success">La victime est morte !</label></li>
+                <li><label class="chat-result-success">La victime est morte !</label></li>
               {{else}}
                 {{#if arme.system.dommagecritiqueko}}
                   <li><label class="chat-result-text chat-result-success ">La victime est KO !</label></li>
                 {{/if}}
-                <li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagecritique}} dommages</label></li>
+                <li><label class="chat-result-success ">La victime subit {{arme.system.dommagecritique}} dommages</label></li>
               {{/if}}
             {{/if}}
           {{else}}  
             {{#if isPart}}
               <li><label class="chat-result-text chat-result-success ">Réussite Particulière !</label></li>
               {{#if arme}}
-                <li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagepart}} dommages</label></li>
+                <li><label class="chat-result-success ">La victime subit {{arme.system.dommagepart}} dommages</label></li>
               {{/if}}        
 
             {{else}}
               <li><label class="chat-result-text chat-result-success ">Succés !</label></li>
               {{#if arme}}
-                <li><label class="chat-result-text chat-result-success ">La victime subit {{arme.system.dommagenormale}} dommages</label></li>
+                <li><label class="chat-result-success ">La victime subit {{arme.system.dommagenormale}} dommages</label></li>
               {{/if}}        
             {{/if}}        
           {{/if}}