From 0fecc3a20259f615832ebdf12d50fcf1b91ae362 Mon Sep 17 00:00:00 2001 From: sladecraven Date: Sun, 26 Jul 2020 17:06:06 +0200 Subject: [PATCH] Various fixes --- RdD.geany | 7 +++-- module/rdd-tmr-dialog.js | 16 +++++------ packs/desirs-lancinants-et-idees-fixes.db | 2 -- packs/queues-de-dragon.db | 4 +-- system.json | 9 ------ templates/item-queues-sheet.html | 35 ----------------------- templates/item-souffle-sheet.html | 4 --- 7 files changed, 14 insertions(+), 63 deletions(-) delete mode 100644 packs/desirs-lancinants-et-idees-fixes.db delete mode 100644 templates/item-queues-sheet.html diff --git a/RdD.geany b/RdD.geany index ba3a660a..8e71e8ab 100644 --- a/RdD.geany +++ b/RdD.geany @@ -28,15 +28,16 @@ long_line_behaviour=1 long_line_column=72 [files] -current_page=5 +current_page=8 FILE_NAME_0=9759;JSON;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Ftemplate.json;0;2 FILE_NAME_1=8120;CSS;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fstyles%2Fsimple.css;0;2 FILE_NAME_2=19778;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Ftmr-utility.js;0;2 FILE_NAME_3=21106;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Factor.js;0;2 -FILE_NAME_4=6287;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Factor-sheet.js;0;2 +FILE_NAME_4=6228;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Factor-sheet.js;0;2 FILE_NAME_5=20083;HTML;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Ftemplates%2Factor-sheet.html;0;2 -FILE_NAME_6=1547;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Frdd-tmr-dialog.js;0;2 +FILE_NAME_6=1312;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Frdd-tmr-dialog.js;0;2 FILE_NAME_7=1767;Javascript;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fmodule%2Frdd-roll-dialog.js;0;2 +FILE_NAME_8=266;None;0;EUTF-8;0;1;0;%2Fhome%2Fmorr%2Fwork%2Ffoundryvtt%2Ffoundryvtt-reve-de-dragon%2Fpacks%2Fqueues-de-dragon.db;0;2 [VTE] last_dir=/home/sigmar diff --git a/module/rdd-tmr-dialog.js b/module/rdd-tmr-dialog.js index 3727a3ab..d3c22905 100644 --- a/module/rdd-tmr-dialog.js +++ b/module/rdd-tmr-dialog.js @@ -28,6 +28,7 @@ export class RdDTMRDialog extends Dialog { dialogConf.title = "Terres Médianes de Rêve", dialogOptions.width = 920; dialogOptions.height = 960; + dialogOptions['z-index'] = 20; super(dialogConf, dialogOptions); @@ -91,7 +92,6 @@ export class RdDTMRDialog extends Dialog { if (result == "souffle") { let souffle = TMRUtility.getSouffle(); } - await this.maximize(); console.log("-> refouler", this.currentRencontre) this.updateValuesDisplay(); } @@ -99,7 +99,6 @@ export class RdDTMRDialog extends Dialog { async matriser(data) { this.actor.deleteTMRRencontreAtPosition( ); // Remove the stored rencontre if necessary this.updatePreviousRencontres(); - await this.maximize(); let draconic = this.actor.getBestDraconic(); let carac = this.actor.getCurrentReve(); @@ -110,11 +109,16 @@ export class RdDTMRDialog extends Dialog { myroll.roll(); if ( myroll.total > scoreDef.score ) { TMRUtility.processRencontreEchec( this.actor, this.rencontre); - ChatMessage.create( { title: "TMR", content: game.user.name + " a perdu sa rencontre.", user: game.user._id, whisper: ChatMessage.getWhisperRecipients("GM") } ); + ChatMessage.create( { title: "TMR", content: "Vous avez échoué à votre maîtrise d'un " . this.currentRencontre.name + " de force " + + this.currentRencontre.force + + "
Vous quittez brutalement les Terres Médianes !", + user: game.user._id, whisper: [ game.user ] } ); + ChatMessage.create( { title: "TMR", content: game.user.name + " a perdu sa rencontre contre : " + this.currentRencontre.name + " de force " + this.currentRencontre.force, user: game.user._id, whisper: ChatMessage.getWhisperRecipients("GM") } ); this.close(); } else { TMRUtility.processRencontreReussite( this.actor, this.rencontre); - ChatMessage.create( { title: "TMR", content: game.user.name + " a gagné sa rencontre.", user: game.user._id, whisper: ChatMessage.getWhisperRecipients("GM") } ); + ChatMessage.create( { title: "TMR", content: "Vous avez réussi votre maîtrise d'un " + this.currentRencontre.name + " de force " + this.currentRencontre.force, user: game.user._id, whisper: [ game.user ] } ); + ChatMessage.create( { title: "TMR", content: game.user.name + " a gagné sa rencontre contre : " + this.currentRencontre.name + " de force " + this.currentRencontre.force, user: game.user._id, whisper: ChatMessage.getWhisperRecipients("GM") } ); } console.log("-> matriser", this.currentRencontre); this.updateValuesDisplay(); @@ -145,7 +149,6 @@ export class RdDTMRDialog extends Dialog { if (rencontre) { // Manages it this.currentRencontre = duplicate(rencontre); - await this.minimize(); let diag = new Dialog( { title: "Rencontre en TMR!", content: "Vous recontrez un " + rencontre.name + " de force " + rencontre.force + "
", buttons: { @@ -198,8 +201,6 @@ export class RdDTMRDialog extends Dialog { manageCaseHumideResult() { if ( this.toclose ) this.close(); - else - this.maximize(); } /* -------------------------------------------- */ @@ -242,7 +243,6 @@ export class RdDTMRDialog extends Dialog { } } ); - await this.minimize(); humideDiag.render(true); } } diff --git a/packs/desirs-lancinants-et-idees-fixes.db b/packs/desirs-lancinants-et-idees-fixes.db deleted file mode 100644 index b9a20fe3..00000000 --- a/packs/desirs-lancinants-et-idees-fixes.db +++ /dev/null @@ -1,2 +0,0 @@ -{"name":"Idées fixes","permission":{"default":0,"jOzRscDxoXZWpGS6":3},"flags":{},"description":"Les idées fixes prennent e!et immédiatement et durent jusqu’à l’extrême fin de l’heure du Château Dormant du lendemain. Si passé ce délai, l’occasion de les manifester ne s’est pas présentée, la queue prend fin néanmoins. Si elles entrent en contradiction avec une autre queue de Dragon, retirer. Les idées fixes peuvent être refoulées à tout moment au prix de 1 point de refoulement.","results":[{"_id":"xX6XGI6ujPDSbbob","flags":{},"type":0,"text":"Ne s’exprimer que par des cris d’animaux (meuh ! coin-coin ! etc.).","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[1,1],"drawn":false},{"_id":"gYN6fcQISs2H7kAn","flags":{},"type":0,"text":"Garder les yeux bandés.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[2,2],"drawn":false},{"_id":"QIHOFfluPnEJFKHD","flags":{},"type":0,"text":"Ne dire que «\"non\"» ou négation analogue.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[3,3],"drawn":false},{"_id":"P0eaJjtQQfpNIL9I","flags":{},"type":0,"text":"Garder sur soi 3d6 kilos de cailloux.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[4,4],"drawn":false},{"_id":"PENvfmIpKFWee8rF","flags":{},"type":0,"text":"Traîner son épée en laisse (ou sa meilleure arme).","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[5,5],"drawn":false},{"_id":"6xT8v1ScJSZEente","flags":{},"type":0,"text":"Garder une main sur la tête.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[6,6],"drawn":false},{"_id":"0CO9RJPygGdJT9nB","flags":{},"type":0,"text":"Avoir le visage noirci à la cendre.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[7,7],"drawn":false},{"_id":"XeCtzSCuEEm9q8TI","flags":{},"type":0,"text":"Cracher dans toute nourriture ou boisson aperçue.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[8,8],"drawn":false},{"_id":"Sh5KRDvM7iXad6rK","flags":{},"type":0,"text":"Anorexie. Ne rien avaler, ni solide, ni liquide, pas même une potion.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[9,9],"drawn":false},{"_id":"6Q3XKURzip61EXK2","flags":{},"type":0,"text":"Aller tout nu, sans porter le moindre paquet ni objet.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[10,10],"drawn":false},{"_id":"7B8joMjIuhNxip6N","flags":{},"type":0,"text":"Vider sur sa tête toute fiole ou flacon aperçu.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[11,11],"drawn":false},{"_id":"Febiy30xqiNo7OqV","flags":{},"type":0,"text":"Appeler les hommes \"madame\" et les femmes \"messire\".","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[12,12],"drawn":false},{"_id":"Aa72g0fFdq2qBmCn","flags":{},"type":0,"text":"Ne marcher qu’à quatre pattes.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[13,13],"drawn":false},{"_id":"UYhT76xYv8OGXcMZ","flags":{},"type":0,"text":"Boulimie. Manger au moins un point de sust par heure.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[14,14],"drawn":false},{"_id":"fOnQmiXMPXrK3K6P","flags":{},"type":0,"text":"Refuser de se déplacer autrement que porté.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[15,15],"drawn":false},{"_id":"KKGlZXouFfIMKQma","flags":{},"type":0,"text":"Ne pas franchir de porte. (On peut franchir une fenêtre)","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[16,16],"drawn":false},{"_id":"JjWHUsMLhLuTYB2q","flags":{},"type":0,"text":"Faire le mort.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[17,17],"drawn":false},{"_id":"r7Dw8GD1ceypY0iV","flags":{},"type":0,"text":"Éteindre tout feu rencontré (feu de camp, torche, lanterne, etc.).","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[18,18],"drawn":false},{"_id":"i0AW1Ir1V7y2ZmEh","flags":{},"type":0,"text":"Refuser de se délester du moindre objet, ni donner ni prêter.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[19,19],"drawn":false},{"_id":"DQBzVXbJKn9zsXUI","flags":{},"type":0,"text":"Refuser de monter dans les TMR.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[20,20],"drawn":false}],"formula":"1d20","replacement":false,"displayRoll":true,"_id":"9XtJu9wwxVTEUlGC"} -{"name":"Désirs lancinants","permission":{"default":0,"jOzRscDxoXZWpGS6":3},"flags":{},"description":"Les désirs lancinants durent jusqu’à ce qu’ils soient satisfaits ou refoulés. Tant que satisfaction n’est pas obtenue, aucun point d’expérience ne peut plus être gagné par l’exercice en cas de particulière et d’ajustement final négatif. Les points d’expérience dus au stress ne sont pas affectés. Les désirs lancinants peuvent être refoulés à tout moment au prix de 1 point de refoulement.","results":[{"_id":"m9BMFVAByyICiMkp","flags":{},"type":0,"text":"Danser nu sous la pluie.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[1,1],"drawn":false},{"_id":"EJYCgPl9BCW92LSM","flags":{},"type":0,"text":"Traire une vache.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[2,2],"drawn":false},{"_id":"fRgwd7VconbmXrWQ","flags":{},"type":0,"text":"Manger du poisson.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[3,3],"drawn":false},{"_id":"NEWpP5vwM5KQviDD","flags":{},"type":0,"text":"Manger des champignons.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[4,4],"drawn":false},{"_id":"8pMq7q3evaj9fIst","flags":{},"type":0,"text":"Se soûler, minimum \"pas frais\".","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[5,5],"drawn":false},{"_id":"qFOyIPVjQkVjrHFI","flags":{},"type":0,"text":"Gagner de l’argent, minimum 10 deniers.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[6,6],"drawn":false},{"_id":"RrOMys2WRxUrRYev","flags":{},"type":0,"text":"Faire des bulles de savon.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[7,7],"drawn":false},{"_id":"kwOTcCx7NDRxqv8B","flags":{},"type":0,"text":"Entendre braire un âne.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[8,8],"drawn":false},{"_id":"KoGHRGGze7WXnO9R","flags":{},"type":0,"text":"Danser avec un(e) partenaire inconnu(e) de Beauté 13 minimum.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[9,9],"drawn":false},{"_id":"JFiIv5R4gAYV1IMs","flags":{},"type":0,"text":"Construire une cabane.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[10,10],"drawn":false},{"_id":"vKXdKjA4Vt7OWhOW","flags":{},"type":0,"text":"Acquérir une chèvre.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[11,11],"drawn":false},{"_id":"wRk4nXin4UUB5c4o","flags":{},"type":0,"text":"Se rouler dans la boue.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[12,12],"drawn":false},{"_id":"XUcNhyHEDjSvg8ki","flags":{},"type":0,"text":"Embrasser un cochon sur le groin.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[13,13],"drawn":false},{"_id":"oN3eP4peneyXENds","flags":{},"type":0,"text":"Briser un objet de verre.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[14,14],"drawn":false},{"_id":"5AHjNXDrQL5TqLjv","flags":{},"type":0,"text":"Casser 3d6 oeufs en les jetant à terre.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[15,15],"drawn":false},{"_id":"crQSShE6rcAnBj1k","flags":{},"type":0,"text":"Passer une nuit sur une échelle.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[16,16],"drawn":false},{"_id":"dDYpP2np5BKlEMSK","flags":{},"type":0,"text":"Se faire raser la tête.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[17,17],"drawn":false},{"_id":"CvynUiSfzZ0UnFzk","flags":{},"type":0,"text":"Masochisme. Perdre 3 points d’endurance minimum en 1 round.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[18,18],"drawn":false},{"_id":"3pM6YTcKglgt5naZ","flags":{},"type":0,"text":"Mégalomanie. Être acclamé par un minimum de 10 personnes.","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[19,19],"drawn":false},{"_id":"EJYLKIrPHPPbgrlW","flags":{},"type":0,"text":"Pisser dans un violon (luth, mandoline, etc.)","img":"icons/svg/d20-black.svg","resultId":"","weight":1,"range":[20,20],"drawn":false}],"formula":"1d20","replacement":false,"displayRoll":true,"_id":"t6UNVkYeeqCwvVOZ"} diff --git a/packs/queues-de-dragon.db b/packs/queues-de-dragon.db index e0aadee7..3a0b1c97 100644 --- a/packs/queues-de-dragon.db +++ b/packs/queues-de-dragon.db @@ -1,5 +1,5 @@ -{"_id":"0jrEZ62Q2Jz4kBGf","name":"Mauvaise rencontre en perspective","permission":{"default":0,"jOzRscDxoXZWpGS6":3},"type":"queue","data":{"description":"

Tirer la prochaine rencontre dans les TMR sur la @RollTable[52ymSWISvXPUhRyQ]{Table spéciale de rencontres}

","refoulement":1},"flags":{},"img":"icons/svg/mystery-man.svg"} -{"_id":"1gGVlZM0UyifL6RK","name":"Souvenir obsessionnel de l'archétype","permission":{"default":0,"jOzRscDxoXZWpGS6":3},"type":"queue","data":{"description":"

Les prochains points d’expérience dus au stress doivent être mis dans une compétence déterminée aléatoirement par la table de @Compendium[world.tables-diverses.E0WLgjn6LA9WsvKJ]{Détermination aléatoire de compétence}.

","refoulement":1},"flags":{},"img":"icons/svg/mystery-man.svg"} +{"_id":"0jrEZ62Q2Jz4kBGf","name":"Mauvaise rencontre en perspective","permission":{"default":0,"jOzRscDxoXZWpGS6":3},"type":"queue","data":{"description":"

Tirer la prochaine rencontre dans les TMR sur la @Compendium[foundryvtt-reve-de-dragon.tables-diverses.66ye0OOxBO9LEjdd]{Table spéciale de rencontres}

","refoulement":1},"flags":{},"img":"icons/svg/mystery-man.svg"} +{"_id":"1gGVlZM0UyifL6RK","name":"Souvenir obsessionnel de l'archétype","permission":{"default":0,"jOzRscDxoXZWpGS6":3},"type":"queue","data":{"description":"

Les prochains points d’expérience dus au stress doivent être mis dans une compétence déterminée aléatoirement par la table de @Compendium[foundryvtt-reve-de-dragon.tables-diverses.E0WLgjn6LA9WsvKJ]{Détermination aléatoire de compétence}.

","refoulement":1},"flags":{},"img":"icons/svg/mystery-man.svg"} {"_id":"32LbwxxokC9Tn370","name":"Coup de foudre fatal","permission":{"default":0,"jOzRscDxoXZWpGS6":3},"type":"queue","data":{"description":"

On devient immédiatement amoureux fou de la première personne inconnue de sexe opposé et de même espèce rencontrée. Tant que satisfaction n’est pas obtenue, traiter comme un désir lancinant. 

","refoulement":2},"flags":{},"img":"icons/svg/mystery-man.svg"} {"_id":"5knw1NcnBsLIjHpr","name":"Montée laborieuse","permission":{"default":0,"jOzRscDxoXZWpGS6":3},"type":"queue","data":{"description":"

Pendant un jour, monter en TMR coûte 2 points de rêve au lieu d’un, et 3 points en déplacement accéléré.

","refoulement":1},"flags":{},"img":"icons/svg/mystery-man.svg"} {"_id":"EUrxQGd7FuW628NS","name":"Inertie draconique","permission":{"default":0,"jOzRscDxoXZWpGS6":3},"type":"queue","data":{"description":"

Pendant un jour, la fatigue en TMR est doublée. Chaque case ou round coûte 2 points au lieu d’un.

","refoulement":1},"flags":{},"img":"icons/svg/mystery-man.svg"} diff --git a/system.json b/system.json index 4cb81b04..301beb31 100644 --- a/system.json +++ b/system.json @@ -90,15 +90,6 @@ "path": "./packs/tetes-de-dragon-pour-tous-personnages.db", "entity": "Item", "tag" : "item" - }, - { - "name": "desirs-lancinants-et-idees-fixes", - "label": "Désirs Lancinants et Idées Fixes", - "system": "foundryvtt-reve-de-dragon", - "module": "foundryvtt-reve-de-dragon", - "path": "./packs/desirs-lancinants-et-idees-fixes.db", - "entity": "RollTable", - "tag" : "rolltable" }, { "name": "tables-diverses", diff --git a/templates/item-queues-sheet.html b/templates/item-queues-sheet.html deleted file mode 100644 index e76c942d..00000000 --- a/templates/item-queues-sheet.html +++ /dev/null @@ -1,35 +0,0 @@ -
-
- -
-

-
-
- - {{!-- Sheet Body --}} -
-
- - -
-
- - -
-
- - -
-
- - -
-
- Description : -
-
- {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} -
-
- -
diff --git a/templates/item-souffle-sheet.html b/templates/item-souffle-sheet.html index d6f1fdeb..8ed8f6b5 100644 --- a/templates/item-souffle-sheet.html +++ b/templates/item-souffle-sheet.html @@ -8,10 +8,6 @@ {{!-- Sheet Body --}}
-
- - -
Description :